http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java ---------------------------------------------------------------------- diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java index f414634..7e223e9 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.dto; +package org.apache.activemq.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java ---------------------------------------------------------------------- diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java index 9f9a720..c8a969a 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.dto; +package org.apache.activemq.dto; import com.fasterxml.jackson.annotation.JsonTypeInfo; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-dto/src/main/java/org/apache/activemq/dto/CoreDTO.java ---------------------------------------------------------------------- diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/CoreDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/CoreDTO.java index 682f51a..0570481 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/CoreDTO.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/CoreDTO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.dto; +package org.apache.activemq.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-dto/src/main/java/org/apache/activemq/dto/JmsDTO.java ---------------------------------------------------------------------- diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/JmsDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/JmsDTO.java index 370c14c..5dcb700 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/JmsDTO.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/JmsDTO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.dto; +package org.apache.activemq.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-dto/src/main/java/org/apache/activemq/dto/NamingDTO.java ---------------------------------------------------------------------- diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/NamingDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/NamingDTO.java index e28351b..e46bbb0 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/NamingDTO.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/NamingDTO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.dto; +package org.apache.activemq.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java ---------------------------------------------------------------------- diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java index d0042cd..d71cd4d 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.dto; +package org.apache.activemq.dto; import com.fasterxml.jackson.annotation.JsonTypeInfo; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-dto/src/main/java/org/apache/activemq/dto/XmlUtil.java ---------------------------------------------------------------------- diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/XmlUtil.java b/activemq-dto/src/main/java/org/apache/activemq/dto/XmlUtil.java index 923d8d5..32ae14a 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/XmlUtil.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/XmlUtil.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.dto; +package org.apache.activemq.dto; import javax.xml.XMLConstants; import javax.xml.bind.JAXBContext; @@ -81,12 +81,12 @@ public class XmlUtil public static <T> T decode(Class<T> clazz, File configuration) throws Exception { - JAXBContext jaxbContext = JAXBContext.newInstance("org.apache.activemq6.dto"); + JAXBContext jaxbContext = JAXBContext.newInstance("org.apache.activemq.dto"); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); sf.setFeature("http://apache.org/xml/features/validation/schema-full-checking";, false); - InputStream xsdStream = XmlUtil.class.getClassLoader().getResourceAsStream("org.apache.activemq6/dto/hornetq.xsd"); + InputStream xsdStream = XmlUtil.class.getClassLoader().getResourceAsStream("org.apache.activemq/dto/hornetq.xsd"); StreamSource xsdSource = new StreamSource(xsdStream); Schema schema = sf.newSchema(xsdSource); unmarshaller.setSchema(schema); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-dto/src/main/java/org/apache/activemq/dto/package-info.java ---------------------------------------------------------------------- diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/package-info.java b/activemq-dto/src/main/java/org/apache/activemq/dto/package-info.java index 698e2cc..4900d55 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/package-info.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/package-info.java @@ -16,4 +16,4 @@ @javax.xml.bind.annotation.XmlSchema( namespace = "http://hornetq.org/schema";, elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.apache.activemq6.dto; \ No newline at end of file +package org.apache.activemq.dto; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-jms-client/pom.xml b/activemq-jms-client/pom.xml index f0b7f2f..04f075b 100644 --- a/activemq-jms-client/pom.xml +++ b/activemq-jms-client/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-client</artifactId> + <artifactId>activemq-jms-client</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JMS Client</name> @@ -22,8 +22,8 @@ <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> @@ -57,7 +57,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-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSClient.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSClient.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSClient.java index 4ae9ed5..974137c 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSClient.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSClient.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms; +package org.apache.activemq.api.jms; import javax.jms.Queue; import javax.jms.Topic; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; -import org.apache.activemq6.jms.client.HornetQQueueConnectionFactory; -import org.apache.activemq6.jms.client.HornetQTopicConnectionFactory; -import org.apache.activemq6.jms.client.HornetQXAConnectionFactory; -import org.apache.activemq6.jms.client.HornetQXAQueueConnectionFactory; -import org.apache.activemq6.jms.client.HornetQXATopicConnectionFactory; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq.jms.client.HornetQQueueConnectionFactory; +import org.apache.activemq.jms.client.HornetQTopicConnectionFactory; +import org.apache.activemq.jms.client.HornetQXAConnectionFactory; +import org.apache.activemq.jms.client.HornetQXAQueueConnectionFactory; +import org.apache.activemq.jms.client.HornetQXATopicConnectionFactory; /** * A utility class for creating HornetQ client-side JMS managed resources. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSConstants.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSConstants.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSConstants.java index f3ecb43..2a57bea 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSConstants.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSConstants.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms; +package org.apache.activemq.api.jms; /** * Constants for HornetQ for property keys used for HornetQ specific extensions to JMS. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/JMSFactoryType.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/JMSFactoryType.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/JMSFactoryType.java index b435e52..1de83b4 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/JMSFactoryType.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/JMSFactoryType.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms; +package org.apache.activemq.api.jms; /** * A JMSFactoryType http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java index 416fb70..6b482ee 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms.management; +package org.apache.activemq.api.jms.management; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.Operation; -import org.apache.activemq6.api.core.management.Parameter; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.Operation; +import org.apache.activemq.api.core.management.Parameter; /** * A ConnectionFactoryControl is used to manage a JMS ConnectionFactory. <br> @@ -281,7 +281,7 @@ public interface ConnectionFactoryControl /** - * @see org.apache.activemq6.api.core.client.ServerLocator#getProducerWindowSize() + * @see org.apache.activemq.api.core.client.ServerLocator#getProducerWindowSize() */ int getProducerWindowSize(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/DestinationControl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/DestinationControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/DestinationControl.java index 8cf2a96..c775bcf 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/DestinationControl.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/DestinationControl.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms.management; +package org.apache.activemq.api.jms.management; import javax.management.MBeanOperationInfo; -import org.apache.activemq6.api.core.management.Operation; -import org.apache.activemq6.api.core.management.Parameter; +import org.apache.activemq.api.core.management.Operation; +import org.apache.activemq.api.core.management.Parameter; /** * A DestinationControl is used to manage a JMS Destination. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConnectionInfo.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConnectionInfo.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConnectionInfo.java index fdec725..acab3ab 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConnectionInfo.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConnectionInfo.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms.management; +package org.apache.activemq.api.jms.management; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; /** * A JMSConnectionInfo http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConsumerInfo.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConsumerInfo.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConsumerInfo.java index 7d629e8..a87fc0c 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConsumerInfo.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConsumerInfo.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms.management; +package org.apache.activemq.api.jms.management; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; /** * Helper class to create Java Objects from the http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSManagementHelper.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSManagementHelper.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSManagementHelper.java index f65875a..4d25f9c 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSManagementHelper.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSManagementHelper.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms.management; +package org.apache.activemq.api.jms.management; import javax.jms.JMSException; import javax.jms.Message; -import org.apache.activemq6.api.core.management.ManagementHelper; -import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq.api.core.management.ManagementHelper; +import org.apache.activemq.jms.client.HornetQMessage; /** * Helper class to use JMS messages to manage HornetQ server resources. @@ -25,7 +25,7 @@ import org.apache.activemq6.jms.client.HornetQMessage; */ public class JMSManagementHelper { - private static org.apache.activemq6.api.core.Message getCoreMessage(final Message jmsMessage) + private static org.apache.activemq.api.core.Message getCoreMessage(final Message jmsMessage) { if (jmsMessage instanceof HornetQMessage == false) { @@ -44,7 +44,7 @@ public class JMSManagementHelper * @param attribute the name of the attribute * @throws JMSException if an exception occurs while putting the information in the message * - * @see org.apache.activemq6.api.core.management.ResourceNames + * @see org.apache.activemq.api.core.management.ResourceNames */ public static void putAttribute(final Message message, final String resourceName, final String attribute) throws JMSException { @@ -59,7 +59,7 @@ public class JMSManagementHelper * @param operationName the name of the operation to invoke on the resource * @throws JMSException if an exception occurs while putting the information in the message * - * @see org.apache.activemq6.api.core.management.ResourceNames + * @see org.apache.activemq.api.core.management.ResourceNames */ public static void putOperationInvocation(final Message message, final String resourceName, @@ -95,7 +95,7 @@ public class JMSManagementHelper * @param parameters the parameters to use to invoke the server resource * @throws JMSException if an exception occurs while putting the information in the message * - * @see org.apache.activemq6.api.core.management.ResourceNames + * @see org.apache.activemq.api.core.management.ResourceNames */ public static void putOperationInvocation(final Message message, final String resourceName, http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java index c617250..adc4963 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms.management; +package org.apache.activemq.api.jms.management; import java.util.Map; import javax.management.MBeanOperationInfo; -import org.apache.activemq6.api.core.management.Operation; -import org.apache.activemq6.api.core.management.Parameter; +import org.apache.activemq.api.core.management.Operation; +import org.apache.activemq.api.core.management.Parameter; /** * A JMSQueueControl is used to manage a JMS queue. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSServerControl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSServerControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSServerControl.java index ca6f621..dea580d 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSServerControl.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSServerControl.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms.management; +package org.apache.activemq.api.jms.management; import javax.management.MBeanOperationInfo; -import org.apache.activemq6.api.core.management.Operation; -import org.apache.activemq6.api.core.management.Parameter; +import org.apache.activemq.api.core.management.Operation; +import org.apache.activemq.api.core.management.Parameter; /** * A JMSSserverControl is used to manage HornetQ JMS server. @@ -147,8 +147,8 @@ public interface JMSServerControl * The ConnectionFactory is bound to JNDI for all the specified bindings Strings. * <br> * {@code liveConnectorsTransportClassNames} are the class names - * of the {@link org.apache.activemq6.spi.core.remoting.ConnectorFactory} to connect to the live servers - * and {@code liveConnectorTransportParams} are Map<String, Object> for the corresponding {@link org.apache.activemq6.api.core.TransportConfiguration}'s parameters. + * of the {@link org.apache.activemq.spi.core.remoting.ConnectorFactory} to connect to the live servers + * and {@code liveConnectorTransportParams} are Map<String, Object> for the corresponding {@link org.apache.activemq.api.core.TransportConfiguration}'s parameters. */ void createConnectionFactory(String name, boolean ha, http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSSessionInfo.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSSessionInfo.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSSessionInfo.java index bc7fac3..1461e25 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSSessionInfo.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSSessionInfo.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms.management; +package org.apache.activemq.api.jms.management; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONException; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONException; +import org.apache.activemq.utils.json.JSONObject; /** * A JMSSessionInfo http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/SubscriptionInfo.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/SubscriptionInfo.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/SubscriptionInfo.java index 8bffddf..b6102cb 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/SubscriptionInfo.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/SubscriptionInfo.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms.management; +package org.apache.activemq.api.jms.management; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; /** * Helper class to create Java Objects from the http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java index 1ef88c8..5d0560f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.jms.management; +package org.apache.activemq.api.jms.management; import java.util.Map; import javax.management.MBeanOperationInfo; -import org.apache.activemq6.api.core.management.Operation; -import org.apache.activemq6.api.core.management.Parameter; +import org.apache.activemq.api.core.management.Operation; +import org.apache.activemq.api.core.management.Parameter; /** * A TopicControl is used to manage a JMS Topic. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/package-info.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/package-info.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/package-info.java index 1e75322..72e8964 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/package-info.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/package-info.java @@ -16,5 +16,5 @@ * HornetQ JMS resources can be managed either using JMX or by sending JMS management messages to the * server's special management address. Please refer to the user manual for more information. */ -package org.apache.activemq6.api.jms.management; +package org.apache.activemq.api.jms.management; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/package-info.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/package-info.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/package-info.java index ef279c2..e638e3e 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/package-info.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/package-info.java @@ -17,5 +17,5 @@ * HornetQ JMS managed resources (ConnectionFactory, Queue and Topic). * */ -package org.apache.activemq6.api.jms; +package org.apache.activemq.api.jms; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQBytesMessage.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQBytesMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQBytesMessage.java index c916af2..d2667ff 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQBytesMessage.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQBytesMessage.java @@ -10,44 +10,44 @@ * 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.BytesMessage; import javax.jms.JMSException; import javax.jms.MessageEOFException; import javax.jms.MessageFormatException; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.core.message.impl.MessageImpl; - -import static org.apache.activemq6.reader.BytesMessageUtil.bytesMessageReset; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadBoolean; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadByte; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadBytes; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadChar; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadDouble; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadFloat; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadInt; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadLong; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadShort; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadUTF; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadUnsignedByte; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadUnsignedShort; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteBoolean; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteByte; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteBytes; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteChar; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteDouble; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteFloat; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteInt; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteLong; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteObject; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteShort; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteUTF; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.core.message.impl.MessageImpl; + +import static org.apache.activemq.reader.BytesMessageUtil.bytesMessageReset; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadBoolean; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadByte; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadBytes; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadChar; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadDouble; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadFloat; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadInt; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadLong; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadShort; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadUTF; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadUnsignedByte; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadUnsignedShort; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteBoolean; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteByte; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteBytes; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteChar; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteDouble; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteFloat; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteInt; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteLong; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteObject; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteShort; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteUTF; /** * HornetQ implementation of a JMS {@link BytesMessage}. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnection.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnection.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnection.java index bd59895..1472a7c 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnection.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnection.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 javax.jms.ConnectionConsumer; import javax.jms.ConnectionMetaData; @@ -32,21 +32,21 @@ import java.lang.ref.WeakReference; import java.util.HashSet; import java.util.Set; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.FailoverEventListener; -import org.apache.activemq6.api.core.client.FailoverEventType; -import org.apache.activemq6.api.core.client.SessionFailureListener; -import org.apache.activemq6.api.jms.HornetQJMSConstants; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.core.version.Version; -import org.apache.activemq6.reader.MessageUtil; -import org.apache.activemq6.utils.ConcurrentHashSet; -import org.apache.activemq6.utils.UUIDGenerator; -import org.apache.activemq6.utils.VersionLoader; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.FailoverEventListener; +import org.apache.activemq.api.core.client.FailoverEventType; +import org.apache.activemq.api.core.client.SessionFailureListener; +import org.apache.activemq.api.jms.HornetQJMSConstants; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.core.version.Version; +import org.apache.activemq.reader.MessageUtil; +import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.utils.VersionLoader; /** * HornetQ implementation of a JMS Connection. @@ -79,9 +79,9 @@ public class HornetQConnection extends HornetQConnectionForContextImpl implement private final int connectionType; - private final Set<HornetQSession> sessions = new org.apache.activemq6.utils.ConcurrentHashSet<HornetQSession>(); + private final Set<HornetQSession> sessions = new org.apache.activemq.utils.ConcurrentHashSet<HornetQSession>(); - private final Set<SimpleString> tempQueues = new org.apache.activemq6.utils.ConcurrentHashSet<SimpleString>(); + private final Set<SimpleString> tempQueues = new org.apache.activemq.utils.ConcurrentHashSet<SimpleString>(); private final Set<SimpleString> knownDestinations = new ConcurrentHashSet<SimpleString>(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionFactory.java index 9fe7aae..503a13a 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionFactory.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionFactory.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 javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -31,14 +31,14 @@ import javax.naming.Reference; import javax.naming.Referenceable; import java.io.Serializable; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.jms.referenceable.ConnectionFactoryObjectFactory; -import org.apache.activemq6.jms.referenceable.SerializableObjectRefAddr; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.jms.referenceable.ConnectionFactoryObjectFactory; +import org.apache.activemq.jms.referenceable.SerializableObjectRefAddr; /** * HornetQ implementation of a JMS ConnectionFactory. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContext.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContext.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContext.java index 80528b4..7e493a1 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContext.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContext.java @@ -13,7 +13,7 @@ /** * */ -package org.apache.activemq6.jms.client; +package org.apache.activemq.jms.client; import javax.jms.JMSContext; import javax.jms.XAJMSContext; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContextImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContextImpl.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContextImpl.java index b77d08d..25e3b3a 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContextImpl.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContextImpl.java @@ -13,7 +13,7 @@ /** * */ -package org.apache.activemq6.jms.client; +package org.apache.activemq.jms.client; import javax.jms.JMSContext; import javax.jms.JMSException; @@ -21,9 +21,9 @@ import javax.jms.JMSRuntimeException; import javax.jms.Session; import javax.jms.XAJMSContext; -import org.apache.activemq6.api.jms.HornetQJMSConstants; -import org.apache.activemq6.utils.ReferenceCounter; -import org.apache.activemq6.utils.ReferenceCounterUtil; +import org.apache.activemq.api.jms.HornetQJMSConstants; +import org.apache.activemq.utils.ReferenceCounter; +import org.apache.activemq.utils.ReferenceCounterUtil; public abstract class HornetQConnectionForContextImpl implements HornetQConnectionForContext { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionMetaData.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionMetaData.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionMetaData.java index 453cb9e..8109b6d 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionMetaData.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionMetaData.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.Enumeration; import java.util.Vector; @@ -18,7 +18,7 @@ import java.util.Vector; import javax.jms.ConnectionMetaData; import javax.jms.JMSException; -import org.apache.activemq6.core.version.Version; +import org.apache.activemq.core.version.Version; /** * HornetQ implementation of a JMS ConnectionMetaData. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQDestination.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQDestination.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQDestination.java index 7ecc457..c9766d0 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQDestination.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQDestination.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.io.Serializable; import java.util.UUID; @@ -22,10 +22,10 @@ import javax.naming.NamingException; import javax.naming.Reference; import javax.naming.Referenceable; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.jms.referenceable.DestinationObjectFactory; -import org.apache.activemq6.jms.referenceable.SerializableObjectRefAddr; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.jms.referenceable.DestinationObjectFactory; +import org.apache.activemq.jms.referenceable.SerializableObjectRefAddr; /** * HornetQ implementation of a JMS Destination. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientBundle.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientBundle.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientBundle.java index d5af6df..7e76e63 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientBundle.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientBundle.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 javax.jms.IllegalStateException; @@ -21,10 +21,10 @@ import javax.jms.JMSRuntimeException; import javax.jms.MessageNotReadableException; import javax.jms.MessageNotWriteableException; -import org.apache.activemq6.api.core.HornetQIllegalStateException; -import org.apache.activemq6.api.core.HornetQInvalidFilterExpressionException; -import org.apache.activemq6.api.core.HornetQNonExistentQueueException; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.HornetQIllegalStateException; +import org.apache.activemq.api.core.HornetQInvalidFilterExpressionException; +import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.SimpleString; 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-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientLogger.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientLogger.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientLogger.java index 1111b98..180e8f1 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientLogger.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientLogger.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 org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConnectionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConnectionFactory.java index d1d1deb..dc76692 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConnectionFactory.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConnectionFactory.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.QueueConnectionFactory; import javax.jms.TopicConnectionFactory; -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.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ServerLocator; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConsumer.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConsumer.java index bdbeb7d..b9ba41f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConsumer.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConsumer.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 javax.jms.JMSConsumer; import javax.jms.JMSException; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSContext.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSContext.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSContext.java index ba3364d..d314336 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSContext.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSContext.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 javax.jms.BytesMessage; import javax.jms.ConnectionMetaData; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSProducer.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSProducer.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSProducer.java index f39f9ca..54f7c05 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSProducer.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSProducer.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 javax.jms.BytesMessage; import javax.jms.CompletionListener; @@ -33,9 +33,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.activemq6.api.core.HornetQPropertyConversionException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.utils.TypedProperties; /** * NOTE: this class forwards {@link #setDisableMessageID(boolean)} and http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMapMessage.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMapMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMapMessage.java index b6a8f04..6ee7b89 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMapMessage.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMapMessage.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 javax.jms.JMSException; import javax.jms.MapMessage; @@ -20,17 +20,17 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Set; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQPropertyConversionException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.utils.TypedProperties; -import static org.apache.activemq6.reader.MapMessageUtil.writeBodyMap; -import static org.apache.activemq6.reader.MapMessageUtil.readBodyMap; +import static org.apache.activemq.reader.MapMessageUtil.writeBodyMap; +import static org.apache.activemq.reader.MapMessageUtil.readBodyMap; /** * HornetQ implementation of a JMS MapMessage. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessage.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessage.java index 4c10911..a01dcaa 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessage.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessage.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.io.InputStream; import java.io.ObjectInputStream; @@ -31,16 +31,16 @@ import javax.jms.Message; import javax.jms.MessageFormatException; import javax.jms.MessageNotWriteableException; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQPropertyConversionException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.jms.HornetQJMSConstants; -import org.apache.activemq6.core.message.impl.MessageInternal; -import org.apache.activemq6.reader.MessageUtil; -import org.apache.activemq6.utils.UUID; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.jms.HornetQJMSConstants; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.reader.MessageUtil; +import org.apache.activemq.utils.UUID; /** @@ -63,7 +63,7 @@ import org.apache.activemq6.utils.UUID; public class HornetQMessage implements javax.jms.Message { // Constants ----------------------------------------------------- - public static final byte TYPE = org.apache.activemq6.api.core.Message.DEFAULT_TYPE; + public static final byte TYPE = org.apache.activemq.api.core.Message.DEFAULT_TYPE; public static Map<String, Object> coreMaptoJMSMap(final Map<String, Object> coreMessage) { @@ -642,7 +642,7 @@ public class HornetQMessage implements javax.jms.Message { if (MessageUtil.JMSXGROUPID.equals(name)) { - return message.getStringProperty(org.apache.activemq6.api.core.Message.HDR_GROUP_ID); + return message.getStringProperty(org.apache.activemq.api.core.Message.HDR_GROUP_ID); } else { @@ -726,7 +726,7 @@ public class HornetQMessage implements javax.jms.Message if (MessageUtil.JMSXGROUPID.equals(name)) { - message.putStringProperty(org.apache.activemq6.api.core.Message.HDR_GROUP_ID, SimpleString.toSimpleString(value)); + message.putStringProperty(org.apache.activemq.api.core.Message.HDR_GROUP_ID, SimpleString.toSimpleString(value)); } else { @@ -794,7 +794,7 @@ public class HornetQMessage implements javax.jms.Message Long value; try { - value = message.getLongProperty(org.apache.activemq6.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME); + value = message.getLongProperty(org.apache.activemq.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME); } catch (Exception e) { @@ -814,7 +814,7 @@ public class HornetQMessage implements javax.jms.Message @Override public void setJMSDeliveryTime(long deliveryTime) throws JMSException { - message.putLongProperty(org.apache.activemq6.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME, deliveryTime); + message.putLongProperty(org.apache.activemq.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME, deliveryTime); } @Override http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageConsumer.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageConsumer.java index ed3a972..1d27026 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageConsumer.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageConsumer.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 javax.jms.IllegalStateException; import javax.jms.JMSException; @@ -22,12 +22,12 @@ import javax.jms.Session; import javax.jms.Topic; import javax.jms.TopicSubscriber; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.SimpleString; -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.SimpleString; +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; /** * HornetQ implementation of a JMS MessageConsumer. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageProducer.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageProducer.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageProducer.java index 9d96772..3bb43c1 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageProducer.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageProducer.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 javax.jms.BytesMessage; import javax.jms.CompletionListener; @@ -30,14 +30,14 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.jms.TopicPublisher; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq6.utils.UUID; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.utils.UUID; +import org.apache.activemq.utils.UUIDGenerator; /** * HornetQ implementation of a JMS MessageProducer. * @@ -556,7 +556,7 @@ public class HornetQMessageProducer implements MessageProducer, QueueSender, Top } @Override - public void sendAcknowledged(org.apache.activemq6.api.core.Message clientMessage) + public void sendAcknowledged(org.apache.activemq.api.core.Message clientMessage) { if (jmsMessage instanceof StreamMessage) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQObjectMessage.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQObjectMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQObjectMessage.java index e01dc1b..dfc8b10 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQObjectMessage.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQObjectMessage.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 javax.jms.JMSException; import javax.jms.MessageFormatException; @@ -21,10 +21,10 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientSession; /** * HornetQ implementation of a JMS ObjectMessage. @@ -151,7 +151,7 @@ public class HornetQObjectMessage extends HornetQMessage implements ObjectMessag try { ByteArrayInputStream bais = new ByteArrayInputStream(data); - ObjectInputStream ois = new org.apache.activemq6.utils.ObjectInputStreamWithClassLoader(bais); + ObjectInputStream ois = new org.apache.activemq.utils.ObjectInputStreamWithClassLoader(bais); Serializable object = (Serializable)ois.readObject(); return object; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueue.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueue.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueue.java index c6f40bd..68e50cf 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueue.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueue.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.client; +package org.apache.activemq.jms.client; import javax.jms.Queue; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.SimpleString; /** * HornetQ implementation of a JMS Queue. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueBrowser.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueBrowser.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueBrowser.java index 091ba10..86c08c6 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueBrowser.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueBrowser.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.Enumeration; import java.util.NoSuchElementException; @@ -19,11 +19,11 @@ import javax.jms.JMSException; import javax.jms.Queue; import javax.jms.QueueBrowser; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientSession; /** * HornetQ implementation of a JMS QueueBrowser. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueConnectionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueConnectionFactory.java index 8a07fe5..68ddd1b 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueConnectionFactory.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueConnectionFactory.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.QueueConnectionFactory; -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 QueueConnectionFactory. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQSession.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQSession.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQSession.java index 4be89fe..35b29d1 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQSession.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQSession.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.io.Serializable; import java.util.HashSet; @@ -45,16 +45,16 @@ import javax.jms.TopicSubscriber; import javax.jms.TransactionInProgressException; import javax.transaction.xa.XAResource; -import org.apache.activemq6.selector.filter.FilterException; -import org.apache.activemq6.selector.SelectorParser; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQQueueExistsException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSession.AddressQuery; -import org.apache.activemq6.api.core.client.ClientSession.QueueQuery; +import org.apache.activemq.selector.filter.FilterException; +import org.apache.activemq.selector.SelectorParser; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQQueueExistsException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSession.AddressQuery; +import org.apache.activemq.api.core.client.ClientSession.QueueQuery; /** * HornetQ implementation of a JMS Session. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQStreamMessage.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQStreamMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQStreamMessage.java index 86182a8..fbef34e 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQStreamMessage.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQStreamMessage.java @@ -10,32 +10,32 @@ * 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.JMSException; import javax.jms.MessageEOFException; import javax.jms.MessageFormatException; import javax.jms.StreamMessage; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.core.client.impl.ClientMessageImpl; -import org.apache.activemq6.utils.DataConstants; - -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadBoolean; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadByte; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadBytes; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadChar; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadDouble; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadFloat; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadInteger; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadLong; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadObject; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadShort; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadString; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.core.client.impl.ClientMessageImpl; +import org.apache.activemq.utils.DataConstants; + +import static org.apache.activemq.reader.StreamMessageUtil.streamReadBoolean; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadByte; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadBytes; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadChar; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadDouble; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadFloat; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadInteger; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadLong; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadObject; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadShort; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadString; /** * HornetQ implementation of a JMS StreamMessage. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryQueue.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryQueue.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryQueue.java index e8ad86b..6d06ac5 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryQueue.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryQueue.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 javax.jms.TemporaryQueue; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryTopic.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryTopic.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryTopic.java index 442f0fc..103619e 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryTopic.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryTopic.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 javax.jms.TemporaryTopic; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTextMessage.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTextMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTextMessage.java index 4684cb2..90ffcc1 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTextMessage.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTextMessage.java @@ -10,19 +10,19 @@ * 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.JMSException; import javax.jms.TextMessage; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientSession; -import static org.apache.activemq6.reader.TextMessageUtil.readBodyText; -import static org.apache.activemq6.reader.TextMessageUtil.writeBodyText; +import static org.apache.activemq.reader.TextMessageUtil.readBodyText; +import static org.apache.activemq.reader.TextMessageUtil.writeBodyText; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopic.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopic.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopic.java index 9b1d835..94408c8 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopic.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopic.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.client; +package org.apache.activemq.jms.client; import javax.jms.Topic; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.SimpleString; /** * HornetQ implementation of a JMS Topic. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopicConnectionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopicConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopicConnectionFactory.java index 26b0e72..13e187f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopicConnectionFactory.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopicConnectionFactory.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.TopicConnectionFactory; -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 TopicConnectionFactory. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnection.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnection.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnection.java index e6b0edf..29b6ec0 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnection.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnection.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 javax.jms.JMSException; import javax.jms.Session; @@ -20,7 +20,7 @@ import javax.jms.XASession; import javax.jms.XATopicConnection; import javax.jms.XATopicSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.ClientSessionFactory; /** * HornetQ implementation of a JMS XAConnection. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnectionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnectionFactory.java index b0ae3d7..3eae974 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnectionFactory.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnectionFactory.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.client; +package org.apache.activemq.jms.client; import javax.jms.XAQueueConnectionFactory; 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 XAConnectionFactory. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAJMSContext.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAJMSContext.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAJMSContext.java index 040f7db..65ab212 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAJMSContext.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAJMSContext.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 javax.jms.XAJMSContext; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAQueueConnectionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAQueueConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAQueueConnectionFactory.java index c8875ec..1d8d622 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAQueueConnectionFactory.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAQueueConnectionFactory.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.XAQueueConnectionFactory; -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 XAQueueConnectionFactory. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXASession.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXASession.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXASession.java index 65aa067..390fff0 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXASession.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXASession.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.client; +package org.apache.activemq.jms.client; import javax.jms.XAQueueSession; import javax.jms.XATopicSession; -import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSession; /** * A HornetQXASession
