You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by an...@apache.org on 2014/11/17 15:48:50 UTC
[15/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-3 renaming
package names from activemq6 to activemq
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 1f0d61e..a64a8be 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -19,11 +19,11 @@
<!-- Connectors -->
<connectors>
<connector name="netty-live-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>
<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>
@@ -31,7 +31,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/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml
index db33233..dd1b882 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -18,11 +18,11 @@
<connectors>
<connector name="netty-live-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>
<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>
@@ -30,7 +30,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/replicated-transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/pom.xml b/examples/jms/replicated-transaction-failover/pom.xml
index be6aff6..5cadc10 100644
--- a/examples/jms/replicated-transaction-failover/pom.xml
+++ b/examples/jms/replicated-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-replicated-transaction-failover-example</artifactId>
+ <artifactId>activemq-jms-replicated-transaction-failover-example</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ6 JMS Replicated 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.ReplicatedTransactionFailoverExample</clientClass>
+ <clientClass>org.apache.activemq.jms.example.ReplicatedTransactionFailoverExample</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-replicated-transaction-failover-example</artifactId>
+ <groupId>org.apache.activemq.examples.jms</groupId>
+ <artifactId>activemq-jms-replicated-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/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java b/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java
index e47d4b5..146345f 100644
--- a/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java
+++ b/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.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/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 36349dd..88e25d4 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/replicated-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/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 1489d1c..5178432 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -20,11 +20,11 @@
<connectors>
<connector name="netty-live-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>
<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>
@@ -32,7 +32,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/request-reply/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/pom.xml b/examples/jms/request-reply/pom.xml
index 3b9edbe..5627512 100644
--- a/examples/jms/request-reply/pom.xml
+++ b/examples/jms/request-reply/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-request-reply-example</artifactId>
+ <artifactId>activemq-jms-request-reply-example</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ6 JMS Request Reply 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.RequestReplyExample</clientClass>
+ <clientClass>org.apache.activemq.jms.example.RequestReplyExample</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-request-reply-example</artifactId>
+ <groupId>org.apache.activemq.examples.jms</groupId>
+ <artifactId>activemq-jms-request-reply-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/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java b/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java
index ad6f54a..609f49a 100644
--- a/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java
+++ b/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.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.HashMap;
import java.util.Map;
@@ -29,7 +29,7 @@ import javax.jms.TemporaryQueue;
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 how to use Request/Replay style messaging.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 0628c86..fa948b3 100644
--- a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/request-reply/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/rest/dup-send/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/pom.xml b/examples/jms/rest/dup-send/pom.xml
index 8a6f42b..eb51ad1 100644
--- a/examples/jms/rest/dup-send/pom.xml
+++ b/examples/jms/rest/dup-send/pom.xml
@@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq6.rest.examples</groupId>
- <artifactId>activemq6-rest-examples-pom</artifactId>
+ <groupId>org.apache.activemq.rest.examples</groupId>
+ <artifactId>activemq-rest-examples-pom</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>dup-send</artifactId>
@@ -92,23 +92,23 @@
</build>
<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-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>
@@ -120,8 +120,8 @@
<artifactId>jboss-jms-api_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.activemq6.rest</groupId>
- <artifactId>activemq6-rest</artifactId>
+ <groupId>org.apache.activemq.rest</groupId>
+ <artifactId>activemq-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/dup-send/src/main/java/PostOrder.java
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/java/PostOrder.java b/examples/jms/rest/dup-send/src/main/java/PostOrder.java
index 1043e92..dceddbe 100644
--- a/examples/jms/rest/dup-send/src/main/java/PostOrder.java
+++ b/examples/jms/rest/dup-send/src/main/java/PostOrder.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-import org.apache.activemq6.jms.client.HornetQDestination;
+import org.apache.activemq.jms.client.HornetQDestination;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
import org.jboss.resteasy.spi.Link;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml b/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml
index 174a2e4..51f6da9 100644
--- a/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml
@@ -5,7 +5,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>
</connector>
</connectors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml b/examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml
index 96a3f4a..15226c7 100644
--- a/examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml
@@ -7,16 +7,16 @@
<connectors>
<connector name="in-vm">
- <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
</connector>
</connectors>
<acceptors>
<acceptor name="in-vm">
- <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
</acceptor>
<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/rest/dup-send/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml b/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
index e886075..49a8436 100644
--- a/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
+++ b/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
@@ -15,11 +15,11 @@
<listener>
- <listener-class>org.apache.activemq6.rest.integration.HornetqBootstrapListener</listener-class>
+ <listener-class>org.apache.activemq.rest.integration.HornetqBootstrapListener</listener-class>
</listener>
<listener>
- <listener-class>org.apache.activemq6.rest.integration.RestMessagingBootstrapListener</listener-class>
+ <listener-class>org.apache.activemq.rest.integration.RestMessagingBootstrapListener</listener-class>
</listener>
<filter>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/javascript-chat/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/javascript-chat/pom.xml b/examples/jms/rest/javascript-chat/pom.xml
index c71c6ec..b7e0819 100644
--- a/examples/jms/rest/javascript-chat/pom.xml
+++ b/examples/jms/rest/javascript-chat/pom.xml
@@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq6.rest.examples</groupId>
- <artifactId>activemq6-rest-examples-pom</artifactId>
+ <groupId>org.apache.activemq.rest.examples</groupId>
+ <artifactId>activemq-rest-examples-pom</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>javascript-chat</artifactId>
@@ -106,23 +106,23 @@
</build>
<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-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>
@@ -134,8 +134,8 @@
<artifactId>jboss-jms-api_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.activemq6.rest</groupId>
- <artifactId>activemq6-rest</artifactId>
+ <groupId>org.apache.activemq.rest</groupId>
+ <artifactId>activemq-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml b/examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml
index 0c803f1..a4438a9 100644
--- a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml
+++ b/examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml
@@ -7,13 +7,13 @@
<connectors>
<connector name="in-vm">
- <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
</connector>
</connectors>
<acceptors>
<acceptor name="in-vm">
- <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/javascript-chat/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/javascript-chat/src/main/webapp/WEB-INF/web.xml b/examples/jms/rest/javascript-chat/src/main/webapp/WEB-INF/web.xml
index 2e04802..5545110 100644
--- a/examples/jms/rest/javascript-chat/src/main/webapp/WEB-INF/web.xml
+++ b/examples/jms/rest/javascript-chat/src/main/webapp/WEB-INF/web.xml
@@ -9,11 +9,11 @@
<listener>
- <listener-class>org.apache.activemq6.rest.integration.HornetqBootstrapListener</listener-class>
+ <listener-class>org.apache.activemq.rest.integration.HornetqBootstrapListener</listener-class>
</listener>
<listener>
- <listener-class>org.apache.activemq6.rest.integration.RestMessagingBootstrapListener</listener-class>
+ <listener-class>org.apache.activemq.rest.integration.RestMessagingBootstrapListener</listener-class>
</listener>
<filter>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java
----------------------------------------------------------------------
diff --git a/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java b/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java
index eabf90a..b1978e1 100644
--- a/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java
+++ b/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java
@@ -15,7 +15,7 @@ package org.jboss.resteasy.messaging.test;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
import org.jboss.resteasy.spi.Link;
-import org.apache.activemq6.rest.util.LinkStrategy;
+import org.apache.activemq.rest.util.LinkStrategy;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/jms-to-rest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/pom.xml b/examples/jms/rest/jms-to-rest/pom.xml
index 7eaf514..aeb83da 100644
--- a/examples/jms/rest/jms-to-rest/pom.xml
+++ b/examples/jms/rest/jms-to-rest/pom.xml
@@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq6.rest.examples</groupId>
- <artifactId>activemq6-rest-examples-pom</artifactId>
+ <groupId>org.apache.activemq.rest.examples</groupId>
+ <artifactId>activemq-rest-examples-pom</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>mixed-jms-rest</artifactId>
@@ -92,23 +92,23 @@
</build>
<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-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>
@@ -120,8 +120,8 @@
<artifactId>jboss-jms-api_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.activemq6.rest</groupId>
- <artifactId>activemq6-rest</artifactId>
+ <groupId>org.apache.activemq.rest</groupId>
+ <artifactId>activemq-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java b/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java
index 211e791..9a0e269 100644
--- a/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java
+++ b/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java
@@ -10,14 +10,14 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.HornetQClient;
-import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl;
-import org.apache.activemq6.core.config.impl.FileConfiguration;
-import org.apache.activemq6.jms.client.HornetQConnectionFactory;
-import org.apache.activemq6.jms.client.HornetQDestination;
-import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.HornetQClient;
+import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl;
+import org.apache.activemq.core.config.impl.FileConfiguration;
+import org.apache.activemq.jms.client.HornetQConnectionFactory;
+import org.apache.activemq.jms.client.HornetQDestination;
+import org.apache.activemq.jms.client.HornetQJMSConnectionFactory;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java b/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java
index 17ee8e8..b8b3d6a 100644
--- a/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java
+++ b/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java
@@ -10,8 +10,8 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-import org.apache.activemq6.jms.client.HornetQDestination;
-import org.apache.activemq6.rest.Jms;
+import org.apache.activemq.jms.client.HornetQDestination;
+import org.apache.activemq.rest.Jms;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java b/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java
index b348a53..3c15637 100644
--- a/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java
+++ b/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-import org.apache.activemq6.jms.client.HornetQDestination;
+import org.apache.activemq.jms.client.HornetQDestination;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml
index 174a2e4..51f6da9 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml
@@ -5,7 +5,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>
</connector>
</connectors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml
index 96a3f4a..15226c7 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml
@@ -7,16 +7,16 @@
<connectors>
<connector name="in-vm">
- <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
</connector>
</connectors>
<acceptors>
<acceptor name="in-vm">
- <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
</acceptor>
<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/rest/jms-to-rest/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/webapp/WEB-INF/web.xml b/examples/jms/rest/jms-to-rest/src/main/webapp/WEB-INF/web.xml
index 2e04802..5545110 100644
--- a/examples/jms/rest/jms-to-rest/src/main/webapp/WEB-INF/web.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/webapp/WEB-INF/web.xml
@@ -9,11 +9,11 @@
<listener>
- <listener-class>org.apache.activemq6.rest.integration.HornetqBootstrapListener</listener-class>
+ <listener-class>org.apache.activemq.rest.integration.HornetqBootstrapListener</listener-class>
</listener>
<listener>
- <listener-class>org.apache.activemq6.rest.integration.RestMessagingBootstrapListener</listener-class>
+ <listener-class>org.apache.activemq.rest.integration.RestMessagingBootstrapListener</listener-class>
</listener>
<filter>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/pom.xml b/examples/jms/rest/pom.xml
index 5d73141..db93485 100644
--- a/examples/jms/rest/pom.xml
+++ b/examples/jms/rest/pom.xml
@@ -3,13 +3,13 @@
<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>
- <groupId>org.apache.activemq6.rest.examples</groupId>
- <artifactId>activemq6-rest-examples-pom</artifactId>
+ <groupId>org.apache.activemq.rest.examples</groupId>
+ <artifactId>activemq-rest-examples-pom</artifactId>
<packaging>pom</packaging>
<name>ActiveMQ6 REST Examples</name>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/push/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/pom.xml b/examples/jms/rest/push/pom.xml
index 17ce834..456a60b 100644
--- a/examples/jms/rest/push/pom.xml
+++ b/examples/jms/rest/push/pom.xml
@@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq6.rest.examples</groupId>
- <artifactId>activemq6-rest-examples-pom</artifactId>
+ <groupId>org.apache.activemq.rest.examples</groupId>
+ <artifactId>activemq-rest-examples-pom</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>push</artifactId>
@@ -98,23 +98,23 @@
</build>
<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-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>
@@ -126,8 +126,8 @@
<artifactId>jboss-jms-api_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.activemq6.rest</groupId>
- <artifactId>activemq6-rest</artifactId>
+ <groupId>org.apache.activemq.rest</groupId>
+ <artifactId>activemq-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/push/src/main/java/JmsHelper.java
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/java/JmsHelper.java b/examples/jms/rest/push/src/main/java/JmsHelper.java
index 12ab96e..bf2f577 100644
--- a/examples/jms/rest/push/src/main/java/JmsHelper.java
+++ b/examples/jms/rest/push/src/main/java/JmsHelper.java
@@ -10,13 +10,13 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.HornetQClient;
-import org.apache.activemq6.core.config.impl.FileConfiguration;
-import org.apache.activemq6.jms.client.HornetQConnectionFactory;
-import org.apache.activemq6.jms.client.HornetQDestination;
-import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.HornetQClient;
+import org.apache.activemq.core.config.impl.FileConfiguration;
+import org.apache.activemq.jms.client.HornetQConnectionFactory;
+import org.apache.activemq.jms.client.HornetQDestination;
+import org.apache.activemq.jms.client.HornetQJMSConnectionFactory;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/push/src/main/java/PostOrder.java
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/java/PostOrder.java b/examples/jms/rest/push/src/main/java/PostOrder.java
index 1fafc6f..15b33c0 100644
--- a/examples/jms/rest/push/src/main/java/PostOrder.java
+++ b/examples/jms/rest/push/src/main/java/PostOrder.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-import org.apache.activemq6.jms.client.HornetQDestination;
+import org.apache.activemq.jms.client.HornetQDestination;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/push/src/main/java/PushReg.java
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/java/PushReg.java b/examples/jms/rest/push/src/main/java/PushReg.java
index b11d695..13f3e66 100644
--- a/examples/jms/rest/push/src/main/java/PushReg.java
+++ b/examples/jms/rest/push/src/main/java/PushReg.java
@@ -10,10 +10,10 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-import org.apache.activemq6.rest.queue.push.xml.Authentication;
-import org.apache.activemq6.rest.queue.push.xml.BasicAuth;
-import org.apache.activemq6.rest.queue.push.xml.PushRegistration;
-import org.apache.activemq6.rest.queue.push.xml.XmlLink;
+import org.apache.activemq.rest.queue.push.xml.Authentication;
+import org.apache.activemq.rest.queue.push.xml.BasicAuth;
+import org.apache.activemq.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.rest.queue.push.xml.XmlLink;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
import org.jboss.resteasy.spi.Link;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/push/src/main/java/ReceiveShipping.java
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/java/ReceiveShipping.java b/examples/jms/rest/push/src/main/java/ReceiveShipping.java
index d29a190..1761f71 100644
--- a/examples/jms/rest/push/src/main/java/ReceiveShipping.java
+++ b/examples/jms/rest/push/src/main/java/ReceiveShipping.java
@@ -10,8 +10,8 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-import org.apache.activemq6.jms.client.HornetQDestination;
-import org.apache.activemq6.rest.Jms;
+import org.apache.activemq.jms.client.HornetQDestination;
+import org.apache.activemq.rest.Jms;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/push/src/main/resources/hornetq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/resources/hornetq-client.xml b/examples/jms/rest/push/src/main/resources/hornetq-client.xml
index 174a2e4..51f6da9 100644
--- a/examples/jms/rest/push/src/main/resources/hornetq-client.xml
+++ b/examples/jms/rest/push/src/main/resources/hornetq-client.xml
@@ -5,7 +5,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>
</connector>
</connectors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/rest/push/src/main/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/resources/hornetq-configuration.xml b/examples/jms/rest/push/src/main/resources/hornetq-configuration.xml
index 96a3f4a..15226c7 100644
--- a/examples/jms/rest/push/src/main/resources/hornetq-configuration.xml
+++ b/examples/jms/rest/push/src/main/resources/hornetq-configuration.xml
@@ -7,16 +7,16 @@
<connectors>
<connector name="in-vm">
- <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
</connector>
</connectors>
<acceptors>
<acceptor name="in-vm">
- <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
</acceptor>
<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/rest/push/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/webapp/WEB-INF/web.xml b/examples/jms/rest/push/src/main/webapp/WEB-INF/web.xml
index 8a3d525..d0c33f1 100644
--- a/examples/jms/rest/push/src/main/webapp/WEB-INF/web.xml
+++ b/examples/jms/rest/push/src/main/webapp/WEB-INF/web.xml
@@ -9,11 +9,11 @@
<listener>
- <listener-class>org.apache.activemq6.rest.integration.HornetqBootstrapListener</listener-class>
+ <listener-class>org.apache.activemq.rest.integration.HornetqBootstrapListener</listener-class>
</listener>
<listener>
- <listener-class>org.apache.activemq6.rest.integration.RestMessagingBootstrapListener</listener-class>
+ <listener-class>org.apache.activemq.rest.integration.RestMessagingBootstrapListener</listener-class>
</listener>
<filter>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/scale-down/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/pom.xml b/examples/jms/scale-down/pom.xml
index 1218fae..676b310 100644
--- a/examples/jms/scale-down/pom.xml
+++ b/examples/jms/scale-down/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>
@@ -69,7 +69,7 @@
<goal>runClient</goal>
</goals>
<configuration>
- <clientClass>org.apache.activemq6.jms.example.ScaleDownExample</clientClass>
+ <clientClass>org.apache.activemq.jms.example.ScaleDownExample</clientClass>
<args>
<param>jnp://localhost:1099</param>
<param>jnp://localhost:1199</param>
@@ -103,28 +103,28 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.activemq6.examples.jms</groupId>
+ <groupId>org.apache.activemq.examples.jms</groupId>
<artifactId>scale-down</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/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java b/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java
index dba235f..7962efd 100644
--- a/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java
+++ b/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.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 example that demonstrates a colocated server
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 581a543..5e91b71 100644
--- a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -14,11 +14,11 @@
<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>
<connector name="server1-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>
@@ -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="5445"/>
</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
index ccd145f..558cfd7 100644
--- a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -15,11 +15,11 @@
<!-- 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>
<connector name="server0-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="5446"/>
</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/scheduled-message/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/pom.xml b/examples/jms/scheduled-message/pom.xml
index 678ca6a..6e24f1a 100644
--- a/examples/jms/scheduled-message/pom.xml
+++ b/examples/jms/scheduled-message/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-scheduled-message-example</artifactId>
+ <artifactId>activemq-jms-scheduled-message-example</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ6 JMS Scheduled Message 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.ScheduledMessageExample</clientClass>
+ <clientClass>org.apache.activemq.jms.example.ScheduledMessageExample</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-scheduled-message-example</artifactId>
+ <groupId>org.apache.activemq.examples.jms</groupId>
+ <artifactId>activemq-jms-scheduled-message-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/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java b/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java
index 7403ab7..a9dcd68 100644
--- a/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java
+++ b/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.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.text.SimpleDateFormat;
import java.util.Date;
@@ -24,8 +24,8 @@ import javax.jms.Session;
import javax.jms.TextMessage;
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 JMS scheduled delivery example that delivers a message in 5 seconds.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 251a2e8..6c6e80a 100644
--- a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/scheduled-message/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/security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/pom.xml b/examples/jms/security/pom.xml
index 7313384..127a811 100644
--- a/examples/jms/security/pom.xml
+++ b/examples/jms/security/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-security-example</artifactId>
+ <artifactId>activemq-jms-security-example</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ6 JMS Security 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.SecurityExample</clientClass>
+ <clientClass>org.apache.activemq.jms.example.SecurityExample</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-security-example</artifactId>
+ <groupId>org.apache.activemq.examples.jms</groupId>
+ <artifactId>activemq-jms-security-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/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java b/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java
index 9215a16..12f35e1 100644
--- a/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java
+++ b/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.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;
@@ -23,7 +23,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 shows how to access messaging with security configured.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/security/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/security/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 63662c1..70e6cf1 100644
--- a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/security/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/send-acknowledgements/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/pom.xml b/examples/jms/send-acknowledgements/pom.xml
index 0684d91..cfc41c9 100644
--- a/examples/jms/send-acknowledgements/pom.xml
+++ b/examples/jms/send-acknowledgements/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-send-acknowledgements-example</artifactId>
+ <artifactId>activemq-jms-send-acknowledgements-example</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ6 JMS Send Acknowledgements 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.SendAcknowledgementsExample</clientClass>
+ <clientClass>org.apache.activemq.jms.example.SendAcknowledgementsExample</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-send-acknowledgements-example</artifactId>
+ <groupId>org.apache.activemq.examples.jms</groupId>
+ <artifactId>activemq-jms-send-acknowledgements-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/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java
index 516a969..b9c7614 100644
--- a/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java
+++ b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.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;
@@ -20,11 +20,11 @@ import javax.jms.Queue;
import javax.jms.Session;
import javax.naming.InitialContext;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq6.common.example.HornetQExample;
-import org.apache.activemq6.jms.client.HornetQSession;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.common.example.HornetQExample;
+import org.apache.activemq.jms.client.HornetQSession;
/**
*
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 0123a1b..f56cb9b 100644
--- a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/send-acknowledgements/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/spring-integration/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/pom.xml b/examples/jms/spring-integration/pom.xml
index 4cf4e82..eac214a 100644
--- a/examples/jms/spring-integration/pom.xml
+++ b/examples/jms/spring-integration/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-spring-integration-example</artifactId>
+ <artifactId>activemq-jms-spring-integration-example</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ6 JMS Spring Integration 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>
- <groupId>org.apache.activemq6</groupId>
- <artifactId>activemq6-spring-integration</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-spring-integration</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -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>runClient</id>
@@ -45,7 +45,7 @@
<goal>runClient</goal>
</goals>
<configuration>
- <clientClass>org.apache.activemq6.jms.example.SpringExample</clientClass>
+ <clientClass>org.apache.activemq.jms.example.SpringExample</clientClass>
<args>
<param>jnp://localhost:1099</param>
</args>
@@ -54,28 +54,28 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.activemq6.examples.jms</groupId>
- <artifactId>activemq6-jms-spring-integration-example</artifactId>
+ <groupId>org.apache.activemq.examples.jms</groupId>
+ <artifactId>activemq-jms-spring-integration-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/spring-integration/src/main/java/org/apache/activemq/jms/example/ExampleListener.java
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/ExampleListener.java b/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/ExampleListener.java
index 4f523a5..8aaa5d9 100644
--- a/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/ExampleListener.java
+++ b/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/ExampleListener.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.JMSException;
import javax.jms.Message;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/MessageSender.java
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/MessageSender.java b/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/MessageSender.java
index e00bd75..11f28c9 100644
--- a/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/MessageSender.java
+++ b/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/MessageSender.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;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/SpringExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/SpringExample.java b/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/SpringExample.java
index 07870e5..7f40632 100644
--- a/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/SpringExample.java
+++ b/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/SpringExample.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 org.springframework.context.support.ClassPathXmlApplicationContext;