http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXATopicConnectionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXATopicConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXATopicConnectionFactory.java index d626c14..462d240 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXATopicConnectionFactory.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXATopicConnectionFactory.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.client; +package org.apache.activemq.jms.client; import javax.jms.XATopicConnectionFactory; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.jms.JMSFactoryType; /** * A class that represents a XATopicConnectionFactory.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java index ba5a224..2833d9e 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.client; +package org.apache.activemq.jms.client; import javax.jms.InvalidDestinationException; import javax.jms.InvalidSelectorException; import javax.jms.JMSException; import javax.jms.JMSSecurityException; -import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQException; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java index 5f339ae..fa3a1cd 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.client; +package org.apache.activemq.jms.client; import javax.jms.MessageListener; import javax.jms.Session; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.MessageHandler; -import org.apache.activemq6.api.jms.HornetQJMSConstants; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.MessageHandler; +import org.apache.activemq.api.jms.HornetQJMSConstants; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JmsExceptionUtils.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JmsExceptionUtils.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JmsExceptionUtils.java index 1f75bce..cee7c74 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JmsExceptionUtils.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JmsExceptionUtils.java @@ -13,7 +13,7 @@ /** * */ -package org.apache.activemq6.jms.client; +package org.apache.activemq.jms.client; import javax.jms.IllegalStateRuntimeException; import javax.jms.InvalidClientIDException; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java index 34ef757..0c9b5cf 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.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.client; +package org.apache.activemq.jms.client; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java index a479685..ec34209 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.client; +package org.apache.activemq.jms.client; -import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq.utils.ConcurrentHashSet; import javax.jms.IllegalStateException; import java.util.Set; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java index 69314b5..acce764 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java @@ -14,9 +14,9 @@ * Implementation of the JMS API. * <br> * Classes in this package are not meant to be used directly - * except {@link org.apache.activemq6.jms.client.HornetQConnectionFactory} which can be instantiated directly + * except {@link org.apache.activemq.jms.client.HornetQConnectionFactory} which can be instantiated directly * if JMS resources are not looked up in JNDI. * */ -package org.apache.activemq6.jms.client; +package org.apache.activemq.jms.client; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java index ee1d271..5b11b24 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.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.referenceable; +package org.apache.activemq.jms.referenceable; import java.util.Hashtable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java index e27e50e..af18fb9 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.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.referenceable; +package org.apache.activemq.jms.referenceable; import java.util.Hashtable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/SerializableObjectRefAddr.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/SerializableObjectRefAddr.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/SerializableObjectRefAddr.java index 55a442e..4ba0506 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/SerializableObjectRefAddr.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/SerializableObjectRefAddr.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.referenceable; +package org.apache.activemq.jms.referenceable; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-jms-server/pom.xml b/activemq-jms-server/pom.xml index b000e34..0345d05 100644 --- a/activemq-jms-server/pom.xml +++ b/activemq-jms-server/pom.xml @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-pom</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pom</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-jms-server</artifactId> + <artifactId>activemq-jms-server</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Server</name> @@ -22,18 +22,18 @@ <artifactId>jboss-logging-processor</artifactId> </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-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-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -80,7 +80,7 @@ <maxmemory>512m</maxmemory> <quiet>false</quiet> <aggregate>true</aggregate> - <excludePackageNames>org.apache.activemq6.core:org.apache.activemq6.utils</excludePackageNames> + <excludePackageNames>org.apache.activemq.core:org.apache.activemq.utils</excludePackageNames> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ConnectionFactoryFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ConnectionFactoryFactory.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ConnectionFactoryFactory.java index 91783d4..1d2c448 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ConnectionFactoryFactory.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ConnectionFactoryFactory.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.bridge; +package org.apache.activemq.jms.bridge; /** * A ConnectionFactoryFactory http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/DestinationFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/DestinationFactory.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/DestinationFactory.java index 2379316..85e177e 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/DestinationFactory.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/DestinationFactory.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.bridge; +package org.apache.activemq.jms.bridge; import javax.jms.Destination; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/HornetQJMSBridgeLogger.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/HornetQJMSBridgeLogger.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/HornetQJMSBridgeLogger.java index edae392..5b89fce 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/HornetQJMSBridgeLogger.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/HornetQJMSBridgeLogger.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.jms.bridge; +package org.apache.activemq.jms.bridge; import javax.management.ObjectName; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java index 55f8e88..936e61e 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.bridge; +package org.apache.activemq.jms.bridge; import javax.transaction.TransactionManager; -import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQComponent; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java index 207dde2..3ed1d61 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.bridge; +package org.apache.activemq.jms.bridge; -import org.apache.activemq6.api.core.management.HornetQComponentControl; +import org.apache.activemq.api.core.management.HornetQComponentControl; /** * A JMSBridgeControl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java index fc02211..188aa05 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.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.bridge; +package org.apache.activemq.jms.bridge; /** * <h3>Quality of server (QoS) levels</h3> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeControlImpl.java index 281dcd4..6f33d3c 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeControlImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeControlImpl.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.bridge.impl; +package org.apache.activemq.jms.bridge.impl; import javax.management.StandardMBean; -import org.apache.activemq6.jms.bridge.JMSBridge; -import org.apache.activemq6.jms.bridge.JMSBridgeControl; -import org.apache.activemq6.jms.bridge.QualityOfServiceMode; +import org.apache.activemq.jms.bridge.JMSBridge; +import org.apache.activemq.jms.bridge.JMSBridgeControl; +import org.apache.activemq.jms.bridge.QualityOfServiceMode; /** * A JMSBridgeControlImpl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java index 32282b8..dee0db8 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.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.bridge.impl; +package org.apache.activemq.jms.bridge.impl; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -45,27 +45,27 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQInterruptedException; -import org.apache.activemq6.api.core.client.FailoverEventListener; -import org.apache.activemq6.api.core.client.FailoverEventType; -import org.apache.activemq6.api.jms.HornetQJMSConstants; -import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; -import org.apache.activemq6.jms.bridge.DestinationFactory; -import org.apache.activemq6.jms.bridge.HornetQJMSBridgeLogger; -import org.apache.activemq6.jms.bridge.JMSBridge; -import org.apache.activemq6.jms.bridge.JMSBridgeControl; -import org.apache.activemq6.jms.bridge.QualityOfServiceMode; -import org.apache.activemq6.jms.client.HornetQConnection; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQMessage; -import org.apache.activemq6.jms.server.HornetQJMSServerBundle; -import org.apache.activemq6.jms.server.recovery.HornetQRegistryBase; -import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; -import org.apache.activemq6.utils.ClassloadingUtil; -import org.apache.activemq6.utils.DefaultSensitiveStringCodec; -import org.apache.activemq6.utils.PasswordMaskingUtil; -import org.apache.activemq6.utils.SensitiveDataCodec; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQInterruptedException; +import org.apache.activemq.api.core.client.FailoverEventListener; +import org.apache.activemq.api.core.client.FailoverEventType; +import org.apache.activemq.api.jms.HornetQJMSConstants; +import org.apache.activemq.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq.jms.bridge.DestinationFactory; +import org.apache.activemq.jms.bridge.HornetQJMSBridgeLogger; +import org.apache.activemq.jms.bridge.JMSBridge; +import org.apache.activemq.jms.bridge.JMSBridgeControl; +import org.apache.activemq.jms.bridge.QualityOfServiceMode; +import org.apache.activemq.jms.client.HornetQConnection; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQMessage; +import org.apache.activemq.jms.server.HornetQJMSServerBundle; +import org.apache.activemq.jms.server.recovery.HornetQRegistryBase; +import org.apache.activemq.jms.server.recovery.XARecoveryConfig; +import org.apache.activemq.utils.ClassloadingUtil; +import org.apache.activemq.utils.DefaultSensitiveStringCodec; +import org.apache.activemq.utils.PasswordMaskingUtil; +import org.apache.activemq.utils.SensitiveDataCodec; /** * A JMSBridge @@ -163,7 +163,7 @@ public final class JMSBridgeImpl implements JMSBridge private int forwardMode; - private String transactionManagerLocatorClass = "org.apache.activemq6.integration.jboss.tm.JBoss5TransactionManagerLocator"; + private String transactionManagerLocatorClass = "org.apache.activemq.integration.jboss.tm.JBoss5TransactionManagerLocator"; private String transactionManagerLocatorMethod = "getTm"; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIConnectionFactoryFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIConnectionFactoryFactory.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIConnectionFactoryFactory.java index 65dcd2b..5a6e4f2 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIConnectionFactoryFactory.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIConnectionFactoryFactory.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.bridge.impl; +package org.apache.activemq.jms.bridge.impl; import java.util.Hashtable; -import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq.jms.bridge.ConnectionFactoryFactory; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIDestinationFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIDestinationFactory.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIDestinationFactory.java index ee41965..c9c2ef4 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIDestinationFactory.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIDestinationFactory.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.bridge.impl; +package org.apache.activemq.jms.bridge.impl; import java.util.Hashtable; import javax.jms.Destination; -import org.apache.activemq6.jms.bridge.DestinationFactory; +import org.apache.activemq.jms.bridge.DestinationFactory; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIFactorySupport.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIFactorySupport.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIFactorySupport.java index 46fa3ce..9899b64 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIFactorySupport.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIFactorySupport.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.bridge.impl; +package org.apache.activemq.jms.bridge.impl; import java.util.Hashtable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java index 74fa619..2a38b7e 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.management.impl; +package org.apache.activemq.jms.management.impl; import javax.management.MBeanInfo; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.Parameter; -import org.apache.activemq6.api.jms.management.ConnectionFactoryControl; -import org.apache.activemq6.core.management.impl.MBeanInfoHelper; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.Parameter; +import org.apache.activemq.api.jms.management.ConnectionFactoryControl; +import org.apache.activemq.core.management.impl.MBeanInfoHelper; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java index f15eaff..5e878e5 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.management.impl; +package org.apache.activemq.jms.management.impl; import javax.management.MBeanInfo; import javax.management.StandardMBean; import java.util.Map; -import org.apache.activemq6.api.core.FilterConstants; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.management.MessageCounterInfo; -import org.apache.activemq6.api.core.management.Operation; -import org.apache.activemq6.api.core.management.QueueControl; -import org.apache.activemq6.api.jms.management.JMSQueueControl; -import org.apache.activemq6.core.management.impl.MBeanInfoHelper; -import org.apache.activemq6.core.messagecounter.MessageCounter; -import org.apache.activemq6.core.messagecounter.impl.MessageCounterHelper; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.jms.client.HornetQMessage; -import org.apache.activemq6.jms.client.SelectorTranslator; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.api.core.FilterConstants; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.management.MessageCounterInfo; +import org.apache.activemq.api.core.management.Operation; +import org.apache.activemq.api.core.management.QueueControl; +import org.apache.activemq.api.jms.management.JMSQueueControl; +import org.apache.activemq.core.management.impl.MBeanInfoHelper; +import org.apache.activemq.core.messagecounter.MessageCounter; +import org.apache.activemq.core.messagecounter.impl.MessageCounterHelper; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.jms.client.HornetQMessage; +import org.apache.activemq.jms.client.SelectorTranslator; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java index aa8da34..f7f0ef8 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.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.management.impl; +package org.apache.activemq.jms.management.impl; import javax.jms.JMSRuntimeException; import javax.management.ListenerNotFoundException; @@ -29,35 +29,35 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.management.Parameter; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.api.jms.management.ConnectionFactoryControl; -import org.apache.activemq6.api.jms.management.DestinationControl; -import org.apache.activemq6.api.jms.management.JMSQueueControl; -import org.apache.activemq6.api.jms.management.JMSServerControl; -import org.apache.activemq6.api.jms.management.TopicControl; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.management.impl.AbstractControl; -import org.apache.activemq6.core.management.impl.MBeanInfoHelper; -import org.apache.activemq6.core.server.ServerConsumer; -import org.apache.activemq6.core.server.ServerSession; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.jms.server.HornetQJMSServerLogger; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.apache.activemq6.jms.server.management.JMSNotificationType; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.utils.TypedProperties; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.api.core.management.Parameter; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.api.jms.management.ConnectionFactoryControl; +import org.apache.activemq.api.jms.management.DestinationControl; +import org.apache.activemq.api.jms.management.JMSQueueControl; +import org.apache.activemq.api.jms.management.JMSServerControl; +import org.apache.activemq.api.jms.management.TopicControl; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.management.impl.AbstractControl; +import org.apache.activemq.core.management.impl.MBeanInfoHelper; +import org.apache.activemq.core.server.ServerConsumer; +import org.apache.activemq.core.server.ServerSession; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.jms.server.HornetQJMSServerLogger; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq.jms.server.management.JMSNotificationType; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> * @author <a href="mailto:[email protected]";>Tim Fox</a> */ public class JMSServerControlImpl extends AbstractControl implements JMSServerControl, NotificationEmitter, - org.apache.activemq6.core.server.management.NotificationListener + org.apache.activemq.core.server.management.NotificationListener { // Constants ----------------------------------------------------- @@ -888,7 +888,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo // Protected ----------------------------------------------------- /* (non-Javadoc) - * @see org.apache.activemq6.core.management.impl.AbstractControl#fillMBeanOperationInfo() + * @see org.apache.activemq.core.management.impl.AbstractControl#fillMBeanOperationInfo() */ @Override protected MBeanOperationInfo[] fillMBeanOperationInfo() @@ -1036,7 +1036,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo } @Override - public void onNotification(org.apache.activemq6.core.server.management.Notification notification) + public void onNotification(org.apache.activemq.core.server.management.Notification notification) { if (!(notification.getType() instanceof JMSNotificationType)) return; JMSNotificationType type = (JMSNotificationType) notification.getType(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java index 53730cc..095b187 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.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.management.impl; +package org.apache.activemq.jms.management.impl; import java.util.ArrayList; import java.util.Collections; @@ -20,21 +20,21 @@ import java.util.Map; import javax.management.MBeanInfo; import javax.management.StandardMBean; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.management.AddressControl; -import org.apache.activemq6.api.core.management.HornetQServerControl; -import org.apache.activemq6.api.core.management.QueueControl; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.api.jms.management.TopicControl; -import org.apache.activemq6.core.management.impl.MBeanInfoHelper; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.jms.client.HornetQMessage; -import org.apache.activemq6.jms.client.SelectorTranslator; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.management.AddressControl; +import org.apache.activemq.api.core.management.HornetQServerControl; +import org.apache.activemq.api.core.management.QueueControl; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.api.jms.management.TopicControl; +import org.apache.activemq.core.management.impl.MBeanInfoHelper; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.jms.client.HornetQMessage; +import org.apache.activemq.jms.client.SelectorTranslator; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java index 921c352..cf0ae3f 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.persistence; +package org.apache.activemq.jms.persistence; import java.util.List; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; -import org.apache.activemq6.jms.persistence.config.PersistedDestination; -import org.apache.activemq6.jms.persistence.config.PersistedJNDI; -import org.apache.activemq6.jms.persistence.config.PersistedType; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq.jms.persistence.config.PersistedDestination; +import org.apache.activemq.jms.persistence.config.PersistedJNDI; +import org.apache.activemq.jms.persistence.config.PersistedType; /** * A JMSPersistence http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java index 33e4bdb..ded50a5 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.persistence.config; +package org.apache.activemq.jms.persistence.config; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; /** * A PersistedConnectionFactory http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java index 3653773..25c728a 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.persistence.config; +package org.apache.activemq.jms.persistence.config; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.utils.BufferHelper; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.utils.BufferHelper; +import org.apache.activemq.utils.DataConstants; /** * A PersistedDestination http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java index 0a2feb0..fa45e5f 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.persistence.config; +package org.apache.activemq.jms.persistence.config; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.utils.BufferHelper; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.utils.BufferHelper; +import org.apache.activemq.utils.DataConstants; /** * A PersistedJNDI http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedType.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedType.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedType.java index c3bbbd3..16e865a 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedType.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedType.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.persistence.config; +package org.apache.activemq.jms.persistence.config; /** * A PersistedType http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java index 829f080..d233e39 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.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.persistence.impl.journal; +package org.apache.activemq.jms.persistence.impl.journal; import java.io.File; import java.util.ArrayList; @@ -18,25 +18,25 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.journal.Journal; -import org.apache.activemq6.core.journal.PreparedTransactionInfo; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.JournalImpl; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.core.replication.ReplicatedJournal; -import org.apache.activemq6.core.replication.ReplicationManager; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.jms.persistence.JMSStorageManager; -import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; -import org.apache.activemq6.jms.persistence.config.PersistedDestination; -import org.apache.activemq6.jms.persistence.config.PersistedJNDI; -import org.apache.activemq6.jms.persistence.config.PersistedType; -import org.apache.activemq6.utils.IDGenerator; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.journal.Journal; +import org.apache.activemq.core.journal.PreparedTransactionInfo; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.core.replication.ReplicatedJournal; +import org.apache.activemq.core.replication.ReplicationManager; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.jms.persistence.JMSStorageManager; +import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq.jms.persistence.config.PersistedDestination; +import org.apache.activemq.jms.persistence.config.PersistedJNDI; +import org.apache.activemq.jms.persistence.config.PersistedType; +import org.apache.activemq.utils.IDGenerator; /** * A JournalJMSStorageManagerImpl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java index 095bc80..552ad81 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.persistence.impl.nullpm; +package org.apache.activemq.jms.persistence.impl.nullpm; import java.util.Collections; import java.util.List; -import org.apache.activemq6.jms.persistence.JMSStorageManager; -import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; -import org.apache.activemq6.jms.persistence.config.PersistedDestination; -import org.apache.activemq6.jms.persistence.config.PersistedJNDI; -import org.apache.activemq6.jms.persistence.config.PersistedType; +import org.apache.activemq.jms.persistence.JMSStorageManager; +import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq.jms.persistence.config.PersistedDestination; +import org.apache.activemq.jms.persistence.config.PersistedJNDI; +import org.apache.activemq.jms.persistence.config.PersistedType; /** * A NullJMSStorageManagerImpl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java index b607b98..a812b75 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server; +package org.apache.activemq.jms.server; -import org.apache.activemq6.api.core.HornetQAddressExistsException; -import org.apache.activemq6.api.core.HornetQIllegalStateException; -import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.HornetQAddressExistsException; +import org.apache.activemq.api.core.HornetQIllegalStateException; +import org.apache.activemq.api.core.HornetQInternalErrorException; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerLogger.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerLogger.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerLogger.java index 1077a29..89af42f 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerLogger.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerLogger.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server; +package org.apache.activemq.jms.server; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.jms.server.recovery.XARecoveryConfig; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerConfigParser.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerConfigParser.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerConfigParser.java index 4071d6e..791f620 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerConfigParser.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerConfigParser.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server; +package org.apache.activemq.jms.server; import java.io.InputStream; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.jms.server.config.JMSConfiguration; -import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq6.jms.server.config.TopicConfiguration; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.jms.server.config.JMSConfiguration; +import org.apache.activemq.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.jms.server.config.TopicConfiguration; import org.w3c.dom.Node; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java index 6261521..fd82e69 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server; +package org.apache.activemq.jms.server; import java.util.List; import java.util.Set; import javax.naming.Context; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.spi.core.naming.BindingRegistry; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.spi.core.naming.BindingRegistry; /** * The JMS Management interface. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/ConnectionFactoryConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/ConnectionFactoryConfiguration.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/ConnectionFactoryConfiguration.java index 7948fe3..3cf8659 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/ConnectionFactoryConfiguration.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/ConnectionFactoryConfiguration.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.config; +package org.apache.activemq.jms.server.config; import java.util.List; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.journal.EncodingSupport; /** * A ConnectionFactoryConfiguration for {@link javax.jms.ConnectionFactory} objects. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java index 63c98fe..bac9f35 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.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.server.config; +package org.apache.activemq.jms.server.config; import java.util.List; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSQueueConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSQueueConfiguration.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSQueueConfiguration.java index cf0a387..5f50e80 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSQueueConfiguration.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSQueueConfiguration.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.server.config; +package org.apache.activemq.jms.server.config; /** * A QeueConfiguration http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/TopicConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/TopicConfiguration.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/TopicConfiguration.java index 96f047c..36a6120 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/TopicConfiguration.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/TopicConfiguration.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.server.config; +package org.apache.activemq.jms.server.config; /** * A TopicConfiguration http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java index 2951708..b915817 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.config.impl; +package org.apache.activemq.jms.server.config.impl; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.utils.BufferHelper; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.utils.BufferHelper; +import org.apache.activemq.utils.DataConstants; /** * This class contains the configuration properties of a connection factory. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java index 91508aa..3561d44 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.config.impl; +package org.apache.activemq.jms.server.config.impl; import java.util.ArrayList; import java.util.List; import javax.naming.Context; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.jms.server.config.JMSConfiguration; -import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq6.jms.server.config.TopicConfiguration; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.jms.server.config.JMSConfiguration; +import org.apache.activemq.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.jms.server.config.TopicConfiguration; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSQueueConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSQueueConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSQueueConfigurationImpl.java index a81aa88..593071f 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSQueueConfigurationImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSQueueConfigurationImpl.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.config.impl; +package org.apache.activemq.jms.server.config.impl; -import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.jms.server.config.JMSQueueConfiguration; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TopicConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TopicConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TopicConfigurationImpl.java index c495e9e..9ac4d69 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TopicConfigurationImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TopicConfigurationImpl.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.config.impl; +package org.apache.activemq.jms.server.config.impl; -import org.apache.activemq6.jms.server.config.TopicConfiguration; +import org.apache.activemq.jms.server.config.TopicConfiguration; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java index deac43a..554fb1b 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.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.server.config.impl; +package org.apache.activemq.jms.server.config.impl; import java.util.ArrayList; import java.util.HashMap; @@ -18,11 +18,11 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.utils.BufferHelper; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.utils.BufferHelper; +import org.apache.activemq.utils.DataConstants; /** * A TransportConfigurationEncodingSupport http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java index 56931d0..159241b 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.embedded; +package org.apache.activemq.jms.server.embedded; import javax.naming.Context; -import org.apache.activemq6.core.registry.JndiBindingRegistry; -import org.apache.activemq6.core.registry.MapBindingRegistry; -import org.apache.activemq6.core.server.embedded.EmbeddedHornetQ; -import org.apache.activemq6.jms.server.config.JMSConfiguration; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.spi.core.naming.BindingRegistry; +import org.apache.activemq.core.registry.JndiBindingRegistry; +import org.apache.activemq.core.registry.MapBindingRegistry; +import org.apache.activemq.core.server.embedded.EmbeddedHornetQ; +import org.apache.activemq.jms.server.config.JMSConfiguration; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.spi.core.naming.BindingRegistry; /** * Simple bootstrap class that parses hornetq config files (server and jms and security) and starts http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java index 5080f16..3a98aa9 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.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.server.impl; +package org.apache.activemq.jms.server.impl; import java.io.InputStream; import java.io.InputStreamReader; @@ -18,24 +18,24 @@ import java.io.Reader; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.config.impl.Validators; -import org.apache.activemq6.jms.server.HornetQJMSServerBundle; -import org.apache.activemq6.jms.server.HornetQJMSServerLogger; -import org.apache.activemq6.jms.server.JMSServerConfigParser; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.jms.server.config.JMSConfiguration; -import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq6.jms.server.config.TopicConfiguration; -import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.apache.activemq6.jms.server.config.impl.JMSConfigurationImpl; -import org.apache.activemq6.jms.server.config.impl.JMSQueueConfigurationImpl; -import org.apache.activemq6.jms.server.config.impl.TopicConfigurationImpl; -import org.apache.activemq6.utils.XMLConfigurationUtil; -import org.apache.activemq6.utils.XMLUtil; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.config.impl.Validators; +import org.apache.activemq.jms.server.HornetQJMSServerBundle; +import org.apache.activemq.jms.server.HornetQJMSServerLogger; +import org.apache.activemq.jms.server.JMSServerConfigParser; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.jms.server.config.JMSConfiguration; +import org.apache.activemq.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.jms.server.config.TopicConfiguration; +import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq.jms.server.config.impl.JMSQueueConfigurationImpl; +import org.apache.activemq.jms.server.config.impl.TopicConfigurationImpl; +import org.apache.activemq.utils.XMLConfigurationUtil; +import org.apache.activemq.utils.XMLUtil; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; @@ -60,7 +60,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser public JMSConfiguration parseConfiguration(final InputStream stream) throws Exception { Reader reader = new InputStreamReader(stream); - String xml = org.apache.activemq6.utils.XMLUtil.readerToString(reader); + String xml = org.apache.activemq.utils.XMLUtil.readerToString(reader); xml = XMLUtil.replaceSystemProps(xml); return parseConfiguration(XMLUtil.stringToElement(xml)); } @@ -78,7 +78,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser Element e = (Element) rootnode; - org.apache.activemq6.utils.XMLUtil.validate(rootnode, "schema/hornetq-jms.xsd"); + org.apache.activemq.utils.XMLUtil.validate(rootnode, "schema/hornetq-jms.xsd"); String[] elements = new String[]{JMSServerDeployer.QUEUE_NODE_NAME, JMSServerDeployer.TOPIC_NODE_NAME, http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java index ec3dbd9..6987dc5 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.impl; - -import org.apache.activemq6.core.deployers.DeploymentManager; -import org.apache.activemq6.core.deployers.impl.XmlDeployer; -import org.apache.activemq6.jms.server.JMSServerConfigParser; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq6.jms.server.config.TopicConfiguration; +package org.apache.activemq.jms.server.impl; + +import org.apache.activemq.core.deployers.DeploymentManager; +import org.apache.activemq.core.deployers.impl.XmlDeployer; +import org.apache.activemq.jms.server.JMSServerConfigParser; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.jms.server.config.TopicConfiguration; import org.w3c.dom.Node; /** @@ -80,7 +80,7 @@ public class JMSServerDeployer extends XmlDeployer @Override public void validate(final Node rootNode) throws Exception { - org.apache.activemq6.utils.XMLUtil.validate(rootNode, "schema/hornetq-jms.xsd"); + org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-jms.xsd"); } /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java index 5ffff6d..51d7d75 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.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.server.impl; +package org.apache.activemq.jms.server.impl; import javax.naming.Context; import javax.naming.InitialContext; @@ -31,62 +31,62 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.AddressControl; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.deployers.DeploymentManager; -import org.apache.activemq6.core.deployers.impl.FileDeploymentManager; -import org.apache.activemq6.core.deployers.impl.XmlDeployer; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.BindingType; -import org.apache.activemq6.core.registry.JndiBindingRegistry; -import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.ActivateCallback; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionDetail; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.jms.client.HornetQQueue; -import org.apache.activemq6.jms.client.HornetQTopic; -import org.apache.activemq6.jms.client.SelectorTranslator; -import org.apache.activemq6.jms.persistence.JMSStorageManager; -import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; -import org.apache.activemq6.jms.persistence.config.PersistedDestination; -import org.apache.activemq6.jms.persistence.config.PersistedJNDI; -import org.apache.activemq6.jms.persistence.config.PersistedType; -import org.apache.activemq6.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; -import org.apache.activemq6.jms.persistence.impl.nullpm.NullJMSStorageManagerImpl; -import org.apache.activemq6.jms.server.HornetQJMSServerBundle; -import org.apache.activemq6.jms.server.HornetQJMSServerLogger; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.jms.server.config.JMSConfiguration; -import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq6.jms.server.config.TopicConfiguration; -import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.apache.activemq6.jms.server.management.JMSManagementService; -import org.apache.activemq6.jms.server.management.JMSNotificationType; -import org.apache.activemq6.jms.server.management.impl.JMSManagementServiceImpl; -import org.apache.activemq6.jms.transaction.JMSTransactionDetail; -import org.apache.activemq6.spi.core.naming.BindingRegistry; -import org.apache.activemq6.utils.TimeAndCounterIDGenerator; -import org.apache.activemq6.utils.TypedProperties; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.AddressControl; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.deployers.DeploymentManager; +import org.apache.activemq.core.deployers.impl.FileDeploymentManager; +import org.apache.activemq.core.deployers.impl.XmlDeployer; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.BindingType; +import org.apache.activemq.core.registry.JndiBindingRegistry; +import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.ActivateCallback; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionDetail; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.jms.client.HornetQQueue; +import org.apache.activemq.jms.client.HornetQTopic; +import org.apache.activemq.jms.client.SelectorTranslator; +import org.apache.activemq.jms.persistence.JMSStorageManager; +import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq.jms.persistence.config.PersistedDestination; +import org.apache.activemq.jms.persistence.config.PersistedJNDI; +import org.apache.activemq.jms.persistence.config.PersistedType; +import org.apache.activemq.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; +import org.apache.activemq.jms.persistence.impl.nullpm.NullJMSStorageManagerImpl; +import org.apache.activemq.jms.server.HornetQJMSServerBundle; +import org.apache.activemq.jms.server.HornetQJMSServerLogger; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.jms.server.config.JMSConfiguration; +import org.apache.activemq.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.jms.server.config.TopicConfiguration; +import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq.jms.server.management.JMSManagementService; +import org.apache.activemq.jms.server.management.JMSNotificationType; +import org.apache.activemq.jms.server.management.impl.JMSManagementServiceImpl; +import org.apache.activemq.jms.transaction.JMSTransactionDetail; +import org.apache.activemq.spi.core.naming.BindingRegistry; +import org.apache.activemq.utils.TimeAndCounterIDGenerator; +import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; /** * A Deployer used to create and add to JNDI queues, topics and connection @@ -514,7 +514,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback } // We have to perform the server.stop outside of the lock because of backup activation issues. // See https://bugzilla.redhat.com/show_bug.cgi?id=959616 - // And org.apache.activemq6.byteman.tests.StartStopDeadlockTest which is validating for this case here + // And org.apache.activemq.byteman.tests.StartStopDeadlockTest which is validating for this case here server.stop(); } @@ -849,7 +849,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback } /* (non-Javadoc) - * @see org.apache.activemq6.jms.server.JMSServerManager#removeTopicFromJNDI(java.lang.String, java.lang.String) + * @see org.apache.activemq.jms.server.JMSServerManager#removeTopicFromJNDI(java.lang.String, java.lang.String) */ public boolean removeTopicFromJNDI(final String name) throws Exception {
