http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/activemq/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml index fdeac50..b6b13bd 100644 --- a/distribution/activemq/pom.xml +++ b/distribution/activemq/pom.xml @@ -17,8 +17,8 @@ <parent> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-distribution</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-distribution</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> @@ -34,103 +34,103 @@ <dependencies> <!-- ActiveMQ artifacts --> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-dto</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-dto</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-bootstrap</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-bootstrap</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-tools</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-tools</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jboss-as-integration</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jboss-as-integration</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-ra</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-ra</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-service-sar</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-service-sar</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-spring-integration</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-spring-integration</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-twitter-integration</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-twitter-integration</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-vertx-integration</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-vertx-integration</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6.rest</groupId> - <artifactId>activemq6-rest</artifactId> + <groupId>org.apache.activemq.rest</groupId> + <artifactId>activemq-rest</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-aerogear-integration</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-aerogear-integration</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> + <groupId>org.apache.activemq</groupId> <artifactId>jnp-client</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-core-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core-client</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-amqp-protocol</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-amqp-protocol</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-stomp-protocol</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-stomp-protocol</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-openwire-protocol</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-openwire-protocol</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-native</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-native</artifactId> <version>${project.version}</version> </dependency> @@ -159,26 +159,26 @@ <!-- javadoc --> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-core-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core-client</artifactId> <version>${project.version}</version> <classifier>javadoc</classifier> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> <version>${project.version}</version> <classifier>javadoc</classifier> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> <classifier>javadoc</classifier> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> <version>${project.version}</version> <classifier>javadoc</classifier> </dependency> @@ -187,7 +187,7 @@ <build> <resources> <resource> - <directory>../activemq6/src/main/resources</directory> + <directory>../activemq/src/main/resources</directory> <filtering>true</filtering> </resource> </resources>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/activemq/src/main/assembly/dep.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/assembly/dep.xml b/distribution/activemq/src/main/assembly/dep.xml index 8f3dcfd..0943469 100644 --- a/distribution/activemq/src/main/assembly/dep.xml +++ b/distribution/activemq/src/main/assembly/dep.xml @@ -25,8 +25,8 @@ <dependencySet> <includes> <!-- modules --> - <include>org.apache.activemq6:*</include> - <include>org.apache.activemq6.rest:activemq6-rest</include> + <include>org.apache.activemq:*</include> + <include>org.apache.activemq.rest:activemq-rest</include> <!-- dependencies --> <include>org.jboss.spec.javax.jms:jboss-jms-api_2.0_spec</include> <include>org.jboss.naming:jnpserver</include> @@ -51,7 +51,7 @@ <!-- native --> <dependencySet> <includes> - <include>org.apache.activemq6:activemq6-native</include> + <include>org.apache.activemq:activemq-native</include> </includes> <outputDirectory>bin</outputDirectory> <unpack>true</unpack> @@ -64,10 +64,10 @@ <!-- javadoc --> <dependencySet> <includes> - <include>org.apache.activemq6:activemq6-core-client:*:javadoc</include> - <include>org.apache.activemq6:activemq6-server:*:javadoc</include> - <include>org.apache.activemq6:activemq6-jms-server:*:javadoc</include> - <include>org.apache.activemq6:activemq6-jms-client:*:javadoc</include> + <include>org.apache.activemq:activemq-core-client:*:javadoc</include> + <include>org.apache.activemq:activemq-server:*:javadoc</include> + <include>org.apache.activemq:activemq-jms-server:*:javadoc</include> + <include>org.apache.activemq:activemq-jms-client:*:javadoc</include> </includes> <outputDirectory>docs/api/${artifact.artifactId}</outputDirectory> <unpack>true</unpack> @@ -76,12 +76,12 @@ <fileSets> <!-- schema --> <fileSet> - <directory>../../activemq6-server/src/main/resources/schema/</directory> + <directory>../../activemq-server/src/main/resources/schema/</directory> <outputDirectory>schema</outputDirectory> <lineEnding>keep</lineEnding> </fileSet> <fileSet> - <directory>../../activemq6-jms-server/src/main/resources/schema/</directory> + <directory>../../activemq-jms-server/src/main/resources/schema/</directory> <outputDirectory>schema</outputDirectory> <lineEnding>keep</lineEnding> </fileSet> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/activemq/src/main/resources/bin/hornetq ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/bin/hornetq b/distribution/activemq/src/main/resources/bin/hornetq index 4690fb3..112a780 100755 --- a/distribution/activemq/src/main/resources/bin/hornetq +++ b/distribution/activemq/src/main/resources/bin/hornetq @@ -84,4 +84,4 @@ done JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Dhornetq.home=$HORNETQ_HOME -Ddata.dir=$HORNETQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:$HORNETQ_HOME/config/logging.properties -Djava.library.path=$HORNETQ_HOME/bin/lib/linux-i686:$HORNETQ_HOME/bin/lib/linux-x86_64" #JAVA_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces" -exec "$JAVACMD" $JAVA_ARGS -classpath $CLASSPATH org.apache.activemq6.cli.HornetQ $@ \ No newline at end of file +exec "$JAVACMD" $JAVA_ARGS -classpath $CLASSPATH org.apache.activemq.cli.HornetQ $@ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/activemq/src/main/resources/bin/hornetq.cmd ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/bin/hornetq.cmd b/distribution/activemq/src/main/resources/bin/hornetq.cmd index 90ff100..3129403 100755 --- a/distribution/activemq/src/main/resources/bin/hornetq.cmd +++ b/distribution/activemq/src/main/resources/bin/hornetq.cmd @@ -49,7 +49,7 @@ rem set JMX_OPTS=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.j set JVM_FLAGS=%JVM_FLAGS% %JMX_OPTS% -Dhornetq.home="%HORNETQ_HOME%" -classpath "%HORNETQ_HOME%\lib\*" -"%_JAVACMD%" %JVM_FLAGS% org.apache.activemq6.cli.HornetQ %* +"%_JAVACMD%" %JVM_FLAGS% org.apache.activemq.cli.HornetQ %* :END endlocal http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/activemq/src/main/resources/config/clustered/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/clustered/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/clustered/hornetq-configuration.xml index b8eb778..4c924b5 100644 --- a/distribution/activemq/src/main/resources/config/clustered/hornetq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/clustered/hornetq-configuration.xml @@ -14,13 +14,13 @@ <connectors> <connector name="netty"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> @@ -29,13 +29,13 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/activemq/src/main/resources/config/logging.properties ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/logging.properties b/distribution/activemq/src/main/resources/config/logging.properties index 16c6fd6..1d05222 100644 --- a/distribution/activemq/src/main/resources/config/logging.properties +++ b/distribution/activemq/src/main/resources/config/logging.properties @@ -22,16 +22,16 @@ # Additional logger names to configure (root logger is always configured) # Root logger option -loggers=org.jboss.logging,org.apache.activemq6.core.server,org.apache.activemq6.utils,org.apache.activemq6.journal,org.apache.activemq6.jms.server,org.apache.activemq6.integration.bootstrap +loggers=org.jboss.logging,org.apache.activemq.core.server,org.apache.activemq.utils,org.apache.activemq.journal,org.apache.activemq.jms.server,org.apache.activemq.integration.bootstrap # Root logger level logger.level=INFO # HornetQ logger levels -logger.org.apache.activemq6.core.server.level=INFO -logger.org.apache.activemq6.journal.level=INFO -logger.org.apache.activemq6.utils.level=INFO -logger.org.apache.activemq6.jms.level=INFO -logger.org.apache.activemq6.integration.bootstrap.level=INFO +logger.org.apache.activemq.core.server.level=INFO +logger.org.apache.activemq.journal.level=INFO +logger.org.apache.activemq.utils.level=INFO +logger.org.apache.activemq.jms.level=INFO +logger.org.apache.activemq.integration.bootstrap.level=INFO # Root logger handlers logger.handlers=FILE,CONSOLE http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/activemq/src/main/resources/config/non-clustered/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/non-clustered/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/non-clustered/hornetq-configuration.xml index bc71be8..3bb9be5 100644 --- a/distribution/activemq/src/main/resources/config/non-clustered/hornetq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/non-clustered/hornetq-configuration.xml @@ -14,13 +14,13 @@ <connectors> <connector name="netty"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> @@ -29,13 +29,13 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/activemq/src/main/resources/config/replicated/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/replicated/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/hornetq-configuration.xml index e545552..4c92c67 100644 --- a/distribution/activemq/src/main/resources/config/replicated/hornetq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/replicated/hornetq-configuration.xml @@ -18,13 +18,13 @@ <connectors> <connector name="netty"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> @@ -33,13 +33,13 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml index 8a1da5c..4caa289 100644 --- a/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml @@ -18,13 +18,13 @@ <connectors> <connector name="netty"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> @@ -33,13 +33,13 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/activemq/src/main/resources/licenses/base64.txt ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/licenses/base64.txt b/distribution/activemq/src/main/resources/licenses/base64.txt index c97f3f7..f3fa8d5 100644 --- a/distribution/activemq/src/main/resources/licenses/base64.txt +++ b/distribution/activemq/src/main/resources/licenses/base64.txt @@ -1,4 +1,4 @@ -For org.apache.activemq6.utils.Base64 +For org.apache.activemq.utils.Base64 I am placing this code in the Public Domain. Do with it as you will. This software comes with no guarantees or warranties but with http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/activemq/src/main/resources/licenses/json.txt ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/licenses/json.txt b/distribution/activemq/src/main/resources/licenses/json.txt index 3632907..48966e0 100644 --- a/distribution/activemq/src/main/resources/licenses/json.txt +++ b/distribution/activemq/src/main/resources/licenses/json.txt @@ -1,4 +1,4 @@ -For classes org.apache.activemq6.utils.json.* +For classes org.apache.activemq.utils.json.* Copyright (c) 2002 JSON.org http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/jnp-client/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/jnp-client/pom.xml b/distribution/jnp-client/pom.xml index c3b0132..122880c 100644 --- a/distribution/jnp-client/pom.xml +++ b/distribution/jnp-client/pom.xml @@ -4,8 +4,8 @@ <parent> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-distribution</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-distribution</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 7f06e32..143b72f 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-pom</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pom</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-distribution</artifactId> + <artifactId>activemq-distribution</artifactId> <packaging>pom</packaging> <name>ActiveMQ6 Distribution</name> @@ -34,7 +34,7 @@ <modules> <module>jnp-client</module> - <module>activemq6</module> + <module>activemq</module> </modules> <build> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/eap-manual/en/clusters.xml ---------------------------------------------------------------------- diff --git a/docs/eap-manual/en/clusters.xml b/docs/eap-manual/en/clusters.xml index 727026e..d8ccce2 100644 --- a/docs/eap-manual/en/clusters.xml +++ b/docs/eap-manual/en/clusters.xml @@ -221,14 +221,14 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0"> <!-- The core configuration --> - <bean name="BackupConfiguration" class="org.apache.activemq6.core.config.impl.FileConfiguration"> + <bean name="BackupConfiguration" class="org.apache.activemq.core.config.impl.FileConfiguration"> <property name="configurationUrl">${jboss.server.home.url}/deploy/hornetq-backup1/hornetq-configuration.xml</property> </bean> <!-- The core server --> - <bean name="BackupHornetQServer" class="org.apache.activemq6.core.server.impl.HornetQServerImpl"> + <bean name="BackupHornetQServer" class="org.apache.activemq.core.server.impl.HornetQServerImpl"> <constructor> <parameter> <inject bean="BackupConfiguration"/> @@ -245,7 +245,7 @@ </bean> <!-- The JMS server --> - <bean name="BackupJMSServerManager" class="org.apache.activemq6.jms.server.impl.JMSServerManagerImpl"> + <bean name="BackupJMSServerManager" class="org.apache.activemq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="BackupHornetQServer"/> @@ -288,7 +288,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> - <jmx-domain>org.apache.activemq6.backup1</jmx-domain> + <jmx-domain>org.apache.activemq.backup1</jmx-domain> <clustered>true</clustered> @@ -310,13 +310,13 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.backup.netty.port:5446}"/> </connector> <connector name="in-vm"> - <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class> <param key="server-id" value="${hornetq.server-id:0}"/> </connector> @@ -324,7 +324,7 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.backup.netty.port:5446}"/> </acceptor> @@ -387,7 +387,7 @@ <literal>jmx-domain</literal> attribute, this is used when adding objects, such as the HornetQ server and JMS server to jmx, we change this from the default - <literal>org.apache.activemq6</literal> + <literal>org.apache.activemq</literal> to avoid naming clashes with the live server </para> <para> @@ -529,7 +529,7 @@ as in the last diagram. Then simply edit the <literal>jms-ds.xml</literal> and change the following lines to </para> <programlisting> - <config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</config-property> + <config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</config-property> <config-property name="ConnectionParameters" type="java.lang.String">host=127.0.0.1;port=5446</config-property> </programlisting> <para> @@ -541,7 +541,7 @@ <description>The transport type</description> <config-property-name>ConnectorClassName</config-property-name> <config-property-type>java.lang.String</config-property-type> - <config-property-value>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> + <config-property-value>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> </config-property> <config-property> <description>The transport configuration. These values must be in the form of key=val;key=val;</description> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/pom.xml ---------------------------------------------------------------------- diff --git a/docs/pom.xml b/docs/pom.xml index 3dd58e0..e85c499 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -16,13 +16,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-pom</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pom</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <groupId>org.apache.activemq6.docs</groupId> - <artifactId>activemq6-docs</artifactId> + <groupId>org.apache.activemq.docs</groupId> + <artifactId>activemq-docs</artifactId> <packaging>pom</packaging> <name>ActiveMQ6 Documentation</name> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/quickstart-guide/en/examples.xml ---------------------------------------------------------------------- diff --git a/docs/quickstart-guide/en/examples.xml b/docs/quickstart-guide/en/examples.xml index 3951d38..057aa27 100644 --- a/docs/quickstart-guide/en/examples.xml +++ b/docs/quickstart-guide/en/examples.xml @@ -100,35 +100,35 @@ [INFO] <<< maven-source-plugin:2.2.1:jar (default) @ hornetq-jms-queue-example <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (default) @ hornetq-jms-queue-example --- -[WARNING] Artifact org.apache.activemq6.examples.jms:hornetq-jms-queue-example:java-source:sources:2.3.0.BETA-SNAPSHOT already attached to project, ignoring duplicate +[WARNING] Artifact org.apache.activemq.examples.jms:hornetq-jms-queue-example:java-source:sources:2.3.0.BETA-SNAPSHOT already attached to project, ignoring duplicate [INFO] [INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:start (start) @ hornetq-jms-queue-example --- [file:/home/andy/projects/hornetq-master/examples/jms/queue/target/classes/hornetq/server0/] -Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.deployers.impl.FileConfigurationParser parseMainConfig +Apr 17, 2013 10:51:01 AM org.apache.activemq.core.deployers.impl.FileConfigurationParser parseMainConfig WARN: HQ222018: AIO was not located on this platform, it will fall back to using pure Java NIO. If your platform is Linux, install LibAIO to enable the AIO journal -Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.server.impl.HornetQServerImpl start +Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.HornetQServerImpl start INFO: HQ221000: live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/journal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/bindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/largemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/paging) -Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.server.impl.HornetQServerImpl$SharedStoreLiveActivation run +Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.HornetQServerImpl$SharedStoreLiveActivation run INFO: HQ221006: Waiting to obtain live lock -Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager <init> +Apr 17, 2013 10:51:01 AM org.apache.activemq.core.persistence.impl.journal.JournalStorageManager <init> INFO: HQ221013: Using NIO Journal -Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.server.impl.HornetQServerImpl initialisePart1 +Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.HornetQServerImpl initialisePart1 WARN: HQ222007: Security risk! HornetQ is running with the default cluster admin user and default password. Please see the HornetQ user guide, cluster chapter, for instructions on how to change this. -Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.server.impl.FileLockNodeManager startLiveNode +Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.FileLockNodeManager startLiveNode INFO: HQ221034: Waiting to obtain live lock -Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.server.impl.FileLockNodeManager startLiveNode +Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.FileLockNodeManager startLiveNode INFO: HQ221035: Live Server Obtained live lock -Apr 17, 2013 10:51:02 AM org.apache.activemq6.core.server.impl.HornetQServerImpl deployQueue +Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.HornetQServerImpl deployQueue INFO: HQ221003: trying to deploy queue jms.queue.exampleQueue -Apr 17, 2013 10:51:02 AM org.apache.activemq6.core.remoting.impl.netty.NettyAcceptor start +Apr 17, 2013 10:51:02 AM org.apache.activemq.core.remoting.impl.netty.NettyAcceptor start INFO: HQ221020: Started Netty Acceptor version 3.6.2.Final-c0d783c localhost:5445 for CORE protocol -Apr 17, 2013 10:51:02 AM org.apache.activemq6.core.server.impl.HornetQServerImpl$SharedStoreLiveActivation run +Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.HornetQServerImpl$SharedStoreLiveActivation run INFO: HQ221007: Server is now live -Apr 17, 2013 10:51:02 AM org.apache.activemq6.core.server.impl.HornetQServerImpl start +Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.HornetQServerImpl start INFO: HQ221001: HornetQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] [INFO] [INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:runClient (runClient) @ hornetq-jms-queue-example --- -Apr 17, 2013 10:51:02 AM org.apache.activemq6.common.example.HornetQExample getContext +Apr 17, 2013 10:51:02 AM org.apache.activemq.common.example.HornetQExample getContext INFO: using jnp://localhost:1099 for jndi Sent message: This is a text message Received message: This is a text message @@ -139,9 +139,9 @@ example complete ##################### [INFO] [INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:stop (stop) @ hornetq-jms-queue-example --- -Apr 17, 2013 10:51:03 AM org.apache.activemq6.core.server.management.impl.ManagementServiceImpl stop +Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.management.impl.ManagementServiceImpl stop WARN: HQ222113: On ManagementService stop, there are 1 unexpected registered MBeans: [core.acceptor.netty-acceptor] -Apr 17, 2013 10:51:03 AM org.apache.activemq6.core.server.impl.HornetQServerImpl stop +Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.impl.HornetQServerImpl stop INFO: HQ221002: HornetQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] stopped [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS @@ -201,7 +201,7 @@ INFO: HQ221002: HornetQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57 ------------------------------------------------------- T E S T S ------------------------------------------------------- -Running org.apache.activemq6.javaee.example.server.ExampleRunnerTest +Running org.apache.activemq.javaee.example.server.ExampleRunnerTest log4j:WARN No appenders could be found for logger (org.jboss.logging). log4j:WARN Please initialize the log4j system properly. log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for more info. @@ -235,28 +235,28 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo 10:58:05,831 INFO [org.jboss.ws.common.management.AbstractServerConfig] (MSC service thread 1-4) JBoss Web Services - Stack CXF Server 4.0.2.GA 10:58:05,943 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-6) Starting Coyote HTTP/1.1 on http-localhost.localdomain-127.0.0.1-8080 10:58:05,966 INFO [org.jboss.as.jacorb] (MSC service thread 1-2) JBAS016330: CORBA ORB Service started -10:58:05,988 INFO [org.apache.activemq6.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingpaging) -10:58:05,996 INFO [org.apache.activemq6.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) Waiting to obtain live lock -10:58:06,037 INFO [org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager] (MSC service thread 1-11) Using AIO Journal +10:58:05,988 INFO [org.apache.activemq.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingpaging) +10:58:05,996 INFO [org.apache.activemq.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) Waiting to obtain live lock +10:58:06,037 INFO [org.apache.activemq.core.persistence.impl.journal.JournalStorageManager] (MSC service thread 1-11) Using AIO Journal 10:58:06,122 INFO [org.jboss.as.jacorb] (MSC service thread 1-14) JBAS016328: CORBA Naming Service started 10:58:06,184 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-7) JBAS010400: Bound data source [java:jboss/datasources/ExampleDS] -10:58:06,204 INFO [org.apache.activemq6.core.server.impl.AIOFileLockNodeManager] (MSC service thread 1-11) Waiting to obtain live lock -10:58:06,205 INFO [org.apache.activemq6.core.server.impl.AIOFileLockNodeManager] (MSC service thread 1-11) Live Server Obtained live lock +10:58:06,204 INFO [org.apache.activemq.core.server.impl.AIOFileLockNodeManager] (MSC service thread 1-11) Waiting to obtain live lock +10:58:06,205 INFO [org.apache.activemq.core.server.impl.AIOFileLockNodeManager] (MSC service thread 1-11) Live Server Obtained live lock 10:58:06,434 INFO [org.jboss.as.remoting] (MSC service thread 1-2) JBAS017100: Listening on localhost.localdomain/127.0.0.1:4447 10:58:06,434 INFO [org.jboss.as.remoting] (MSC service thread 1-15) JBAS017100: Listening on /127.0.0.1:9999 10:58:06,436 INFO [org.jboss.as.server.deployment.scanner] (MSC service thread 1-16) JBAS015012: Started FileSystemDeploymentService for directory /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/deployments -10:58:08,790 INFO [org.apache.activemq6.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5445 for CORE protocol -10:58:08,793 INFO [org.apache.activemq6.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5455 for CORE protocol -10:58:08,795 INFO [org.apache.activemq6.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) Server is now live -10:58:08,797 INFO [org.apache.activemq6.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) HornetQ Server version 2.2.13.Final (HQ_2_2_13_FINAL_AS7, 122) [5c499e88-9c63-11e2-bfa3-fe5400591699]) started +10:58:08,790 INFO [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5445 for CORE protocol +10:58:08,793 INFO [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5455 for CORE protocol +10:58:08,795 INFO [org.apache.activemq.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) Server is now live +10:58:08,797 INFO [org.apache.activemq.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) HornetQ Server version 2.2.13.Final (HQ_2_2_13_FINAL_AS7, 122) [5c499e88-9c63-11e2-bfa3-fe5400591699]) started 10:58:08,822 INFO [org.jboss.as.messaging] (MSC service thread 1-4) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/RemoteConnectionFactory 10:58:08,824 INFO [org.jboss.as.messaging] (MSC service thread 1-4) JBAS011601: Bound messaging object to jndi name java:/RemoteConnectionFactory 10:58:08,825 INFO [org.jboss.as.messaging] (MSC service thread 1-10) JBAS011601: Bound messaging object to jndi name java:/ConnectionFactory -10:58:08,830 INFO [org.apache.activemq6.core.server.impl.HornetQServerImpl] (MSC service thread 1-3) trying to deploy queue jms.queue.testQueue +10:58:08,830 INFO [org.apache.activemq.core.server.impl.HornetQServerImpl] (MSC service thread 1-3) trying to deploy queue jms.queue.testQueue 10:58:08,836 INFO [org.jboss.as.messaging] (MSC service thread 1-3) JBAS011601: Bound messaging object to jndi name java:/queue/test 10:58:08,840 INFO [org.jboss.as.messaging] (MSC service thread 1-3) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/queues/testQueue 10:58:08,859 INFO [org.jboss.as.deployment.connector] (MSC service thread 1-9) JBAS010406: Registered connection factory java:/JmsXA -10:58:08,866 INFO [org.apache.activemq6.ra.HornetQResourceAdapter] (MSC service thread 1-9) HornetQ resource adaptor started +10:58:08,866 INFO [org.apache.activemq.ra.HornetQResourceAdapter] (MSC service thread 1-9) HornetQ resource adaptor started 10:58:08,867 INFO [org.jboss.as.connector.services.ResourceAdapterActivatorService$ResourceAdapterActivator] (MSC service thread 1-9) IJ020002: Deployed: file://RaActivatorhornetq-ra 10:58:08,870 INFO [org.jboss.as.deployment.connector] (MSC service thread 1-5) JBAS010401: Bound JCA ConnectionFactory [java:/JmsXA] 10:58:08,898 INFO [org.jboss.as.server.deployment] (MSC service thread 1-10) JBAS015876: Starting deployment of "ONT001-1.0.war" @@ -283,11 +283,11 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo 10:58:09,979 INFO [org.jboss.as.server] (DeploymentScanner-threads - 2) JBAS018559: Deployed "ONT001-1.0.war" mdb.jar: /org/ -/org.apache.activemq6/ -/org.apache.activemq6/javaee/ -/org.apache.activemq6/javaee/example/ -/org.apache.activemq6/javaee/example/server/ -/org.apache.activemq6/javaee/example/server/MDB_BMTExample.class +/org.apache.activemq/ +/org.apache.activemq/javaee/ +/org.apache.activemq/javaee/example/ +/org.apache.activemq/javaee/example/server/ +/org.apache.activemq/javaee/example/server/MDB_BMTExample.class 10:58:11,612 INFO [org.jboss.as.repository] (management-handler-thread - 2) JBAS014900: Content added at location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/f0/e2d589ab9490193e109c8bc833f725c87defae/content 10:58:11,620 INFO [org.jboss.as.server.deployment] (MSC service thread 1-8) JBAS015876: Starting deployment of "arquillian-service" 10:58:11,811 WARN [org.jboss.as.dependency.private] (MSC service thread 1-1) JBAS018567: Deployment "deployment.arquillian-service" is using a private module ("org.jboss.as.jmx:main") which may be changed or removed in future versions without notice. @@ -298,7 +298,7 @@ mdb.jar: 10:58:11,953 INFO [org.jboss.as.server] (management-handler-thread - 2) JBAS018559: Deployed "arquillian-service" 10:58:12,328 INFO [org.jboss.as.repository] (management-handler-thread - 3) JBAS014900: Content added at location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/59/7dcdb0f420ed57aea638b2599f7a86eecf6c85/content 10:58:12,333 INFO [org.jboss.as.server.deployment] (MSC service thread 1-7) JBAS015876: Starting deployment of "mdb.jar" -10:58:12,401 INFO [org.jboss.as.arquillian] (MSC service thread 1-14) Arquillian deployment detected: ArquillianConfig[service=jboss.arquillian.config."mdb.jar",unit=mdb.jar,tests=[org.apache.activemq6.javaee.example.server.ExampleRunnerTest]] +10:58:12,401 INFO [org.jboss.as.arquillian] (MSC service thread 1-14) Arquillian deployment detected: ArquillianConfig[service=jboss.arquillian.config."mdb.jar",unit=mdb.jar,tests=[org.apache.activemq.javaee.example.server.ExampleRunnerTest]] 10:58:12,418 INFO [org.jboss.as.ejb3] (MSC service thread 1-15) JBAS014142: Started message driven bean 'MDB_BMTExample' with 'hornetq-ra' resource adapter 10:58:12,562 INFO [org.jboss.as.server] (management-handler-thread - 3) JBAS018559: Deployed "mdb.jar" Sent message: This is a text message http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/quickstart-guide/en/running.xml ---------------------------------------------------------------------- diff --git a/docs/quickstart-guide/en/running.xml b/docs/quickstart-guide/en/running.xml index 2dcfc5c..56333e9 100644 --- a/docs/quickstart-guide/en/running.xml +++ b/docs/quickstart-guide/en/running.xml @@ -31,9 +31,9 @@ <programlisting> bin$ ./hornetq run - 11:05:06,589 INFO [org.apache.activemq6.integration.bootstrap] HQ101000: Starting HornetQ Server + 11:05:06,589 INFO [org.apache.activemq.integration.bootstrap] HQ101000: Starting HornetQ Server ... - 11:05:10,848 INFO [org.apache.activemq6.core.server] HQ221001: HornetQ Server version 2.5.0.SNAPSHOT (Wild Hornet, 125) [e32ae252-52ee-11e4-a716-7785dc3013a3] + 11:05:10,848 INFO [org.apache.activemq.core.server] HQ221001: HornetQ Server version 2.5.0.SNAPSHOT (Wild Hornet, 125) [e32ae252-52ee-11e4-a716-7785dc3013a3] </programlisting> <para>HornetQ is now running.</para> <para>Both the run and the stop scripts use the config under <literal @@ -89,30 +89,30 @@ 14:47:42,471 INFO [org.wildfly.extension.undertow] (MSC service thread 1-7) JBAS017519: Undertow HTTP listener default listening on /127.0.0.1:8080 14:47:42,823 INFO [org.jboss.as.server.deployment.scanner] (MSC service thread 1-10) JBAS015012: Started FileSystemDeploymentService for directory /home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/deployments 14:47:42,882 INFO [org.jboss.as.remoting] (MSC service thread 1-16) JBAS017100: Listening on 127.0.0.1:9999 - 14:47:43,037 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221000: live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingpaging) - 14:47:43,062 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221006: Waiting to obtain live lock - 14:47:43,103 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221012: Using AIO Journal - 14:47:43,313 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support CORE + 14:47:43,037 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221000: live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingpaging) + 14:47:43,062 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221006: Waiting to obtain live lock + 14:47:43,103 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221012: Using AIO Journal + 14:47:43,313 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support CORE 14:47:43,426 INFO [org.jboss.ws.common.management] (MSC service thread 1-3) JBWS022052: Starting JBoss Web Services - Stack CXF Server 4.2.1.Final - 14:47:43,448 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support AMQP - 14:47:43,451 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support STOMP - 14:47:43,453 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support STOMP_WS - 14:47:43,567 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221034: Waiting to obtain live lock - 14:47:43,567 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221035: Live Server Obtained live lock + 14:47:43,448 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support AMQP + 14:47:43,451 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support STOMP + 14:47:43,453 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support STOMP_WS + 14:47:43,567 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221034: Waiting to obtain live lock + 14:47:43,567 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221035: Live Server Obtained live lock 14:47:43,777 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-8) JBAS010400: Bound data source [java:jboss/datasources/ExampleDS] 14:47:43,781 INFO [org.jboss.as.jacorb] (MSC service thread 1-1) JBAS016330: CORBA ORB Service started 14:47:44,115 INFO [org.jboss.as.jacorb] (MSC service thread 1-13) JBAS016328: CORBA Naming Service started 14:47:44,345 INFO [org.wildfly.extension.undertow] (MSC service thread 1-3) JBAS018210: Register web context: /hornetq-server - 14:47:44,361 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5455 for CORE protocol - 14:47:44,362 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5445 for CORE protocol - 14:47:44,364 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 org.apache.activemq6.default.servlet:5445 for CORE protocol - 14:47:44,366 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221007: Server is now live - 14:47:44,366 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221001: HornetQ Server version 2.4.0.Beta2 (Andromedian Flyer, 123) [bcc1cd10-2bfb-11e3-ad5f-9f88840f9e1a] + 14:47:44,361 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5455 for CORE protocol + 14:47:44,362 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5445 for CORE protocol + 14:47:44,364 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 org.apache.activemq.default.servlet:5445 for CORE protocol + 14:47:44,366 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221007: Server is now live + 14:47:44,366 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221001: HornetQ Server version 2.4.0.Beta2 (Andromedian Flyer, 123) [bcc1cd10-2bfb-11e3-ad5f-9f88840f9e1a] 14:47:44,435 INFO [org.jboss.as.messaging] (ServerService Thread Pool -- 58) JBAS011601: Bound messaging object to jndi name java:/ConnectionFactory 14:47:44,437 INFO [org.jboss.as.messaging] (ServerService Thread Pool -- 59) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/ServletConnectionFactory 14:47:44,439 INFO [org.jboss.as.messaging] (ServerService Thread Pool -- 60) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/RemoteConnectionFactory 14:47:44,462 INFO [org.jboss.as.connector.deployment] (MSC service thread 1-3) JBAS010406: Registered connection factory java:/JmsXA - 14:47:44,531 INFO [org.apache.activemq6.ra] (MSC service thread 1-3) HornetQ resource adaptor started + 14:47:44,531 INFO [org.apache.activemq.ra] (MSC service thread 1-3) HornetQ resource adaptor started 14:47:44,532 INFO [org.jboss.as.connector.services.resourceadapters.ResourceAdapterActivatorService$ResourceAdapterActivator] (MSC service thread 1-3) IJ020002: Deployed: file://RaActivatorhornetq-ra 14:47:44,535 INFO [org.jboss.as.connector.deployment] (MSC service thread 1-12) JBAS010401: Bound JCA ConnectionFactory [java:/JmsXA] 14:47:44,536 INFO [org.jboss.as.messaging] (MSC service thread 1-15) JBAS011601: Bound messaging object to jndi name java:jboss/DefaultJMSConnectionFactory http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/quickstart-guide/pom.xml ---------------------------------------------------------------------- diff --git a/docs/quickstart-guide/pom.xml b/docs/quickstart-guide/pom.xml index 88ffa16..c8ffe38 100644 --- a/docs/quickstart-guide/pom.xml +++ b/docs/quickstart-guide/pom.xml @@ -6,12 +6,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.docs</groupId> - <artifactId>activemq6-docs</artifactId> + <groupId>org.apache.activemq.docs</groupId> + <artifactId>activemq-docs</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <groupId>org.apache.activemq6.docs</groupId> + <groupId>org.apache.activemq.docs</groupId> <artifactId>quickstart-guide</artifactId> <version>1.0</version> <packaging>jdocbook</packaging> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/quickstart-guide/zh/examples.xml ---------------------------------------------------------------------- diff --git a/docs/quickstart-guide/zh/examples.xml b/docs/quickstart-guide/zh/examples.xml index 5c0d726..e87cbb8 100644 --- a/docs/quickstart-guide/zh/examples.xml +++ b/docs/quickstart-guide/zh/examples.xml @@ -70,31 +70,31 @@ runExample: seParallelGC,-XX:+AggressiveOpts,-XX:+UseFastAccessorMethods,-Djava.util.logging.config. file=/home/andy/projects/hornetq/trunk/examples/jms/common/../../../src/config/stand-alone/no n-clustered/logging.properties - [java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:08,437 INFO @main [Journal + [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:08,437 INFO @main [Journal StorageManager] AIO journal selected - [java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:08,437 WARN @main [Journal + [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:08,437 WARN @main [Journal StorageManager] AIO wasn't located on this platform, it will fall back to using pure Jav a NIO. If your platform is Linux, install LibAIO to enable the AIO journal - [java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:08,437 WARN @main [Securit + [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:08,437 WARN @main [Securit yStoreImpl] It has been detected that the cluster admin password which is used to replic ate management operation from one node to the other has not had its password changed fro m the installation default. Please see the HornetQ user guide for instructions o n how to do this. - [java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:10,941 INFO @main [HornetQCo + [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:10,941 INFO @main [HornetQCo nnectionFactory] read only is false - [java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:10,941 INFO @main [HornetQCo + [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:10,941 INFO @main [HornetQCo nnectionFactory] read only is false - [java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:10,941 INFO @main [HornetQCo + [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:10,941 INFO @main [HornetQCo nnectionFactory] read only is false - [java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:10,991 WARN @main [JMSServ + [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:10,991 WARN @main [JMSServ erManagerImpl] Binding for java:/ConnectionFactory already exists - [java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:10,991 WARN @main [JMSServ + [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:10,991 WARN @main [JMSServ erManagerImpl] Binding for java:/XAConnectionFactory already exists - [java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:11,241 INFO @main [Messagi + [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:11,241 INFO @main [Messagi ngServerImpl] HornetQ Server version 2.0.0.BETA5 (buzz-buzz, 107) started - [java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:11,241 INFO @main [HornetQBoot + [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:11,241 INFO @main [HornetQBoot strapServer] HornetQ server started - [java] org.apache.activemq6.jms.example.SpawnedJMSServer out:STARTED:: + [java] org.apache.activemq.jms.example.SpawnedJMSServer out:STARTED:: [java] 10:41:11,276 INFO @main [JMSExample] using server0/client-jndi.properties f or jndi [java] Sent message: This is a text message @@ -155,7 +155,7 @@ deploy-ear: [exec] 16:01:04,607 INFO [JBossASKernel] Added bean(jboss.j2ee:ear=mdb-example.ear, jar=mdb-example.jar,name=MessageMDBExample,service=EJB3) to KernelDeployment of: mdb-example.jar - [exec] 16:01:04,702 INFO [EJBContainer] STARTED EJB: org.apache.activemq6.javaee.example.server + [exec] 16:01:04,702 INFO [EJBContainer] STARTED EJB: org.apache.activemq.javaee.example.server .MDBExample ejbName: MessageMDBExample [exec] 16:01:09,496 INFO [TomcatDeployment] deploy, ctxPath=/mdb-example [exec] 16:01:09,812 WARNING [config] Unable to process deployment descriptor for cont http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/aerogear-integration.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/aerogear-integration.xml b/docs/user-manual/en/aerogear-integration.xml index ebc4000..0b34e16 100644 --- a/docs/user-manual/en/aerogear-integration.xml +++ b/docs/user-manual/en/aerogear-integration.xml @@ -31,7 +31,7 @@ <para>AeroGear Connector services are configured in the connector-services configuration:</para> <programlisting> <connector-service name="aerogear-connector"> - <factory-class>org.apache.activemq6.integration.aerogear.AeroGearConnectorServiceFactory</factory-class> + <factory-class>org.apache.activemq.integration.aerogear.AeroGearConnectorServiceFactory</factory-class> <param key="endpoint" value="endpoint"/> <param key="queue" value="jms.queue.aerogearQueue"/> <param key="application-id" value="an applicationid"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/appserver-integration.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/appserver-integration.xml b/docs/user-manual/en/appserver-integration.xml index 1493679..2a74b15 100644 --- a/docs/user-manual/en/appserver-integration.xml +++ b/docs/user-manual/en/appserver-integration.xml @@ -325,13 +325,13 @@ public class MyMDB implements MessageListener <para>The configuration will look something like the following:</para> <programlisting> <resourceadapter> - <resourceadapter-class>org.apache.activemq6.ra.HornetQResourceAdapter</resourceadapter-class> + <resourceadapter-class>org.apache.activemq.ra.HornetQResourceAdapter</resourceadapter-class> <config-property> <description>The transport type. Multiple connectors can be configured by using a comma separated list, - i.e. org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory.</description> + i.e. org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory.</description> <config-property-name>ConnectorClassName</config-property-name> <config-property-type>java.lang.String</config-property-type> - <config-property-value>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</config-property-value> + <config-property-value>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</config-property-value> </config-property> <config-property> <description>The transport configuration. These values must be in the form of key=val;key=val;, @@ -344,7 +344,7 @@ public class MyMDB implements MessageListener <outbound-resourceadapter> <connection-definition> - <managedconnectionfactory-class>org.apache.activemq6.ra.HornetQRAManagedConnection + <managedconnectionfactory-class>org.apache.activemq.ra.HornetQRAManagedConnection Factory</managedconnectionfactory-class> <config-property> @@ -361,12 +361,12 @@ public class MyMDB implements MessageListener <config-property-value>0</config-property-value> </config-property> - <connectionfactory-interface>org.apache.activemq6.ra.HornetQRAConnectionFactory + <connectionfactory-interface>org.apache.activemq.ra.HornetQRAConnectionFactory </connectionfactory-interface> - <connectionfactororg.apache.activemq6.ra.HornetQConnectionFactoryImplonFactoryImpl + <connectionfactororg.apache.activemq.ra.HornetQConnectionFactoryImplonFactoryImpl </connectionfactory-impl-class> <connection-interface>javax.jms.Session</connection-interface> - <connection-impl-class>org.apache.activemq6.ra.HornetQRASession + <connection-impl-class>org.apache.activemq.ra.HornetQRASession </connection-impl-class> </connection-definition> <transaction-support>XATransaction</transaction-support> @@ -384,7 +384,7 @@ public class MyMDB implements MessageListener <messagelistener> <messagelistener-type>javax.jms.MessageListener</messagelistener-type> <activationspec> - <activationspec-class>org.apache.activemq6.ra.inflow.HornetQActivationSpec + <activationspec-class>org.apache.activemq.ra.inflow.HornetQActivationSpec </activationspec-class> <required-config-property> <config-property-name>destination</config-property-name> @@ -714,11 +714,11 @@ public class MyMDB implements MessageListener <jndi-name>RemoteJmsXA</jndi-name> <xa-transaction/> <rar-name>jms-ra.rar</rar-name> - <connection-definition>org.apache.activemq6.ra.HornetQRAConnectionFactory + <connection-definition>org.apache.activemq.ra.HornetQRAConnectionFactory </connection-definition> <config-property name="SessionDefaultType" type="String">javax.jms.Topic</config-property> <config-property name="ConnectorClassName" type="String"> - org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory </config-property> <config-property name="ConnectionParameters" type="String"> port=5445</config-property> @@ -902,12 +902,12 @@ private ConnectionFactory connectionFactory;</programlisting> Heres an example of what this would look like: </para> <programlisting> -<resourceadapter-class>org.apache.activemq6.ra.HornetQResourceAdapter</resourceadapter-class> +<resourceadapter-class>org.apache.activemq.ra.HornetQResourceAdapter</resourceadapter-class> <config-property> <description>The transport type</description> <config-property-name>ConnectorClassName</config-property-name> <config-property-type>java.lang.String</config-property-type> - <config-property-value>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> + <config-property-value>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> </config-property> <config-property> <description>The transport configuration. These values must be in the form of key=val;key=val;</description> @@ -921,12 +921,12 @@ private ConnectionFactory connectionFactory;</programlisting> </para> <programlisting> -<resourceadapter-class>org.apache.activemq6.ra.HornetQResourceAdapter</resourceadapter-class> +<resourceadapter-class>org.apache.activemq.ra.HornetQResourceAdapter</resourceadapter-class> <config-property> <description>The transport type</description> <config-property-name>ConnectorClassName</config-property-name> <config-property-type>java.lang.String</config-property-type> - <config-property-value>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory,org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> + <config-property-value>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> </config-property> <config-property> <description>The transport configuration. These values must be in the form of key=val;key=val;</description> @@ -961,9 +961,9 @@ private ConnectionFactory connectionFactory;</programlisting> <jndi-name>RemoteJmsXA</jndi-name> <xa-transaction/> <rar-name>hornetq-ra.rar</rar-name> - <connection-definition>org.apache.activemq6.ra.HornetQRAConnectionFactory</connection-definition> + <connection-definition>org.apache.activemq.ra.HornetQRAConnectionFactory</connection-definition> <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property> - <config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</config-property> + <config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</config-property> <config-property name="ConnectionParameters" type="java.lang.String">host=127.0.0.1;port=5446</config-property> <max-pool-size>20</max-pool-size> </tx-connection-factory></programlisting> @@ -1092,12 +1092,12 @@ Copyright 2009 Red Hat, Inc. </license> <resourceadapter> - <resourceadapter-class>org.apache.activemq6.ra.HornetQResourceAdapter</resourceadapter-class> + <resourceadapter-class>org.apache.activemq.ra.HornetQResourceAdapter</resourceadapter-class> <config-property> <description>The transport type</description> <config-property-name>ConnectorClassName</config-property-name> <config-property-type>java.lang.String</config-property-type> - <config-property-value>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> + <config-property-value>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> </config-property> <config-property> <description>The transport configuration. These values must be in the form of key=val;key=val;</description> @@ -1108,7 +1108,7 @@ Copyright 2009 Red Hat, Inc. <outbound-resourceadapter> <connection-definition> - <managedconnectionfactory-class>org.apache.activemq6.ra.HornetQRAManagedConnectionFactory</managedconnectionfactory-class> + <managedconnectionfactory-class>org.apache.activemq.ra.HornetQRAManagedConnectionFactory</managedconnectionfactory-class> <config-property> <description>The default session type</description> @@ -1123,10 +1123,10 @@ Copyright 2009 Red Hat, Inc. <config-property-value>0</config-property-value> </config-property> - <connectionfactory-interface>org.apache.activemq6.ra.HornetQRAConnectionFactory</connectionfactory-interface> - <connectionfactory-impl-class>org.apache.activemq6.ra.HornetQRAConnectionFactoryImpl</connectionfactory-impl-class> + <connectionfactory-interface>org.apache.activemq.ra.HornetQRAConnectionFactory</connectionfactory-interface> + <connectionfactory-impl-class>org.apache.activemq.ra.HornetQRAConnectionFactoryImpl</connectionfactory-impl-class> <connection-interface>javax.jms.Session</connection-interface> - <connection-impl-class>org.apache.activemq6.ra.HornetQRASession</connection-impl-class> + <connection-impl-class>org.apache.activemq.ra.HornetQRASession</connection-impl-class> </connection-definition> <transaction-support>XATransaction</transaction-support> <authentication-mechanism> @@ -1141,7 +1141,7 @@ Copyright 2009 Red Hat, Inc. <messagelistener> <messagelistener-type>javax.jms.MessageListener</messagelistener-type> <activationspec> - <activationspec-class>org.apache.activemq6.ra.inflow.HornetQActivationSpec</activationspec-class> + <activationspec-class>org.apache.activemq.ra.inflow.HornetQActivationSpec</activationspec-class> <required-config-property> <config-property-name>destination</config-property-name> </required-config-property> @@ -1178,9 +1178,9 @@ Copyright 2009 Red Hat, Inc. <jndi-name>RemoteJmsXA</jndi-name> <xa-transaction/> <rar-name>hornetq-ra.rar</rar-name> - <connection-definition>org.apache.activemq6.ra.HornetQRAConnectionFactory</connection-definition> + <connection-definition>org.apache.activemq.ra.HornetQRAConnectionFactory</connection-definition> <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property> - <config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</config-property> + <config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</config-property> <config-property name="ConnectionParameters" type="java.lang.String">host=127.0.0.1;port=5445</config-property> <max-pool-size>20</max-pool-size> </tx-connection-factory> @@ -1260,7 +1260,7 @@ initialContext = new InitialContext(jndiParameters);</programlisting> ... <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HornetQ1" - value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;[connection configuration]"/> + value="org.apache.activemq.jms.server.recovery.HornetQXAResourceRecovery;[connection configuration]"/> <property name="com.arjuna.ats.jta.xaRecoveryNode" value="1"/> </properties></programlisting> <para>The <literal>[connection configuration]</literal> contains all the information @@ -1271,9 +1271,9 @@ initialContext = new InitialContext(jndiParameters);</programlisting> <para><literal>[connector factory class name]</literal> corresponds to the name of the <literal>ConnectorFactory</literal> used to connect to HornetQ. Values can be <literal - >org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</literal> or + >org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</literal> or <literal - >org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</literal></para> + >org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</literal></para> </listitem> <listitem> <para><literal>[user name]</literal> is the user name to create a client @@ -1302,24 +1302,24 @@ initialContext = new InitialContext(jndiParameters);</programlisting> <para>If HornetQ is configured with a default in-vm acceptor:</para> <programlisting> <acceptor name="in-vm"> - <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> </acceptor></programlisting> <para>the corresponding configuration in <literal >conf/jbossts-properties.xml</literal> is:</para> <programlisting> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" - value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory"/></programlisting> + value="org.apache.activemq.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"/></programlisting> <para>If it is now configured with a netty acceptor on a non-default port:</para> <programlisting> <acceptor name="netty"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="8888"/> </acceptor></programlisting> <para>the corresponding configuration in <literal >conf/jbossts-properties.xml</literal> is:</para> <programlisting> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" - value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory, , , port=8888"/></programlisting> + value="org.apache.activemq.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory, , , port=8888"/></programlisting> <note> <para>Note the additional commas to skip the user and password before connector parameters</para> @@ -1328,7 +1328,7 @@ initialContext = new InitialContext(jndiParameters);</programlisting> configuration would have been:</para> <programlisting> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" - value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory, admin, adminpass, port=8888"/></programlisting> + value="org.apache.activemq.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory, admin, adminpass, port=8888"/></programlisting> <para>Configuring HornetQ with an invm acceptor and configuring the Recovery Manager with an invm connector is the recommended way to enable XA Recovery.</para> </section> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/clusters.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/clusters.xml b/docs/user-manual/en/clusters.xml index c22d22a..ad36dc5 100644 --- a/docs/user-manual/en/clusters.xml +++ b/docs/user-manual/en/clusters.xml @@ -806,31 +806,31 @@ ClientSession session = factory.createSession();</programlisting> subsequent node is chosen sequentially in the same order.</para> <para>For example nodes might be chosen in the order B, C, D, A, B, C, D, A, B or D, A, B, C, D, A, B, C, D or C, D, A, B, C, D, A, B, C.</para> - <para>Use <literal>org.apache.activemq6.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal> + <para>Use <literal>org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal> as the <literal><connection-load-balancing-policy-class-name></literal>.</para> </listitem> <listitem> <para>Random. With this policy each node is chosen randomly.</para> - <para>Use <literal>org.apache.activemq6.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy</literal> + <para>Use <literal>org.apache.activemq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy</literal> as the <literal><connection-load-balancing-policy-class-name></literal>.</para> </listitem> <listitem> <para>Random Sticky. With this policy the first node is chosen randomly and then re-used for subsequent connections.</para> - <para>Use <literal>org.apache.activemq6.api.core.client.loadbalance.RandomStickyConnectionLoadBalancingPolicy</literal> + <para>Use <literal>org.apache.activemq.api.core.client.loadbalance.RandomStickyConnectionLoadBalancingPolicy</literal> as the <literal><connection-load-balancing-policy-class-name></literal>.</para> </listitem> <listitem> <para>First Element. With this policy the "first" (i.e. 0th) node is always returned.</para> - <para>Use <literal>org.apache.activemq6.api.core.client.loadbalance.FirstElementConnectionLoadBalancingPolicy</literal> + <para>Use <literal>org.apache.activemq.api.core.client.loadbalance.FirstElementConnectionLoadBalancingPolicy</literal> as the <literal><connection-load-balancing-policy-class-name></literal>.</para> </listitem> </itemizedlist> <para>You can also implement your own policy by implementing the interface <literal - >org.apache.activemq6.api.core.client.loadbalance.ConnectionLoadBalancingPolicy</literal></para> + >org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy</literal></para> <para>Specifying which load balancing policy to use differs whether you are using JMS or the core API. If you don't specify a policy then the default will be used which is <literal - >org.apache.activemq6.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>.</para> + >org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>.</para> <para>If you're using JMS, and you're using JNDI on the server to put your JMS connection factories into JNDI, then you can specify the load balancing policy directly in the <literal>hornetq-jms.xml</literal> configuration file on the server as follows:</para> @@ -841,7 +841,7 @@ ClientSession session = factory.createSession();</programlisting> <entry name="ConnectionFactory"/> </entries> <connection-load-balancing-policy-class-name> - org.apache.activemq6.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy + org.apache.activemq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy </connection-load-balancing-policy-class-name> </connection-factory></programlisting> <para>The above example would deploy a JMS connection factory that uses the random connection load
