Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9FD4617617 for ; Tue, 28 Apr 2015 16:02:07 +0000 (UTC) Received: (qmail 36744 invoked by uid 500); 28 Apr 2015 16:02:07 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 36632 invoked by uid 500); 28 Apr 2015 16:02:07 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 36139 invoked by uid 99); 28 Apr 2015 16:02:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 16:02:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C4D89E0772; Tue, 28 Apr 2015 16:02:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Tue, 28 Apr 2015 16:02:17 -0000 Message-Id: <2c5390ba74a540feb917fc49ff513f47@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/57] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-1 Artemis rename http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java b/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java index 9ca170c..6ef36ee 100644 --- a/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java +++ b/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.example; +package org.apache.activemq.artemis.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -26,8 +26,8 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.apache.activemq.api.jms.ActiveMQJMSClient; -import org.apache.activemq.common.example.ActiveMQExample; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.common.example.ActiveMQExample; /** * 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/8f52a622/examples/jms/topic-hierarchies/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/topic-hierarchies/src/main/resources/jndi.properties b/examples/jms/topic-hierarchies/src/main/resources/jndi.properties index 40ed640..ed96c02 100644 --- a/examples/jms/topic-hierarchies/src/main/resources/jndi.properties +++ b/examples/jms/topic-hierarchies/src/main/resources/jndi.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://localhost:61616 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/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 3b7e37b..6ef0b11 100644 --- a/examples/jms/topic-selector-example1/pom.xml +++ b/examples/jms/topic-selector-example1/pom.xml @@ -24,17 +24,17 @@ under the License. org.apache.activemq.examples.jms jms-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT - activemq-jms-topic-selector-example1-example + artemis-jms-topic-selector-example1-example jar ActiveMQ Artemis JMS Topic Selector Example 1 org.apache.activemq.examples.jms - activemq-jms-examples-common + artemis-jms-examples-common ${project.version} @@ -50,7 +50,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin start @@ -85,27 +85,27 @@ under the License. org.apache.activemq.examples.jms - activemq-jms-topic-selector-example1-example + artemis-jms-topic-selector-example1-example ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java ---------------------------------------------------------------------- diff --git a/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java b/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java index 961144c..6bc40ad 100644 --- a/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java +++ b/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.example; +package org.apache.activemq.artemis.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -25,7 +25,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.apache.activemq.common.example.ActiveMQExample; +import org.apache.activemq.artemis.common.example.ActiveMQExample; /** * 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/8f52a622/examples/jms/topic-selector-example1/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/topic-selector-example1/src/main/resources/jndi.properties b/examples/jms/topic-selector-example1/src/main/resources/jndi.properties index 09611dc..560b0cb 100644 --- a/examples/jms/topic-selector-example1/src/main/resources/jndi.properties +++ b/examples/jms/topic-selector-example1/src/main/resources/jndi.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://localhost:61616 topic.topic/exampleTopic=exampleTopic http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/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 1b9be6c..742d692 100644 --- a/examples/jms/topic-selector-example2/pom.xml +++ b/examples/jms/topic-selector-example2/pom.xml @@ -24,17 +24,17 @@ under the License. org.apache.activemq.examples.jms jms-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT - activemq-jms-topic-selector-example2-example + artemis-jms-topic-selector-example2-example jar ActiveMQ Artemis JMS Topic Selector Example 2 org.apache.activemq.examples.jms - activemq-jms-examples-common + artemis-jms-examples-common ${project.version} @@ -50,7 +50,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin start @@ -85,27 +85,27 @@ under the License. org.apache.activemq.examples.jms - activemq-jms-topic-selector-example2-example + artemis-jms-topic-selector-example2-example ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java ---------------------------------------------------------------------- diff --git a/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java b/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java index e25517f..c2acfd4 100644 --- a/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java +++ b/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.example; +package org.apache.activemq.artemis.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -28,7 +28,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.apache.activemq.common.example.ActiveMQExample; +import org.apache.activemq.artemis.common.example.ActiveMQExample; /** * A simple JMS example that consumes messages using selectors. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/topic-selector-example2/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/topic-selector-example2/src/main/resources/jndi.properties b/examples/jms/topic-selector-example2/src/main/resources/jndi.properties index 09611dc..560b0cb 100644 --- a/examples/jms/topic-selector-example2/src/main/resources/jndi.properties +++ b/examples/jms/topic-selector-example2/src/main/resources/jndi.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://localhost:61616 topic.topic/exampleTopic=exampleTopic http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/topic/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml index cc86042..e259b93 100644 --- a/examples/jms/topic/pom.xml +++ b/examples/jms/topic/pom.xml @@ -24,17 +24,17 @@ under the License. org.apache.activemq.examples.jms jms-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT - activemq-jms-topic-example + artemis-jms-topic-example jar ActiveMQ Artemis JMS Topic Example org.apache.activemq.examples.jms - activemq-jms-examples-common + artemis-jms-examples-common ${project.version} @@ -49,7 +49,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin start @@ -87,27 +87,27 @@ under the License. org.apache.activemq.examples.jms - activemq-jms-topic-example + artemis-jms-topic-example ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java b/examples/jms/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java index 60b0830..8b85643 100644 --- a/examples/jms/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java +++ b/examples/jms/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.example; +package org.apache.activemq.artemis.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -25,7 +25,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.apache.activemq.common.example.ActiveMQExample; +import org.apache.activemq.artemis.common.example.ActiveMQExample; /** * 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/8f52a622/examples/jms/topic/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/topic/src/main/resources/jndi.properties b/examples/jms/topic/src/main/resources/jndi.properties index 09611dc..560b0cb 100644 --- a/examples/jms/topic/src/main/resources/jndi.properties +++ b/examples/jms/topic/src/main/resources/jndi.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://localhost:61616 topic.topic/exampleTopic=exampleTopic http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/transaction-failover/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transaction-failover/pom.xml b/examples/jms/transaction-failover/pom.xml index c8dd77a..cf4254e 100644 --- a/examples/jms/transaction-failover/pom.xml +++ b/examples/jms/transaction-failover/pom.xml @@ -24,17 +24,17 @@ under the License. org.apache.activemq.examples.jms jms-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT - activemq-jms-transaction-failover-example + artemis-jms-transaction-failover-example jar ActiveMQ Artemis JMS Transaction Failover Example org.apache.activemq.examples.jms - activemq-jms-examples-common + artemis-jms-examples-common ${project.version} @@ -50,7 +50,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin start0 @@ -128,27 +128,27 @@ under the License. org.apache.activemq.examples.jms - activemq-jms-transaction-failover-example + artemis-jms-transaction-failover-example ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/TransactionFailoverExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/TransactionFailoverExample.java b/examples/jms/transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/TransactionFailoverExample.java index 7d81c01..df7b930 100644 --- a/examples/jms/transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/TransactionFailoverExample.java +++ b/examples/jms/transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/TransactionFailoverExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.example; +package org.apache.activemq.artemis.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -26,8 +26,8 @@ import javax.jms.TextMessage; import javax.jms.TransactionRolledBackException; import javax.naming.InitialContext; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.common.example.ActiveMQExample; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.common.example.ActiveMQExample; /** * 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/8f52a622/examples/jms/transaction-failover/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/transaction-failover/src/main/resources/jndi.properties b/examples/jms/transaction-failover/src/main/resources/jndi.properties index 0dac60e..07c84f2 100644 --- a/examples/jms/transaction-failover/src/main/resources/jndi.properties +++ b/examples/jms/transaction-failover/src/main/resources/jndi.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1 queue.queue/exampleQueue=exampleQueue http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/transactional/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transactional/pom.xml b/examples/jms/transactional/pom.xml index b82da66..22adc90 100644 --- a/examples/jms/transactional/pom.xml +++ b/examples/jms/transactional/pom.xml @@ -24,17 +24,17 @@ under the License. org.apache.activemq.examples.jms jms-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT - activemq-jms-transactional-example + artemis-jms-transactional-example jar ActiveMQ Artemis JMS Transactional Example org.apache.activemq.examples.jms - activemq-jms-examples-common + artemis-jms-examples-common ${project.version} @@ -50,7 +50,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin start @@ -85,27 +85,27 @@ under the License. org.apache.activemq.examples.jms - activemq-jms-transactional-example + artemis-jms-transactional-example ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java b/examples/jms/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java index 5919e31..b538333 100644 --- a/examples/jms/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java +++ b/examples/jms/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.example; +package org.apache.activemq.artemis.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -25,7 +25,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.apache.activemq.common.example.ActiveMQExample; +import org.apache.activemq.artemis.common.example.ActiveMQExample; /** * A simple JMS example that sends and consume message transactionally. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/transactional/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/transactional/src/main/resources/jndi.properties b/examples/jms/transactional/src/main/resources/jndi.properties index 1cb3686..4836ac8 100644 --- a/examples/jms/transactional/src/main/resources/jndi.properties +++ b/examples/jms/transactional/src/main/resources/jndi.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://localhost:61616 queue.queue/exampleQueue=exampleQueue http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/xa-heuristic/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml index c787600..31fe3f6 100644 --- a/examples/jms/xa-heuristic/pom.xml +++ b/examples/jms/xa-heuristic/pom.xml @@ -24,17 +24,17 @@ under the License. org.apache.activemq.examples.jms jms-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT - activemq-jms-xa-heuristic-example + artemis-jms-xa-heuristic-example jar ActiveMQ Artemis JMS XAHeuristicExample Example org.apache.activemq.examples.jms - activemq-jms-examples-common + artemis-jms-examples-common ${project.version} @@ -50,7 +50,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin start @@ -103,27 +103,27 @@ under the License. org.apache.activemq.examples.jms - activemq-jms-xa-heuristic-example + artemis-jms-xa-heuristic-example ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java b/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java index e82b358..4e3434f 100644 --- a/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java +++ b/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.example; +package org.apache.activemq.artemis.jms.example; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -40,10 +40,10 @@ import javax.naming.InitialContext; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.management.ObjectNameBuilder; -import org.apache.activemq.common.example.DummyXid; -import org.apache.activemq.common.example.ActiveMQExample; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; +import org.apache.activemq.artemis.common.example.DummyXid; +import org.apache.activemq.artemis.common.example.ActiveMQExample; +import org.apache.activemq.artemis.utils.UUIDGenerator; /** * A simple JMS example showing how to administer un-finished transactions. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/xa-heuristic/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/xa-heuristic/src/main/resources/jndi.properties b/examples/jms/xa-heuristic/src/main/resources/jndi.properties index bf09643..79d8e1a 100644 --- a/examples/jms/xa-heuristic/src/main/resources/jndi.properties +++ b/examples/jms/xa-heuristic/src/main/resources/jndi.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://localhost:61616 connectionFactory.XAConnectionFactory=tcp://localhost:61616?type=XA_CF queue.queue/exampleQueue=exampleQueue http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/xa-receive/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-receive/pom.xml b/examples/jms/xa-receive/pom.xml index a02e903..81a1b44 100644 --- a/examples/jms/xa-receive/pom.xml +++ b/examples/jms/xa-receive/pom.xml @@ -24,17 +24,17 @@ under the License. org.apache.activemq.examples.jms jms-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT - activemq-jms-xa-receive-example + artemis-jms-xa-receive-example jar ActiveMQ Artemis JMS XA Receive Example org.apache.activemq.examples.jms - activemq-jms-examples-common + artemis-jms-examples-common ${project.version} @@ -50,7 +50,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin start @@ -85,27 +85,27 @@ under the License. org.apache.activemq.examples.jms - activemq-jms-xa-receive-example + artemis-jms-xa-receive-example ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java b/examples/jms/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java index 6c03d95..a59991a 100644 --- a/examples/jms/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java +++ b/examples/jms/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.example; +package org.apache.activemq.artemis.jms.example; import java.nio.charset.StandardCharsets; @@ -30,9 +30,9 @@ import javax.naming.InitialContext; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq.common.example.DummyXid; -import org.apache.activemq.common.example.ActiveMQExample; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.common.example.DummyXid; +import org.apache.activemq.artemis.common.example.ActiveMQExample; +import org.apache.activemq.artemis.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/8f52a622/examples/jms/xa-receive/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/xa-receive/src/main/resources/jndi.properties b/examples/jms/xa-receive/src/main/resources/jndi.properties index bf09643..79d8e1a 100644 --- a/examples/jms/xa-receive/src/main/resources/jndi.properties +++ b/examples/jms/xa-receive/src/main/resources/jndi.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://localhost:61616 connectionFactory.XAConnectionFactory=tcp://localhost:61616?type=XA_CF queue.queue/exampleQueue=exampleQueue http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/xa-send/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-send/pom.xml b/examples/jms/xa-send/pom.xml index f0747d1..2052a8b 100644 --- a/examples/jms/xa-send/pom.xml +++ b/examples/jms/xa-send/pom.xml @@ -24,17 +24,17 @@ under the License. org.apache.activemq.examples.jms jms-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT - activemq-jms-xa-send-example + artemis-jms-xa-send-example jar ActiveMQ Artemis JMS XA Send Example org.apache.activemq.examples.jms - activemq-jms-examples-common + artemis-jms-examples-common ${project.version} @@ -50,7 +50,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin start @@ -85,27 +85,27 @@ under the License. org.apache.activemq.examples.jms - activemq-jms-xa-send-example + artemis-jms-xa-send-example ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java b/examples/jms/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java index 24edd84..e97e500 100644 --- a/examples/jms/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java +++ b/examples/jms/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.example; +package org.apache.activemq.artemis.jms.example; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -34,9 +34,9 @@ import javax.naming.InitialContext; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq.common.example.DummyXid; -import org.apache.activemq.common.example.ActiveMQExample; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.common.example.DummyXid; +import org.apache.activemq.artemis.common.example.ActiveMQExample; +import org.apache.activemq.artemis.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/8f52a622/examples/jms/xa-send/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/xa-send/src/main/resources/jndi.properties b/examples/jms/xa-send/src/main/resources/jndi.properties index bf09643..79d8e1a 100644 --- a/examples/jms/xa-send/src/main/resources/jndi.properties +++ b/examples/jms/xa-send/src/main/resources/jndi.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://localhost:61616 connectionFactory.XAConnectionFactory=tcp://localhost:61616?type=XA_CF queue.queue/exampleQueue=exampleQueue http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index c26179d..4a4bb01 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -23,12 +23,12 @@ under the License. org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT org.apache.activemq.examples - activemq-examples + artemis-examples pom ActiveMQ Artemis Examples http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/soak/normal/pom.xml ---------------------------------------------------------------------- diff --git a/examples/soak/normal/pom.xml b/examples/soak/normal/pom.xml index 8c50765..7c0c4b9 100644 --- a/examples/soak/normal/pom.xml +++ b/examples/soak/normal/pom.xml @@ -21,20 +21,20 @@ under the License. 4.0.0 - activemq-jms-soak-example + artemis-jms-soak-example jar ActiveMQ Artemis Soak Normal Example org.apache.activemq.examples.soak soak-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} @@ -47,21 +47,21 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin org.apache.activemq.example.soak - activemq-jms-soak-example + artemis-jms-soak-example ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} @@ -90,7 +90,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin start @@ -146,7 +146,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin runConsumer @@ -183,7 +183,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin start http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java ---------------------------------------------------------------------- diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java index c852d1f..3343f59 100644 --- a/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.soak.example; +package org.apache.activemq.artemis.jms.soak.example; import java.io.FileInputStream; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakParams.java ---------------------------------------------------------------------- diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakParams.java b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakParams.java index d097730..43ed549 100644 --- a/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakParams.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakParams.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.soak.example; +package org.apache.activemq.artemis.jms.soak.example; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakReceiver.java ---------------------------------------------------------------------- diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakReceiver.java b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakReceiver.java index 63b5abd..5e22c9b 100644 --- a/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakReceiver.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakReceiver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.soak.example; +package org.apache.activemq.artemis.jms.soak.example; import java.lang.Override; import java.lang.Runnable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakSender.java ---------------------------------------------------------------------- diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakSender.java b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakSender.java index 1b13f17..7f51a53 100644 --- a/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakSender.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakSender.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.soak.example; +package org.apache.activemq.artemis.jms.soak.example; import java.util.Hashtable; import java.util.concurrent.atomic.AtomicLong; @@ -32,8 +32,8 @@ import javax.jms.Session; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.apache.activemq.utils.TokenBucketLimiter; -import org.apache.activemq.utils.TokenBucketLimiterImpl; +import org.apache.activemq.artemis.utils.TokenBucketLimiter; +import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl; public class SoakSender { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/soak/pom.xml ---------------------------------------------------------------------- diff --git a/examples/soak/pom.xml b/examples/soak/pom.xml index 652ac91..403d3b2 100644 --- a/examples/soak/pom.xml +++ b/examples/soak/pom.xml @@ -23,8 +23,8 @@ under the License. org.apache.activemq.examples - activemq-examples - 10.0.0-SNAPSHOT + artemis-examples + 1.0.0-SNAPSHOT org.apache.activemq.examples.soak http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-aerogear-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/pom.xml b/integration/activemq-aerogear-integration/pom.xml index 706dad8..bd023ce 100644 --- a/integration/activemq-aerogear-integration/pom.xml +++ b/integration/activemq-aerogear-integration/pom.xml @@ -19,12 +19,12 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT ../../pom.xml - activemq-aerogear-integration + artemis-aerogear-integration jar ActiveMQ Artemis Aerogear Integration @@ -49,7 +49,7 @@ org.apache.activemq - activemq-server + artemis-server ${project.version} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java index 945e484..231d342 100644 --- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java +++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.aerogear; +package org.apache.activemq.artemis.integration.aerogear; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; 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/8f52a622/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java index 681e0f1..e371cd3 100644 --- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java +++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.aerogear; +package org.apache.activemq.artemis.integration.aerogear; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java index b37e020..f27a60c 100644 --- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java +++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.aerogear; +package org.apache.activemq.artemis.integration.aerogear; import java.net.HttpURLConnection; import java.net.URL; @@ -26,19 +26,19 @@ import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -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.ActiveMQServerLogger; -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.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.utils.ConfigurationHelper; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.filter.impl.FilterImpl; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ConnectorService; +import org.apache.activemq.artemis.core.server.Consumer; +import org.apache.activemq.artemis.core.server.HandleStatus; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.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/8f52a622/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java index 1c82090..d3eaea7 100644 --- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java +++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.aerogear; +package org.apache.activemq.artemis.integration.aerogear; -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 org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.ConnectorService; +import org.apache.activemq.artemis.core.server.ConnectorServiceFactory; import java.util.Map; import java.util.Set; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java index d78c744..a8669df 100644 --- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java +++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.aerogear; +package org.apache.activemq.artemis.integration.aerogear; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; import java.util.HashSet; import java.util.Set; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-spring-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml index eb5c80d..227e77c 100644 --- a/integration/activemq-spring-integration/pom.xml +++ b/integration/activemq-spring-integration/pom.xml @@ -20,12 +20,12 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT ../../pom.xml - activemq-spring-integration + artemis-spring-integration jar ActiveMQ Artemis Spring Integration @@ -50,12 +50,12 @@ org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java ---------------------------------------------------------------------- diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java index 27b621d..8dfcd50 100644 --- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java +++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.spring; +package org.apache.activemq.artemis.integration.spring; -import org.apache.activemq.spi.core.naming.BindingRegistry; +import org.apache.activemq.artemis.spi.core.naming.BindingRegistry; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.config.ConfigurableBeanFactory; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringJmsBootstrap.java ---------------------------------------------------------------------- diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringJmsBootstrap.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringJmsBootstrap.java index ffce5e5..4d855da 100644 --- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringJmsBootstrap.java +++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringJmsBootstrap.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.spring; +package org.apache.activemq.artemis.integration.spring; -import org.apache.activemq.jms.server.embedded.EmbeddedJMS; +import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java ---------------------------------------------------------------------- diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java index 6e30524..3e089b7 100644 --- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java +++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spring; +package org.apache.activemq.artemis.spring; import org.jboss.logging.annotations.MessageBundle; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java ---------------------------------------------------------------------- diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java index 96f637b..fa55588 100644 --- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java +++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spring; +package org.apache.activemq.artemis.spring; import org.jboss.logging.annotations.MessageLogger; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-vertx-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-vertx-integration/pom.xml b/integration/activemq-vertx-integration/pom.xml index 2f7a2db..63c47e6 100644 --- a/integration/activemq-vertx-integration/pom.xml +++ b/integration/activemq-vertx-integration/pom.xml @@ -20,12 +20,12 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT ../../pom.xml - activemq-vertx-integration + artemis-vertx-integration jar ActiveMQ Artemis Vert.x Integration @@ -92,7 +92,7 @@ org.apache.activemq - activemq-server + artemis-server ${project.version} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/ActiveMQVertxLogger.java ---------------------------------------------------------------------- diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/ActiveMQVertxLogger.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/ActiveMQVertxLogger.java index f21b269..ec61a98 100644 --- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/ActiveMQVertxLogger.java +++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/ActiveMQVertxLogger.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.vertx; +package org.apache.activemq.artemis.integration.vertx; -import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.ServerMessage; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.LogMessage; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java ---------------------------------------------------------------------- diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java index 549f60c..663733a 100644 --- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java +++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.vertx; +package org.apache.activemq.artemis.integration.vertx; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.persistence.StorageManager; -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.ServerMessage; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.utils.ConfigurationHelper; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.ConnectorService; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.utils.ConfigurationHelper; import org.vertx.java.core.Handler; import org.vertx.java.core.buffer.Buffer; import org.vertx.java.core.eventbus.EventBus; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java ---------------------------------------------------------------------- diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java index b7b91b3..0520861 100644 --- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java +++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.vertx; +package org.apache.activemq.artemis.integration.vertx; import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.persistence.StorageManager; -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.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.utils.ConfigurationHelper; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.ConnectorService; +import org.apache.activemq.artemis.core.server.Consumer; +import org.apache.activemq.artemis.core.server.HandleStatus; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.utils.ConfigurationHelper; import org.vertx.java.core.buffer.Buffer; import org.vertx.java.core.eventbus.EventBus; import org.vertx.java.core.eventbus.ReplyException; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxConstants.java ---------------------------------------------------------------------- diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxConstants.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxConstants.java index ff6ffd8..671b46b 100644 --- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxConstants.java +++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxConstants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.vertx; +package org.apache.activemq.artemis.integration.vertx; import java.util.HashSet; import java.util.Set; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxIncomingConnectorServiceFactory.java ---------------------------------------------------------------------- diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxIncomingConnectorServiceFactory.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxIncomingConnectorServiceFactory.java index 921069d..3d44f3a 100644 --- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxIncomingConnectorServiceFactory.java +++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxIncomingConnectorServiceFactory.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.vertx; +package org.apache.activemq.artemis.integration.vertx; import java.util.Map; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; -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 org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.ConnectorService; +import org.apache.activemq.artemis.core.server.ConnectorServiceFactory; public class VertxIncomingConnectorServiceFactory implements ConnectorServiceFactory {