http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java b/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java index fb087e5..40f22b0 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.lang.ref.SoftReference; -import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffer; /** *
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/UUID.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/UUID.java b/activemq-commons/src/main/java/org/apache/activemq/utils/UUID.java index 35c2a0f..32c3895 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/UUID.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/UUID.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java b/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java index 0cabf23..693b821 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.lang.reflect.Method; import java.net.NetworkInterface; @@ -31,7 +31,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.SimpleString; public final class UUIDGenerator { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDTimer.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDTimer.java b/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDTimer.java index 60b41d7..04b89e3 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDTimer.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDTimer.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.util.Random; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/test/java/org/apache/activemq/utils/ByteUtilTest.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/test/java/org/apache/activemq/utils/ByteUtilTest.java b/activemq-commons/src/test/java/org/apache/activemq/utils/ByteUtilTest.java index ccec25e..5f88144 100644 --- a/activemq-commons/src/test/java/org/apache/activemq/utils/ByteUtilTest.java +++ b/activemq-commons/src/test/java/org/apache/activemq/utils/ByteUtilTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/test/java/org/apache/activemq/utils/PairTest.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/test/java/org/apache/activemq/utils/PairTest.java b/activemq-commons/src/test/java/org/apache/activemq/utils/PairTest.java index 15df799..b120260 100644 --- a/activemq-commons/src/test/java/org/apache/activemq/utils/PairTest.java +++ b/activemq-commons/src/test/java/org/apache/activemq/utils/PairTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import org.junit.Test; import org.junit.Assert; -import org.apache.activemq6.api.core.Pair; +import org.apache.activemq.api.core.Pair; public class PairTest extends Assert http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/test/java/org/apache/activemq/utils/ReferenceCounterTest.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/test/java/org/apache/activemq/utils/ReferenceCounterTest.java b/activemq-commons/src/test/java/org/apache/activemq/utils/ReferenceCounterTest.java index 860b983..7f56387 100644 --- a/activemq-commons/src/test/java/org/apache/activemq/utils/ReferenceCounterTest.java +++ b/activemq-commons/src/test/java/org/apache/activemq/utils/ReferenceCounterTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-core-client/pom.xml b/activemq-core-client/pom.xml index a42ec60..8b29615 100644 --- a/activemq-core-client/pom.xml +++ b/activemq-core-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-core-client</artifactId> + <artifactId>activemq-core-client</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 Core Client</name> @@ -26,18 +26,18 @@ <artifactId>jgroups</artifactId> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-commons</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-selector</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-selector</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-journal</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-journal</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -73,7 +73,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> @@ -103,7 +103,7 @@ <executions> <!-- Adds a directory to the list of source folders to be used in this project. This is here to let Maven know about: - target/generated-sources/xslt/org.apache.activemq6/api/config/HornetQDefaultConfiguration.java + target/generated-sources/xslt/org.apache.activemq/api/config/HornetQDefaultConfiguration.java which is generated by ./src/main/resources/hqDefaults.xsl using the HornetQ configuration schema. --> <execution> @@ -136,7 +136,7 @@ <transformationSet> <!-- Generates target/generated-sources/xslt/.../HornetQDefaultConfiguration.java using this XSLT `./src/main/resources/hqDefaults.xsl`. --> - <dir>../activemq6-server/src/main/resources/schema</dir> + <dir>../activemq-server/src/main/resources/schema</dir> <outputDir>${project.build.directory}/generated-sources/xslt</outputDir> <stylesheet>./src/main/resources/hqDefaults.xsl</stylesheet> <includes> @@ -144,7 +144,7 @@ </includes> <fileMappers> <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper"> - <targetName>./org/apache/activemq6/api/config/HornetQDefaultConfiguration.java</targetName> + <targetName>./org/apache/activemq/api/config/HornetQDefaultConfiguration.java</targetName> </fileMapper> </fileMappers> </transformationSet> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpoint.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpoint.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpoint.java index b34e3f2..f400584 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpoint.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpoint.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.core; +package org.apache.activemq.api.core; import java.util.concurrent.TimeUnit; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactory.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactory.java index 5dc6e83..97e824c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactory.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactory.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.core; +package org.apache.activemq.api.core; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactoryConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactoryConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactoryConfiguration.java index dd55518..213e639 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactoryConfiguration.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactoryConfiguration.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java index e974343..97f4faf 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; import java.io.Serializable; import java.util.List; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; /** * The basic configuration used to determine how the server will broadcast members - * This is analogous to {@link org.apache.activemq6.api.core.DiscoveryGroupConfiguration} + * This is analogous to {@link org.apache.activemq.api.core.DiscoveryGroupConfiguration} * * @author <a href="mailto:[email protected]";>Tim Fox</a> * @author <a href="mailto:[email protected]";>Howard Gao</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfiguration.java index 04641fe..053760c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfiguration.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfiguration.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.utils.UUIDGenerator; /** * This file represents how we are using Discovery. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java index bf1dce4..d0185b3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java @@ -11,12 +11,12 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; /** * This interface is needed for making a DiscoveryGroupConfiguration backward * compatible with version 2.2 clients. It is used to extract from new - * {@link org.apache.activemq6.api.core.BroadcastEndpointFactoryConfiguration} the four + * {@link org.apache.activemq.api.core.BroadcastEndpointFactoryConfiguration} the four * UDP attributes in order to form a version 2.2 DiscoveryGroupConfiguration * in time of serialization. * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/FilterConstants.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/FilterConstants.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/FilterConstants.java index 816d5d1..3571e10 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/FilterConstants.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/FilterConstants.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.core; +package org.apache.activemq.api.core; /** * Constants representing pre-defined message attributes that can be referenced in HornetQ core http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java index d2a53ee..62f6a4d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.spi.core.protocol.RemotingConnection; /** * This is class is a simple way to intercepting calls on HornetQ client and servers. * <p> * To add an interceptor to HornetQ server, you have to modify the server configuration file * {@literal hornetq-configuration.xml}.<br> - * To add it to a client, use {@link org.apache.activemq6.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)} + * To add it to a client, use {@link org.apache.activemq.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)} * * @author [email protected] * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsBroadcastGroupConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsBroadcastGroupConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsBroadcastGroupConfiguration.java index 7ecbb93..19cd7cf 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsBroadcastGroupConfiguration.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsBroadcastGroupConfiguration.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.core; +package org.apache.activemq.api.core; import java.net.URL; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java index 12b37c1..29f47ed 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.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.core; +package org.apache.activemq.api.core; import java.util.Map; import java.util.Set; -import org.apache.activemq6.utils.UUID; +import org.apache.activemq.utils.UUID; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java index 7805052..d43c6c5 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.apache.activemq6.core.client.HornetQClientMessageBundle; -import org.apache.activemq6.core.remoting.impl.TransportConfigurationUtil; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.core.client.HornetQClientMessageBundle; +import org.apache.activemq.core.remoting.impl.TransportConfigurationUtil; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.utils.UUIDGenerator; /** * A TransportConfiguration is used by a client to specify connections to a server and its backup if @@ -86,7 +86,7 @@ public class TransportConfiguration implements Serializable } /** - * Creates a TransportConfiguration with a specific name providing the class name of the {@link org.apache.activemq6.spi.core.remoting.ConnectorFactory} + * Creates a TransportConfiguration with a specific name providing the class name of the {@link org.apache.activemq.spi.core.remoting.ConnectorFactory} * and any parameters needed. * * @param className The class name of the ConnectorFactory @@ -110,7 +110,7 @@ public class TransportConfiguration implements Serializable } /** - * Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq6.spi.core.remoting.ConnectorFactory} + * Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq.spi.core.remoting.ConnectorFactory} * and any parameters needed. * * @param className The class name of the ConnectorFactory @@ -122,7 +122,7 @@ public class TransportConfiguration implements Serializable } /** - * Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq6.spi.core.remoting.ConnectorFactory} + * Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq.spi.core.remoting.ConnectorFactory} * * @param className The class name of the ConnectorFactory */ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfigurationHelper.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfigurationHelper.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfigurationHelper.java index e06f3d0..e2faea9 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfigurationHelper.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfigurationHelper.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/UDPBroadcastGroupConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/UDPBroadcastGroupConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/UDPBroadcastGroupConfiguration.java index db1ed47..6c16ab6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/UDPBroadcastGroupConfiguration.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/UDPBroadcastGroupConfiguration.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.core; +package org.apache.activemq.api.core; import java.io.IOException; import java.io.InterruptedIOException; @@ -22,13 +22,13 @@ import java.net.InetSocketAddress; import java.net.MulticastSocket; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq.core.client.HornetQClientLogger; /** * The configuration used to determine how the server will broadcast members. * <p> - * This is analogous to {@link org.apache.activemq6.api.core.DiscoveryGroupConfiguration} + * This is analogous to {@link org.apache.activemq.api.core.DiscoveryGroupConfiguration} * * @author <a href="mailto:[email protected]";>Tim Fox</a> Created 18 Nov 2008 08:44:30 */ @@ -110,7 +110,7 @@ public final class UDPBroadcastGroupConfiguration implements BroadcastEndpointFa /** * <p> This is the member discovery implementation using direct UDP. It was extracted as a refactoring from - * {@link org.apache.activemq6.core.cluster.DiscoveryGroup}</p> + * {@link org.apache.activemq.core.cluster.DiscoveryGroup}</p> * * @author Tomohisa * @author Howard Gao http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java index 1d980d6..e7567bd 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.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.core.client; +package org.apache.activemq.api.core.client; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.spi.core.remoting.ConsumerContext; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.spi.core.remoting.ConsumerContext; /** * A ClientConsumer receives messages from HornetQ queues. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java index 73a2ad9..80dfb2f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.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.core.client; +package org.apache.activemq.api.core.client; import java.io.InputStream; import java.io.OutputStream; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; /** * @@ -120,112 +120,112 @@ public interface ClientMessage extends Message /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putBooleanProperty(SimpleString key, boolean value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putBooleanProperty(String key, boolean value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putByteProperty(SimpleString key, byte value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putByteProperty(String key, byte value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putBytesProperty(SimpleString key, byte[] value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putBytesProperty(String key, byte[] value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putShortProperty(SimpleString key, short value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putShortProperty(String key, short value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putCharProperty(SimpleString key, char value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putCharProperty(String key, char value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putIntProperty(SimpleString key, int value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putIntProperty(String key, int value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putLongProperty(SimpleString key, long value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putLongProperty(String key, long value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putFloatProperty(SimpleString key, float value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putFloatProperty(String key, float value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putDoubleProperty(SimpleString key, double value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putDoubleProperty(String key, double value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putStringProperty(SimpleString key, SimpleString value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage putStringProperty(String key, String value); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage writeBodyBufferBytes(byte[] bytes); /** - * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq.api.core.Message} to enable fluent API */ ClientMessage writeBodyBufferString(String string); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java index b9abb24..8b50a5b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.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.core.client; +package org.apache.activemq.api.core.client; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; /** * A ClientProducer is used to send messages to a specific address. Messages are then routed on the @@ -24,13 +24,13 @@ import org.apache.activemq6.api.core.SimpleString; * <p> * The sending semantics can change depending on what blocking semantics are set via * {@link ServerLocator#setBlockOnDurableSend(boolean)} and - * {@link org.apache.activemq6.api.core.client.ServerLocator#setBlockOnNonDurableSend(boolean)} . If set to + * {@link org.apache.activemq.api.core.client.ServerLocator#setBlockOnNonDurableSend(boolean)} . If set to * true then for each message type, durable and non durable respectively, any exceptions such as the * address not existing or security exceptions will be thrown at the time of send. Alternatively if * set to false then exceptions will only be logged on the server. <br> * <p> * The send rate can also be controlled via {@link ServerLocator#setProducerMaxRate(int)} and the - * {@link org.apache.activemq6.api.core.client.ServerLocator#setProducerWindowSize(int)}. <br> + * {@link org.apache.activemq.api.core.client.ServerLocator#setProducerWindowSize(int)}. <br> * <br> * @author <a href="mailto:[email protected]";>Tim Fox</a> * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java index aabd39c..de25226 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.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.core.client; +package org.apache.activemq.api.core.client; import java.util.UUID; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.client.impl.ClientMessageImpl; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.client.impl.ClientMessageImpl; /** * The ClientRequestor class helps making requests. @@ -23,9 +23,9 @@ import org.apache.activemq6.core.client.impl.ClientMessageImpl; * The ClientRequestor constructor is given a ClientSession and a request address. * It creates a temporary queue for the responses and provides a request method that sends the request message and waits for its reply. * - * @apiviz.uses org.apache.activemq6.api.core.client.ClientSession - * @apiviz.owns org.apache.activemq6.api.core.client.ClientProducer - * @apiviz.owns org.apache.activemq6.api.core.client.ClientConsumer + * @apiviz.uses org.apache.activemq.api.core.client.ClientSession + * @apiviz.owns org.apache.activemq.api.core.client.ClientProducer + * @apiviz.owns org.apache.activemq.api.core.client.ClientConsumer * * @author <a href="[email protected]">Jeff Mesnil</a> */ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java index c9baf64..5c9ac02 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.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.core.client; +package org.apache.activemq.api.core.client; import javax.transaction.xa.XAResource; import java.util.List; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.SimpleString; /** * A ClientSession is a single-thread object required for producing and consuming messages. @@ -47,7 +47,7 @@ public interface ClientSession extends XAResource, AutoCloseable } /** - * @deprecated Use {@link org.apache.activemq6.api.core.client.ClientSession.AddressQuery} instead + * @deprecated Use {@link org.apache.activemq.api.core.client.ClientSession.AddressQuery} instead */ @Deprecated public interface BindingQuery extends AddressQuery @@ -487,7 +487,7 @@ public interface ClientSession extends XAResource, AutoCloseable * Address must be specified every time a message is sent * * @return a ClientProducer - * @see ClientProducer#send(SimpleString, org.apache.activemq6.api.core.Message) + * @see ClientProducer#send(SimpleString, org.apache.activemq.api.core.Message) */ ClientProducer createProducer() throws HornetQException; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java index 313bf72..80bcf10 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.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.core.client; +package org.apache.activemq.api.core.client; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.spi.core.protocol.RemotingConnection; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClusterTopologyListener.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClusterTopologyListener.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClusterTopologyListener.java index f765852..658762d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClusterTopologyListener.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClusterTopologyListener.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.core.client; +package org.apache.activemq.api.core.client; /** * A cluster topology listener. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventListener.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventListener.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventListener.java index 5dd4a4c..8c48108 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventListener.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventListener.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.core.client; +package org.apache.activemq.api.core.client; /** * A FailoverEvent notifies the client the state if the connection changes occurred on the session. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventType.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventType.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventType.java index 69acf6f..171e7c4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventType.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventType.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.core.client; +package org.apache.activemq.api.core.client; public enum FailoverEventType { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java index 64576a1..edafea2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.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.core.client; +package org.apache.activemq.api.core.client; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy; -import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy; +import org.apache.activemq.core.client.impl.ServerLocatorImpl; /** * Utility class for creating HornetQ {@link ClientSessionFactory} objects. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/MessageHandler.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/MessageHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/MessageHandler.java index 7a8657c..2de910a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/MessageHandler.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/MessageHandler.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.core.client; +package org.apache.activemq.api.core.client; /** * A MessageHandler is used to receive message <em>asynchronously</em>. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SendAcknowledgementHandler.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SendAcknowledgementHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SendAcknowledgementHandler.java index 0c4780a..4cc1b42 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SendAcknowledgementHandler.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SendAcknowledgementHandler.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.core.client; +package org.apache.activemq.api.core.client; -import org.apache.activemq6.api.core.Message; +import org.apache.activemq.api.core.Message; /** * A SendAcknowledgementHandler notifies a client when an message sent asynchronously has been http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java index 02f83fb..087b287 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.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.core.client; +package org.apache.activemq.api.core.client; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.client.impl.Topology; -import org.apache.activemq6.spi.core.remoting.ClientProtocolManagerFactory; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.Interceptor; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.client.impl.Topology; +import org.apache.activemq.spi.core.remoting.ClientProtocolManagerFactory; /** * The serverLocator locates a server, but beyond that it locates a server based on a list. @@ -165,7 +165,7 @@ public interface ServerLocator extends AutoCloseable * Returns the blocking calls timeout. * <p> * If client's blocking calls to the server take more than this timeout, the call will throw a - * {@link org.apache.activemq6.api.core.HornetQException} with the code {@link org.apache.activemq6.api.core.HornetQExceptionType#CONNECTION_TIMEDOUT}. Value + * {@link org.apache.activemq.api.core.HornetQException} with the code {@link org.apache.activemq.api.core.HornetQExceptionType#CONNECTION_TIMEDOUT}. Value * is in milliseconds, default value is {@link HornetQClient#DEFAULT_CALL_TIMEOUT}. * * @return the blocking calls timeout @@ -397,7 +397,7 @@ public interface ServerLocator extends AutoCloseable * assign a group ID to the messages they sent. * <p> * if <code>true</code>, a random unique group ID is created and set on each message for the property - * {@link org.apache.activemq6.api.core.Message#HDR_GROUP_ID}. + * {@link org.apache.activemq.api.core.Message#HDR_GROUP_ID}. * Default value is {@link HornetQClient#DEFAULT_AUTO_GROUP}. * * @return whether producers will automatically assign a group ID to their messages @@ -414,7 +414,7 @@ public interface ServerLocator extends AutoCloseable ServerLocator setAutoGroup(boolean autoGroup); /** - * Returns the group ID that will be eventually set on each message for the property {@link org.apache.activemq6.api.core.Message#HDR_GROUP_ID}. + * Returns the group ID that will be eventually set on each message for the property {@link org.apache.activemq.api.core.Message#HDR_GROUP_ID}. * <p> * Default value is is {@code null} and no group ID will be set on the messages. * @@ -650,7 +650,7 @@ public interface ServerLocator extends AutoCloseable /** * Returns the class name of the connection load balancing policy. * <p> - * Default value is "org.apache.activemq6.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy". + * Default value is "org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy". * * @return the class name of the connection load balancing policy */ @@ -659,7 +659,7 @@ public interface ServerLocator extends AutoCloseable /** * Sets the class name of the connection load balancing policy. * <p> - * Value must be the name of a class implementing {@link org.apache.activemq6.api.core.client.loadbalance.ConnectionLoadBalancingPolicy}. + * Value must be the name of a class implementing {@link org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy}. * * @param loadBalancingPolicyClassName class name of the connection load balancing policy * @return this ServerLocator http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java index 82b317d..8317af2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.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.core.client; +package org.apache.activemq.api.core.client; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.core.remoting.FailureListener; /** * A SessionFailureListener notifies the client when a failure occurred on the session. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/TopologyMember.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/TopologyMember.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/TopologyMember.java index 4b442fd..e08eded 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/TopologyMember.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/TopologyMember.java @@ -13,12 +13,12 @@ /** * */ -package org.apache.activemq6.api.core.client; +package org.apache.activemq.api.core.client; import java.io.Serializable; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.spi.core.protocol.RemotingConnection; /** * A member of the topology. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java index adac722..5f2b621 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.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.core.client.loadbalance; +package org.apache.activemq.api.core.client.loadbalance; /** * A ConnectionLoadBalancingPolicy defines a policy to load balance between connections. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java index 98f7c39..82498c7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.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.core.client.loadbalance; +package org.apache.activemq.api.core.client.loadbalance; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java index 3935c6f..715ae78 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.core.client.loadbalance; +package org.apache.activemq.api.core.client.loadbalance; -import org.apache.activemq6.utils.Random; +import org.apache.activemq.utils.Random; /** * {@link RandomConnectionLoadBalancingPolicy#select(int)} returns a (pseudo) random integer between http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java index ca304e2..25322ba 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.core.client.loadbalance; +package org.apache.activemq.api.core.client.loadbalance; -import org.apache.activemq6.utils.Random; +import org.apache.activemq.utils.Random; /** * {@link RandomConnectionLoadBalancingPolicy#select(int)} chooses a the initial node randomly then subsequent requests return the same node http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java index 49a40b7..a8b87ca 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.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.core.client.loadbalance; +package org.apache.activemq.api.core.client.loadbalance; import java.io.Serializable; -import org.apache.activemq6.utils.Random; +import org.apache.activemq.utils.Random; /** * RoundRobinConnectionLoadBalancingPolicy corresponds to a round-robin load-balancing policy. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java index 59f8e18..d9f059e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java @@ -17,5 +17,5 @@ * HornetQ to load-balance client connections across * HornetQ servers. */ -package org.apache.activemq6.api.core.client.loadbalance; +package org.apache.activemq.api.core.client.loadbalance; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java index 4468e36..d76a779 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java @@ -15,5 +15,5 @@ * <br> * This package defines the API used by HornetQ clients to produce and consume messages. */ -package org.apache.activemq6.api.core.client; +package org.apache.activemq.api.core.client; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java index 753d443..4f05cac 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.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.core.management; +package org.apache.activemq.api.core.management; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressControl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressControl.java index 29ad3ac..e8be6b2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressControl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressControl.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.core.management; +package org.apache.activemq.api.core.management; import javax.management.MBeanOperationInfo; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressSettingsInfo.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressSettingsInfo.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressSettingsInfo.java index 5714c25..d5be28d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressSettingsInfo.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressSettingsInfo.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.core.management; +package org.apache.activemq.api.core.management; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.utils.json.JSONObject; /** * A AddressSettingsInfo http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java index 5faa8b6..938107c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.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.core.management; +package org.apache.activemq.api.core.management; /** @@ -42,7 +42,7 @@ public interface BridgeControl extends HornetQComponentControl String getFilterString(); /** - * Return the name of the org.apache.activemq6.core.server.cluster.Transformer implementation associated to this bridge. + * Return the name of the org.apache.activemq.core.server.cluster.Transformer implementation associated to this bridge. */ String getTransformerClassName(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java index cc6e7a1..2d857bd 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.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.core.management; +package org.apache.activemq.api.core.management; /** * A BroadcastGroupControl is used to manage a broadcast group. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java index a735978..8942f13 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.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.core.management; +package org.apache.activemq.api.core.management; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/CoreNotificationType.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/CoreNotificationType.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/CoreNotificationType.java index 03d807b..da89ccb 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/CoreNotificationType.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/CoreNotificationType.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.core.management; +package org.apache.activemq.api.core.management; /** * This enum defines all core notification types http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DayCounterInfo.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DayCounterInfo.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DayCounterInfo.java index 0b1f1d4..d8cfbdf 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DayCounterInfo.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DayCounterInfo.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.core.management; +package org.apache.activemq.api.core.management; import java.util.Arrays; -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; /** * Helper class to create Java Objects from the http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DivertControl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DivertControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DivertControl.java index b3a9e10..abf4418 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DivertControl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DivertControl.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.core.management; +package org.apache.activemq.api.core.management; /** * A DivertControl is used to manage a divert. @@ -53,7 +53,7 @@ public interface DivertControl String getForwardingAddress(); /** - * Return the name of the org.apache.activemq6.core.server.cluster.Transformer implementation associated to this bridge. + * Return the name of the org.apache.activemq.core.server.cluster.Transformer implementation associated to this bridge. */ String getTransformerClassName(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQComponentControl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQComponentControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQComponentControl.java index 00f773f..6733264 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQComponentControl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQComponentControl.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.core.management; +package org.apache.activemq.api.core.management; /** * A HornetQComponentControl is used to manage the life cycle of a HornetQ component. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java index 052d332..8c7e5c7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.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.core.management; +package org.apache.activemq.api.core.management; import javax.management.MBeanOperationInfo; @@ -38,7 +38,7 @@ public interface HornetQServerControl * Returns the list of interceptors used by this server. Invoking this method is the same as invoking * <code>getIncomingInterceptorClassNames().</code> * - * @see org.apache.activemq6.api.core.Interceptor + * @see org.apache.activemq.api.core.Interceptor * @deprecated As of HornetQ 2.3.0.Final, replaced by * {@link #getIncomingInterceptorClassNames()} and * {@link #getOutgoingInterceptorClassNames()} @@ -49,14 +49,14 @@ public interface HornetQServerControl /** * Returns the list of interceptors used by this server for incoming messages. * - * @see org.apache.activemq6.api.core.Interceptor + * @see org.apache.activemq.api.core.Interceptor */ String[] getIncomingInterceptorClassNames(); /** * Returns the list of interceptors used by this server for outgoing messages. * - * @see org.apache.activemq6.api.core.Interceptor + * @see org.apache.activemq.api.core.Interceptor */ String[] getOutgoingInterceptorClassNames(); @@ -316,7 +316,7 @@ public interface HornetQServerControl /** * Create a durable queue. * <br> - * This method throws a {@link org.apache.activemq6.api.core.HornetQQueueExistsException}) exception if the queue already exits. + * This method throws a {@link org.apache.activemq.api.core.HornetQQueueExistsException}) exception if the queue already exits. * * @param address address to bind the queue to * @param name name of the queue @@ -328,7 +328,7 @@ public interface HornetQServerControl /** * Create a queue. * <br> - * This method throws a {@link org.apache.activemq6.api.core.HornetQQueueExistsException}) exception if the queue already exits. + * This method throws a {@link org.apache.activemq.api.core.HornetQQueueExistsException}) exception if the queue already exits. * * @param address address to bind the queue to * @param name name of the queue @@ -344,7 +344,7 @@ public interface HornetQServerControl /** * Create a queue. * <br> - * This method throws a {@link org.apache.activemq6.api.core.HornetQQueueExistsException}) exception if the queue already exits. + * This method throws a {@link org.apache.activemq.api.core.HornetQQueueExistsException}) exception if the queue already exits. * * @param address address to bind the queue to * @param name name of the queue http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java index b0e980e..cad6844 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.api.core.management; +package org.apache.activemq.api.core.management; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.client.HornetQClientMessageBundle; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.client.HornetQClientMessageBundle; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; /** * Helper class to use HornetQ Core messages to manage server resources. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java index b281c23..0f94538 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.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.core.management; +package org.apache.activemq.api.core.management; /** * Types of notification emitted by HornetQ servers. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java index 6a821b8..26cca91 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.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.core.management; +package org.apache.activemq.api.core.management; import javax.management.ObjectName; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.SimpleString; /** * Helper class to build ObjectNames for HornetQ resources. @@ -157,7 +157,7 @@ public final class ObjectNameBuilder /** * Returns the ObjectName used by JMSServerControl. - * @see org.apache.activemq6.api.jms.management.JMSServerControl + * @see org.apache.activemq.api.jms.management.JMSServerControl */ public ObjectName getJMSServerObjectName() throws Exception { @@ -166,7 +166,7 @@ public final class ObjectNameBuilder /** * Returns the ObjectName used by JMSQueueControl. - * @see org.apache.activemq6.api.jms.management.JMSQueueControl + * @see org.apache.activemq.api.jms.management.JMSQueueControl */ public ObjectName getJMSQueueObjectName(final String name) throws Exception { @@ -185,7 +185,7 @@ public final class ObjectNameBuilder /** * Returns the ObjectName used by ConnectionFactoryControl. - * @see org.apache.activemq6.api.jms.management.ConnectionFactoryControl + * @see org.apache.activemq.api.jms.management.ConnectionFactoryControl */ public ObjectName getConnectionFactoryObjectName(final String name) throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Operation.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Operation.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Operation.java index 67388cc..581ef08 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Operation.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Operation.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.core.management; +package org.apache.activemq.api.core.management; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Parameter.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Parameter.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Parameter.java index 75834a5..eca98bd 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Parameter.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Parameter.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.core.management; +package org.apache.activemq.api.core.management; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/QueueControl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/QueueControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/QueueControl.java index e28e9bb..a217356 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/QueueControl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/QueueControl.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.core.management; +package org.apache.activemq.api.core.management; import javax.management.MBeanOperationInfo; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ResourceNames.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ResourceNames.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ResourceNames.java index 099038a..7fa4324 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ResourceNames.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ResourceNames.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.core.management; +package org.apache.activemq.api.core.management; /** * Helper class used to build resource names used by management messages. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/RoleInfo.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/RoleInfo.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/RoleInfo.java index f0070c9..c84ef4d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/RoleInfo.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/RoleInfo.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.core.management; +package org.apache.activemq.api.core.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
