4 files changed, 138 insertions, 289 deletions

diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index c7ed05eba13a..cfe408e31d8c 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -1,31 +1,27 @@
-# New ports collection makefile for:	activemq
-# Date created:		2010-02-07
-# Whom:			Gvozdikov Veniamin <g.veniamin@googlemail.com>
-#
 # $FreeBSD$
 #
 
 PORTNAME=	activemq
-PORTVERSION=	5.5.0
+PORTVERSION=	5.6.0
 CATEGORIES=	net java
 MASTER_SITES=	http://www.sai.msu.su/apache/${MASTER_SITE_SUBDIR}/ \
 		${MASTER_SITE_APACHE}/${MASTER_SITE_SUBDIR}/
 MASTER_SITE_SUBDIR=${PORTNAME}/apache-${PORTNAME}/${PORTVERSION}
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin
 
-MAINTAINER=	g.veniamin@googlemail.com
+MAINTAINER=	tj@freebsd.org
 COMMENT=	Messaging and Integration Patterns provider
 
 NO_BUILD=	yes
 
 USE_JAVA=	yes
 LICENSE=	AL2
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 MQDATA=		${PREFIX}/lib/${PORTNAME}
-MQDB=		${PREFIX}/${PORTNAME}
+MQDB?=		/var/db/activemq
 DATADIR=	${MQDATA}
-MQUSER=		activemq
-MQGROUP=	${MQUSER}
+MQUSER?=	activemq
+MQGROUP?=	${MQUSER}
 USERS=		${MQUSER}
 GROUPS=		${MQGROUP}
 
@@ -63,10 +59,16 @@ ETC_FILES=	activemq-command.xml \
 
 WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}
 SUB_FILES=	pkg-install pkg-deinstall
-SUB_LIST=	ETC_FILES="${ETC_FILES}"
+SUB_LIST=	ETC_FILES="${ETC_FILES}" \
+		MQUSER="${MQUSER}" \
+		MQGROUP="${MQGROUP}" \
+		MQDB="${MQDB}"
+PLIST_SUB=	MQUSER="${MQUSER}" MQGROUP="${MQGROUP}" MQDB="${MQDB}"
+
+.include <bsd.port.options.mk>
 
 do-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR}/
 .for f in ${PORTDOCS}
@@ -94,9 +96,11 @@ do-install:
 	@${LN} -sf ${MQDB} ${MQDATA}/data
 	@${LN} -sf ${ETCDIR} ${MQDATA}/conf
 	@${LN} -sf ${EXAMPLESDIR}/example ${MQDATA}/example
-	@${CHOWN} -Rh ${MQUSER}:${MQGROUP} ${MQDB} ${ETCDIR} ${EXAMPLES} ${MQDATA}
+	@${CHOWN} -Rh ${MQUSER}:${MQGROUP} ${MQDB} ${ETCDIR} ${EXAMPLES} \
+		${MQDATA}
 
 post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${INSTALL} -d -o ${MQUSER} -g ${MQGROUP} ${MQDB}
 
 .include <bsd.port.mk>
diff --git a/net/activemq/distinfo b/net/activemq/distinfo
index 12e54eb09a46..d9ff68247912 100644
--- a/net/activemq/distinfo
+++ b/net/activemq/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-activemq-5.5.0-bin.tar.gz) = f4f2362aac136adb870889e7467f50a7b81cef78366dbdaa763fc654aa5bb6e9
-SIZE (apache-activemq-5.5.0-bin.tar.gz) = 27495046
+SHA256 (apache-activemq-5.6.0-bin.tar.gz) = 801a479c02f38910894d32ab62ec30c2a266bf310f2ed745570636a44e04f58b
+SIZE (apache-activemq-5.6.0-bin.tar.gz) = 49041409
diff --git a/net/activemq/files/activemq.in b/net/activemq/files/activemq.in
index 072f131efde8..aeb13b53080a 100644
--- a/net/activemq/files/activemq.in
+++ b/net/activemq/files/activemq.in
@@ -35,9 +35,11 @@ load_rc_config $name
 
 # Set defaults
 : ${activemq_enable:=NO}
-: ${activemq_user:=${name}}
-: ${activemq_group:=${name}}
+: ${activemq_user:=%%MQUSER%%}
+: ${activemq_group:=%%MQGROUP%%}
 : ${activemq_classpath:=%%ETCDIR%%}
+: ${activemq_conf:=%%ETCDIR%%}
+: ${activemq_data:=%%MQDB%%}
 : ${activemq_home:=%%DATADIR%%}
 : ${activemq_javargs:='-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties -Dcom.sun.management.jmxremote'}
 : ${activemq_stop_timeout:="10"}
@@ -48,6 +50,8 @@ required_files="%%ETCDIR%%/activemq.xml"
 jar_file="%%DATADIR%%/bin/run.jar"
 java_options=" 	-server -jar ${activemq_javargs} \
 		-Dactivemq.classpath=${activemq_classpath} \
+		-Dactivemq.conf=${activemq_conf} \
+		-Dactivemq.data=${activemq_data} \
 		-Dactivemq.home=${activemq_home} \
 		-Dactivemq.base=${activemq_home}"
 
diff --git a/net/activemq/pkg-plist b/net/activemq/pkg-plist
index 14602bb73d0d..283a5b824728 100644
--- a/net/activemq/pkg-plist
+++ b/net/activemq/pkg-plist
@@ -1,4 +1,7 @@
 @exec /bin/mkdir -p %%PREFIX%%/lib/activemq/webapps/admin/WEB-INF/jsp
+@exec install -d -o %%MQUSER%% -g %%MQGROUP%% %%MQDB%%
+@dirrmtry %%MQDB%%
+@unexec if [ -d %%MQDB%% ]; then echo "You should remove %%MQDB%% if you don't need it any more."; fi
 lib/activemq/bin/activemq
 lib/activemq/bin/activemq-admin
 lib/activemq/bin/run.jar
@@ -6,55 +9,20 @@ lib/activemq/bin/wrapper.jar
 lib/activemq/conf
 lib/activemq/data
 lib/activemq/example
-lib/activemq/lib/activation-1.1.jar
 lib/activemq/lib/activemq-protobuf-1.1.jar
 lib/activemq/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar
 lib/activemq/lib/geronimo-jms_1.1_spec-1.1.1.jar
 lib/activemq/lib/geronimo-jta_1.0.1B_spec-1.0.1.jar
-lib/activemq/lib/jaxb-api-2.1.jar
-lib/activemq/lib/jaxb-impl-2.1.6.jar
-lib/activemq/lib/optional/activeio-core-3.1.2.jar
-lib/activemq/lib/optional/commons-beanutils-1.6.1.jar
-lib/activemq/lib/optional/commons-codec-1.2.jar
 lib/activemq/lib/optional/commons-collections-3.2.1.jar
-lib/activemq/lib/optional/commons-dbcp-1.2.2.jar
 lib/activemq/lib/optional/commons-httpclient-3.1.jar
-lib/activemq/lib/optional/commons-lang-2.4.jar
-lib/activemq/lib/optional/commons-net-2.0.jar
-lib/activemq/lib/optional/commons-pool-1.5.4.jar
 lib/activemq/lib/optional/geronimo-j2ee-connector_1.5_spec-2.0.0.jar
-lib/activemq/lib/optional/jettison-1.2.jar
 lib/activemq/lib/optional/josql-1.5.jar
-lib/activemq/lib/optional/log4j-1.2.14.jar
-lib/activemq/lib/optional/spring-aop-3.0.3.RELEASE.jar
-lib/activemq/lib/optional/spring-asm-3.0.3.RELEASE.jar
-lib/activemq/lib/optional/spring-beans-3.0.3.RELEASE.jar
-lib/activemq/lib/optional/spring-context-3.0.3.RELEASE.jar
-lib/activemq/lib/optional/spring-core-3.0.3.RELEASE.jar
-lib/activemq/lib/optional/spring-expression-3.0.3.RELEASE.jar
-lib/activemq/lib/optional/spring-jms-3.0.3.RELEASE.jar
-lib/activemq/lib/optional/spring-oxm-tiger-1.5.8.jar
-lib/activemq/lib/optional/spring-tx-3.0.3.RELEASE.jar
-lib/activemq/lib/optional/stax2-api-3.0.1.jar
-lib/activemq/lib/optional/velocity-1.6.2.jar
-lib/activemq/lib/optional/woodstox-core-asl-4.0.7.jar
-lib/activemq/lib/optional/xbean-spring-3.7.jar
-lib/activemq/lib/optional/xstream-1.3.1.jar
 lib/activemq/lib/optional/xpp3-1.1.4c.jar
-lib/activemq/lib/stax-1.2.0.jar
-lib/activemq/lib/stax-api-1.0.1.jar
-lib/activemq/lib/web/commons-management-1.0.jar
 lib/activemq/lib/web/core-3.1.1.jar
 lib/activemq/lib/web/geronimo-servlet_2.5_spec-1.2.jar
 lib/activemq/lib/web/jdom-1.0.jar
-lib/activemq/lib/web/jetty-all-server-7.1.6.v20100715.jar
-lib/activemq/lib/web/jetty-websocket-7.1.6.v20100715.jar
 lib/activemq/lib/web/jsp-2.1-glassfish-2.1.v20100127.jar
 lib/activemq/lib/web/jsp-api-2.1-glassfish-2.1.v20100127.jar
-lib/activemq/lib/web/rome-0.8.jar
-lib/activemq/lib/web/sitemesh-2.2.1.jar
-lib/activemq/lib/web/spring-web-3.0.3.RELEASE.jar
-lib/activemq/lib/web/spring-webmvc-3.0.3.RELEASE.jar
 lib/activemq/webapps/admin/404.html
 lib/activemq/webapps/admin/500.html
 lib/activemq/webapps/admin/META-INF/LICENSE
@@ -79,6 +47,7 @@ lib/activemq/webapps/admin/WEB-INF/dispatcher-servlet.xml
 lib/activemq/webapps/admin/WEB-INF/jspf/headertags.jspf
 lib/activemq/webapps/admin/WEB-INF/jspf/old.jspf
 lib/activemq/webapps/admin/WEB-INF/tags/form/checkbox.tag
+lib/activemq/webapps/admin/WEB-INF/tags/form/escape.tag
 lib/activemq/webapps/admin/WEB-INF/tags/form/forEachMapEntry.tag
 lib/activemq/webapps/admin/WEB-INF/tags/form/option.tag
 lib/activemq/webapps/admin/WEB-INF/tags/form/short.tag
@@ -145,6 +114,7 @@ lib/activemq/webapps/admin/js/plotkit/iecanvas.htc
 lib/activemq/webapps/admin/js/prettify.js
 lib/activemq/webapps/admin/js/standardista-table-sorting.js
 lib/activemq/webapps/admin/message.jsp
+lib/activemq/webapps/admin/network.jsp
 lib/activemq/webapps/admin/queueConsumers.jsp
 lib/activemq/webapps/admin/queueGraph.jsp
 lib/activemq/webapps/admin/queues.jsp
@@ -160,172 +130,8 @@ lib/activemq/webapps/admin/test/index.jsp
 lib/activemq/webapps/admin/test/systemProperties.jsp
 lib/activemq/webapps/admin/topics.jsp
 lib/activemq/webapps/admin/xml/queues.jsp
+lib/activemq/webapps/admin/xml/subscribers.jsp
 lib/activemq/webapps/admin/xml/topics.jsp
-lib/activemq/webapps/camel/META-INF/DEPENDENCIES
-lib/activemq/webapps/camel/META-INF/LICENSE
-lib/activemq/webapps/camel/META-INF/LICENSE.txt
-lib/activemq/webapps/camel/META-INF/MANIFEST.MF
-lib/activemq/webapps/camel/META-INF/NOTICE
-lib/activemq/webapps/camel/META-INF/NOTICE.txt
-lib/activemq/webapps/camel/META-INF/maven/org.apache.camel/camel-web/pom.properties
-lib/activemq/webapps/camel/META-INF/maven/org.apache.camel/camel-web/pom.xml
-lib/activemq/webapps/camel/WEB-INF/applicationContext.xml
-lib/activemq/webapps/camel/WEB-INF/classes/META-INF/DEPENDENCIES
-lib/activemq/webapps/camel/WEB-INF/classes/META-INF/LICENSE
-lib/activemq/webapps/camel/WEB-INF/classes/META-INF/LICENSE.txt
-lib/activemq/webapps/camel/WEB-INF/classes/META-INF/NOTICE
-lib/activemq/webapps/camel/WEB-INF/classes/META-INF/NOTICE.txt
-lib/activemq/webapps/camel/WEB-INF/classes/application-doc.xml
-lib/activemq/webapps/camel/WEB-INF/classes/application-grammars.xml
-lib/activemq/webapps/camel/WEB-INF/classes/application.wadl
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/model/Camel.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/model/EndpointLink.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/model/Endpoints.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/model/Route.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/model/jaxb.index
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/model/package-info.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/CamelChildResourceSupport.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/CamelContextResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/ComponentResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/ComponentsResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/Constants.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/ConvertersFromResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/ConvertersResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/EndpointResource$1.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/EndpointResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/EndpointsResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/ExchangeResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/LanguageResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/LanguagesResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/RouteResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/RouteStatusResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources/RoutesResource.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/AggregateDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/CamelOSGIResourceConfig.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/CamelResourceConfig.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/CatchDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/ChoiceDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/ConvertBodyDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/ErrorHandlerRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/ExpressionNodeRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/ExpressionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/GroovyRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/JAXBContextResolver.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/JAXBContextResolverOSGI.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/JAXBMarshallerResolver$1.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/JAXBMarshallerResolver.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/OnCompletionDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/OnExceptionDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/OutputDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/PredicateRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/ProcessorDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/ResequenceDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/RoutingSlipDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/SendDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/TextRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/ThrottleDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/ThrowExceptionDefinitionRenderer.class
-lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util/UriCharactersEncoder.class
-lib/activemq/webapps/camel/WEB-INF/classes/resourcedoc.xml
-lib/activemq/webapps/camel/WEB-INF/decorators.xml
-lib/activemq/webapps/camel/WEB-INF/decorators/main.jsp
-lib/activemq/webapps/camel/WEB-INF/decorators/panel.jsp
-lib/activemq/webapps/camel/WEB-INF/decorators/plain.jsp
-lib/activemq/webapps/camel/WEB-INF/decorators/printable.jsp
-lib/activemq/webapps/camel/WEB-INF/jspf/header.jspf
-lib/activemq/webapps/camel/WEB-INF/lib/asm-3.1.jar
-lib/activemq/webapps/camel/WEB-INF/lib/bytelist-1.0.6.jar
-lib/activemq/webapps/camel/WEB-INF/lib/constantine-0.6.jar
-lib/activemq/webapps/camel/WEB-INF/lib/jaffl-0.5.1.jar
-lib/activemq/webapps/camel/WEB-INF/lib/jcodings-1.0.4.jar
-lib/activemq/webapps/camel/WEB-INF/lib/jersey-atom-1.1.5.jar
-lib/activemq/webapps/camel/WEB-INF/lib/jersey-core-1.1.5.jar
-lib/activemq/webapps/camel/WEB-INF/lib/jersey-json-1.1.5.jar
-lib/activemq/webapps/camel/WEB-INF/lib/jersey-server-1.1.5.jar
-lib/activemq/webapps/camel/WEB-INF/lib/jersey-spring-1.1.5.jar
-lib/activemq/webapps/camel/WEB-INF/lib/jffi-1.0.1.jar
-lib/activemq/webapps/camel/WEB-INF/lib/jline-0.9.93.jar
-lib/activemq/webapps/camel/WEB-INF/lib/jnr-netdb-1.0.jar
-lib/activemq/webapps/camel/WEB-INF/lib/jnr-posix-1.1.4.jar
-lib/activemq/webapps/camel/WEB-INF/lib/joda-time-1.6.jar
-lib/activemq/webapps/camel/WEB-INF/lib/joni-1.1.4.jar
-lib/activemq/webapps/camel/WEB-INF/lib/jsr311-api-1.1.1.jar
-lib/activemq/webapps/camel/WEB-INF/tags/api/doc.tag
-lib/activemq/webapps/camel/WEB-INF/tags/api/resource.tag
-lib/activemq/webapps/camel/WEB-INF/web.xml
-lib/activemq/webapps/camel/com/sun/jersey/server/impl/wadl/WadlResource/index.jsp
-lib/activemq/webapps/camel/com/sun/jersey/server/impl/wadl/WadlResourceResource/index.jsp
-lib/activemq/webapps/camel/css/prettify/prettify.css
-lib/activemq/webapps/camel/css/site.css
-lib/activemq/webapps/camel/css/sorttable.css
-lib/activemq/webapps/camel/css/type-settings.css
-lib/activemq/webapps/camel/images/asf-logo.png
-lib/activemq/webapps/camel/images/big-bullet.png
-lib/activemq/webapps/camel/images/black-footer-bottom.png
-lib/activemq/webapps/camel/images/black-footer-left.png
-lib/activemq/webapps/camel/images/black-footer-right.png
-lib/activemq/webapps/camel/images/bottom-red-bar.png
-lib/activemq/webapps/camel/images/camel-logo.png
-lib/activemq/webapps/camel/images/checker-bg.png
-lib/activemq/webapps/camel/images/content-left.png
-lib/activemq/webapps/camel/images/content-right.png
-lib/activemq/webapps/camel/images/feed_atom.png
-lib/activemq/webapps/camel/images/feed_rss.png
-lib/activemq/webapps/camel/images/left-box-bottom.png
-lib/activemq/webapps/camel/images/left-box-right.png
-lib/activemq/webapps/camel/images/left-box-top.png
-lib/activemq/webapps/camel/images/oval-arrow.png
-lib/activemq/webapps/camel/images/right-box-bottom.png
-lib/activemq/webapps/camel/images/right-box-left.png
-lib/activemq/webapps/camel/images/right-box-top.png
-lib/activemq/webapps/camel/images/small-bullet-gray.png
-lib/activemq/webapps/camel/images/small-bullet-red.png
-lib/activemq/webapps/camel/images/spacer.gif
-lib/activemq/webapps/camel/images/top-red-bar.png
-lib/activemq/webapps/camel/images/white-header-left.png
-lib/activemq/webapps/camel/images/white-header-right.png
-lib/activemq/webapps/camel/images/white-header-top.png
-lib/activemq/webapps/camel/js/buildProfile.js
-lib/activemq/webapps/camel/js/common.js
-lib/activemq/webapps/camel/js/css.js
-lib/activemq/webapps/camel/js/dojo/dojo.js
-lib/activemq/webapps/camel/js/prettify/lang-css.js
-lib/activemq/webapps/camel/js/prettify/lang-hs.js
-lib/activemq/webapps/camel/js/prettify/lang-lisp.js
-lib/activemq/webapps/camel/js/prettify/lang-lua.js
-lib/activemq/webapps/camel/js/prettify/lang-ml.js
-lib/activemq/webapps/camel/js/prettify/lang-proto.js
-lib/activemq/webapps/camel/js/prettify/lang-sql.js
-lib/activemq/webapps/camel/js/prettify/lang-vb.js
-lib/activemq/webapps/camel/js/prettify/lang-wiki.js
-lib/activemq/webapps/camel/js/prettify/prettify.js
-lib/activemq/webapps/camel/js/route.js
-lib/activemq/webapps/camel/js/standardista-table-sorting.js
-lib/activemq/webapps/camel/js/th/borders.js
-lib/activemq/webapps/camel/js/th/components.js
-lib/activemq/webapps/camel/js/th/css.js
-lib/activemq/webapps/camel/js/th/docs.txt
-lib/activemq/webapps/camel/js/th/helpers.js
-lib/activemq/webapps/camel/js/th/models.js
-lib/activemq/webapps/camel/js/th/th.js
-lib/activemq/webapps/camel/org/apache/camel/web/resources/CamelContextResource/api.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/CamelContextResource/index.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/CamelContextResource/systemProperties.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/ComponentResource/index.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/ComponentsResource/index.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/ConvertersFromResource/index.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/ConvertersResource/index.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/EndpointResource/index.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/EndpointResource/send.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/EndpointsResource/index.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/ExchangeResource/index.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/LanguageResource/index.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/LanguagesResource/index.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/RouteResource/edit.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/RouteResource/index.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/RoutesResource/create.jsp
-lib/activemq/webapps/camel/org/apache/camel/web/resources/RoutesResource/index.jsp
 lib/activemq/webapps/demo/META-INF/LICENSE
 lib/activemq/webapps/demo/META-INF/NOTICE
 lib/activemq/webapps/demo/WEB-INF/web.xml
@@ -353,6 +159,10 @@ lib/activemq/webapps/demo/test/amq_test.html
 lib/activemq/webapps/demo/test/assets/README
 lib/activemq/webapps/demo/test/assets/jsunittest.js
 lib/activemq/webapps/demo/test/assets/unittest.css
+lib/activemq/webapps/demo/websocket/chat.css
+lib/activemq/webapps/demo/websocket/chat.js
+lib/activemq/webapps/demo/websocket/index.html
+lib/activemq/webapps/demo/websocket/stomp.js
 lib/activemq/webapps/favicon.ico
 lib/activemq/webapps/fileserver/META-INF/LICENSE
 lib/activemq/webapps/fileserver/META-INF/NOTICE
@@ -365,27 +175,109 @@ lib/activemq/webapps/fileserver/index.html
 lib/activemq/webapps/index.html
 lib/activemq/webapps/styles/site.css
 lib/activemq/webapps/styles/type-settings.css
-lib/activemq/lib/camel-core-2.7.0.jar
-lib/activemq/lib/activemq-jaas-5.5.0.jar
-lib/activemq/lib/camel-jetty-2.7.0.jar
-lib/activemq/lib/jcl-over-slf4j-1.5.11.jar
-lib/activemq/lib/activemq-web-5.5.0.jar
-lib/activemq/lib/activemq-console-5.5.0.jar
+lib/activemq/lib/activemq-camel-5.6.0.jar
+lib/activemq/lib/activemq-console-5.6.0.jar
+lib/activemq/lib/activemq-core-5.6.0.jar
+lib/activemq/lib/activemq-jaas-5.6.0.jar
 lib/activemq/lib/activemq-rar.txt
-lib/activemq/lib/camel-spring-2.7.0.jar
-lib/activemq/lib/activemq-camel-5.5.0.jar
-lib/activemq/lib/optional/activemq-spring-5.5.0.jar
-lib/activemq/lib/optional/slf4j-log4j12-1.5.11.jar
-lib/activemq/lib/optional/activemq-optional-5.5.0.jar
-lib/activemq/lib/optional/activemq-jmdns_1.0-5.5.0.jar
-lib/activemq/lib/optional/activemq-xmpp-5.5.0.jar
-lib/activemq/lib/optional/activemq-pool-5.5.0.jar
-lib/activemq/lib/optional/jasypt-1.7.jar
-lib/activemq/lib/slf4j-api-1.5.11.jar
-lib/activemq/lib/kahadb-5.5.0.jar
-lib/activemq/lib/camel-jms-2.7.0.jar
-lib/activemq/webapps/admin/network.jsp
-lib/activemq/lib/activemq-core-5.5.0.jar
+lib/activemq/lib/activemq-web-5.6.0.jar
+lib/activemq/lib/camel-core-2.9.2.jar
+lib/activemq/lib/camel-jetty-2.9.2.jar
+lib/activemq/lib/camel-jms-2.9.2.jar
+lib/activemq/lib/camel-spring-2.9.2.jar
+lib/activemq/lib/jcl-over-slf4j-1.6.4.jar
+lib/activemq/lib/kahadb-5.6.0.jar
+lib/activemq/lib/optional/activeio-core-3.1.4.jar
+lib/activemq/lib/optional/activemq-jmdns_1.0-5.6.0.jar
+lib/activemq/lib/optional/activemq-optional-5.6.0.jar
+lib/activemq/lib/optional/activemq-pool-5.6.0.jar
+lib/activemq/lib/optional/activemq-spring-5.6.0.jar
+lib/activemq/lib/optional/activemq-xmpp-5.6.0.jar
+lib/activemq/lib/optional/aopalliance-1.0.jar
+lib/activemq/lib/optional/axis-1.4.2.jar
+lib/activemq/lib/optional/commons-beanutils-1.8.3.jar
+lib/activemq/lib/optional/commons-beanutils-core-1.8.0.jar
+lib/activemq/lib/optional/commons-codec-1.4.jar
+lib/activemq/lib/optional/commons-configuration-1.6.jar
+lib/activemq/lib/optional/commons-dbcp-1.4.jar
+lib/activemq/lib/optional/commons-digester-1.8.jar
+lib/activemq/lib/optional/commons-lang-2.6.jar
+lib/activemq/lib/optional/commons-logging-1.1.1.jar
+lib/activemq/lib/optional/commons-net-2.2.jar
+lib/activemq/lib/optional/commons-pool-1.5.6.jar
+lib/activemq/lib/optional/fusemq-leveldb-1.1.jar
+lib/activemq/lib/optional/geronimo-activation_1.1_spec-1.0.2.jar
+lib/activemq/lib/optional/guava-10.0.1.jar
+lib/activemq/lib/optional/guice-3.0.jar
+lib/activemq/lib/optional/guice-multibindings-3.0.jar
+lib/activemq/lib/optional/hadoop-core-1.0.0.jar
+lib/activemq/lib/optional/hawtbuf-1.9.jar
+lib/activemq/lib/optional/hawtbuf-proto-1.9.jar
+lib/activemq/lib/optional/hawtdispatch-1.9.jar
+lib/activemq/lib/optional/hawtdispatch-scala-1.9.jar
+lib/activemq/lib/optional/hawtdispatch-transport-1.9.jar
+lib/activemq/lib/optional/hawtjni-runtime-1.5.jar
+lib/activemq/lib/optional/jackson-core-asl-1.9.2.jar
+lib/activemq/lib/optional/jackson-mapper-asl-1.9.2.jar
+lib/activemq/lib/optional/jasypt-1.8.jar
+lib/activemq/lib/optional/javax.inject-1.jar
+lib/activemq/lib/optional/jettison-1.3.jar
+lib/activemq/lib/optional/jetty-6.1.26.jar
+lib/activemq/lib/optional/jetty-http-7.6.1.v20120215.jar
+lib/activemq/lib/optional/jetty-io-7.6.1.v20120215.jar
+lib/activemq/lib/optional/jetty-util-6.1.26.jar
+lib/activemq/lib/optional/jetty-util-7.6.1.v20120215.jar
+lib/activemq/lib/optional/jetty-webapp-7.6.1.v20120215.jar
+lib/activemq/lib/optional/jetty-websocket-7.6.1.v20120215.jar
+lib/activemq/lib/optional/jetty-xml-7.6.1.v20120215.jar
+lib/activemq/lib/optional/jsp-2.1-6.1.14.jar
+lib/activemq/lib/optional/jsp-api-2.1-6.1.14.jar
+lib/activemq/lib/optional/jsr305-1.3.9.jar
+lib/activemq/lib/optional/leveldb-0.2.jar
+lib/activemq/lib/optional/leveldb-api-0.2.jar
+lib/activemq/lib/optional/leveldbjni-1.2.jar
+lib/activemq/lib/optional/leveldbjni-linux32-1.2.jar
+lib/activemq/lib/optional/leveldbjni-linux64-1.2.jar
+lib/activemq/lib/optional/leveldbjni-osx-1.2.jar
+lib/activemq/lib/optional/log4j-1.2.16.jar
+lib/activemq/lib/optional/mqtt-client-1.0.jar
+lib/activemq/lib/optional/oro-2.0.8.jar
+lib/activemq/lib/optional/scala-library-2.9.1.jar
+lib/activemq/lib/optional/servlet-api-2.5-20081211.jar
+lib/activemq/lib/optional/servlet-api-2.5-6.1.14.jar
+lib/activemq/lib/optional/slf4j-log4j12-1.6.4.jar
+lib/activemq/lib/optional/snappy-java-1.0.3.jar
+lib/activemq/lib/optional/spring-aop-3.0.6.RELEASE.jar
+lib/activemq/lib/optional/spring-asm-3.0.6.RELEASE.jar
+lib/activemq/lib/optional/spring-beans-3.0.6.RELEASE.jar
+lib/activemq/lib/optional/spring-context-3.0.6.RELEASE.jar
+lib/activemq/lib/optional/spring-context-support-3.0.6.RELEASE.jar
+lib/activemq/lib/optional/spring-core-3.0.6.RELEASE.jar
+lib/activemq/lib/optional/spring-expression-3.0.6.RELEASE.jar
+lib/activemq/lib/optional/spring-jms-3.0.6.RELEASE.jar
+lib/activemq/lib/optional/spring-osgi-core-1.2.1.jar
+lib/activemq/lib/optional/spring-osgi-io-1.2.1.jar
+lib/activemq/lib/optional/spring-oxm-1.5.10.jar
+lib/activemq/lib/optional/spring-oxm-tiger-1.5.10.jar
+lib/activemq/lib/optional/spring-test-3.0.6.RELEASE.jar
+lib/activemq/lib/optional/spring-tx-3.0.6.RELEASE.jar
+lib/activemq/lib/optional/spring-xml-1.5.10.jar
+lib/activemq/lib/optional/stax-api-1.0-2.jar
+lib/activemq/lib/optional/stax-api-1.0.1.jar
+lib/activemq/lib/optional/stax2-api-3.0.2.jar
+lib/activemq/lib/optional/velocity-1.6.4.jar
+lib/activemq/lib/optional/woodstox-core-asl-4.0.8.jar
+lib/activemq/lib/optional/xbean-spring-3.9.jar
+lib/activemq/lib/optional/xmlpull-1.1.3.1.jar
+lib/activemq/lib/optional/xpp3_min-1.1.4c.jar
+lib/activemq/lib/optional/xstream-1.4.2.jar
+lib/activemq/lib/slf4j-api-1.6.4.jar
+lib/activemq/lib/web/jetty-all-server-7.6.1.v20120215.jar
+lib/activemq/lib/web/jetty-websocket-7.6.1.v20120215.jar
+lib/activemq/lib/web/rome-1.0.jar
+lib/activemq/lib/web/sitemesh-2.4.2.jar
+lib/activemq/lib/web/spring-web-3.0.6.RELEASE.jar
+lib/activemq/lib/web/spring-webmvc-3.0.6.RELEASE.jar
 %%EXAMPLESDIR%%/example/build.xml
 %%EXAMPLESDIR%%/example/conf/activemq.xml
 %%EXAMPLESDIR%%/example/conf/log4j.properties
@@ -461,6 +353,7 @@ lib/activemq/lib/activemq-core-5.5.0.jar
 @dirrm lib/activemq/webapps/fileserver/WEB-INF
 @dirrm lib/activemq/webapps/fileserver/META-INF
 @dirrm lib/activemq/webapps/fileserver
+@dirrm lib/activemq/webapps/demo/websocket
 @dirrm lib/activemq/webapps/demo/test/assets
 @dirrm lib/activemq/webapps/demo/test
 @dirrm lib/activemq/webapps/demo/sandbox
@@ -469,58 +362,6 @@ lib/activemq/lib/activemq-core-5.5.0.jar
 @dirrm lib/activemq/webapps/demo/WEB-INF
 @dirrm lib/activemq/webapps/demo/META-INF
 @dirrm lib/activemq/webapps/demo
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources/RoutesResource
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources/RouteResource
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources/LanguagesResource
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources/LanguageResource
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources/ExchangeResource
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources/EndpointsResource
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources/EndpointResource
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources/ConvertersResource
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources/ConvertersFromResource
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources/ComponentsResource
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources/ComponentResource
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources/CamelContextResource
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web/resources
-@dirrm lib/activemq/webapps/camel/org/apache/camel/web
-@dirrm lib/activemq/webapps/camel/org/apache/camel
-@dirrm lib/activemq/webapps/camel/org/apache
-@dirrm lib/activemq/webapps/camel/org
-@dirrm lib/activemq/webapps/camel/js/th
-@dirrm lib/activemq/webapps/camel/js/prettify
-@dirrm lib/activemq/webapps/camel/js/dojo
-@dirrm lib/activemq/webapps/camel/js
-@dirrm lib/activemq/webapps/camel/images
-@dirrm lib/activemq/webapps/camel/css/prettify
-@dirrm lib/activemq/webapps/camel/css
-@dirrm lib/activemq/webapps/camel/com/sun/jersey/server/impl/wadl/WadlResourceResource
-@dirrm lib/activemq/webapps/camel/com/sun/jersey/server/impl/wadl/WadlResource
-@dirrm lib/activemq/webapps/camel/com/sun/jersey/server/impl/wadl
-@dirrm lib/activemq/webapps/camel/com/sun/jersey/server/impl
-@dirrm lib/activemq/webapps/camel/com/sun/jersey/server
-@dirrm lib/activemq/webapps/camel/com/sun/jersey
-@dirrm lib/activemq/webapps/camel/com/sun
-@dirrm lib/activemq/webapps/camel/com
-@dirrm lib/activemq/webapps/camel/WEB-INF/tags/api
-@dirrm lib/activemq/webapps/camel/WEB-INF/tags
-@dirrm lib/activemq/webapps/camel/WEB-INF/lib
-@dirrm lib/activemq/webapps/camel/WEB-INF/jspf
-@dirrm lib/activemq/webapps/camel/WEB-INF/decorators
-@dirrm lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/util
-@dirrm lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/resources
-@dirrm lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web/model
-@dirrm lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel/web
-@dirrm lib/activemq/webapps/camel/WEB-INF/classes/org/apache/camel
-@dirrm lib/activemq/webapps/camel/WEB-INF/classes/org/apache
-@dirrm lib/activemq/webapps/camel/WEB-INF/classes/org
-@dirrm lib/activemq/webapps/camel/WEB-INF/classes/META-INF
-@dirrm lib/activemq/webapps/camel/WEB-INF/classes
-@dirrm lib/activemq/webapps/camel/WEB-INF
-@dirrm lib/activemq/webapps/camel/META-INF/maven/org.apache.camel/camel-web
-@dirrm lib/activemq/webapps/camel/META-INF/maven/org.apache.camel
-@dirrm lib/activemq/webapps/camel/META-INF/maven
-@dirrm lib/activemq/webapps/camel/META-INF
-@dirrm lib/activemq/webapps/camel
 @dirrm lib/activemq/webapps/admin/xml
 @dirrm lib/activemq/webapps/admin/test
 @dirrm lib/activemq/webapps/admin/styles