http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/message-group/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/message-group/pom.xml b/examples/jms/message-group/pom.xml index b71f018..325675f 100644 --- a/examples/jms/message-group/pom.xml +++ b/examples/jms/message-group/pom.xml @@ -3,19 +3,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>jms-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-jms-message-group-example</artifactId> + <artifactId>activemq-jms-message-group-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Message Group Example</name> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-examples-common</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-examples-common</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -27,8 +27,8 @@ <build> <plugins> <plugin> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-maven-plugin</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> <executions> <execution> <id>start</id> @@ -50,7 +50,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.MessageGroupExample</clientClass> + <clientClass>org.apache.activemq.jms.example.MessageGroupExample</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -65,28 +65,28 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-message-group-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-message-group-example</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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-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-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java b/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java index b865c92..0689eab 100644 --- a/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java +++ b/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -27,7 +27,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * A simple JMS Queue example that sends and receives message groups. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml index 91b4979..6e666cc 100644 --- a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml @@ -14,14 +14,14 @@ <!-- Connectors --> <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> </connector> </connectors> <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/message-group2/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/message-group2/pom.xml b/examples/jms/message-group2/pom.xml index 03f1be6..5bad1af 100644 --- a/examples/jms/message-group2/pom.xml +++ b/examples/jms/message-group2/pom.xml @@ -3,19 +3,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>jms-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-jms-message-group2-example</artifactId> + <artifactId>activemq-jms-message-group2-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Message Group Example 2</name> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-examples-common</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-examples-common</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -27,8 +27,8 @@ <build> <plugins> <plugin> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-maven-plugin</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> <executions> <execution> <id>start</id> @@ -50,7 +50,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.MessageGroup2Example</clientClass> + <clientClass>org.apache.activemq.jms.example.MessageGroup2Example</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -65,28 +65,28 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-message-group2-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-message-group2-example</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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-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-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java ---------------------------------------------------------------------- diff --git a/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java b/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java index e7911d7..5c0768b 100644 --- a/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java +++ b/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -27,7 +27,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * A simple JMS Queue example that sends and receives message groups. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml index 91b4979..6e666cc 100644 --- a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml @@ -14,14 +14,14 @@ <!-- Connectors --> <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> </connector> </connectors> <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/message-priority/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/message-priority/pom.xml b/examples/jms/message-priority/pom.xml index 31c0702..e13979c 100644 --- a/examples/jms/message-priority/pom.xml +++ b/examples/jms/message-priority/pom.xml @@ -3,19 +3,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>jms-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-jms-message-priority-example</artifactId> + <artifactId>activemq-jms-message-priority-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS MessagePriorityExample Example</name> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-examples-common</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-examples-common</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -27,8 +27,8 @@ <build> <plugins> <plugin> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-maven-plugin</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> <executions> <execution> <id>start</id> @@ -50,7 +50,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.MessagePriorityExample</clientClass> + <clientClass>org.apache.activemq.jms.example.MessagePriorityExample</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -65,28 +65,28 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-message-priority-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-message-priority-example</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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-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-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java b/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java index 3993281..3226b4b 100644 --- a/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java +++ b/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import java.util.ArrayList; @@ -27,7 +27,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * A simple JMS example that shows the delivery order of messages with priorities. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml index 91b4979..6e666cc 100644 --- a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml @@ -14,14 +14,14 @@ <!-- Connectors --> <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> </connector> </connectors> <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/multiple-failover-failback/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/multiple-failover-failback/pom.xml b/examples/jms/multiple-failover-failback/pom.xml index 0cff60a..9d62bc6 100644 --- a/examples/jms/multiple-failover-failback/pom.xml +++ b/examples/jms/multiple-failover-failback/pom.xml @@ -3,19 +3,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>jms-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-jms-multiple-failover-failback-example</artifactId> + <artifactId>activemq-jms-multiple-failover-failback-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Multiple Failover Failback Example</name> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-examples-common</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-examples-common</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -27,8 +27,8 @@ <build> <plugins> <plugin> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-maven-plugin</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> <executions> <execution> <id>start0</id> @@ -99,7 +99,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.MultipleFailoverFailbackExample</clientClass> + <clientClass>org.apache.activemq.jms.example.MultipleFailoverFailbackExample</clientClass> <args> <param>jnp://localhost:1099</param> <param>jnp://localhost:1199</param> @@ -143,28 +143,28 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-multiple-failover-failback-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-multiple-failover-failback-example</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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-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-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java b/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java index b0eac81..10ecc62 100644 --- a/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java +++ b/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,7 +22,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml index 9e3416f..20ab28e 100644 --- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml @@ -19,7 +19,7 @@ <!-- Connectors --> <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="port" value="5445"/> </connector> </connectors> @@ -27,7 +27,7 @@ <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <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="5445"/> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml index e424498..7055264 100644 --- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml @@ -19,7 +19,7 @@ <!-- Connectors --> <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="port" value="5446"/> </connector> </connectors> @@ -27,7 +27,7 @@ <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <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="5446"/> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml index dd54c44..2dd4833 100644 --- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml +++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml @@ -18,7 +18,7 @@ <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="port" value="5447"/> </connector> </connectors> @@ -26,7 +26,7 @@ <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <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="5447"/> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/multiple-failover/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/multiple-failover/pom.xml b/examples/jms/multiple-failover/pom.xml index f84f620..29854dd 100644 --- a/examples/jms/multiple-failover/pom.xml +++ b/examples/jms/multiple-failover/pom.xml @@ -3,19 +3,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>jms-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-jms-multiple-failover-example</artifactId> + <artifactId>activemq-jms-multiple-failover-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Multiple Failover Example</name> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-examples-common</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-examples-common</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -27,8 +27,8 @@ <build> <plugins> <plugin> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-maven-plugin</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> <executions> <execution> <id>start0</id> @@ -99,7 +99,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.MultipleFailoverExample</clientClass> + <clientClass>org.apache.activemq.jms.example.MultipleFailoverExample</clientClass> <args> <param>jnp://localhost:1099</param> <param>jnp://localhost:1199</param> @@ -143,28 +143,28 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-multiple-failover-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-multiple-failover-example</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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-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-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java b/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java index 08ee195..8f7d099 100644 --- a/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java +++ b/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,7 +22,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml index ab0cda6..9dd4894 100644 --- a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml @@ -19,7 +19,7 @@ <!-- Connectors --> <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="port" value="5445"/> </connector> </connectors> @@ -27,7 +27,7 @@ <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <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="5445"/> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml index 78d0c4a..4a340ec 100644 --- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml @@ -19,7 +19,7 @@ <!-- Connectors --> <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="port" value="5446"/> </connector> </connectors> @@ -27,7 +27,7 @@ <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <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="5446"/> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml index b6df202..d2af9c7 100644 --- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml +++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml @@ -19,7 +19,7 @@ <!-- Connectors --> <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="port" value="5447"/> </connector> </connectors> @@ -27,7 +27,7 @@ <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <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="5447"/> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/no-consumer-buffering/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/no-consumer-buffering/pom.xml b/examples/jms/no-consumer-buffering/pom.xml index 9850ec8..022e291 100644 --- a/examples/jms/no-consumer-buffering/pom.xml +++ b/examples/jms/no-consumer-buffering/pom.xml @@ -3,19 +3,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>jms-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-jms-no-consumer-buffering-example</artifactId> + <artifactId>activemq-jms-no-consumer-buffering-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS No Consumer Buffering Example</name> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-examples-common</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-examples-common</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -27,8 +27,8 @@ <build> <plugins> <plugin> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-maven-plugin</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> <executions> <execution> <id>start</id> @@ -50,7 +50,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.NoConsumerBufferingExample</clientClass> + <clientClass>org.apache.activemq.jms.example.NoConsumerBufferingExample</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -65,28 +65,28 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-no-consumer-buffering-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-no-consumer-buffering-example</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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-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-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java b/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java index 6064e7b..3d5688a 100644 --- a/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java +++ b/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -21,7 +21,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * This example demonstrates how HornetQ consumers can be configured to not buffer any messages from http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml index 0123a1b..f56cb9b 100644 --- a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml @@ -15,14 +15,14 @@ <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> </connector> </connectors> <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/non-transaction-failover/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/non-transaction-failover/pom.xml b/examples/jms/non-transaction-failover/pom.xml index e5aa551..ccfc326 100644 --- a/examples/jms/non-transaction-failover/pom.xml +++ b/examples/jms/non-transaction-failover/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>jms-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> @@ -14,8 +14,8 @@ <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-examples-common</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-examples-common</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -27,8 +27,8 @@ <build> <plugins> <plugin> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-maven-plugin</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> <executions> <execution> <id>start0</id> @@ -83,7 +83,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.NonTransactionFailoverExample</clientClass> + <clientClass>org.apache.activemq.jms.example.NonTransactionFailoverExample</clientClass> <args> <param>jnp://localhost:1099</param> <param>jnp://localhost:1199</param> @@ -117,28 +117,28 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>non-transaction-failover</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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-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-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java b/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java index 80fefdf..2278872 100644 --- a/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java +++ b/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,7 +22,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * A simple example that demonstrates failover of the JMS connection from one node to another http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml index 85da9c1..736b700 100644 --- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml @@ -12,7 +12,7 @@ <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="port" value="5445"/> </connector> </connectors> @@ -20,7 +20,7 @@ <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <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="5445"/> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml index 4102925..e60d32f 100644 --- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml @@ -12,7 +12,7 @@ <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="port" value="5446"/> </connector> </connectors> @@ -20,7 +20,7 @@ <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <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="5446"/> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/openwire/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/openwire/pom.xml b/examples/jms/openwire/pom.xml index 5dda020..be59ad3 100644 --- a/examples/jms/openwire/pom.xml +++ b/examples/jms/openwire/pom.xml @@ -3,19 +3,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>jms-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-jms-openwire-example</artifactId> + <artifactId>activemq-jms-openwire-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Openwire Example</name> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-examples-common</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-examples-common</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -31,8 +31,8 @@ <build> <plugins> <plugin> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-maven-plugin</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> <executions> <execution> <id>start</id> @@ -54,7 +54,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.OpenWireExample</clientClass> + <clientClass>org.apache.activemq.jms.example.OpenWireExample</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -69,33 +69,33 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-openwire-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-openwire-example</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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-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-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-openwire-protocol</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-openwire-protocol</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/openwire/src/main/java/org/apache/activemq/jms/example/OpenWireExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/openwire/src/main/java/org/apache/activemq/jms/example/OpenWireExample.java b/examples/jms/openwire/src/main/java/org/apache/activemq/jms/example/OpenWireExample.java index 5aa9fa8..b9e16dc 100644 --- a/examples/jms/openwire/src/main/java/org/apache/activemq/jms/example/OpenWireExample.java +++ b/examples/jms/openwire/src/main/java/org/apache/activemq/jms/example/OpenWireExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,7 +22,7 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQQueue; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * A simple JMS Queue example that creates a producer and consumer on a queue http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml index 02edf2e..7215c93 100644 --- a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml @@ -12,17 +12,17 @@ <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> </connector> </connectors> <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> <acceptor name="openwire-acceptor"> - <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="protocols" value="OPENWIRE" /> <param key="port" value="61616" /> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/paging/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/paging/pom.xml b/examples/jms/paging/pom.xml index 372249d..beab47c 100644 --- a/examples/jms/paging/pom.xml +++ b/examples/jms/paging/pom.xml @@ -3,19 +3,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>jms-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-jms-paging-example</artifactId> + <artifactId>activemq-jms-paging-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Paging Example</name> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-examples-common</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-examples-common</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -27,8 +27,8 @@ <build> <plugins> <plugin> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-maven-plugin</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> <executions> <execution> <id>start</id> @@ -50,7 +50,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.PagingExample</clientClass> + <clientClass>org.apache.activemq.jms.example.PagingExample</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -65,28 +65,28 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-paging-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-paging-example</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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-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-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java b/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java index 7dcde8b..0c37045 100644 --- a/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java +++ b/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -22,7 +22,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.naming.InitialContext; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml index 5b51943..ef6635f 100644 --- a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml @@ -14,14 +14,14 @@ <!-- Connectors --> <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> </connector> </connectors> <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/perf/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/perf/pom.xml b/examples/jms/perf/pom.xml index dc1225a..6fcd9fb 100644 --- a/examples/jms/perf/pom.xml +++ b/examples/jms/perf/pom.xml @@ -3,24 +3,24 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>jms-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-jms-perf-example</artifactId> + <artifactId>activemq-jms-perf-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS PerfExample Example</name> <dependencies> <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-commons</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -39,8 +39,8 @@ <version>5.0.5.Final</version> </dependency> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-examples-common</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-examples-common</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -58,8 +58,8 @@ <build> <plugins> <plugin> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-maven-plugin</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> <executions> <execution> <id>start</id> @@ -84,28 +84,28 @@ </configuration> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-perf-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-perf-example</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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-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-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -145,7 +145,7 @@ </execution> </executions> <configuration> - <mainClass>org.apache.activemq6.jms.example.PerfListener</mainClass> + <mainClass>org.apache.activemq.jms.example.PerfListener</mainClass> </configuration> </plugin> </plugins> @@ -168,7 +168,7 @@ </execution> </executions> <configuration> - <mainClass>org.apache.activemq6.jms.example.PerfSender</mainClass> + <mainClass>org.apache.activemq.jms.example.PerfSender</mainClass> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java index 1c3e10f..8651634 100644 --- a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java +++ b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import java.io.FileInputStream; import java.io.InputStream; @@ -23,8 +23,8 @@ import java.util.logging.Logger; import javax.jms.*; import javax.naming.InitialContext; -import org.apache.activemq6.utils.TokenBucketLimiter; -import org.apache.activemq6.utils.TokenBucketLimiterImpl; +import org.apache.activemq.utils.TokenBucketLimiter; +import org.apache.activemq.utils.TokenBucketLimiterImpl; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java index 49dce39..aadfc5e 100644 --- a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java +++ b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import java.util.Properties; import java.util.logging.Logger; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfParams.java ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfParams.java b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfParams.java index 99ae640..1e28405 100644 --- a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfParams.java +++ b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfParams.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java index 237d45e..81b28fa 100644 --- a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java +++ b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import java.util.Properties; import java.util.logging.Logger; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml index fafe507..88d6295 100644 --- a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml +++ b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml @@ -6,7 +6,7 @@ <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <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="tcp-no-delay" value="false"/> <param key="tcp-send-buffer-size" value="1048576"/> <param key="tcp-receive-buffer-size" value="1048576"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml index 5af74ea..19f81eb 100644 --- a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml @@ -4,7 +4,7 @@ <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="tcp-no-delay" value="false"/> <param key="tcp-send-buffer-size" value="1048576"/> <param key="tcp-receive-buffer-size" value="1048576"/> @@ -14,7 +14,7 @@ <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <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="tcp-no-delay" value="false"/> <param key="tcp-send-buffer-size" value="1048576"/> <param key="tcp-receive-buffer-size" value="1048576"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pom.xml b/examples/jms/pom.xml index cfe1596..4d208ff 100644 --- a/examples/jms/pom.xml +++ b/examples/jms/pom.xml @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.examples</groupId> - <artifactId>activemq6-examples</artifactId> + <groupId>org.apache.activemq.examples</groupId> + <artifactId>activemq-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>jms-examples</artifactId> <packaging>pom</packaging> <name>ActiveMQ6 JMS Examples</name> @@ -21,7 +21,7 @@ <profile> <id>maven-release</id> <modules> - <module>activemq6-jms-examples-common</module> + <module>activemq-jms-examples-common</module> </modules> </profile> <profile> @@ -30,7 +30,7 @@ <activeByDefault>true</activeByDefault> </activation> <modules> - <module>activemq6-jms-examples-common</module> + <module>activemq-jms-examples-common</module> <!--this needs to be run standalone--> <!--<module>applet</module>--> <module>application-layer-failover</module> @@ -113,7 +113,7 @@ <profile> <id>release</id> <modules> - <module>activemq6-jms-examples-common</module> + <module>activemq-jms-examples-common</module> </modules> </profile> </profiles> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/pre-acknowledge/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml index 037c7e9..2b3212e 100644 --- a/examples/jms/pre-acknowledge/pom.xml +++ b/examples/jms/pre-acknowledge/pom.xml @@ -3,19 +3,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.examples.jms</groupId> + <groupId>org.apache.activemq.examples.jms</groupId> <artifactId>jms-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-jms-pre-acknowledge-example</artifactId> + <artifactId>activemq-jms-pre-acknowledge-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Pre Acknowledge Example</name> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-examples-common</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-examples-common</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -27,8 +27,8 @@ <build> <plugins> <plugin> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-maven-plugin</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> <executions> <execution> <id>start</id> @@ -50,7 +50,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.PreacknowledgeExample</clientClass> + <clientClass>org.apache.activemq.jms.example.PreacknowledgeExample</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -65,28 +65,28 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-pre-acknowledge-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-pre-acknowledge-example</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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-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-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java index 5644dc4..5ffb652 100644 --- a/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java +++ b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.example; +package org.apache.activemq.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -25,10 +25,10 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.HornetQJMSConstants; -import org.apache.activemq6.api.jms.management.JMSManagementHelper; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.HornetQJMSConstants; +import org.apache.activemq.api.jms.management.JMSManagementHelper; +import org.apache.activemq.common.example.HornetQExample; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml index c2f0e6e..0603e3f 100644 --- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml @@ -15,14 +15,14 @@ <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> </connector> </connectors> <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors>
