http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java b/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java index fdbf8a5..ee6e3f0 100644 --- a/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java +++ b/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.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,8 +22,8 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.common.example.HornetQExample; /** * This example demonstrates how a JMS TopicSubscriber can be created to subscribe to a wild-card Topic.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-configuration.xml index b52d3a5..0c9694c 100644 --- a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/topic-hierarchies/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/topic-selector-example1/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic-selector-example1/pom.xml b/examples/jms/topic-selector-example1/pom.xml index 85fa9b3..c5bb053 100644 --- a/examples/jms/topic-selector-example1/pom.xml +++ b/examples/jms/topic-selector-example1/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-topic-selector-example1-example</artifactId> + <artifactId>activemq-jms-topic-selector-example1-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Topic Selector Example 1</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.TopicSelectorExample1</clientClass> + <clientClass>org.apache.activemq.jms.example.TopicSelectorExample1</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-topic-selector-example1-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-topic-selector-example1-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/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java ---------------------------------------------------------------------- diff --git a/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java b/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java index 518bb3d..2fd3739 100644 --- a/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java +++ b/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.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.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * A simple JMS Topic example that creates a producer and consumer on a queue and sends and receives a message. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-configuration.xml index 93f13af..6cf0ac6 100644 --- a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/topic-selector-example1/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/topic-selector-example2/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic-selector-example2/pom.xml b/examples/jms/topic-selector-example2/pom.xml index 86cc6b2..a49becc 100644 --- a/examples/jms/topic-selector-example2/pom.xml +++ b/examples/jms/topic-selector-example2/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-topic-selector-example2-example</artifactId> + <artifactId>activemq-jms-topic-selector-example2-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Topic Selector 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.TopicSelectorExample2</clientClass> + <clientClass>org.apache.activemq.jms.example.TopicSelectorExample2</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-topic-selector-example2-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-topic-selector-example2-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/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java ---------------------------------------------------------------------- diff --git a/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java b/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java index 7818c8a..aca16d3 100644 --- a/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java +++ b/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.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; @@ -24,7 +24,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * A simple JMS example that consumes messages using selectors. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-configuration.xml index 93f13af..6cf0ac6 100644 --- a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/topic-selector-example2/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/topic/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml index 73524ac..4f71000 100644 --- a/examples/jms/topic/pom.xml +++ b/examples/jms/topic/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-topic-example</artifactId> + <artifactId>activemq-jms-topic-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Topic 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.TopicExample</clientClass> + <clientClass>org.apache.activemq.jms.example.TopicExample</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-topic-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-topic-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/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java b/examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java index 017d6ca..777e96d 100644 --- a/examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java +++ b/examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.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.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * A simple JMS Topic example that creates a producer and consumer on a queue and sends and receives a message. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-configuration.xml index 93f13af..6cf0ac6 100644 --- a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/topic/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/transaction-failover/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transaction-failover/pom.xml b/examples/jms/transaction-failover/pom.xml index a9c54fe..5fa5c9b 100644 --- a/examples/jms/transaction-failover/pom.xml +++ b/examples/jms/transaction-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-transaction-failover-example</artifactId> + <artifactId>activemq-jms-transaction-failover-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Transaction 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> @@ -77,7 +77,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.TransactionFailoverExample</clientClass> + <clientClass>org.apache.activemq.jms.example.TransactionFailoverExample</clientClass> <args> <param>jnp://localhost:1099</param> <param>jnp://localhost:1199</param> @@ -111,28 +111,28 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-transaction-failover-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-transaction-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/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java b/examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java index 436e687..15839cd 100644 --- a/examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java +++ b/examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.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,8 +22,8 @@ import javax.jms.TextMessage; import javax.jms.TransactionRolledBackException; import javax.naming.InitialContext; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.api.core.Message; +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/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml index 0a22ede..d87600e 100644 --- a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml @@ -20,7 +20,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> @@ -28,7 +28,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/transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml index 9355aa3..4dee04b 100644 --- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/transaction-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/transactional/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transactional/pom.xml b/examples/jms/transactional/pom.xml index e6739ef..bdbe4e1 100644 --- a/examples/jms/transactional/pom.xml +++ b/examples/jms/transactional/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-transactional-example</artifactId> + <artifactId>activemq-jms-transactional-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Transactional 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.TransactionalExample</clientClass> + <clientClass>org.apache.activemq.jms.example.TransactionalExample</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-transactional-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-transactional-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/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java b/examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java index 4fadcbd..9dbac87 100644 --- a/examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java +++ b/examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.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; /** * A simple JMS example that sends and consume message transactionally. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-configuration.xml index 251a2e8..6c6e80a 100644 --- a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/transactional/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/xa-heuristic/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml index ebd61e1..95c122f 100644 --- a/examples/jms/xa-heuristic/pom.xml +++ b/examples/jms/xa-heuristic/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-xa-heuristic-example</artifactId> + <artifactId>activemq-jms-xa-heuristic-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS XAHeuristicExample 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> @@ -32,8 +32,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> @@ -73,7 +73,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.XAHeuristicExample</clientClass> + <clientClass>org.apache.activemq.jms.example.XAHeuristicExample</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -88,28 +88,28 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-xa-heuristic-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-xa-heuristic-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/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java b/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java index dd7ca2a..a1d2da4 100644 --- a/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java +++ b/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.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.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -36,10 +36,10 @@ import javax.naming.InitialContext; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.common.example.DummyXid; -import org.apache.activemq6.common.example.HornetQExample; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.common.example.DummyXid; +import org.apache.activemq.common.example.HornetQExample; +import org.apache.activemq.utils.UUIDGenerator; /** * A simple JMS example showing how to administer un-finished transactions. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-configuration.xml index 251a2e8..6c6e80a 100644 --- a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/xa-heuristic/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/xa-receive/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-receive/pom.xml b/examples/jms/xa-receive/pom.xml index 323819a..6250786 100644 --- a/examples/jms/xa-receive/pom.xml +++ b/examples/jms/xa-receive/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-xa-receive-example</artifactId> + <artifactId>activemq-jms-xa-receive-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS XA Receive 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.XAReceiveExample</clientClass> + <clientClass>org.apache.activemq.jms.example.XAReceiveExample</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-xa-receive-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-xa-receive-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/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java b/examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java index b1c5521..fa4277d 100644 --- a/examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java +++ b/examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.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.nio.charset.StandardCharsets; @@ -26,9 +26,9 @@ import javax.naming.InitialContext; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq6.common.example.DummyXid; -import org.apache.activemq6.common.example.HornetQExample; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.common.example.DummyXid; +import org.apache.activemq.common.example.HornetQExample; +import org.apache.activemq.utils.UUIDGenerator; /** * A simple JMS example showing the usage of XA support in JMS. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-configuration.xml index 251a2e8..6c6e80a 100644 --- a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/xa-receive/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/xa-send/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-send/pom.xml b/examples/jms/xa-send/pom.xml index dcebc69..08bfd5c 100644 --- a/examples/jms/xa-send/pom.xml +++ b/examples/jms/xa-send/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-xa-send-example</artifactId> + <artifactId>activemq-jms-xa-send-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS XA Send 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.XASendExample</clientClass> + <clientClass>org.apache.activemq.jms.example.XASendExample</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-xa-send-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-xa-send-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/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java b/examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java index 094fbb5..27e5fe6 100644 --- a/examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java +++ b/examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.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.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -30,9 +30,9 @@ import javax.naming.InitialContext; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq6.common.example.DummyXid; -import org.apache.activemq6.common.example.HornetQExample; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.common.example.DummyXid; +import org.apache.activemq.common.example.HornetQExample; +import org.apache.activemq.utils.UUIDGenerator; /** * A simple JMS example showing the usage of XA support in JMS. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-configuration.xml index 7a3a61e..6c6e80a 100644 --- a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/xa-send/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/xa-with-jta/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-with-jta/pom.xml b/examples/jms/xa-with-jta/pom.xml index e52a65b..29cd849 100644 --- a/examples/jms/xa-with-jta/pom.xml +++ b/examples/jms/xa-with-jta/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-xa-with-jta-example</artifactId> + <artifactId>activemq-jms-xa-with-jta-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS XA with JTA 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> @@ -36,8 +36,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> @@ -59,7 +59,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.example.XAwithJTAExample</clientClass> + <clientClass>org.apache.activemq.jms.example.XAwithJTAExample</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -74,28 +74,28 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.activemq6.examples.jms</groupId> - <artifactId>activemq6-jms-xa-with-jta-example</artifactId> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-xa-with-jta-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/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.java b/examples/jms/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.java index 1d3602d..6f2b68b 100644 --- a/examples/jms/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.java +++ b/examples/jms/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.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.MessageConsumer; import javax.jms.MessageProducer; @@ -28,7 +28,7 @@ import javax.transaction.xa.Xid; import com.arjuna.ats.jta.TransactionManager; -import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq.common.example.HornetQExample; /** * A simple JMS example showing the HornetQ XA support with JTA. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-configuration.xml index 0d72f44..6c6e80a 100644 --- a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/xa-with-jta/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/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 89904ee..23a17ef 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,13 +3,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.examples</groupId> - <artifactId>activemq6-examples</artifactId> + <groupId>org.apache.activemq.examples</groupId> + <artifactId>activemq-examples</artifactId> <packaging>pom</packaging> <name>ActiveMQ6 Examples</name> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/soak/normal/pom.xml ---------------------------------------------------------------------- diff --git a/examples/soak/normal/pom.xml b/examples/soak/normal/pom.xml index dae1bcb..d8b8ea0 100644 --- a/examples/soak/normal/pom.xml +++ b/examples/soak/normal/pom.xml @@ -2,20 +2,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <artifactId>activemq6-jms-soak-example</artifactId> + <artifactId>activemq-jms-soak-example</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 Soak Normal Example</name> <parent> - <groupId>org.apache.activemq6.example.soak</groupId> + <groupId>org.apache.activemq.example.soak</groupId> <artifactId>soak-examples</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> <dependencies> <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> </dependencies> @@ -27,22 +27,22 @@ <build> <plugins> <plugin> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-maven-plugin</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> <dependencies> <dependency> - <groupId>org.apache.activemq6.example.soak</groupId> - <artifactId>activemq6-jms-soak-example</artifactId> + <groupId>org.apache.activemq.example.soak</groupId> + <artifactId>activemq-jms-soak-example</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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -78,8 +78,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> @@ -97,7 +97,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.soak.example.SoakReceiver</clientClass> + <clientClass>org.apache.activemq.jms.soak.example.SoakReceiver</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -109,7 +109,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.soak.example.SoakSender</clientClass> + <clientClass>org.apache.activemq.jms.soak.example.SoakSender</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -134,8 +134,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>runConsumer</id> @@ -143,7 +143,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.soak.example.SoakReceiver</clientClass> + <clientClass>org.apache.activemq.jms.soak.example.SoakReceiver</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -155,7 +155,7 @@ <goal>runClient</goal> </goals> <configuration> - <clientClass>org.apache.activemq6.jms.soak.example.SoakSender</clientClass> + <clientClass>org.apache.activemq.jms.soak.example.SoakSender</clientClass> <args> <param>jnp://localhost:1099</param> </args> @@ -171,8 +171,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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/soak/normal/server0/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/soak/normal/server0/hornetq-configuration.xml b/examples/soak/normal/server0/hornetq-configuration.xml index ac9d00a..593ce84 100644 --- a/examples/soak/normal/server0/hornetq-configuration.xml +++ b/examples/soak/normal/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"/> @@ -15,7 +15,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/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakBase.java ---------------------------------------------------------------------- diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakBase.java b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakBase.java index 22db294..7132c6d 100644 --- a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakBase.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakBase.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.soak.example; +package org.apache.activemq.jms.soak.example; import java.io.FileInputStream; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakParams.java ---------------------------------------------------------------------- diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakParams.java b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakParams.java index 5fb3170..f5ea06a 100644 --- a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakParams.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakParams.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.soak.example; +package org.apache.activemq.jms.soak.example; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java ---------------------------------------------------------------------- diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java index ed9fcd1..d57d8b0 100644 --- a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.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.soak.example; +package org.apache.activemq.jms.soak.example; import java.lang.Override; import java.lang.Runnable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java ---------------------------------------------------------------------- diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java index a3e5dee..029598b 100644 --- a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.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.soak.example; +package org.apache.activemq.jms.soak.example; import java.util.Hashtable; import java.util.concurrent.atomic.AtomicLong; @@ -28,8 +28,8 @@ import javax.jms.Session; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.apache.activemq6.utils.TokenBucketLimiter; -import org.apache.activemq6.utils.TokenBucketLimiterImpl; +import org.apache.activemq.utils.TokenBucketLimiter; +import org.apache.activemq.utils.TokenBucketLimiterImpl; public class SoakSender { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/soak/pom.xml ---------------------------------------------------------------------- diff --git a/examples/soak/pom.xml b/examples/soak/pom.xml index 75e3661..946cea4 100644 --- a/examples/soak/pom.xml +++ b/examples/soak/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.example.soak</groupId> + <groupId>org.apache.activemq.example.soak</groupId> <artifactId>soak-examples</artifactId> <packaging>pom</packaging> <name>ActiveMQ6 Soak Examples</name> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-aerogear-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/pom.xml b/integration/activemq-aerogear-integration/pom.xml index eda5f3e..1fe0b3d 100644 --- a/integration/activemq-aerogear-integration/pom.xml +++ b/integration/activemq-aerogear-integration/pom.xml @@ -3,13 +3,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> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>activemq6-aerogear-integration</artifactId> + <artifactId>activemq-aerogear-integration</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 Aerogear Integration</name> @@ -31,8 +31,8 @@ <artifactId>jboss-logging</artifactId> </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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorService.java ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorService.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorService.java index e69ee4c..1e2ad0e 100644 --- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorService.java +++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorService.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.integration.aerogear; +package org.apache.activemq.integration.aerogear; import java.net.HttpURLConnection; import java.net.URL; @@ -22,19 +22,19 @@ import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.filter.impl.FilterImpl; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.server.ConnectorService; -import org.apache.activemq6.core.server.Consumer; -import org.apache.activemq6.core.server.HandleStatus; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.utils.ConfigurationHelper; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.filter.impl.FilterImpl; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.server.ConnectorService; +import org.apache.activemq.core.server.Consumer; +import org.apache.activemq.core.server.HandleStatus; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.utils.ConfigurationHelper; import org.jboss.aerogear.unifiedpush.JavaSender; import org.jboss.aerogear.unifiedpush.SenderClient; import org.jboss.aerogear.unifiedpush.message.MessageResponseCallback; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorServiceFactory.java ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorServiceFactory.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorServiceFactory.java index cb9fdae..d20f651 100644 --- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorServiceFactory.java +++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorServiceFactory.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.integration.aerogear; +package org.apache.activemq.integration.aerogear; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.server.ConnectorService; -import org.apache.activemq6.core.server.ConnectorServiceFactory; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.server.ConnectorService; +import org.apache.activemq.core.server.ConnectorServiceFactory; import java.util.Map; import java.util.Set; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConstants.java ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConstants.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConstants.java index cead084..d31df97 100644 --- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConstants.java +++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConstants.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.integration.aerogear; +package org.apache.activemq.integration.aerogear; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.SimpleString; import java.util.HashSet; import java.util.Set; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearBundle.java ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearBundle.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearBundle.java index cf6649c..b760e27 100644 --- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearBundle.java +++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearBundle.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.integration.aerogear; +package org.apache.activemq.integration.aerogear; -import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq.api.core.HornetQIllegalStateException; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; import org.jboss.logging.Messages; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearLogger.java ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearLogger.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearLogger.java index d7e0c70..dcb3eac 100644 --- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearLogger.java +++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearLogger.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.integration.aerogear; +package org.apache.activemq.integration.aerogear; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/integration/activemq-jboss-as-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-jboss-as-integration/pom.xml b/integration/activemq-jboss-as-integration/pom.xml index acd545e..677112c 100644 --- a/integration/activemq-jboss-as-integration/pom.xml +++ b/integration/activemq-jboss-as-integration/pom.xml @@ -3,13 +3,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> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>activemq6-jboss-as-integration</artifactId> + <artifactId>activemq-jboss-as-integration</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JBoss AS Integration</name> @@ -31,8 +31,8 @@ <artifactId>jboss-logging</artifactId> </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>
