diff --git a/hornetq-bootstrap/pom.xml b/activemq6-bootstrap/pom.xml similarity index 75% rename from hornetq-bootstrap/pom.xml rename to activemq6-bootstrap/pom.xml index 50befc183f..ce481541d4 100644 --- a/hornetq-bootstrap/pom.xml +++ b/activemq6-bootstrap/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-bootstrap + activemq6-bootstrap jar - HornetQ Bootstrap + ActiveMQ6 Bootstrap ${project.basedir}/.. @@ -18,18 +18,18 @@ - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-dto + org.apache.activemq6 + activemq6-dto ${project.version} diff --git a/hornetq-bootstrap/src/main/filtered-resources/org/hornetq/cli/banner.txt b/activemq6-bootstrap/src/main/filtered-resources/org/apache/activemq6/cli/banner.txt similarity index 100% rename from hornetq-bootstrap/src/main/filtered-resources/org/hornetq/cli/banner.txt rename to activemq6-bootstrap/src/main/filtered-resources/org/apache/activemq6/cli/banner.txt diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/cli/ConfigurationException.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/ConfigurationException.java similarity index 95% rename from hornetq-bootstrap/src/main/java/org/hornetq/cli/ConfigurationException.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/ConfigurationException.java index 5f53bbbdab..c4b39eaaef 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/cli/ConfigurationException.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/ConfigurationException.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.cli; +package org.apache.activemq6.cli; public class ConfigurationException extends Exception { diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/cli/HornetQ.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/HornetQ.java similarity index 88% rename from hornetq-bootstrap/src/main/java/org/hornetq/cli/HornetQ.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/HornetQ.java index d2e260e99f..e1f102ef6d 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/cli/HornetQ.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/HornetQ.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.cli; +package org.apache.activemq6.cli; import io.airlift.command.Cli; import io.airlift.command.ParseArgumentsUnexpectedException; -import org.hornetq.cli.commands.Action; -import org.hornetq.cli.commands.ActionContext; -import org.hornetq.cli.commands.HelpAction; -import org.hornetq.cli.commands.Run; -import org.hornetq.cli.commands.Stop; +import org.apache.activemq6.cli.commands.Action; +import org.apache.activemq6.cli.commands.ActionContext; +import org.apache.activemq6.cli.commands.HelpAction; +import org.apache.activemq6.cli.commands.Run; +import org.apache.activemq6.cli.commands.Stop; import java.io.InputStream; import java.io.OutputStream; diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/Action.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Action.java similarity index 94% rename from hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/Action.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Action.java index bf7999411a..48dc98b54e 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/Action.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Action.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.cli.commands; +package org.apache.activemq6.cli.commands; public interface Action { diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/ActionContext.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/ActionContext.java similarity index 96% rename from hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/ActionContext.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/ActionContext.java index c31bd88f55..abc7f9c176 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/ActionContext.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/ActionContext.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.cli.commands; +package org.apache.activemq6.cli.commands; import java.io.InputStream; import java.io.PrintStream; diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/HelpAction.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/HelpAction.java similarity index 95% rename from hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/HelpAction.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/HelpAction.java index d87e8592a5..f6a79c3d98 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/HelpAction.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/HelpAction.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.cli.commands; +package org.apache.activemq6.cli.commands; import io.airlift.command.Help; diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/Run.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Run.java similarity index 82% rename from hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/Run.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Run.java index c385524d89..d838aefc3e 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/Run.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Run.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.cli.commands; +package org.apache.activemq6.cli.commands; import io.airlift.command.Arguments; import io.airlift.command.Command; -import org.hornetq.cli.HornetQ; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.dto.BrokerDTO; -import org.hornetq.factory.BrokerFactory; -import org.hornetq.factory.CoreFactory; -import org.hornetq.factory.JmsFactory; -import org.hornetq.factory.SecurityManagerFactory; -import org.hornetq.integration.bootstrap.HornetQBootstrapLogger; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.jms.server.impl.StandaloneNamingServer; -import org.hornetq.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.cli.HornetQ; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.dto.BrokerDTO; +import org.apache.activemq6.factory.BrokerFactory; +import org.apache.activemq6.factory.CoreFactory; +import org.apache.activemq6.factory.JmsFactory; +import org.apache.activemq6.factory.SecurityManagerFactory; +import org.apache.activemq6.integration.bootstrap.HornetQBootstrapLogger; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.jms.server.impl.StandaloneNamingServer; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; import javax.management.MBeanServer; diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/Stop.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Stop.java similarity index 91% rename from hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/Stop.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Stop.java index 14785070c8..684f37ad8f 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/cli/commands/Stop.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Stop.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.cli.commands; +package org.apache.activemq6.cli.commands; import io.airlift.command.Arguments; import io.airlift.command.Command; -import org.hornetq.dto.BrokerDTO; -import org.hornetq.factory.BrokerFactory; +import org.apache.activemq6.dto.BrokerDTO; +import org.apache.activemq6.factory.BrokerFactory; import java.io.File; diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/factory/BrokerFactory.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/BrokerFactory.java similarity index 87% rename from hornetq-bootstrap/src/main/java/org/hornetq/factory/BrokerFactory.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/BrokerFactory.java index 723b8f4566..b713e42ccd 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/factory/BrokerFactory.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/BrokerFactory.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.factory; +package org.apache.activemq6.factory; -import org.hornetq.cli.ConfigurationException; -import org.hornetq.dto.BrokerDTO; -import org.hornetq.utils.FactoryFinder; +import org.apache.activemq6.cli.ConfigurationException; +import org.apache.activemq6.dto.BrokerDTO; +import org.apache.activemq6.utils.FactoryFinder; import java.io.IOException; import java.net.URI; @@ -32,7 +32,7 @@ public class BrokerFactory BrokerFactoryHandler factory = null; try { - FactoryFinder finder = new FactoryFinder("META-INF/services/org/hornetq/broker/"); + FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq6/broker/"); factory = (BrokerFactoryHandler)finder.newInstance(configURI.getScheme()); } catch (IOException ioe ) diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/factory/BrokerFactoryHandler.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/BrokerFactoryHandler.java similarity index 90% rename from hornetq-bootstrap/src/main/java/org/hornetq/factory/BrokerFactoryHandler.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/BrokerFactoryHandler.java index 68afb4bff6..ff107ef473 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/factory/BrokerFactoryHandler.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/BrokerFactoryHandler.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.factory; +package org.apache.activemq6.factory; -import org.hornetq.dto.BrokerDTO; +import org.apache.activemq6.dto.BrokerDTO; import java.net.URI; diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/factory/CoreFactory.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/CoreFactory.java similarity index 80% rename from hornetq-bootstrap/src/main/java/org/hornetq/factory/CoreFactory.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/CoreFactory.java index d03cc97850..0a8f6139d2 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/factory/CoreFactory.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/CoreFactory.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.factory; +package org.apache.activemq6.factory; -import org.hornetq.cli.ConfigurationException; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.dto.CoreDTO; -import org.hornetq.utils.FactoryFinder; +import org.apache.activemq6.cli.ConfigurationException; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.dto.CoreDTO; +import org.apache.activemq6.utils.FactoryFinder; import java.io.IOException; import java.net.URI; @@ -31,7 +31,7 @@ public class CoreFactory URI configURI = new URI(core.configuration.replace("\\", "/")); try { - FactoryFinder finder = new FactoryFinder("META-INF/services/org/hornetq/broker/core/"); + FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq6/broker/core/"); factory = (CoreFactoryHandler)finder.newInstance(configURI.getScheme()); } catch (IOException ioe ) diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/factory/CoreFactoryHandler.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/CoreFactoryHandler.java similarity index 89% rename from hornetq-bootstrap/src/main/java/org/hornetq/factory/CoreFactoryHandler.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/CoreFactoryHandler.java index bec7c8556b..0f5dccf2c2 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/factory/CoreFactoryHandler.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/CoreFactoryHandler.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.factory; +package org.apache.activemq6.factory; -import org.hornetq.core.config.Configuration; +import org.apache.activemq6.core.config.Configuration; import java.net.URI; diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/factory/FileCoreFactoryHandler.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/FileCoreFactoryHandler.java similarity index 86% rename from hornetq-bootstrap/src/main/java/org/hornetq/factory/FileCoreFactoryHandler.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/FileCoreFactoryHandler.java index 76edad7ff0..5f693b17c6 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/factory/FileCoreFactoryHandler.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/FileCoreFactoryHandler.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.factory; +package org.apache.activemq6.factory; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.FileConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.FileConfiguration; import java.net.URI; diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/factory/FileJmsFactoryHandler.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/FileJmsFactoryHandler.java similarity index 86% rename from hornetq-bootstrap/src/main/java/org/hornetq/factory/FileJmsFactoryHandler.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/FileJmsFactoryHandler.java index dc280360dd..57cf1a1c84 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/factory/FileJmsFactoryHandler.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/FileJmsFactoryHandler.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.factory; +package org.apache.activemq6.factory; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.impl.JMSServerConfigParserImpl; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.impl.JMSServerConfigParserImpl; import java.io.FileInputStream; import java.io.InputStream; diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/factory/JmsFactory.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/JmsFactory.java similarity index 82% rename from hornetq-bootstrap/src/main/java/org/hornetq/factory/JmsFactory.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/JmsFactory.java index 755ce5890b..0d97ddf8e4 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/factory/JmsFactory.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/JmsFactory.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.factory; +package org.apache.activemq6.factory; import java.io.IOException; import java.net.URI; -import org.hornetq.cli.ConfigurationException; -import org.hornetq.dto.JmsDTO; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.utils.FactoryFinder; +import org.apache.activemq6.cli.ConfigurationException; +import org.apache.activemq6.dto.JmsDTO; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.utils.FactoryFinder; public class JmsFactory { @@ -30,7 +30,7 @@ public class JmsFactory URI configURI = new URI(jms.configuration.replace("\\", "/")); try { - FactoryFinder finder = new FactoryFinder("META-INF/services/org/hornetq/broker/jms/"); + FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq6/broker/jms/"); factory = (JmsFactoryHandler)finder.newInstance(configURI.getScheme()); } catch (IOException ioe ) diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/factory/JmsFactoryHandler.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/JmsFactoryHandler.java similarity index 88% rename from hornetq-bootstrap/src/main/java/org/hornetq/factory/JmsFactoryHandler.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/JmsFactoryHandler.java index 0a1bbd55ad..b5772cca68 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/factory/JmsFactoryHandler.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/JmsFactoryHandler.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.factory; +package org.apache.activemq6.factory; -import org.hornetq.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.JMSConfiguration; import java.net.URI; diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/factory/SecurityManagerFactory.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/SecurityManagerFactory.java similarity index 83% rename from hornetq-bootstrap/src/main/java/org/hornetq/factory/SecurityManagerFactory.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/SecurityManagerFactory.java index c1ad22181e..0138670e81 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/factory/SecurityManagerFactory.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/SecurityManagerFactory.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.factory; +package org.apache.activemq6.factory; -import org.hornetq.dto.SecurityDTO; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.utils.FactoryFinder; +import org.apache.activemq6.dto.SecurityDTO; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.utils.FactoryFinder; import javax.xml.bind.annotation.XmlRootElement; @@ -25,7 +25,7 @@ public class SecurityManagerFactory { if (config != null) { - FactoryFinder finder = new FactoryFinder("META-INF/services/org/hornetq/security/"); + FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq6/security/"); HornetQSecurityManager manager = (HornetQSecurityManager)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name()); return manager; } diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/factory/XmlBrokerFactoryHandler.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/XmlBrokerFactoryHandler.java similarity index 85% rename from hornetq-bootstrap/src/main/java/org/hornetq/factory/XmlBrokerFactoryHandler.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/XmlBrokerFactoryHandler.java index ffb37b9fe6..2512c6847b 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/factory/XmlBrokerFactoryHandler.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/XmlBrokerFactoryHandler.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.factory; +package org.apache.activemq6.factory; -import org.hornetq.cli.ConfigurationException; -import org.hornetq.dto.BrokerDTO; -import org.hornetq.dto.XmlUtil; +import org.apache.activemq6.cli.ConfigurationException; +import org.apache.activemq6.dto.BrokerDTO; +import org.apache.activemq6.dto.XmlUtil; import java.io.File; import java.net.URI; diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/integration/bootstrap/HornetQBootstrapBundle.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/integration/bootstrap/HornetQBootstrapBundle.java similarity index 94% rename from hornetq-bootstrap/src/main/java/org/hornetq/integration/bootstrap/HornetQBootstrapBundle.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/integration/bootstrap/HornetQBootstrapBundle.java index 9cf37a687f..cab0b187ba 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/integration/bootstrap/HornetQBootstrapBundle.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/integration/bootstrap/HornetQBootstrapBundle.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.bootstrap; +package org.apache.activemq6.integration.bootstrap; import org.jboss.logging.annotations.MessageBundle; diff --git a/hornetq-bootstrap/src/main/java/org/hornetq/integration/bootstrap/HornetQBootstrapLogger.java b/activemq6-bootstrap/src/main/java/org/apache/activemq6/integration/bootstrap/HornetQBootstrapLogger.java similarity index 98% rename from hornetq-bootstrap/src/main/java/org/hornetq/integration/bootstrap/HornetQBootstrapLogger.java rename to activemq6-bootstrap/src/main/java/org/apache/activemq6/integration/bootstrap/HornetQBootstrapLogger.java index a42675258f..e862ba2eba 100644 --- a/hornetq-bootstrap/src/main/java/org/hornetq/integration/bootstrap/HornetQBootstrapLogger.java +++ b/activemq6-bootstrap/src/main/java/org/apache/activemq6/integration/bootstrap/HornetQBootstrapLogger.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.integration.bootstrap; +package org.apache.activemq6.integration.bootstrap; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/hornetq-bootstrap/src/main/resources/META-INF/services/org/hornetq/broker/core/file b/activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/core/file similarity index 100% rename from hornetq-bootstrap/src/main/resources/META-INF/services/org/hornetq/broker/core/file rename to activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/core/file diff --git a/hornetq-bootstrap/src/main/resources/META-INF/services/org/hornetq/broker/jms/file b/activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/jms/file similarity index 100% rename from hornetq-bootstrap/src/main/resources/META-INF/services/org/hornetq/broker/jms/file rename to activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/jms/file diff --git a/hornetq-bootstrap/src/main/resources/META-INF/services/org/hornetq/broker/xml b/activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/xml similarity index 100% rename from hornetq-bootstrap/src/main/resources/META-INF/services/org/hornetq/broker/xml rename to activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/xml diff --git a/hornetq-commons/pom.xml b/activemq6-commons/pom.xml similarity index 82% rename from hornetq-commons/pom.xml rename to activemq6-commons/pom.xml index 8aa97242d4..8b7651ba02 100644 --- a/hornetq-commons/pom.xml +++ b/activemq6-commons/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-commons + activemq6-commons jar - HornetQ Commons + ActiveMQ6 Commons ${project.basedir}/.. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQAddressExistsException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAddressExistsException.java similarity index 90% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQAddressExistsException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAddressExistsException.java index 83ebaed896..16154cd40c 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQAddressExistsException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAddressExistsException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.ADDRESS_EXISTS; +import static org.apache.activemq6.api.core.HornetQExceptionType.ADDRESS_EXISTS; /** * An operation failed because an address exists on the server. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQAddressFullException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAddressFullException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQAddressFullException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAddressFullException.java index 2550304d39..e3c1a63180 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQAddressFullException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAddressFullException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.ADDRESS_FULL; +import static org.apache.activemq6.api.core.HornetQExceptionType.ADDRESS_FULL; /** * An address is full. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQAlreadyReplicatingException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAlreadyReplicatingException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQAlreadyReplicatingException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAlreadyReplicatingException.java index 86ef2dbca7..a2a60bf23a 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQAlreadyReplicatingException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAlreadyReplicatingException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.ALREADY_REPLICATING; +import static org.apache.activemq6.api.core.HornetQExceptionType.ALREADY_REPLICATING; /** * The server is already paired with a replicating backup. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQBuffer.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQBuffer.java similarity index 99% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQBuffer.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQBuffer.java index b4d6d271b3..97fd810b35 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQBuffer.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQBuffer.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; import java.nio.ByteBuffer; diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQBuffers.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQBuffers.java similarity index 96% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQBuffers.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQBuffers.java index 2f63d261df..18e3a6cfb5 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQBuffers.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQBuffers.java @@ -11,12 +11,12 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; import java.nio.ByteBuffer; import io.netty.buffer.Unpooled; -import org.hornetq.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper; /** * Factory class to create instances of {@link HornetQBuffer}. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQClusterSecurityException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQClusterSecurityException.java similarity index 96% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQClusterSecurityException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQClusterSecurityException.java index 34b523fa65..b75957a835 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQClusterSecurityException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQClusterSecurityException.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; /** * Security exception thrown when the cluster user fails authentication. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQConnectionTimedOutException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQConnectionTimedOutException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQConnectionTimedOutException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQConnectionTimedOutException.java index d52457f907..ff440dae68 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQConnectionTimedOutException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQConnectionTimedOutException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.CONNECTION_TIMEDOUT; +import static org.apache.activemq6.api.core.HornetQExceptionType.CONNECTION_TIMEDOUT; /** * A client timed out will connecting to HornetQ server. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQDisconnectedException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDisconnectedException.java similarity index 90% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQDisconnectedException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDisconnectedException.java index 54536c0cdc..6c7d6d27a3 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQDisconnectedException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDisconnectedException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.DISCONNECTED; +import static org.apache.activemq6.api.core.HornetQExceptionType.DISCONNECTED; /** * A client was disconnected from HornetQ server when the server has shut down. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQDuplicateIdException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDuplicateIdException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQDuplicateIdException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDuplicateIdException.java index cc9d176d33..f4cc95d1e2 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQDuplicateIdException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDuplicateIdException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.DUPLICATE_ID_REJECTED; +import static org.apache.activemq6.api.core.HornetQExceptionType.DUPLICATE_ID_REJECTED; /** * A DuplicateID was rejected. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQDuplicateMetaDataException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDuplicateMetaDataException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQDuplicateMetaDataException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDuplicateMetaDataException.java index f1549fe3ad..d1bdd83152 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQDuplicateMetaDataException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDuplicateMetaDataException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.DUPLICATE_METADATA; +import static org.apache.activemq6.api.core.HornetQExceptionType.DUPLICATE_METADATA; /** * A Session Metadata was set in duplication diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQException.java similarity index 98% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQException.java index 26a7f543ea..ec93477324 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQException.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; /** * HornetQException is the root exception for the HornetQ API. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQExceptionType.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQExceptionType.java similarity index 99% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQExceptionType.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQExceptionType.java index 830fa1c9f2..c30890db68 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQExceptionType.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQExceptionType.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; import java.util.Collections; import java.util.EnumSet; diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQIOErrorException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIOErrorException.java similarity index 91% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQIOErrorException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIOErrorException.java index 225fe723d5..c68da1a56b 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQIOErrorException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIOErrorException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.IO_ERROR; +import static org.apache.activemq6.api.core.HornetQExceptionType.IO_ERROR; /** * Unexpected I/O error occurred on the server. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQIllegalStateException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIllegalStateException.java similarity index 90% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQIllegalStateException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIllegalStateException.java index eca86a6cee..570a9d20e5 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQIllegalStateException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIllegalStateException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.ILLEGAL_STATE; +import static org.apache.activemq6.api.core.HornetQExceptionType.ILLEGAL_STATE; /** * A HornetQ resource is not in a legal state (e.g. calling ClientConsumer.receive() if a diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQIncompatibleClientServerException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIncompatibleClientServerException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQIncompatibleClientServerException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIncompatibleClientServerException.java index 7be96bc4ed..087c34118d 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQIncompatibleClientServerException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIncompatibleClientServerException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS; +import static org.apache.activemq6.api.core.HornetQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS; /** * The server version and the client version are incompatible. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInterceptorRejectedPacketException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterceptorRejectedPacketException.java similarity index 82% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInterceptorRejectedPacketException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterceptorRejectedPacketException.java index dccc16f028..e426d63bf2 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInterceptorRejectedPacketException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterceptorRejectedPacketException.java @@ -11,13 +11,13 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.INTERCEPTOR_REJECTED_PACKET; +import static org.apache.activemq6.api.core.HornetQExceptionType.INTERCEPTOR_REJECTED_PACKET; /** * An outgoing interceptor returned false. - * @see org.hornetq.api.core.client.ServerLocator#addOutgoingInterceptor(org.hornetq.api.core.Interceptor) + * @see org.apache.activemq6.api.core.client.ServerLocator#addOutgoingInterceptor(org.hornetq.api.core.Interceptor) * @author Justin Bertram */ // XXX I doubt any reader will make much sense of this Javadoc's text. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInternalErrorException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInternalErrorException.java similarity index 91% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInternalErrorException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInternalErrorException.java index fc0930927a..d52a5ff91e 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInternalErrorException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInternalErrorException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.INTERNAL_ERROR; +import static org.apache.activemq6.api.core.HornetQExceptionType.INTERNAL_ERROR; /** * Internal error which prevented HornetQ from performing an important operation. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInterruptedException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterruptedException.java similarity index 96% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInterruptedException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterruptedException.java index 9fb95d7533..c6575cf527 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInterruptedException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterruptedException.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; /** * When an interruption happens, we will just throw a non-checked exception. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInvalidFilterExpressionException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInvalidFilterExpressionException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInvalidFilterExpressionException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInvalidFilterExpressionException.java index 0dac654549..fd8d44b4cc 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInvalidFilterExpressionException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInvalidFilterExpressionException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.INVALID_FILTER_EXPRESSION; +import static org.apache.activemq6.api.core.HornetQExceptionType.INVALID_FILTER_EXPRESSION; /** * A filter expression was found to be invalid. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInvalidTransientQueueUseException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInvalidTransientQueueUseException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInvalidTransientQueueUseException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInvalidTransientQueueUseException.java index 302e7c2496..44c474a25d 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQInvalidTransientQueueUseException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInvalidTransientQueueUseException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.INVALID_TRANSIENT_QUEUE_USE; +import static org.apache.activemq6.api.core.HornetQExceptionType.INVALID_TRANSIENT_QUEUE_USE; /** * An operation failed because a queue exists on the server. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQLargeMessageException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQLargeMessageException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQLargeMessageException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQLargeMessageException.java index 626dada3d2..67354039b6 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQLargeMessageException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQLargeMessageException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.LARGE_MESSAGE_ERROR_BODY; +import static org.apache.activemq6.api.core.HornetQExceptionType.LARGE_MESSAGE_ERROR_BODY; /** * A problem occurred while manipulating the body of a large message. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQLargeMessageInterruptedException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQLargeMessageInterruptedException.java similarity index 88% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQLargeMessageInterruptedException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQLargeMessageInterruptedException.java index 6ce19d8317..0c8334b0c8 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQLargeMessageInterruptedException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQLargeMessageInterruptedException.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.LARGE_MESSAGE_INTERRUPTED; +import static org.apache.activemq6.api.core.HornetQExceptionType.LARGE_MESSAGE_INTERRUPTED; /** * @author Clebert diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQNativeIOError.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNativeIOError.java similarity index 96% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQNativeIOError.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNativeIOError.java index e7c24cf8d9..eb821a2439 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQNativeIOError.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNativeIOError.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; /** diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQNonExistentQueueException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNonExistentQueueException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQNonExistentQueueException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNonExistentQueueException.java index b2924910d2..2b333535e6 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQNonExistentQueueException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNonExistentQueueException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.QUEUE_DOES_NOT_EXIST; +import static org.apache.activemq6.api.core.HornetQExceptionType.QUEUE_DOES_NOT_EXIST; /** * An operation failed because a queue does not exist on the server. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQNotConnectedException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNotConnectedException.java similarity index 90% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQNotConnectedException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNotConnectedException.java index f6329ff17a..ededf30108 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQNotConnectedException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNotConnectedException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.NOT_CONNECTED; +import static org.apache.activemq6.api.core.HornetQExceptionType.NOT_CONNECTED; /** * A client is not able to connect to HornetQ server. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQObjectClosedException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQObjectClosedException.java similarity index 90% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQObjectClosedException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQObjectClosedException.java index bfc8c6be9e..3923cdb4fd 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQObjectClosedException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQObjectClosedException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.OBJECT_CLOSED; +import static org.apache.activemq6.api.core.HornetQExceptionType.OBJECT_CLOSED; /** * A client operation failed because the calling resource (ClientSession, ClientProducer, etc.) is diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQPropertyConversionException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQPropertyConversionException.java similarity index 83% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQPropertyConversionException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQPropertyConversionException.java index f56ac51d10..320489d987 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQPropertyConversionException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQPropertyConversionException.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; /** - * A PropertyConversionException is thrown by {@code org.hornetq.api.core.Message} methods when a + * A PropertyConversionException is thrown by {@code org.apache.activemq6.api.core.Message} methods when a * property can not be converted to the expected type. * @author Jeff Mesnil - * @see org.hornetq.api.core.Message + * @see org.apache.activemq6.api.core.Message */ public final class HornetQPropertyConversionException extends RuntimeException { diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQQueueExistsException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQQueueExistsException.java similarity index 90% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQQueueExistsException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQQueueExistsException.java index 8e9343824e..8dc26f4cb8 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQQueueExistsException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQQueueExistsException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.QUEUE_EXISTS; +import static org.apache.activemq6.api.core.HornetQExceptionType.QUEUE_EXISTS; /** * An operation failed because a queue exists on the server. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQSecurityException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQSecurityException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQSecurityException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQSecurityException.java index ae3f0efb13..f5f46f3fdc 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQSecurityException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQSecurityException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.SECURITY_EXCEPTION; +import static org.apache.activemq6.api.core.HornetQExceptionType.SECURITY_EXCEPTION; /** * A security problem occurred (authentication issues, permission issues,...) diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQSessionCreationException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQSessionCreationException.java similarity index 90% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQSessionCreationException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQSessionCreationException.java index e42b2728cc..b2191a8253 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQSessionCreationException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQSessionCreationException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.SESSION_CREATION_REJECTED; +import static org.apache.activemq6.api.core.HornetQExceptionType.SESSION_CREATION_REJECTED; /** * The creation of a session was rejected by the server (e.g. if the server is starting and has not diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQTransactionOutcomeUnknownException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQTransactionOutcomeUnknownException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQTransactionOutcomeUnknownException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQTransactionOutcomeUnknownException.java index 83587a25ed..c3f55852aa 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQTransactionOutcomeUnknownException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQTransactionOutcomeUnknownException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.TRANSACTION_OUTCOME_UNKNOWN; +import static org.apache.activemq6.api.core.HornetQExceptionType.TRANSACTION_OUTCOME_UNKNOWN; /** * The outcome of a transaction is unknown. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQTransactionRolledBackException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQTransactionRolledBackException.java similarity index 89% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQTransactionRolledBackException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQTransactionRolledBackException.java index 818702b83f..d5687804e5 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQTransactionRolledBackException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQTransactionRolledBackException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.TRANSACTION_ROLLED_BACK; +import static org.apache.activemq6.api.core.HornetQExceptionType.TRANSACTION_ROLLED_BACK; /** * A transaction was rolled back. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQUnBlockedException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQUnBlockedException.java similarity index 90% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQUnBlockedException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQUnBlockedException.java index dc9ab1a72d..f8ff6f7783 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQUnBlockedException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQUnBlockedException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.UNBLOCKED; +import static org.apache.activemq6.api.core.HornetQExceptionType.UNBLOCKED; /** * A blocking call from a client was unblocked during failover. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQUnsupportedPacketException.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQUnsupportedPacketException.java similarity index 90% rename from hornetq-commons/src/main/java/org/hornetq/api/core/HornetQUnsupportedPacketException.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQUnsupportedPacketException.java index f0dfc06f86..7544832f0e 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQUnsupportedPacketException.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQUnsupportedPacketException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; -import static org.hornetq.api.core.HornetQExceptionType.UNSUPPORTED_PACKET; +import static org.apache.activemq6.api.core.HornetQExceptionType.UNSUPPORTED_PACKET; /** * A packet of unsupported type was received by HornetQ PacketHandler. diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/Pair.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/Pair.java similarity index 98% rename from hornetq-commons/src/main/java/org/hornetq/api/core/Pair.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/Pair.java index 9cf8f72fbe..74b38049ff 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/Pair.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/Pair.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; import java.io.Serializable; diff --git a/hornetq-commons/src/main/java/org/hornetq/api/core/SimpleString.java b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/SimpleString.java similarity index 99% rename from hornetq-commons/src/main/java/org/hornetq/api/core/SimpleString.java rename to activemq6-commons/src/main/java/org/apache/activemq6/api/core/SimpleString.java index 4eb0f3a715..1c6242348b 100644 --- a/hornetq-commons/src/main/java/org/hornetq/api/core/SimpleString.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/api/core/SimpleString.java @@ -11,13 +11,13 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.utils.DataConstants; /** * A simple String class that can store all characters, and stores as simple {@code byte[]}, this diff --git a/hornetq-commons/src/main/java/org/hornetq/core/buffers/impl/ChannelBufferWrapper.java b/activemq6-commons/src/main/java/org/apache/activemq6/core/buffers/impl/ChannelBufferWrapper.java similarity index 98% rename from hornetq-commons/src/main/java/org/hornetq/core/buffers/impl/ChannelBufferWrapper.java rename to activemq6-commons/src/main/java/org/apache/activemq6/core/buffers/impl/ChannelBufferWrapper.java index 689f234044..8f7336c50f 100644 --- a/hornetq-commons/src/main/java/org/hornetq/core/buffers/impl/ChannelBufferWrapper.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/core/buffers/impl/ChannelBufferWrapper.java @@ -11,16 +11,16 @@ * permissions and limitations under the License. */ -package org.hornetq.core.buffers.impl; +package org.apache.activemq6.core.buffers.impl; import java.nio.ByteBuffer; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.utils.DataConstants; -import org.hornetq.utils.UTF8Util; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq6.utils.UTF8Util; /** * A ChannelBufferWrapper diff --git a/hornetq-commons/src/main/java/org/hornetq/core/server/HornetQComponent.java b/activemq6-commons/src/main/java/org/apache/activemq6/core/server/HornetQComponent.java similarity index 92% rename from hornetq-commons/src/main/java/org/hornetq/core/server/HornetQComponent.java rename to activemq6-commons/src/main/java/org/apache/activemq6/core/server/HornetQComponent.java index 1c57745e74..95a5fdd22c 100644 --- a/hornetq-commons/src/main/java/org/hornetq/core/server/HornetQComponent.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/core/server/HornetQComponent.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; /** * A HornetQComponent diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/Base64.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/Base64.java similarity index 99% rename from hornetq-commons/src/main/java/org/hornetq/utils/Base64.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/Base64.java index dab0a744ae..766e34c95b 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/Base64.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/Base64.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/ByteUtil.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ByteUtil.java similarity index 98% rename from hornetq-commons/src/main/java/org/hornetq/utils/ByteUtil.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/ByteUtil.java index 20285e13ed..4dee08b7f3 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/ByteUtil.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ByteUtil.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/ClassloadingUtil.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ClassloadingUtil.java similarity index 99% rename from hornetq-commons/src/main/java/org/hornetq/utils/ClassloadingUtil.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/ClassloadingUtil.java index fb6665b6b0..6390663992 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/ClassloadingUtil.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ClassloadingUtil.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.net.URL; diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/ConcurrentHashSet.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ConcurrentHashSet.java similarity index 98% rename from hornetq-commons/src/main/java/org/hornetq/utils/ConcurrentHashSet.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/ConcurrentHashSet.java index fe6545accd..742b710cba 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/ConcurrentHashSet.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ConcurrentHashSet.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.AbstractSet; import java.util.Iterator; diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/ConcurrentSet.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ConcurrentSet.java similarity index 95% rename from hornetq-commons/src/main/java/org/hornetq/utils/ConcurrentSet.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/ConcurrentSet.java index a0557cd70a..dab80ace7d 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/ConcurrentSet.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ConcurrentSet.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.Set; diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/DataConstants.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/DataConstants.java similarity index 97% rename from hornetq-commons/src/main/java/org/hornetq/utils/DataConstants.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/DataConstants.java index d902cc93de..790f2197e3 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/DataConstants.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/DataConstants.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; /** * diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/DefaultSensitiveStringCodec.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/DefaultSensitiveStringCodec.java similarity index 98% rename from hornetq-commons/src/main/java/org/hornetq/utils/DefaultSensitiveStringCodec.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/DefaultSensitiveStringCodec.java index 51ba4b074c..d7d0326330 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/DefaultSensitiveStringCodec.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/DefaultSensitiveStringCodec.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.math.BigInteger; import java.security.InvalidKeyException; diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/FactoryFinder.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/FactoryFinder.java similarity index 97% rename from hornetq-commons/src/main/java/org/hornetq/utils/FactoryFinder.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/FactoryFinder.java index a057656536..ffd07269b0 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/FactoryFinder.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/FactoryFinder.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.io.BufferedInputStream; import java.io.IOException; @@ -23,7 +23,7 @@ public class FactoryFinder /** * The strategy that the FactoryFinder uses to find load and instantiate Objects * can be changed out by calling the - * {@link org.hornetq.utils.FactoryFinder#setObjectFactory(org.hornetq.utils.FactoryFinder.ObjectFactory)} + * {@link org.apache.activemq6.utils.FactoryFinder#setObjectFactory(org.hornetq.utils.FactoryFinder.ObjectFactory)} * method with a custom implementation of ObjectFactory. *

* The default ObjectFactory is typically changed out when running in a specialized container diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/HornetQThreadFactory.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQThreadFactory.java similarity index 98% rename from hornetq-commons/src/main/java/org/hornetq/utils/HornetQThreadFactory.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQThreadFactory.java index be16d4ca71..68341d3397 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/HornetQThreadFactory.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQThreadFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/HornetQUtilBundle.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQUtilBundle.java similarity index 94% rename from hornetq-commons/src/main/java/org/hornetq/utils/HornetQUtilBundle.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQUtilBundle.java index a5869251f6..42fc4c6ae4 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/HornetQUtilBundle.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQUtilBundle.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; -import org.hornetq.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.HornetQIllegalStateException; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/HornetQUtilLogger.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQUtilLogger.java similarity index 97% rename from hornetq-commons/src/main/java/org/hornetq/utils/HornetQUtilLogger.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQUtilLogger.java index 456ced9ea6..5149f2a407 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/HornetQUtilLogger.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQUtilLogger.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/PasswordMaskingUtil.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/PasswordMaskingUtil.java similarity index 94% rename from hornetq-commons/src/main/java/org/hornetq/utils/PasswordMaskingUtil.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/PasswordMaskingUtil.java index ccadfa7747..c6b5052290 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/PasswordMaskingUtil.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/PasswordMaskingUtil.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; /** * A PasswordMarkingUtil diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/ReferenceCounter.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ReferenceCounter.java similarity index 95% rename from hornetq-commons/src/main/java/org/hornetq/utils/ReferenceCounter.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/ReferenceCounter.java index 8a1ddf8b10..bbf887fb02 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/ReferenceCounter.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ReferenceCounter.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; /** * @author Clebert Suconic diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/ReferenceCounterUtil.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ReferenceCounterUtil.java similarity index 97% rename from hornetq-commons/src/main/java/org/hornetq/utils/ReferenceCounterUtil.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/ReferenceCounterUtil.java index 55f2a813f0..eed841ab97 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/ReferenceCounterUtil.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ReferenceCounterUtil.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/ReusableLatch.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ReusableLatch.java similarity index 99% rename from hornetq-commons/src/main/java/org/hornetq/utils/ReusableLatch.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/ReusableLatch.java index da61564525..deecfd1982 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/ReusableLatch.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/ReusableLatch.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.AbstractQueuedSynchronizer; diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/SensitiveDataCodec.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/SensitiveDataCodec.java similarity index 96% rename from hornetq-commons/src/main/java/org/hornetq/utils/SensitiveDataCodec.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/SensitiveDataCodec.java index 4cfe6a72de..0bf6c5290d 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/SensitiveDataCodec.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/SensitiveDataCodec.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.Map; diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/TypedProperties.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/TypedProperties.java similarity index 97% rename from hornetq-commons/src/main/java/org/hornetq/utils/TypedProperties.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/TypedProperties.java index d970ebdc62..6e5d54d269 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/TypedProperties.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/TypedProperties.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.nio.ByteBuffer; import java.util.Collections; @@ -20,21 +20,21 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQPropertyConversionException; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQPropertyConversionException; +import org.apache.activemq6.api.core.SimpleString; -import static org.hornetq.utils.DataConstants.BOOLEAN; -import static org.hornetq.utils.DataConstants.BYTE; -import static org.hornetq.utils.DataConstants.BYTES; -import static org.hornetq.utils.DataConstants.CHAR; -import static org.hornetq.utils.DataConstants.DOUBLE; -import static org.hornetq.utils.DataConstants.FLOAT; -import static org.hornetq.utils.DataConstants.INT; -import static org.hornetq.utils.DataConstants.LONG; -import static org.hornetq.utils.DataConstants.NULL; -import static org.hornetq.utils.DataConstants.SHORT; -import static org.hornetq.utils.DataConstants.STRING; +import static org.apache.activemq6.utils.DataConstants.BOOLEAN; +import static org.apache.activemq6.utils.DataConstants.BYTE; +import static org.apache.activemq6.utils.DataConstants.BYTES; +import static org.apache.activemq6.utils.DataConstants.CHAR; +import static org.apache.activemq6.utils.DataConstants.DOUBLE; +import static org.apache.activemq6.utils.DataConstants.FLOAT; +import static org.apache.activemq6.utils.DataConstants.INT; +import static org.apache.activemq6.utils.DataConstants.LONG; +import static org.apache.activemq6.utils.DataConstants.NULL; +import static org.apache.activemq6.utils.DataConstants.SHORT; +import static org.apache.activemq6.utils.DataConstants.STRING; /** * Property Value Conversion. diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/UTF8Util.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/UTF8Util.java similarity index 98% rename from hornetq-commons/src/main/java/org/hornetq/utils/UTF8Util.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/UTF8Util.java index 6fd9253957..fb087e536e 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/UTF8Util.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/UTF8Util.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.lang.ref.SoftReference; -import org.hornetq.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffer; /** * diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/UUID.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/UUID.java similarity index 99% rename from hornetq-commons/src/main/java/org/hornetq/utils/UUID.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/UUID.java index d9ab0094cb..35c2a0f7a2 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/UUID.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/UUID.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; /** diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/UUIDGenerator.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/UUIDGenerator.java similarity index 99% rename from hornetq-commons/src/main/java/org/hornetq/utils/UUIDGenerator.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/UUIDGenerator.java index 3c7b88965c..0cabf23408 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/UUIDGenerator.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/UUIDGenerator.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.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.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; public final class UUIDGenerator { diff --git a/hornetq-commons/src/main/java/org/hornetq/utils/UUIDTimer.java b/activemq6-commons/src/main/java/org/apache/activemq6/utils/UUIDTimer.java similarity index 99% rename from hornetq-commons/src/main/java/org/hornetq/utils/UUIDTimer.java rename to activemq6-commons/src/main/java/org/apache/activemq6/utils/UUIDTimer.java index f7ad43ff3f..60b41d7e8f 100644 --- a/hornetq-commons/src/main/java/org/hornetq/utils/UUIDTimer.java +++ b/activemq6-commons/src/main/java/org/apache/activemq6/utils/UUIDTimer.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.Random; diff --git a/hornetq-commons/src/test/java/org/hornetq/utils/ByteUtilTest.java b/activemq6-commons/src/test/java/org/apache/activemq6/utils/ByteUtilTest.java similarity index 97% rename from hornetq-commons/src/test/java/org/hornetq/utils/ByteUtilTest.java rename to activemq6-commons/src/test/java/org/apache/activemq6/utils/ByteUtilTest.java index f6ee7a2fdd..ccec25e685 100644 --- a/hornetq-commons/src/test/java/org/hornetq/utils/ByteUtilTest.java +++ b/activemq6-commons/src/test/java/org/apache/activemq6/utils/ByteUtilTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import org.junit.Assert; import org.junit.Test; diff --git a/hornetq-commons/src/test/java/org/hornetq/utils/PairTest.java b/activemq6-commons/src/test/java/org/apache/activemq6/utils/PairTest.java similarity index 92% rename from hornetq-commons/src/test/java/org/hornetq/utils/PairTest.java rename to activemq6-commons/src/test/java/org/apache/activemq6/utils/PairTest.java index bbd310ead3..15df799bc9 100644 --- a/hornetq-commons/src/test/java/org/hornetq/utils/PairTest.java +++ b/activemq6-commons/src/test/java/org/apache/activemq6/utils/PairTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.Pair; +import org.apache.activemq6.api.core.Pair; public class PairTest extends Assert diff --git a/hornetq-commons/src/test/java/org/hornetq/utils/ReferenceCounterTest.java b/activemq6-commons/src/test/java/org/apache/activemq6/utils/ReferenceCounterTest.java similarity index 98% rename from hornetq-commons/src/test/java/org/hornetq/utils/ReferenceCounterTest.java rename to activemq6-commons/src/test/java/org/apache/activemq6/utils/ReferenceCounterTest.java index 51a8fd8272..860b983341 100644 --- a/hornetq-commons/src/test/java/org/hornetq/utils/ReferenceCounterTest.java +++ b/activemq6-commons/src/test/java/org/apache/activemq6/utils/ReferenceCounterTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; diff --git a/hornetq-core-client/pom.xml b/activemq6-core-client/pom.xml similarity index 89% rename from hornetq-core-client/pom.xml rename to activemq6-core-client/pom.xml index 6b95f6025e..96034d1c6d 100644 --- a/hornetq-core-client/pom.xml +++ b/activemq6-core-client/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-core-client + activemq6-core-client jar - HornetQ Core Client + ActiveMQ6 Core Client ${project.basedir}/.. @@ -26,18 +26,18 @@ jgroups - org.hornetq - hornetq-commons + org.apache.activemq6 + activemq6-commons ${project.version} - org.hornetq - hornetq-selector + org.apache.activemq6 + activemq6-selector ${project.version} - org.hornetq - hornetq-journal + org.apache.activemq6 + activemq6-journal ${project.version} @@ -136,7 +136,7 @@ -

../hornetq-server/src/main/resources/schema + ../activemq6-server/src/main/resources/schema ${project.build.directory}/generated-sources/xslt ./src/main/resources/hqDefaults.xsl @@ -144,7 +144,7 @@ - ./org/hornetq/api/config/HornetQDefaultConfiguration.java + ./org/apache/activemq6/api/config/HornetQDefaultConfiguration.java diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/BroadcastEndpoint.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpoint.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/BroadcastEndpoint.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpoint.java index 5fb95c5282..b34e3f28ac 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/BroadcastEndpoint.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core; +package org.apache.activemq6.api.core; import java.util.concurrent.TimeUnit; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/BroadcastEndpointFactory.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpointFactory.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/BroadcastEndpointFactory.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpointFactory.java index ae6b5abd6b..5dc6e835eb 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/BroadcastEndpointFactory.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core; +package org.apache.activemq6.api.core; import java.io.Serializable; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/BroadcastEndpointFactoryConfiguration.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpointFactoryConfiguration.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/BroadcastEndpointFactoryConfiguration.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpointFactoryConfiguration.java index 765b0eb005..dd55518f1a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/BroadcastEndpointFactoryConfiguration.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpointFactoryConfiguration.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; import java.io.Serializable; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/BroadcastGroupConfiguration.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastGroupConfiguration.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/BroadcastGroupConfiguration.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastGroupConfiguration.java index 575cc3202f..e974343485 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/BroadcastGroupConfiguration.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core; +package org.apache.activemq6.api.core; import java.io.Serializable; import java.util.List; -import org.hornetq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; /** * The basic configuration used to determine how the server will broadcast members - * This is analogous to {@link org.hornetq.api.core.DiscoveryGroupConfiguration} + * This is analogous to {@link org.apache.activemq6.api.core.DiscoveryGroupConfiguration} * * @author Tim Fox * @author Howard Gao diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/DiscoveryGroupConfiguration.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/DiscoveryGroupConfiguration.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/DiscoveryGroupConfiguration.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/DiscoveryGroupConfiguration.java index d97408ea19..04641fe488 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/DiscoveryGroupConfiguration.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core; +package org.apache.activemq6.api.core; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.utils.UUIDGenerator; /** * This file represents how we are using Discovery. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java index f8679f4439..bf1dce4e67 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java @@ -11,12 +11,12 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.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.hornetq.api.core.BroadcastEndpointFactoryConfiguration} the four + * {@link org.apache.activemq6.api.core.BroadcastEndpointFactoryConfiguration} the four * UDP attributes in order to form a version 2.2 DiscoveryGroupConfiguration * in time of serialization. * diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/FilterConstants.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/FilterConstants.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/FilterConstants.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/FilterConstants.java index ed5c2cbcbd..816d5d1c3b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/FilterConstants.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core; +package org.apache.activemq6.api.core; /** * Constants representing pre-defined message attributes that can be referenced in HornetQ core diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/Interceptor.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/Interceptor.java similarity index 83% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/Interceptor.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/Interceptor.java index 8b23cea35e..d2a53ee720 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/Interceptor.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core; +package org.apache.activemq6.api.core; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * This is class is a simple way to intercepting calls on HornetQ client and servers. *

* To add an interceptor to HornetQ server, you have to modify the server configuration file * {@literal hornetq-configuration.xml}.
- * To add it to a client, use {@link org.hornetq.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)} + * To add it to a client, use {@link org.apache.activemq6.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)} * * @author clebert.suconic@jboss.com * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/JGroupsBroadcastGroupConfiguration.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/JGroupsBroadcastGroupConfiguration.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/JGroupsBroadcastGroupConfiguration.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/JGroupsBroadcastGroupConfiguration.java index 6c55c38c6f..7ecbb939b0 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/JGroupsBroadcastGroupConfiguration.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core; +package org.apache.activemq6.api.core; import java.net.URL; import java.util.ArrayList; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/Message.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/Message.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/Message.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/Message.java index 2f93e254a7..12b37c17af 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/Message.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core; +package org.apache.activemq6.api.core; import java.util.Map; import java.util.Set; -import org.hornetq.utils.UUID; +import org.apache.activemq6.utils.UUID; /** diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/TransportConfiguration.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/TransportConfiguration.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/TransportConfiguration.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/TransportConfiguration.java index 2f06fb8670..7805052e62 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/TransportConfiguration.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core; +package org.apache.activemq6.api.core; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.remoting.impl.TransportConfigurationUtil; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.utils.UUIDGenerator; +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; /** * 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.hornetq.spi.core.remoting.ConnectorFactory} + * Creates a TransportConfiguration with a specific name providing the class name of the {@link org.apache.activemq6.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.hornetq.spi.core.remoting.ConnectorFactory} + * Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq6.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.hornetq.spi.core.remoting.ConnectorFactory} + * Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq6.spi.core.remoting.ConnectorFactory} * * @param className The class name of the ConnectorFactory */ diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/TransportConfigurationHelper.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/TransportConfigurationHelper.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/TransportConfigurationHelper.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/TransportConfigurationHelper.java index 9a9565bd22..e06f3d0321 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/TransportConfigurationHelper.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/TransportConfigurationHelper.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; import java.util.Map; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/UDPBroadcastGroupConfiguration.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/UDPBroadcastGroupConfiguration.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/UDPBroadcastGroupConfiguration.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/UDPBroadcastGroupConfiguration.java index 73deb9a7b4..db1ed47222 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/UDPBroadcastGroupConfiguration.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core; +package org.apache.activemq6.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.hornetq.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientLogger; /** * The configuration used to determine how the server will broadcast members. *

- * This is analogous to {@link org.hornetq.api.core.DiscoveryGroupConfiguration} + * This is analogous to {@link org.apache.activemq6.api.core.DiscoveryGroupConfiguration} * * @author Tim Fox Created 18 Nov 2008 08:44:30 */ @@ -110,7 +110,7 @@ public final class UDPBroadcastGroupConfiguration implements BroadcastEndpointFa /** *

This is the member discovery implementation using direct UDP. It was extracted as a refactoring from - * {@link org.hornetq.core.cluster.DiscoveryGroup}

+ * {@link org.apache.activemq6.core.cluster.DiscoveryGroup}

* * @author Tomohisa * @author Howard Gao diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientConsumer.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientConsumer.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientConsumer.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientConsumer.java index 06e3f56719..1d980d6ff8 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientConsumer.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; -import org.hornetq.api.core.HornetQException; -import org.hornetq.spi.core.remoting.ConsumerContext; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.spi.core.remoting.ConsumerContext; /** * A ClientConsumer receives messages from HornetQ queues. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientMessage.java similarity index 73% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientMessage.java index 1a23af3355..73a2ad901a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; import java.io.InputStream; import java.io.OutputStream; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; /** * @@ -120,112 +120,112 @@ public interface ClientMessage extends Message /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putBooleanProperty(SimpleString key, boolean value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putBooleanProperty(String key, boolean value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putByteProperty(SimpleString key, byte value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putByteProperty(String key, byte value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putBytesProperty(SimpleString key, byte[] value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putBytesProperty(String key, byte[] value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putShortProperty(SimpleString key, short value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putShortProperty(String key, short value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putCharProperty(SimpleString key, char value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putCharProperty(String key, char value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putIntProperty(SimpleString key, int value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putIntProperty(String key, int value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putLongProperty(SimpleString key, long value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putLongProperty(String key, long value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putFloatProperty(SimpleString key, float value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putFloatProperty(String key, float value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putDoubleProperty(SimpleString key, double value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putDoubleProperty(String key, double value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putStringProperty(SimpleString key, SimpleString value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage putStringProperty(String key, String value); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage writeBodyBufferBytes(byte[] bytes); /** - * Overridden from {@link org.hornetq.api.core.Message} to enable fluent API + * Overridden from {@link org.apache.activemq6.api.core.Message} to enable fluent API */ ClientMessage writeBodyBufferString(String string); diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientProducer.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientProducer.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientProducer.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientProducer.java index 9ef9980fc4..b9abb24d39 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientProducer.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.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.hornetq.api.core.SimpleString; *

* The sending semantics can change depending on what blocking semantics are set via * {@link ServerLocator#setBlockOnDurableSend(boolean)} and - * {@link org.hornetq.api.core.client.ServerLocator#setBlockOnNonDurableSend(boolean)} . If set to + * {@link org.apache.activemq6.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.
*

* The send rate can also be controlled via {@link ServerLocator#setProducerMaxRate(int)} and the - * {@link org.hornetq.api.core.client.ServerLocator#setProducerWindowSize(int)}.
+ * {@link org.apache.activemq6.api.core.client.ServerLocator#setProducerWindowSize(int)}.
*
* @author Tim Fox * @author Andy Taylor diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientRequestor.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientRequestor.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientRequestor.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientRequestor.java index 19a1bc18ea..aabd39c178 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientRequestor.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; import java.util.UUID; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.impl.ClientMessageImpl; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.client.impl.ClientMessageImpl; /** * The ClientRequestor class helps making requests. @@ -23,9 +23,9 @@ import org.hornetq.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.hornetq.api.core.client.ClientSession - * @apiviz.owns org.hornetq.api.core.client.ClientProducer - * @apiviz.owns org.hornetq.api.core.client.ClientConsumer + * @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 * * @author Jeff Mesnil */ diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientSession.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientSession.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientSession.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientSession.java index b55c9e11fb..c9baf6417d 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientSession.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; import javax.transaction.xa.XAResource; import java.util.List; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.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.hornetq.api.core.client.ClientSession.AddressQuery} instead + * @deprecated Use {@link org.apache.activemq6.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.hornetq.api.core.Message) + * @see ClientProducer#send(SimpleString, org.apache.activemq6.api.core.Message) */ ClientProducer createProducer() throws HornetQException; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientSessionFactory.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientSessionFactory.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientSessionFactory.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientSessionFactory.java index 4c2d98c1bc..313bf72776 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClientSessionFactory.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClusterTopologyListener.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClusterTopologyListener.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClusterTopologyListener.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClusterTopologyListener.java index 59765b2bf7..f765852d01 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ClusterTopologyListener.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; /** * A cluster topology listener. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/FailoverEventListener.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/FailoverEventListener.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/FailoverEventListener.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/FailoverEventListener.java index f28840da58..5dd4a4ca99 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/FailoverEventListener.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; /** * A FailoverEvent notifies the client the state if the connection changes occurred on the session. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/FailoverEventType.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/FailoverEventType.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/FailoverEventType.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/FailoverEventType.java index 7a76330f01..69acf6f8d9 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/FailoverEventType.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; public enum FailoverEventType { diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/HornetQClient.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/HornetQClient.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/HornetQClient.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/HornetQClient.java index 45cdc6c46f..64576a12b1 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/HornetQClient.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy; -import org.hornetq.core.client.impl.ServerLocatorImpl; +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; /** * Utility class for creating HornetQ {@link ClientSessionFactory} objects. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/MessageHandler.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/MessageHandler.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/MessageHandler.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/MessageHandler.java index d8b6aff8af..7a8657cb02 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/MessageHandler.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; /** * A MessageHandler is used to receive message asynchronously. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/SendAcknowledgementHandler.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/SendAcknowledgementHandler.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/SendAcknowledgementHandler.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/SendAcknowledgementHandler.java index 979f65f491..0c4780ae1b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/SendAcknowledgementHandler.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; -import org.hornetq.api.core.Message; +import org.apache.activemq6.api.core.Message; /** * A SendAcknowledgementHandler notifies a client when an message sent asynchronously has been diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ServerLocator.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ServerLocator.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/ServerLocator.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ServerLocator.java index eb2efa8668..03b12b8789 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/ServerLocator.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.spi.core.remoting.ClientProtocolManagerFactory; +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; /** * 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. *

* If client's blocking calls to the server take more than this timeout, the call will throw a - * {@link org.hornetq.api.core.HornetQException} with the code {@link org.hornetq.api.core.HornetQExceptionType#CONNECTION_TIMEDOUT}. Value + * {@link org.apache.activemq6.api.core.HornetQException} with the code {@link org.hornetq.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. *

* if true, a random unique group ID is created and set on each message for the property - * {@link org.hornetq.api.core.Message#HDR_GROUP_ID}. + * {@link org.apache.activemq6.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.hornetq.api.core.Message#HDR_GROUP_ID}. + * 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}. *

* 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. *

- * Default value is "org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy". + * Default value is "org.apache.activemq6.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. *

- * Value must be the name of a class implementing {@link org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy}. + * Value must be the name of a class implementing {@link org.apache.activemq6.api.core.client.loadbalance.ConnectionLoadBalancingPolicy}. * * @param loadBalancingPolicyClassName class name of the connection load balancing policy * @return this ServerLocator diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/SessionFailureListener.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/SessionFailureListener.java similarity index 87% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/SessionFailureListener.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/SessionFailureListener.java index 191030950d..82b317d438 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/SessionFailureListener.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.remoting.FailureListener; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.remoting.FailureListener; /** * A SessionFailureListener notifies the client when a failure occurred on the session. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/TopologyMember.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/TopologyMember.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/TopologyMember.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/TopologyMember.java index a1373508ce..4b442fd4c5 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/TopologyMember.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/TopologyMember.java @@ -13,12 +13,12 @@ /** * */ -package org.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; import java.io.Serializable; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * A member of the topology. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java index 300c9e3b38..adac722115 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client.loadbalance; +package org.apache.activemq6.api.core.client.loadbalance; /** * A ConnectionLoadBalancingPolicy defines a policy to load balance between connections. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java index 6521906c49..98f7c390f9 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client.loadbalance; +package org.apache.activemq6.api.core.client.loadbalance; /** diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java index 050d30dbf5..3935c6f285 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client.loadbalance; +package org.apache.activemq6.api.core.client.loadbalance; -import org.hornetq.utils.Random; +import org.apache.activemq6.utils.Random; /** * {@link RandomConnectionLoadBalancingPolicy#select(int)} returns a (pseudo) random integer between diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java index 4db342cb36..ca304e227c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client.loadbalance; +package org.apache.activemq6.api.core.client.loadbalance; -import org.hornetq.utils.Random; +import org.apache.activemq6.utils.Random; /** * {@link RandomConnectionLoadBalancingPolicy#select(int)} chooses a the initial node randomly then subsequent requests return the same node diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java index ae260e8734..49a40b75cc 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.client.loadbalance; +package org.apache.activemq6.api.core.client.loadbalance; import java.io.Serializable; -import org.hornetq.utils.Random; +import org.apache.activemq6.utils.Random; /** * RoundRobinConnectionLoadBalancingPolicy corresponds to a round-robin load-balancing policy. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/package-info.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/package-info.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/package-info.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/package-info.java index ec418cd325..59f8e18da1 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/loadbalance/package-info.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/package-info.java @@ -17,5 +17,5 @@ * HornetQ to load-balance client connections across * HornetQ servers. */ -package org.hornetq.api.core.client.loadbalance; +package org.apache.activemq6.api.core.client.loadbalance; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/package-info.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/package-info.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/client/package-info.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/package-info.java index b6189c8ad6..4468e36d3b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/client/package-info.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/package-info.java @@ -15,5 +15,5 @@ *
* This package defines the API used by HornetQ clients to produce and consume messages. */ -package org.hornetq.api.core.client; +package org.apache.activemq6.api.core.client; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/AcceptorControl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/AcceptorControl.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/AcceptorControl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/AcceptorControl.java index 9deb640650..753d443064 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/AcceptorControl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; import java.util.Map; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/AddressControl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/AddressControl.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/AddressControl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/AddressControl.java index bbc857f5e6..29ad3ac468 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/AddressControl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; import javax.management.MBeanOperationInfo; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/AddressSettingsInfo.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/AddressSettingsInfo.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/AddressSettingsInfo.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/AddressSettingsInfo.java index cd06495330..5714c259d8 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/AddressSettingsInfo.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.utils.json.JSONObject; /** * A AddressSettingsInfo diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/BridgeControl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/BridgeControl.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/BridgeControl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/BridgeControl.java index 72e40ab0ed..5faa8b63a0 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/BridgeControl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; /** @@ -42,7 +42,7 @@ public interface BridgeControl extends HornetQComponentControl String getFilterString(); /** - * Return the name of the org.hornetq.core.server.cluster.Transformer implementation associated to this bridge. + * Return the name of the org.apache.activemq6.core.server.cluster.Transformer implementation associated to this bridge. */ String getTransformerClassName(); diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/BroadcastGroupControl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/BroadcastGroupControl.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/BroadcastGroupControl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/BroadcastGroupControl.java index 15ae7596a7..cc6e7a18c7 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/BroadcastGroupControl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; /** * A BroadcastGroupControl is used to manage a broadcast group. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/ClusterConnectionControl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ClusterConnectionControl.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/ClusterConnectionControl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ClusterConnectionControl.java index 5890bb0cd4..a735978738 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/ClusterConnectionControl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; import java.util.Map; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/CoreNotificationType.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/CoreNotificationType.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/CoreNotificationType.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/CoreNotificationType.java index d792a9a21c..03d807bd75 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/CoreNotificationType.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; /** * This enum defines all core notification types diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/DayCounterInfo.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/DayCounterInfo.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/DayCounterInfo.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/DayCounterInfo.java index 03332205ad..0b1f1d4076 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/DayCounterInfo.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; import java.util.Arrays; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONException; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONException; +import org.apache.activemq6.utils.json.JSONObject; /** * Helper class to create Java Objects from the diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/DivertControl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/DivertControl.java similarity index 90% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/DivertControl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/DivertControl.java index 9cbb7f4799..b3a9e10bdd 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/DivertControl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.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.hornetq.core.server.cluster.Transformer implementation associated to this bridge. + * Return the name of the org.apache.activemq6.core.server.cluster.Transformer implementation associated to this bridge. */ String getTransformerClassName(); } diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/HornetQComponentControl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/HornetQComponentControl.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/HornetQComponentControl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/HornetQComponentControl.java index 64649d43a5..00f773f21d 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/HornetQComponentControl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; /** * A HornetQComponentControl is used to manage the life cycle of a HornetQ component. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/HornetQServerControl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/HornetQServerControl.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/HornetQServerControl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/HornetQServerControl.java index ca566f743c..052d332c5b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/HornetQServerControl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.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 * getIncomingInterceptorClassNames(). * - * @see org.hornetq.api.core.Interceptor + * @see org.apache.activemq6.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.hornetq.api.core.Interceptor + * @see org.apache.activemq6.api.core.Interceptor */ String[] getIncomingInterceptorClassNames(); /** * Returns the list of interceptors used by this server for outgoing messages. * - * @see org.hornetq.api.core.Interceptor + * @see org.apache.activemq6.api.core.Interceptor */ String[] getOutgoingInterceptorClassNames(); @@ -316,7 +316,7 @@ public interface HornetQServerControl /** * Create a durable queue. *
- * This method throws a {@link org.hornetq.api.core.HornetQQueueExistsException}) exception if the queue already exits. + * This method throws a {@link org.apache.activemq6.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. *
- * This method throws a {@link org.hornetq.api.core.HornetQQueueExistsException}) exception if the queue already exits. + * This method throws a {@link org.apache.activemq6.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. *
- * This method throws a {@link org.hornetq.api.core.HornetQQueueExistsException}) exception if the queue already exits. + * This method throws a {@link org.apache.activemq6.api.core.HornetQQueueExistsException}) exception if the queue already exits. * * @param address address to bind the queue to * @param name name of the queue diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/ManagementHelper.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ManagementHelper.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/ManagementHelper.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ManagementHelper.java index bacae4d76a..b0e980e645 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/ManagementHelper.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +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; /** * Helper class to use HornetQ Core messages to manage server resources. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/NotificationType.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/NotificationType.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/NotificationType.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/NotificationType.java index ecabae7b06..b281c2361b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/NotificationType.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; /** * Types of notification emitted by HornetQ servers. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/ObjectNameBuilder.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ObjectNameBuilder.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/ObjectNameBuilder.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ObjectNameBuilder.java index 4994902318..6a821b8e81 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/ObjectNameBuilder.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; import javax.management.ObjectName; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.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.hornetq.api.jms.management.JMSServerControl + * @see org.apache.activemq6.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.hornetq.api.jms.management.JMSQueueControl + * @see org.apache.activemq6.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.hornetq.api.jms.management.ConnectionFactoryControl + * @see org.apache.activemq6.api.jms.management.ConnectionFactoryControl */ public ObjectName getConnectionFactoryObjectName(final String name) throws Exception { diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/Operation.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/Operation.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/Operation.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/Operation.java index 4e947a48ee..67388ccfd5 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/Operation.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/Parameter.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/Parameter.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/Parameter.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/Parameter.java index 3ec45d0e03..75834a5656 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/Parameter.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/QueueControl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/QueueControl.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/QueueControl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/QueueControl.java index d63ea153ba..e28e9bbed5 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/QueueControl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; import javax.management.MBeanOperationInfo; import java.util.Map; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/ResourceNames.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ResourceNames.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/ResourceNames.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ResourceNames.java index 72b17fb061..099038aa3c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/ResourceNames.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; /** * Helper class used to build resource names used by management messages. diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/RoleInfo.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/RoleInfo.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/RoleInfo.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/RoleInfo.java index f3b300be2c..f0070c96fc 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/RoleInfo.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/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.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; /** * Helper class to create Java Objects from the diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/package-info.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/package-info.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/management/package-info.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/package-info.java index f1b7b23592..75dfa6ccd5 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/management/package-info.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/package-info.java @@ -16,5 +16,5 @@ * HornetQ can be managed either using JMX or by sending management messages to the * server's special management address. Please refer to the user manual for more information. */ -package org.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; diff --git a/hornetq-core-client/src/main/java/org/hornetq/api/core/package-info.java b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/package-info.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/api/core/package-info.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/api/core/package-info.java index a429800de3..8757bb2bdb 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/api/core/package-info.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/package-info.java @@ -16,5 +16,5 @@ * This package defines base classes and interfaces used * throughout HornetQ API */ -package org.hornetq.api.core; +package org.apache.activemq6.api.core; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java index 9eae62ef4f..396ece6c95 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.buffers.impl; +package org.apache.activemq6.core.buffers.impl; import java.nio.ByteBuffer; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.message.impl.MessageInternal; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.message.impl.MessageInternal; /** * A ResetLimitWrappedHornetQBuffer diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientLogger.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/HornetQClientLogger.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientLogger.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/HornetQClientLogger.java index ca990e6ea0..fcba4e1170 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientLogger.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/HornetQClientLogger.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client; +package org.apache.activemq6.core.client; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.protocol.core.Packet; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.protocol.core.Packet; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; @@ -293,7 +293,7 @@ public interface HornetQClientLogger extends BasicLogger void packetOutOfOrder(Object obj, @Cause Throwable t); /** - * Warns about usage of {@link org.hornetq.api.core.client.SendAcknowledgementHandler} or JMS's {@code CompletionWindow} with + * Warns about usage of {@link org.apache.activemq6.api.core.client.SendAcknowledgementHandler} or JMS's {@code CompletionWindow} with * confirmations disabled (confirmationWindowSize=-1). */ @LogMessage(level = Logger.Level.WARN) diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientMessageBundle.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/HornetQClientMessageBundle.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientMessageBundle.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/HornetQClientMessageBundle.java index e426a63e34..1d4fc5c24b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/HornetQClientMessageBundle.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/HornetQClientMessageBundle.java @@ -11,24 +11,24 @@ * permissions and limitations under the License. */ -package org.hornetq.core.client; +package org.apache.activemq6.core.client; -import org.hornetq.api.core.HornetQAddressFullException; -import org.hornetq.api.core.HornetQConnectionTimedOutException; -import org.hornetq.api.core.HornetQDisconnectedException; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.HornetQInterceptorRejectedPacketException; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.api.core.HornetQLargeMessageException; -import org.hornetq.api.core.HornetQLargeMessageInterruptedException; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.HornetQObjectClosedException; -import org.hornetq.api.core.HornetQTransactionOutcomeUnknownException; -import org.hornetq.api.core.HornetQTransactionRolledBackException; -import org.hornetq.api.core.HornetQUnBlockedException; -import org.hornetq.core.cluster.DiscoveryGroup; -import org.hornetq.spi.core.remoting.Connection; +import org.apache.activemq6.api.core.HornetQAddressFullException; +import org.apache.activemq6.api.core.HornetQConnectionTimedOutException; +import org.apache.activemq6.api.core.HornetQDisconnectedException; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.HornetQInterceptorRejectedPacketException; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq6.api.core.HornetQLargeMessageException; +import org.apache.activemq6.api.core.HornetQLargeMessageInterruptedException; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.HornetQObjectClosedException; +import org.apache.activemq6.api.core.HornetQTransactionOutcomeUnknownException; +import org.apache.activemq6.api.core.HornetQTransactionRolledBackException; +import org.apache.activemq6.api.core.HornetQUnBlockedException; +import org.apache.activemq6.core.cluster.DiscoveryGroup; +import org.apache.activemq6.spi.core.remoting.Connection; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/AddressQueryImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/AddressQueryImpl.java similarity index 88% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/AddressQueryImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/AddressQueryImpl.java index cce1fe46c3..00dd51d828 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/AddressQueryImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/AddressQueryImpl.java @@ -11,13 +11,13 @@ * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientSession; public class AddressQueryImpl implements ClientSession.AddressQuery, ClientSession.BindingQuery { diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/AfterConnectInternalListener.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/AfterConnectInternalListener.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/AfterConnectInternalListener.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/AfterConnectInternalListener.java index e7bec9dc4e..d1ca8dd4c2 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/AfterConnectInternalListener.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/AfterConnectInternalListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; /** * To be called right after the ConnectionFactory created a connection. diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientConsumerImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientConsumerImpl.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientConsumerImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientConsumerImpl.java index 7933245bc8..ed89a212e2 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientConsumerImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientConsumerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.io.File; import java.security.AccessController; @@ -20,25 +20,25 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.spi.core.remoting.ConsumerContext; -import org.hornetq.spi.core.remoting.SessionContext; -import org.hornetq.utils.FutureLatch; -import org.hornetq.utils.PriorityLinkedList; -import org.hornetq.utils.PriorityLinkedListImpl; -import org.hornetq.utils.ReusableLatch; -import org.hornetq.utils.TokenBucketLimiter; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInterruptedException; +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.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.spi.core.remoting.ConsumerContext; +import org.apache.activemq6.spi.core.remoting.SessionContext; +import org.apache.activemq6.utils.FutureLatch; +import org.apache.activemq6.utils.PriorityLinkedList; +import org.apache.activemq6.utils.PriorityLinkedListImpl; +import org.apache.activemq6.utils.ReusableLatch; +import org.apache.activemq6.utils.TokenBucketLimiter; /** * @author Tim Fox @@ -1003,7 +1003,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal return; } - org.hornetq.utils.FutureLatch future = new FutureLatch(); + org.apache.activemq6.utils.FutureLatch future = new FutureLatch(); sessionExecutor.execute(future); diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientConsumerInternal.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientConsumerInternal.java similarity index 84% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientConsumerInternal.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientConsumerInternal.java index 5b198f5523..a4f1551945 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientConsumerInternal.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientConsumerInternal.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.utils.FutureLatch; +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.activemq6.utils.FutureLatch; /** * A ClientConsumerInternal diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientLargeMessageImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientLargeMessageImpl.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientLargeMessageImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientLargeMessageImpl.java index 09a75031f4..49f4d8906b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientLargeMessageImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientLargeMessageImpl.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.io.IOException; import java.io.OutputStream; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.core.buffers.impl.ResetLimitWrappedHornetQBuffer; -import org.hornetq.utils.DataConstants; +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.core.buffers.impl.ResetLimitWrappedHornetQBuffer; +import org.apache.activemq6.utils.DataConstants; /** * ClientLargeMessageImpl is only created when receiving large messages. diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientLargeMessageInternal.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientLargeMessageInternal.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientLargeMessageInternal.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientLargeMessageInternal.java index 1c3c152511..61fdd67ff5 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientLargeMessageInternal.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientLargeMessageInternal.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; /** diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientMessageImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientMessageImpl.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientMessageImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientMessageImpl.java index cb68c4714d..58d29b6443 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientMessageImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientMessageImpl.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.ByteBuffer; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQPropertyConversionException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.message.BodyEncoder; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.reader.MessageUtil; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +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.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.core.message.BodyEncoder; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.reader.MessageUtil; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientMessageInternal.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientMessageInternal.java similarity index 85% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientMessageInternal.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientMessageInternal.java index 2a1e291561..ab55b88b34 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientMessageInternal.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientMessageInternal.java @@ -11,11 +11,11 @@ * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.utils.TypedProperties; /** * A ClientMessageInternal diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerCreditManager.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditManager.java similarity index 87% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerCreditManager.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditManager.java index 156d526a13..83360b7561 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerCreditManager.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditManager.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; -import org.hornetq.api.core.SimpleString; -import org.hornetq.spi.core.remoting.SessionContext; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.spi.core.remoting.SessionContext; /** * A ClientProducerCreditManager diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerCreditManagerImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditManagerImpl.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerCreditManagerImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditManagerImpl.java index 74775439bc..c0fd364224 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerCreditManagerImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditManagerImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.spi.core.remoting.SessionContext; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.spi.core.remoting.SessionContext; /** * A ProducerCreditManager diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerCredits.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCredits.java similarity index 86% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerCredits.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCredits.java index f4398f1f81..7ef4916e7f 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerCredits.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCredits.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.spi.core.remoting.SessionContext; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.spi.core.remoting.SessionContext; /** * A ClientProducerCredits diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditsImpl.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditsImpl.java index 3290f27c38..2b420d530c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditsImpl.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.spi.core.remoting.SessionContext; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.spi.core.remoting.SessionContext; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerImpl.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerImpl.java index ac12955823..12dc32241a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerImpl.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.io.IOException; import java.io.InputStream; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.message.BodyEncoder; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.spi.core.remoting.SessionContext; -import org.hornetq.utils.DeflaterReader; -import org.hornetq.utils.HornetQBufferInputStream; -import org.hornetq.utils.TokenBucketLimiter; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.core.message.BodyEncoder; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; +import org.apache.activemq6.spi.core.remoting.SessionContext; +import org.apache.activemq6.utils.DeflaterReader; +import org.apache.activemq6.utils.HornetQBufferInputStream; +import org.apache.activemq6.utils.TokenBucketLimiter; +import org.apache.activemq6.utils.UUIDGenerator; /** * The client-side Producer. diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerInternal.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerInternal.java similarity index 88% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerInternal.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerInternal.java index 9d8a46ebf6..056c20c0d9 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerInternal.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerInternal.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; -import org.hornetq.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientProducer; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionFactoryImpl.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionFactoryImpl.java index 8660a2df69..eebc0444fb 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionFactoryImpl.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.lang.ref.WeakReference; import java.security.AccessController; @@ -28,40 +28,40 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.FailoverEventListener; -import org.hornetq.api.core.client.FailoverEventType; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.ClientProtocolManager; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.spi.core.remoting.Connector; -import org.hornetq.spi.core.remoting.ConnectorFactory; -import org.hornetq.spi.core.remoting.TopologyResponseHandler; -import org.hornetq.spi.core.remoting.SessionContext; -import org.hornetq.utils.ClassloadingUtil; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.ConfigurationHelper; -import org.hornetq.utils.ConfirmationWindowWarning; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.OrderedExecutorFactory; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.FailoverEventListener; +import org.apache.activemq6.api.core.client.FailoverEventType; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.spi.core.remoting.Connector; +import org.apache.activemq6.spi.core.remoting.ConnectorFactory; +import org.apache.activemq6.spi.core.remoting.TopologyResponseHandler; +import org.apache.activemq6.spi.core.remoting.SessionContext; +import org.apache.activemq6.utils.ClassloadingUtil; +import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.ConfigurationHelper; +import org.apache.activemq6.utils.ConfirmationWindowWarning; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.OrderedExecutorFactory; +import org.apache.activemq6.utils.UUIDGenerator; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryInternal.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionFactoryInternal.java similarity index 82% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryInternal.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionFactoryInternal.java index e09823de1e..3ddfde543c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryInternal.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionFactoryInternal.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.util.concurrent.locks.Lock; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.utils.ConfirmationWindowWarning; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.utils.ConfirmationWindowWarning; /** * A ClientSessionFactoryInternal diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionImpl.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionImpl.java index 197d80c414..e912369786 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -23,28 +23,28 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.FailoverEventListener; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.ConsumerContext; -import org.hornetq.spi.core.remoting.SessionContext; -import org.hornetq.utils.ConfirmationWindowWarning; -import org.hornetq.utils.TokenBucketLimiterImpl; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.FailoverEventListener; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.ConsumerContext; +import org.apache.activemq6.spi.core.remoting.SessionContext; +import org.apache.activemq6.utils.ConfirmationWindowWarning; +import org.apache.activemq6.utils.TokenBucketLimiterImpl; +import org.apache.activemq6.utils.XidCodecSupport; /** * @author Tim Fox @@ -359,7 +359,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi } /** - * Use {@link #addressQuery(org.hornetq.api.core.SimpleString)} instead + * Use {@link #addressQuery(org.apache.activemq6.api.core.SimpleString)} instead * * @param address * @return diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionInternal.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionInternal.java similarity index 87% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionInternal.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionInternal.java index a05e6a3677..2fa66095ee 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientSessionInternal.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionInternal.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.ConsumerContext; +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.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.ConsumerContext; /** * A ClientSessionInternal diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/CompressedLargeMessageControllerImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/CompressedLargeMessageControllerImpl.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/CompressedLargeMessageControllerImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/CompressedLargeMessageControllerImpl.java index 193317b083..63d9a7bd9e 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/CompressedLargeMessageControllerImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/CompressedLargeMessageControllerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.io.DataInputStream; import java.io.InputStream; @@ -18,16 +18,16 @@ import java.io.OutputStream; import java.nio.ByteBuffer; import io.netty.buffer.ByteBuf; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.utils.DataConstants; -import org.hornetq.utils.HornetQBufferInputStream; -import org.hornetq.utils.InflaterReader; -import org.hornetq.utils.InflaterWriter; -import org.hornetq.utils.UTF8Util; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq6.utils.HornetQBufferInputStream; +import org.apache.activemq6.utils.InflaterReader; +import org.apache.activemq6.utils.InflaterWriter; +import org.apache.activemq6.utils.UTF8Util; /** * @author Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/DelegatingSession.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/DelegatingSession.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/DelegatingSession.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/DelegatingSession.java index 5b90f55b70..9d6f2d0f2c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/DelegatingSession.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/DelegatingSession.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; import java.util.Set; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.FailoverEventListener; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.ConsumerContext; -import org.hornetq.utils.ConcurrentHashSet; +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.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.FailoverEventListener; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.ConsumerContext; +import org.apache.activemq6.utils.ConcurrentHashSet; /** * A DelegatingSession diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/HornetQXAResource.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/HornetQXAResource.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/HornetQXAResource.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/HornetQXAResource.java index e278b8c6df..40c0a7ee41 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/HornetQXAResource.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/HornetQXAResource.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import javax.transaction.xa.XAResource; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/LargeMessageController.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/LargeMessageController.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/LargeMessageController.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/LargeMessageController.java index df9fc61a7c..d75ab8ad31 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/LargeMessageController.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/LargeMessageController.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.io.OutputStream; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; /** * A LargeMessageBufferInternal diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/LargeMessageControllerImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/LargeMessageControllerImpl.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/LargeMessageControllerImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/LargeMessageControllerImpl.java index c4fbcbcb09..e15edc46a3 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/LargeMessageControllerImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/LargeMessageControllerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.io.File; import java.io.FileNotFoundException; @@ -26,19 +26,19 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import io.netty.buffer.ByteBuf; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.utils.DataConstants; -import org.hornetq.utils.UTF8Util; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq6.utils.UTF8Util; /** - * This class aggregates several {@link org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage} + * This class aggregates several {@link org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage} * as it was being handled * by a single buffer. This buffer can be consumed as messages are arriving, and it will hold the * packets until they are read using the ChannelBuffer interface, or the setOutputStream or diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/QueueQueryImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/QueueQueryImpl.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/QueueQueryImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/QueueQueryImpl.java index 35b7a7f05d..8ced2c13c7 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/QueueQueryImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/QueueQueryImpl.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientSession; public class QueueQueryImpl implements ClientSession.QueueQuery { diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ServerLocatorImpl.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ServerLocatorImpl.java index 5aa37b850c..c37036a5a5 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ServerLocatorImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.io.IOException; import java.io.ObjectInputStream; @@ -35,35 +35,35 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.cluster.DiscoveryEntry; -import org.hornetq.core.cluster.DiscoveryGroup; -import org.hornetq.core.cluster.DiscoveryListener; -import org.hornetq.core.protocol.core.impl.HornetQClientProtocolManagerFactory; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.spi.core.remoting.ClientProtocolManager; -import org.hornetq.spi.core.remoting.ClientProtocolManagerFactory; -import org.hornetq.spi.core.remoting.Connector; -import org.hornetq.utils.ClassloadingUtil; -import org.hornetq.utils.HornetQThreadFactory; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.api.core.client.loadbalance.ConnectionLoadBalancingPolicy; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.core.cluster.DiscoveryEntry; +import org.apache.activemq6.core.cluster.DiscoveryGroup; +import org.apache.activemq6.core.cluster.DiscoveryListener; +import org.apache.activemq6.core.protocol.core.impl.HornetQClientProtocolManagerFactory; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManagerFactory; +import org.apache.activemq6.spi.core.remoting.Connector; +import org.apache.activemq6.utils.ClassloadingUtil; +import org.apache.activemq6.utils.HornetQThreadFactory; +import org.apache.activemq6.utils.UUIDGenerator; /** - * This is the implementation of {@link org.hornetq.api.core.client.ServerLocator} and all + * This is the implementation of {@link org.apache.activemq6.api.core.client.ServerLocator} and all * the proper javadoc is located on that interface. * * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ServerLocatorInternal.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ServerLocatorInternal.java similarity index 86% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ServerLocatorInternal.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ServerLocatorInternal.java index 4d8c258046..4ae2497b06 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ServerLocatorInternal.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ServerLocatorInternal.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.util.concurrent.Executor; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.Pair; -import org.hornetq.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; /** * A ServerLocatorInternal diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/Topology.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/Topology.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/Topology.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/Topology.java index 22f6b90460..deb1b36612 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/Topology.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/Topology.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; import java.io.Serializable; import java.util.ArrayList; @@ -23,10 +23,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.spi.core.remoting.Connector; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.spi.core.remoting.Connector; /** * @author Andy Taylor diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/TopologyMemberImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/TopologyMemberImpl.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/core/client/impl/TopologyMemberImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/TopologyMemberImpl.java index 275eecfdb6..a63f787d10 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/TopologyMemberImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/TopologyMemberImpl.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.client.impl; +package org.apache.activemq6.core.client.impl; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * @author Andy Taylor diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/cluster/DiscoveryEntry.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryEntry.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/cluster/DiscoveryEntry.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryEntry.java index 8da622c7f1..e5bfae473f 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/cluster/DiscoveryEntry.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryEntry.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.cluster; +package org.apache.activemq6.core.cluster; -import org.hornetq.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; /** * A DiscoveryEntry diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/cluster/DiscoveryGroup.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryGroup.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/cluster/DiscoveryGroup.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryGroup.java index 43beff499e..fd2ae35885 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/cluster/DiscoveryGroup.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryGroup.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.cluster; +package org.apache.activemq6.core.cluster; import java.util.ArrayList; import java.util.HashMap; @@ -19,19 +19,19 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.core.BroadcastEndpoint; -import org.hornetq.api.core.BroadcastEndpointFactory; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationService; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.BroadcastEndpoint; +import org.apache.activemq6.api.core.BroadcastEndpointFactory; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationService; +import org.apache.activemq6.utils.TypedProperties; /** * This class is used to search for members on the cluster through the opaque interface {@link BroadcastEndpoint}. diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/cluster/DiscoveryListener.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryListener.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/cluster/DiscoveryListener.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryListener.java index c0353d50ab..032ba68ce3 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/cluster/DiscoveryListener.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.cluster; +package org.apache.activemq6.core.cluster; import java.util.List; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/exception/HornetQXAException.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/exception/HornetQXAException.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/exception/HornetQXAException.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/exception/HornetQXAException.java index f6f816219c..f72f2b23a1 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/exception/HornetQXAException.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/exception/HornetQXAException.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.exception; +package org.apache.activemq6.core.exception; import javax.transaction.xa.XAException; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/message/BodyEncoder.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/message/BodyEncoder.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/message/BodyEncoder.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/message/BodyEncoder.java index fecf1dbec6..923beb138a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/message/BodyEncoder.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/message/BodyEncoder.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.message; +package org.apache.activemq6.core.message; import java.nio.ByteBuffer; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; /** * Class used to encode message body into buffers. diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/message/impl/MessageImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/message/impl/MessageImpl.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/core/message/impl/MessageImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/message/impl/MessageImpl.java index 057dcf6989..b797f38be5 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/message/impl/MessageImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/message/impl/MessageImpl.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.message.impl; +package org.apache.activemq6.core.message.impl; import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQPropertyConversionException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.buffers.impl.ResetLimitWrappedHornetQBuffer; -import org.hornetq.core.message.BodyEncoder; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.utils.ByteUtil; -import org.hornetq.utils.DataConstants; -import org.hornetq.utils.TypedProperties; -import org.hornetq.utils.UUID; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +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.core.buffers.impl.ResetLimitWrappedHornetQBuffer; +import org.apache.activemq6.core.message.BodyEncoder; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.utils.ByteUtil; +import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq6.utils.UUID; /** * A concrete implementation of a message diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/message/impl/MessageInternal.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/message/impl/MessageInternal.java similarity index 80% rename from hornetq-core-client/src/main/java/org/hornetq/core/message/impl/MessageInternal.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/message/impl/MessageInternal.java index f84cf0a60c..b341c25cdf 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/message/impl/MessageInternal.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/message/impl/MessageInternal.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.message.impl; +package org.apache.activemq6.core.message.impl; import java.io.InputStream; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.message.BodyEncoder; -import org.hornetq.utils.TypedProperties; +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.SimpleString; +import org.apache.activemq6.core.message.BodyEncoder; +import org.apache.activemq6.utils.TypedProperties; /** * A MessageInternal diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/ClientPacketDecoder.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/ClientPacketDecoder.java similarity index 70% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/ClientPacketDecoder.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/ClientPacketDecoder.java index 5cccbda285..0f2f1e7eb5 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/ClientPacketDecoder.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/ClientPacketDecoder.java @@ -11,18 +11,18 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol; +package org.apache.activemq6.core.protocol; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_LARGE_MSG; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_MSG; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_LARGE_MSG; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_MSG; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.client.impl.ClientLargeMessageImpl; -import org.hornetq.core.client.impl.ClientMessageImpl; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketDecoder; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveClientLargeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.client.impl.ClientLargeMessageImpl; +import org.apache.activemq6.core.client.impl.ClientMessageImpl; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketDecoder; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveClientLargeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveMessage; /** * @author Andy Taylor * 10/12/12 diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/Channel.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/Channel.java similarity index 81% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/Channel.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/Channel.java index fd043fe78c..4c82ef29bf 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/Channel.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/Channel.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core; +package org.apache.activemq6.core.protocol.core; import java.util.concurrent.locks.Lock; -import org.hornetq.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQException; /** - * A channel is a way of interleaving data meant for different endpoints over the same {@link org.hornetq.core.protocol.core.CoreRemotingConnection}. + * A channel is a way of interleaving data meant for different endpoints over the same {@link org.apache.activemq6.core.protocol.core.CoreRemotingConnection}. *

* Any packet sent will have its channel id set to the specific channel sending so it can be routed to its correct channel - * when received by the {@link org.hornetq.core.protocol.core.CoreRemotingConnection}. see {@link org.hornetq.core.protocol.core.Packet#setChannelID(long)}. + * when received by the {@link org.apache.activemq6.core.protocol.core.CoreRemotingConnection}. see {@link org.hornetq.core.protocol.core.Packet#setChannelID(long)}. *

- * Each Channel should will forward any packets received to its {@link org.hornetq.core.protocol.core.ChannelHandler}. + * Each Channel should will forward any packets received to its {@link org.apache.activemq6.core.protocol.core.ChannelHandler}. *

* A Channel *does not* support concurrent access by more than one thread! * @@ -74,14 +74,14 @@ public interface Channel Packet sendBlocking(Packet packet, byte expectedPacket) throws HornetQException; /** - * Sets the {@link org.hornetq.core.protocol.core.ChannelHandler} that this channel should + * Sets the {@link org.apache.activemq6.core.protocol.core.ChannelHandler} that this channel should * forward received packets to. * @param handler the handler */ void setHandler(ChannelHandler handler); /** - * Gets the {@link org.hornetq.core.protocol.core.ChannelHandler} that this channel should + * Gets the {@link org.apache.activemq6.core.protocol.core.ChannelHandler} that this channel should * forward received packets to. * @return the current channel handler */ @@ -131,12 +131,12 @@ public interface Channel void unlock(); /** - * forces any {@link org.hornetq.core.protocol.core.Channel#sendBlocking(Packet, byte)} request to return with an exception. + * forces any {@link org.apache.activemq6.core.protocol.core.Channel#sendBlocking(Packet, byte)} request to return with an exception. */ void returnBlocking(); /** - * forces any {@link org.hornetq.core.protocol.core.Channel#sendBlocking(Packet, byte)} request to return with an exception. + * forces any {@link org.apache.activemq6.core.protocol.core.Channel#sendBlocking(Packet, byte)} request to return with an exception. */ void returnBlocking(Throwable cause); @@ -172,9 +172,9 @@ public interface Channel void flushConfirmations(); /** - * Called by {@link org.hornetq.core.protocol.core.CoreRemotingConnection} when a packet is received. + * Called by {@link org.apache.activemq6.core.protocol.core.CoreRemotingConnection} when a packet is received. *

- * This method should then call its {@link org.hornetq.core.protocol.core.ChannelHandler} after appropriate processing of + * This method should then call its {@link org.apache.activemq6.core.protocol.core.ChannelHandler} after appropriate processing of * the packet * * @param packet the packet to process. diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/ChannelHandler.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/ChannelHandler.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/ChannelHandler.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/ChannelHandler.java index cd60cb5332..0fce6dae71 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/ChannelHandler.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/ChannelHandler.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core; +package org.apache.activemq6.core.protocol.core; /** diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/CommandConfirmationHandler.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/CommandConfirmationHandler.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/CommandConfirmationHandler.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/CommandConfirmationHandler.java index 3113ecdcb1..fe7fda9f45 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/CommandConfirmationHandler.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/CommandConfirmationHandler.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core; +package org.apache.activemq6.core.protocol.core; /** diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/CoreRemotingConnection.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/CoreRemotingConnection.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/CoreRemotingConnection.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/CoreRemotingConnection.java index bccc2d33ac..513aa70cb8 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/CoreRemotingConnection.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/CoreRemotingConnection.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core; +package org.apache.activemq6.core.protocol.core; -import org.hornetq.core.security.HornetQPrincipal; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.core.security.HornetQPrincipal; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/Packet.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/Packet.java similarity index 88% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/Packet.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/Packet.java index 47035227a2..6fb6359606 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/Packet.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/Packet.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core; +package org.apache.activemq6.core.protocol.core; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * A Packet represents a packet of data transmitted over a connection. @@ -54,7 +54,7 @@ public interface Packet byte getType(); /** - * Encodes the packet and returns a {@link org.hornetq.api.core.HornetQBuffer} containing the data + * Encodes the packet and returns a {@link org.apache.activemq6.api.core.HornetQBuffer} containing the data * * @param connection the connection * @return the buffer to encode to diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/ChannelImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/ChannelImpl.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/ChannelImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/ChannelImpl.java index 0a6202adb2..b186fe994b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/ChannelImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/ChannelImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl; +package org.apache.activemq6.core.protocol.core.impl; import java.util.EnumSet; import java.util.List; @@ -21,20 +21,20 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.ChannelHandler; -import org.hornetq.core.protocol.core.CommandConfirmationHandler; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.PacketsConfirmedMessage; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.ChannelHandler; +import org.apache.activemq6.core.protocol.core.CommandConfirmationHandler; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.HornetQExceptionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.PacketsConfirmedMessage; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * A ChannelImpl diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/HornetQClientProtocolManager.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQClientProtocolManager.java similarity index 87% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/HornetQClientProtocolManager.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQClientProtocolManager.java index b2bad9a9c8..19b48a8fbc 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/HornetQClientProtocolManager.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQClientProtocolManager.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl; +package org.apache.activemq6.core.protocol.core.impl; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -19,43 +19,43 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import io.netty.channel.ChannelPipeline; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.protocol.ClientPacketDecoder; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.ChannelHandler; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.CheckFailoverMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; -import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.DisconnectMessage; -import org.hornetq.core.protocol.core.impl.wireformat.DisconnectMessage_V2; -import org.hornetq.core.protocol.core.impl.wireformat.Ping; -import org.hornetq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; -import org.hornetq.core.remoting.impl.netty.HornetQFrameDecoder2; -import org.hornetq.core.version.Version; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.ClientProtocolManager; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.TopologyResponseHandler; -import org.hornetq.spi.core.remoting.SessionContext; -import org.hornetq.utils.VersionLoader; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.protocol.ClientPacketDecoder; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.ChannelHandler; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CheckFailoverMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSessionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.DisconnectMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.DisconnectMessage_V2; +import org.apache.activemq6.core.protocol.core.impl.wireformat.Ping; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; +import org.apache.activemq6.core.remoting.impl.netty.HornetQFrameDecoder2; +import org.apache.activemq6.core.version.Version; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.TopologyResponseHandler; +import org.apache.activemq6.spi.core.remoting.SessionContext; +import org.apache.activemq6.utils.VersionLoader; /** * This class will return specific packets for different types of actions happening on a messaging protocol. diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/HornetQClientProtocolManagerFactory.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQClientProtocolManagerFactory.java similarity index 85% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/HornetQClientProtocolManagerFactory.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQClientProtocolManagerFactory.java index 0a066f251e..09b91c378b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/HornetQClientProtocolManagerFactory.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQClientProtocolManagerFactory.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl; +package org.apache.activemq6.core.protocol.core.impl; -import org.hornetq.spi.core.remoting.ClientProtocolManager; -import org.hornetq.spi.core.remoting.ClientProtocolManagerFactory; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManagerFactory; /** * @author Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/HornetQConsumerContext.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQConsumerContext.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/HornetQConsumerContext.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQConsumerContext.java index b63f372f92..c4967f139c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/HornetQConsumerContext.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQConsumerContext.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl; +package org.apache.activemq6.core.protocol.core.impl; -import org.hornetq.spi.core.remoting.ConsumerContext; +import org.apache.activemq6.spi.core.remoting.ConsumerContext; /** * @author Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/HornetQSessionContext.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQSessionContext.java similarity index 82% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/HornetQSessionContext.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQSessionContext.java index 311e93781c..2ec884d695 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/HornetQSessionContext.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQSessionContext.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl; +package org.apache.activemq6.core.protocol.core.impl; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -23,85 +23,85 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Executor; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.client.impl.AddressQueryImpl; -import org.hornetq.core.client.impl.ClientConsumerImpl; -import org.hornetq.core.client.impl.ClientConsumerInternal; -import org.hornetq.core.client.impl.ClientLargeMessageInternal; -import org.hornetq.core.client.impl.ClientMessageInternal; -import org.hornetq.core.client.impl.ClientProducerCreditsImpl; -import org.hornetq.core.client.impl.ClientSessionImpl; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.ChannelHandler; -import org.hornetq.core.protocol.core.CommandConfirmationHandler; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; -import org.hornetq.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; -import org.hornetq.core.protocol.core.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReattachSessionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.RollbackMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; -import org.hornetq.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionCloseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionExpireMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendLargeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXACommitMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAEndMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAForgetMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAJoinMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAResumeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXARollbackMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAStartMessage; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.SessionContext; -import org.hornetq.utils.TokenBucketLimiterImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.core.client.impl.AddressQueryImpl; +import org.apache.activemq6.core.client.impl.ClientConsumerImpl; +import org.apache.activemq6.core.client.impl.ClientConsumerInternal; +import org.apache.activemq6.core.client.impl.ClientLargeMessageInternal; +import org.apache.activemq6.core.client.impl.ClientMessageInternal; +import org.apache.activemq6.core.client.impl.ClientProducerCreditsImpl; +import org.apache.activemq6.core.client.impl.ClientSessionImpl; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.ChannelHandler; +import org.apache.activemq6.core.protocol.core.CommandConfirmationHandler; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateQueueMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSessionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.HornetQExceptionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReattachSessionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.RollbackMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCloseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionExpireMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveLargeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendLargeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXACommitMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAEndMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAForgetMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAJoinMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAResumeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXARollbackMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAStartMessage; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.SessionContext; +import org.apache.activemq6.utils.TokenBucketLimiterImpl; -import static org.hornetq.core.protocol.core.impl.PacketImpl.DISCONNECT_CONSUMER; -import static org.hornetq.core.protocol.core.impl.PacketImpl.EXCEPTION; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_CONTINUATION; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_LARGE_MSG; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_MSG; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.DISCONNECT_CONSUMER; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.EXCEPTION; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_CONTINUATION; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_LARGE_MSG; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_MSG; /** * @author Clebert Suconic diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/PacketDecoder.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/PacketDecoder.java new file mode 100644 index 0000000000..c13a4e86f3 --- /dev/null +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/PacketDecoder.java @@ -0,0 +1,474 @@ +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.core.protocol.core.impl; + +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CLUSTER_TOPOLOGY; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CLUSTER_TOPOLOGY_V2; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CLUSTER_TOPOLOGY_V3; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CREATESESSION; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CREATESESSION_RESP; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CREATE_QUEUE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CREATE_SHARED_QUEUE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.DELETE_QUEUE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.DISCONNECT; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.DISCONNECT_V2; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.DISCONNECT_CONSUMER; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.EXCEPTION; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.NULL_RESPONSE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.PACKETS_CONFIRMED; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.PING; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REATTACH_SESSION; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REATTACH_SESSION_RESP; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CHECK_FOR_FAILOVER; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_ACKNOWLEDGE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_ADD_METADATA; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_ADD_METADATA2; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY_RESP; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_CLOSE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_COMMIT; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_CONSUMER_CLOSE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_CREATECONSUMER; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_EXPIRED; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_FLOWTOKEN; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_INDIVIDUAL_ACKNOWLEDGE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_PRODUCER_CREDITS; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_PRODUCER_FAIL_CREDITS; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_PRODUCER_REQUEST_CREDITS; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY_RESP; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_CONTINUATION; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_ROLLBACK; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_START; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_STOP; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_UNIQUE_ADD_METADATA; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_COMMIT; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_END; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_FAILED; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_FORGET; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT_RESP; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS_RESP; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_JOIN; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_PREPARE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_RESP; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_RESUME; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_ROLLBACK; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT_RESP; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_START; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_SUSPEND; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SUBSCRIBE_TOPOLOGY; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SUBSCRIBE_TOPOLOGY_V2; + +import java.io.Serializable; + +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CheckFailoverMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateQueueMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSessionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.DisconnectMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.DisconnectMessage_V2; +import org.apache.activemq6.core.protocol.core.impl.wireformat.HornetQExceptionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.NullResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.PacketsConfirmedMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.Ping; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReattachSessionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.RollbackMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCloseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCommitMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionExpireMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXACommitMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAEndMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAForgetMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAJoinMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAResumeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXARollbackMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAStartMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; + +/** + * A PacketDecoder + * + * @author Tim Fox + */ +public abstract class PacketDecoder implements Serializable +{ + public abstract Packet decode(final HornetQBuffer in); + + public Packet decode(byte packetType) + { + Packet packet; + + switch (packetType) + { + case PING: + { + packet = new Ping(); + break; + } + case DISCONNECT: + { + packet = new DisconnectMessage(); + break; + } + case DISCONNECT_V2: + { + packet = new DisconnectMessage_V2(); + break; + } + case DISCONNECT_CONSUMER: + { + packet = new DisconnectConsumerMessage(); + break; + } + case EXCEPTION: + { + packet = new HornetQExceptionMessage(); + break; + } + case PACKETS_CONFIRMED: + { + packet = new PacketsConfirmedMessage(); + break; + } + case CREATESESSION: + { + packet = new CreateSessionMessage(); + break; + } + case CHECK_FOR_FAILOVER: + { + packet = new CheckFailoverMessage(); + break; + } + case CREATESESSION_RESP: + { + packet = new CreateSessionResponseMessage(); + break; + } + case REATTACH_SESSION: + { + packet = new ReattachSessionMessage(); + break; + } + case REATTACH_SESSION_RESP: + { + packet = new ReattachSessionResponseMessage(); + break; + } + case SESS_CLOSE: + { + packet = new SessionCloseMessage(); + break; + } + case SESS_CREATECONSUMER: + { + packet = new SessionCreateConsumerMessage(); + break; + } + case SESS_ACKNOWLEDGE: + { + packet = new SessionAcknowledgeMessage(); + break; + } + case SESS_EXPIRED: + { + packet = new SessionExpireMessage(); + break; + } + case SESS_COMMIT: + { + packet = new SessionCommitMessage(); + break; + } + case SESS_ROLLBACK: + { + packet = new RollbackMessage(); + break; + } + case SESS_QUEUEQUERY: + { + packet = new SessionQueueQueryMessage(); + break; + } + case SESS_QUEUEQUERY_RESP: + { + packet = new SessionQueueQueryResponseMessage(); + break; + } + case CREATE_QUEUE: + { + packet = new CreateQueueMessage(); + break; + } + case CREATE_SHARED_QUEUE: + { + packet = new CreateSharedQueueMessage(); + break; + } + case DELETE_QUEUE: + { + packet = new SessionDeleteQueueMessage(); + break; + } + case SESS_BINDINGQUERY: + { + packet = new SessionBindingQueryMessage(); + break; + } + case SESS_BINDINGQUERY_RESP: + { + packet = new SessionBindingQueryResponseMessage(); + break; + } + case SESS_XA_START: + { + packet = new SessionXAStartMessage(); + break; + } + case SESS_XA_FAILED: + { + packet = new SessionXAAfterFailedMessage(); + break; + } + case SESS_XA_END: + { + packet = new SessionXAEndMessage(); + break; + } + case SESS_XA_COMMIT: + { + packet = new SessionXACommitMessage(); + break; + } + case SESS_XA_PREPARE: + { + packet = new SessionXAPrepareMessage(); + break; + } + case SESS_XA_RESP: + { + packet = new SessionXAResponseMessage(); + break; + } + case SESS_XA_ROLLBACK: + { + packet = new SessionXARollbackMessage(); + break; + } + case SESS_XA_JOIN: + { + packet = new SessionXAJoinMessage(); + break; + } + case SESS_XA_SUSPEND: + { + packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND); + break; + } + case SESS_XA_RESUME: + { + packet = new SessionXAResumeMessage(); + break; + } + case SESS_XA_FORGET: + { + packet = new SessionXAForgetMessage(); + break; + } + case SESS_XA_INDOUBT_XIDS: + { + packet = new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS); + break; + } + case SESS_XA_INDOUBT_XIDS_RESP: + { + packet = new SessionXAGetInDoubtXidsResponseMessage(); + break; + } + case SESS_XA_SET_TIMEOUT: + { + packet = new SessionXASetTimeoutMessage(); + break; + } + case SESS_XA_SET_TIMEOUT_RESP: + { + packet = new SessionXASetTimeoutResponseMessage(); + break; + } + case SESS_XA_GET_TIMEOUT: + { + packet = new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT); + break; + } + case SESS_XA_GET_TIMEOUT_RESP: + { + packet = new SessionXAGetTimeoutResponseMessage(); + break; + } + case SESS_START: + { + packet = new PacketImpl(PacketImpl.SESS_START); + break; + } + case SESS_STOP: + { + packet = new PacketImpl(PacketImpl.SESS_STOP); + break; + } + case SESS_FLOWTOKEN: + { + packet = new SessionConsumerFlowCreditMessage(); + break; + } + case SESS_CONSUMER_CLOSE: + { + packet = new SessionConsumerCloseMessage(); + break; + } + case SESS_INDIVIDUAL_ACKNOWLEDGE: + { + packet = new SessionIndividualAcknowledgeMessage(); + break; + } + case NULL_RESPONSE: + { + packet = new NullResponseMessage(); + break; + } + case SESS_RECEIVE_CONTINUATION: + { + packet = new SessionReceiveContinuationMessage(); + break; + } + case SESS_SEND_CONTINUATION: + { + packet = new SessionSendContinuationMessage(); + break; + } + case SESS_PRODUCER_REQUEST_CREDITS: + { + packet = new SessionRequestProducerCreditsMessage(); + break; + } + case SESS_PRODUCER_CREDITS: + { + packet = new SessionProducerCreditsMessage(); + break; + } + case SESS_PRODUCER_FAIL_CREDITS: + { + packet = new SessionProducerCreditsFailMessage(); + break; + } + case SESS_FORCE_CONSUMER_DELIVERY: + { + packet = new SessionForceConsumerDelivery(); + break; + } + case CLUSTER_TOPOLOGY: + { + packet = new ClusterTopologyChangeMessage(); + break; + } + case CLUSTER_TOPOLOGY_V2: + { + packet = new ClusterTopologyChangeMessage_V2(); + break; + } + case CLUSTER_TOPOLOGY_V3: + { + packet = new ClusterTopologyChangeMessage_V3(); + break; + } + case SUBSCRIBE_TOPOLOGY: + { + packet = new SubscribeClusterTopologyUpdatesMessage(); + break; + } + case SUBSCRIBE_TOPOLOGY_V2: + { + packet = new SubscribeClusterTopologyUpdatesMessageV2(); + break; + } + case SESS_ADD_METADATA: + { + packet = new SessionAddMetaDataMessage(); + break; + } + case SESS_ADD_METADATA2: + { + packet = new SessionAddMetaDataMessageV2(); + break; + } + case SESS_UNIQUE_ADD_METADATA: + { + packet = new SessionUniqueAddMetaDataMessage(); + break; + } + case PacketImpl.CHECK_FOR_FAILOVER_REPLY: + { + packet = new CheckFailoverReplyMessage(); + break; + } + default: + { + throw HornetQClientMessageBundle.BUNDLE.invalidType(packetType); + } + } + + return packet; + } + +} diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/PacketImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/PacketImpl.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/PacketImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/PacketImpl.java index 54531dca1b..66f72fe10e 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/PacketImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/PacketImpl.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl; +package org.apache.activemq6.core.protocol.core.impl; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.utils.DataConstants; /** * @author Jeff Mesnil diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/RemotingConnectionImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/RemotingConnectionImpl.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/RemotingConnectionImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/RemotingConnectionImpl.java index 3afd32e107..f30f0734a3 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/RemotingConnectionImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/RemotingConnectionImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl; +package org.apache.activemq6.core.protocol.core.impl; import java.util.HashSet; import java.util.List; @@ -19,21 +19,21 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; -import org.hornetq.core.protocol.core.impl.wireformat.DisconnectMessage; -import org.hornetq.core.protocol.core.impl.wireformat.DisconnectMessage_V2; -import org.hornetq.core.security.HornetQPrincipal; -import org.hornetq.spi.core.protocol.AbstractRemotingConnection; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.utils.SimpleIDGenerator; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; +import org.apache.activemq6.core.protocol.core.impl.wireformat.DisconnectMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.DisconnectMessage_V2; +import org.apache.activemq6.core.security.HornetQPrincipal; +import org.apache.activemq6.spi.core.protocol.AbstractRemotingConnection; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.utils.SimpleIDGenerator; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CheckFailoverMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CheckFailoverMessage.java similarity index 86% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CheckFailoverMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CheckFailoverMessage.java index 75e879f1b3..ab1ec8c9c7 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CheckFailoverMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CheckFailoverMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; public class CheckFailoverMessage extends PacketImpl { diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java similarity index 88% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java index fc917d2475..d2fbc49b85 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; public class CheckFailoverReplyMessage extends PacketImpl { diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java index 1a239f425a..0c3a9983a6 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java index b187ccef70..5a1eeb9f8a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; /** * Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java index db41212a9d..7a78e6cf43 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; /** * @author Justin Bertram diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CreateQueueMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateQueueMessage.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CreateQueueMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateQueueMessage.java index 92aaa54e0e..2be3e02a95 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CreateQueueMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateQueueMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CreateSessionMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSessionMessage.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CreateSessionMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSessionMessage.java index fe966638d9..ad871b320e 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CreateSessionMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSessionMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java index 53c0e39e9e..76a5f54a04 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java index e9702d36ad..12339e6702 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java similarity index 87% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java index 59347ab461..e842bd8758 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; public class DisconnectConsumerMessage extends PacketImpl { diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/DisconnectMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectMessage.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/DisconnectMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectMessage.java index 4a71a7dcc6..12ba1740c9 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/DisconnectMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; public class DisconnectMessage extends PacketImpl { diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java index eb39811245..a2714be6c8 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; public class DisconnectMessage_V2 extends DisconnectMessage { diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java similarity index 90% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java index 82caa1132e..ab6fe23e53 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Jeff Mesnil diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/MessagePacket.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/MessagePacket.java similarity index 80% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/MessagePacket.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/MessagePacket.java index 08c46460c9..a9c4b3196c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/MessagePacket.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/MessagePacket.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.Message; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A MessagePacket diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/NullResponseMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/NullResponseMessage.java similarity index 87% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/NullResponseMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/NullResponseMessage.java index 98125d3e77..474f53d90c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/NullResponseMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/NullResponseMessage.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java index b2d94b2f4b..8eb088d8c6 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/Ping.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/Ping.java similarity index 81% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/Ping.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/Ping.java index 77811bba0b..f2ce2a394a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/Ping.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/Ping.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** - * Ping is sent on the client side by {@link org.hornetq.core.client.impl.ClientSessionFactoryImpl}. At the server's - * side it is handled by {@link org.hornetq.core.remoting.server.impl.RemotingServiceImpl} - * @see org.hornetq.spi.core.protocol.RemotingConnection#checkDataReceived() + * Ping is sent on the client side by {@link org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl}. At the server's + * side it is handled by {@link org.apache.activemq6.core.remoting.server.impl.RemotingServiceImpl} + * @see org.apache.activemq6.spi.core.protocol.RemotingConnection#checkDataReceived() * @author Tim Fox */ public final class Ping extends PacketImpl diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReattachSessionMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReattachSessionMessage.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReattachSessionMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReattachSessionMessage.java index b15cd221bc..0e47ac5902 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReattachSessionMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReattachSessionMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java index da8d71c65b..81ed8eade9 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/RollbackMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/RollbackMessage.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/RollbackMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/RollbackMessage.java index 9eed86e555..7c00bfcd69 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/RollbackMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/RollbackMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A RollbackMessage diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java index a1fe32378d..1a0a4bbe87 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java index 32935e183b..2ab3296e61 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A SessionAddMetaDataMessage diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java index 8dc405f162..070bda010a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A SessionAddMetaDataMessage diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java similarity index 89% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java index fc959161d3..5d113e76f9 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java index 77577668c2..9db872778a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionCloseMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCloseMessage.java similarity index 90% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionCloseMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCloseMessage.java index fabb387e07..7aaac80e8b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionCloseMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCloseMessage.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionCommitMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCommitMessage.java similarity index 87% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionCommitMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCommitMessage.java index 74f224ba21..48169991b3 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionCommitMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCommitMessage.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A SessionCommitMessage diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java index a271cfb905..a4fcfec34b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java index deec1bb8e9..7bea576737 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionContinuationMessage.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionContinuationMessage.java index 13f05f602c..433cfefe40 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionContinuationMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.utils.DataConstants; /** * A SessionContinuationMessage diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java index 5147251163..7ba0b85924 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java similarity index 90% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java index 16326b6d8f..088aefe828 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionExpireMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionExpireMessage.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionExpireMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionExpireMessage.java index 4e35d4a07f..234ff5870b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionExpireMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionExpireMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java index e9643954e2..c9b9d54aee 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java index f0871dc932..41865398b4 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java index b363047797..198bfffcdb 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Justin Bertram diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java index a8a1b5b7e5..0446d29b7a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java similarity index 89% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java index 29a40f994c..d2dbfbb949 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java index 23afbb1a39..8dec378e07 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.client.impl.QueueQueryImpl; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.server.QueueQueryResult; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.core.client.impl.QueueQueryImpl; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.server.QueueQueryResult; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java similarity index 81% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java index 88f2e295a7..1eb6c1d19b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java @@ -11,11 +11,11 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.client.impl.ClientLargeMessageInternal; -import org.hornetq.core.message.impl.MessageInternal; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.client.impl.ClientLargeMessageInternal; +import org.apache.activemq6.core.message.impl.MessageInternal; /** * @author Andy Taylor diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java index 9267f6b68a..83f6c90a6f 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.utils.DataConstants; /** * A SessionSendContinuationMessage diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java index 35bb17eb8c..7d872e86eb 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A SessionReceiveLargeMessage diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveMessage.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveMessage.java index 147b67e9e5..87b696685a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveMessage.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.utils.DataConstants; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java index 185a76a226..992a507217 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java similarity index 87% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java index f5599df790..ba792f1f2a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.core.message.impl.MessageInternal; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.core.message.impl.MessageInternal; /** * A SessionSendContinuationMessage
@@ -29,12 +29,12 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage // Used on confirmation handling private MessageInternal message; /** - * In case, we are using a different handler than the one set on the {@link org.hornetq.api.core.client.ClientSession} + * In case, we are using a different handler than the one set on the {@link org.apache.activemq6.api.core.client.ClientSession} *

* This field is only used at the client side. * - * @see org.hornetq.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) - * @see org.hornetq.api.core.client.ClientProducer#send(org.hornetq.api.core.SimpleString, org.hornetq.api.core.Message, SendAcknowledgementHandler) + * @see org.apache.activemq6.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) + * @see org.apache.activemq6.api.core.client.ClientProducer#send(org.hornetq.api.core.SimpleString, org.hornetq.api.core.Message, SendAcknowledgementHandler) */ private final transient SendAcknowledgementHandler handler; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java similarity index 90% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java index 088eaeef45..7857bae3fd 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionSendMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendMessage.java similarity index 82% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionSendMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendMessage.java index fac4698e59..3547845a65 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionSendMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.utils.DataConstants; /** * @author Tim Fox @@ -27,12 +27,12 @@ public class SessionSendMessage extends MessagePacket private boolean requiresResponse; /** - * In case, we are using a different handler than the one set on the {@link org.hornetq.api.core.client.ClientSession} + * In case, we are using a different handler than the one set on the {@link org.apache.activemq6.api.core.client.ClientSession} *

* This field is only used at the client side. * - * @see org.hornetq.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) - * @see org.hornetq.api.core.client.ClientProducer#send(org.hornetq.api.core.SimpleString, org.hornetq.api.core.Message, SendAcknowledgementHandler) + * @see org.apache.activemq6.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) + * @see org.apache.activemq6.api.core.client.ClientProducer#send(org.hornetq.api.core.SimpleString, org.hornetq.api.core.Message, SendAcknowledgementHandler) */ private final transient SendAcknowledgementHandler handler; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java index 56f28696d3..6b86bfc31c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; /** diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java index 70dbaf158d..9ebd0297eb 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.utils.XidCodecSupport; /** * to be called after a failure on an XA Session diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXACommitMessage.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXACommitMessage.java index 233f4427ee..1fe0acf638 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXACommitMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.utils.XidCodecSupport; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAEndMessage.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAEndMessage.java index bea88d89f9..8c75fb779d 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAEndMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.utils.XidCodecSupport; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java similarity index 89% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java index 1200962bfa..51269e22fe 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.utils.XidCodecSupport; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java index e9caf25c58..0bd0dde375 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import java.util.ArrayList; import java.util.List; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.utils.XidCodecSupport; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java index 3228fe06f1..773fdd58ee 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java similarity index 89% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java index eb9844914c..af64efe2bf 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.utils.XidCodecSupport; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java similarity index 89% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java index cc515eeac4..7b014d2ead 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.utils.XidCodecSupport; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java index ebc48cbb2e..36e6b70ec2 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java similarity index 89% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java index 1b1323d843..6dd712c296 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.utils.XidCodecSupport; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java similarity index 90% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java index 6f10199c0c..fc0679a8cb 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.utils.XidCodecSupport; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java index 4a2f2b7865..94b5f28b81 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java index 2f25701d47..4ac036e313 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAStartMessage.java similarity index 90% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAStartMessage.java index 0f37793e60..ad2a73bcd3 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAStartMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.utils.XidCodecSupport; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java index 907011d63c..d838779e18 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java index d02123d3ca..a129ce02a5 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffer; /** * @author Tim Fox diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/CloseListener.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/CloseListener.java similarity index 73% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/CloseListener.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/CloseListener.java index 916dad2395..ea74b0ef4e 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/CloseListener.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/CloseListener.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting; +package org.apache.activemq6.core.remoting; /** - * CloseListeners can be registered with a {@link org.hornetq.spi.core.protocol.RemotingConnection} to get notified when the connection is closed. + * CloseListeners can be registered with a {@link org.apache.activemq6.spi.core.protocol.RemotingConnection} to get notified when the connection is closed. *

- * {@link org.hornetq.spi.core.protocol.RemotingConnection#addCloseListener(CloseListener)} + * {@link org.apache.activemq6.spi.core.protocol.RemotingConnection#addCloseListener(CloseListener)} * * @author Andy Taylor */ diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/FailureListener.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/FailureListener.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/FailureListener.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/FailureListener.java index 6151606bc3..7274f146cb 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/FailureListener.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/FailureListener.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting; +package org.apache.activemq6.core.remoting; -import org.hornetq.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQException; /** * A FailureListener notifies the user when a connection failure occurred. diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/TransportConfigurationUtil.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/TransportConfigurationUtil.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/TransportConfigurationUtil.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/TransportConfigurationUtil.java index 58666e02e4..66e1e271a2 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/TransportConfigurationUtil.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/TransportConfigurationUtil.java @@ -11,15 +11,15 @@ * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl; +package org.apache.activemq6.core.remoting.impl; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.TransportConfigurationHelper; -import org.hornetq.utils.ClassloadingUtil; +import org.apache.activemq6.api.core.TransportConfigurationHelper; +import org.apache.activemq6.utils.ClassloadingUtil; /** * Stores static mappings of class names to ConnectorFactory instances to act as a central repo for ConnectorFactory diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java index 68fc6e1f39..7890953abd 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/HornetQChannelHandler.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQChannelHandler.java similarity index 88% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/HornetQChannelHandler.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQChannelHandler.java index ad6367f0ae..5cbcb14bf9 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/HornetQChannelHandler.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQChannelHandler.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.group.ChannelGroup; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.buffers.impl.ChannelBufferWrapper; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; /** diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder2.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQFrameDecoder2.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder2.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQFrameDecoder2.java index 87efc7829b..31f9c80cdf 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder2.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQFrameDecoder2.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.LengthFieldBasedFrameDecoder; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.utils.DataConstants; /** * A Netty decoder specially optimised to to decode messages on the core protocol only diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnection.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnection.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnection.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnection.java index a848df267b..015a8644bb 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnection.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnection.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import java.net.SocketAddress; import java.util.Map; @@ -24,18 +24,18 @@ import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelPromise; import io.netty.channel.EventLoop; import io.netty.handler.ssl.SslHandler; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.buffers.impl.ChannelBufferWrapper; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.security.HornetQPrincipal; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.spi.core.remoting.ReadyListener; -import org.hornetq.utils.ConcurrentHashSet; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.security.HornetQPrincipal; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.spi.core.remoting.ReadyListener; +import org.apache.activemq6.utils.ConcurrentHashSet; /** * @author Jeff Mesnil diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnector.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnector.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnector.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnector.java index f442c91edf..569ae20a43 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnector.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnector.java @@ -23,7 +23,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; @@ -95,23 +95,23 @@ import io.netty.util.AttributeKey; import io.netty.util.ResourceLeakDetector; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GlobalEventExecutor; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.protocol.core.impl.HornetQClientProtocolManager; -import org.hornetq.core.remoting.impl.ssl.SSLSupport; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.spi.core.remoting.AbstractConnector; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.ClientProtocolManager; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.utils.ConfigurationHelper; -import org.hornetq.utils.FutureLatch; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq6.core.protocol.core.impl.HornetQClientProtocolManager; +import org.apache.activemq6.core.remoting.impl.ssl.SSLSupport; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.spi.core.remoting.AbstractConnector; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.utils.ConfigurationHelper; +import org.apache.activemq6.utils.FutureLatch; -import static org.hornetq.utils.Base64.encodeBytes; +import static org.apache.activemq6.utils.Base64.encodeBytes; /** * A NettyConnector @@ -128,12 +128,12 @@ public class NettyConnector extends AbstractConnector public static final String JAVAX_KEYSTORE_PASSWORD_PROP_NAME = "javax.net.ssl.keyStorePassword"; public static final String JAVAX_TRUSTSTORE_PATH_PROP_NAME = "javax.net.ssl.trustStore"; public static final String JAVAX_TRUSTSTORE_PASSWORD_PROP_NAME = "javax.net.ssl.trustStorePassword"; - public static final String HORNETQ_KEYSTORE_PROVIDER_PROP_NAME = "org.hornetq.ssl.keyStoreProvider"; - public static final String HORNETQ_KEYSTORE_PATH_PROP_NAME = "org.hornetq.ssl.keyStore"; - public static final String HORNETQ_KEYSTORE_PASSWORD_PROP_NAME = "org.hornetq.ssl.keyStorePassword"; - public static final String HORNETQ_TRUSTSTORE_PROVIDER_PROP_NAME = "org.hornetq.ssl.trustStoreProvider"; - public static final String HORNETQ_TRUSTSTORE_PATH_PROP_NAME = "org.hornetq.ssl.trustStore"; - public static final String HORNETQ_TRUSTSTORE_PASSWORD_PROP_NAME = "org.hornetq.ssl.trustStorePassword"; + public static final String HORNETQ_KEYSTORE_PROVIDER_PROP_NAME = "org.apache.activemq6.ssl.keyStoreProvider"; + public static final String HORNETQ_KEYSTORE_PATH_PROP_NAME = "org.apache.activemq6.ssl.keyStore"; + public static final String HORNETQ_KEYSTORE_PASSWORD_PROP_NAME = "org.apache.activemq6.ssl.keyStorePassword"; + public static final String HORNETQ_TRUSTSTORE_PROVIDER_PROP_NAME = "org.apache.activemq6.ssl.trustStoreProvider"; + public static final String HORNETQ_TRUSTSTORE_PATH_PROP_NAME = "org.apache.activemq6.ssl.trustStore"; + public static final String HORNETQ_TRUSTSTORE_PASSWORD_PROP_NAME = "org.apache.activemq6.ssl.trustStorePassword"; // Constants for HTTP upgrade // These constants are exposed publicly as they are used on the server-side to fetch diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnectorFactory.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnectorFactory.java similarity index 83% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnectorFactory.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnectorFactory.java index f66b58ae36..e2c31b6c0c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnectorFactory.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnectorFactory.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.ClientProtocolManager; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.spi.core.remoting.Connector; -import org.hornetq.spi.core.remoting.ConnectorFactory; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.spi.core.remoting.Connector; +import org.apache.activemq6.spi.core.remoting.ConnectorFactory; /** * A NettyConnectorFactory diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/PartialPooledByteBufAllocator.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/PartialPooledByteBufAllocator.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/PartialPooledByteBufAllocator.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/PartialPooledByteBufAllocator.java index 275af12f4d..6c481c602c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/PartialPooledByteBufAllocator.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/PartialPooledByteBufAllocator.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/SharedNioEventLoopGroup.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/SharedNioEventLoopGroup.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/SharedNioEventLoopGroup.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/SharedNioEventLoopGroup.java index 3383d958e6..f7ed135479 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/SharedNioEventLoopGroup.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/SharedNioEventLoopGroup.java @@ -23,15 +23,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.FutureListener; import io.netty.util.concurrent.ImmediateEventExecutor; import io.netty.util.concurrent.Promise; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.utils.HornetQThreadFactory; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq6.utils.HornetQThreadFactory; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/TransportConstants.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/TransportConstants.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/TransportConstants.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/TransportConstants.java index f659798c30..990e99ef71 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/netty/TransportConstants.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/TransportConstants.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import java.util.Collections; import java.util.HashSet; import java.util.Set; import io.netty.util.Version; -import org.hornetq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; /** * A TransportConstants diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/ssl/SSLSupport.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/ssl/SSLSupport.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/ssl/SSLSupport.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/ssl/SSLSupport.java index 97bd565711..f2036af1ba 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/impl/ssl/SSLSupport.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/ssl/SSLSupport.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.ssl; +package org.apache.activemq6.core.remoting.impl.ssl; import java.io.File; import java.io.IOException; @@ -28,7 +28,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; -import org.hornetq.utils.ClassloadingUtil; +import org.apache.activemq6.utils.ClassloadingUtil; /** * @author Jeff Mesnil diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/package-info.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/package-info.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/remoting/package-info.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/package-info.java index 7ce2bae00b..457daae7ff 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/remoting/package-info.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/package-info.java @@ -15,5 +15,5 @@ *
* This package defines the API used by HornetQ for remoting. */ -package org.hornetq.core.remoting; +package org.apache.activemq6.core.remoting; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/security/HornetQPrincipal.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/security/HornetQPrincipal.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/core/security/HornetQPrincipal.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/security/HornetQPrincipal.java index 228f643336..94f675289c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/security/HornetQPrincipal.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/security/HornetQPrincipal.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.security; +package org.apache.activemq6.core.security; /** * @author Andy Taylor diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/security/Role.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/security/Role.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/core/security/Role.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/security/Role.java index ee4f34fb38..30348cbc00 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/security/Role.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/security/Role.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.security; +package org.apache.activemq6.core.security; import java.io.Serializable; diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/server/QueueQueryResult.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/server/QueueQueryResult.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/core/server/QueueQueryResult.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/server/QueueQueryResult.java index ebe26e46fd..9fba0b8815 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/server/QueueQueryResult.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/server/QueueQueryResult.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/server/management/Notification.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/Notification.java similarity index 85% rename from hornetq-core-client/src/main/java/org/hornetq/core/server/management/Notification.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/Notification.java index 79f9bbcad3..214dfdfb99 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/server/management/Notification.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/Notification.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.management; +package org.apache.activemq6.core.server.management; -import org.hornetq.api.core.management.NotificationType; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.management.NotificationType; +import org.apache.activemq6.utils.TypedProperties; /** * A Notification - * @see org.hornetq.core.server.management.NotificationListener + * @see org.apache.activemq6.core.server.management.NotificationListener * @see NotificationType * @author Tim Fox Created 22 Jan 2009 16:41:12 */ diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/server/management/NotificationListener.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/NotificationListener.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/core/server/management/NotificationListener.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/NotificationListener.java index 405fa48a6c..f20b1afb3a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/server/management/NotificationListener.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/NotificationListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.management; +package org.apache.activemq6.core.server.management; /** diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/server/management/NotificationService.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/NotificationService.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/core/server/management/NotificationService.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/NotificationService.java index c22dab0982..8cedaff91b 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/server/management/NotificationService.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/NotificationService.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.management; +package org.apache.activemq6.core.server.management; /** * A NotificationService diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/settings/impl/AddressFullMessagePolicy.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/settings/impl/AddressFullMessagePolicy.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/core/settings/impl/AddressFullMessagePolicy.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/settings/impl/AddressFullMessagePolicy.java index 692f9b348e..290402779c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/settings/impl/AddressFullMessagePolicy.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/settings/impl/AddressFullMessagePolicy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.settings.impl; +package org.apache.activemq6.core.settings.impl; /** * A AddressFullMessagePolicy diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/transaction/impl/XidImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/transaction/impl/XidImpl.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/core/transaction/impl/XidImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/transaction/impl/XidImpl.java index 12abdd4526..e2963a787a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/transaction/impl/XidImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/transaction/impl/XidImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.transaction.impl; +package org.apache.activemq6.core.transaction.impl; import java.io.Serializable; import java.util.Arrays; import javax.transaction.xa.Xid; -import org.hornetq.utils.Base64; +import org.apache.activemq6.utils.Base64; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/version/Version.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/version/Version.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/core/version/Version.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/version/Version.java index 2e31d0cb86..783a7a69e9 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/version/Version.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/version/Version.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.version; +package org.apache.activemq6.core.version; /** * diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/version/impl/VersionImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/core/version/impl/VersionImpl.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/core/version/impl/VersionImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/core/version/impl/VersionImpl.java index 17269328bd..7295dfb1c9 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/core/version/impl/VersionImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/core/version/impl/VersionImpl.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.version.impl; +package org.apache.activemq6.core.version.impl; import java.io.Serializable; import java.util.Arrays; -import org.hornetq.core.version.Version; +import org.apache.activemq6.core.version.Version; /** * A VersionImpl diff --git a/hornetq-core-client/src/main/java/org/hornetq/reader/BytesMessageUtil.java b/activemq6-core-client/src/main/java/org/apache/activemq6/reader/BytesMessageUtil.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/reader/BytesMessageUtil.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/reader/BytesMessageUtil.java index 24ea35c951..21bc2093f7 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/reader/BytesMessageUtil.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/reader/BytesMessageUtil.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.reader; +package org.apache.activemq6.reader; -import org.hornetq.api.core.Message; +import org.apache.activemq6.api.core.Message; /** * @author Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/reader/MapMessageUtil.java b/activemq6-core-client/src/main/java/org/apache/activemq6/reader/MapMessageUtil.java similarity index 88% rename from hornetq-core-client/src/main/java/org/hornetq/reader/MapMessageUtil.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/reader/MapMessageUtil.java index d55fb305e0..734b4133e5 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/reader/MapMessageUtil.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/reader/MapMessageUtil.java @@ -11,11 +11,11 @@ * permissions and limitations under the License. */ -package org.hornetq.reader; +package org.apache.activemq6.reader; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Message; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.utils.TypedProperties; /** * @author Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/reader/MessageUtil.java b/activemq6-core-client/src/main/java/org/apache/activemq6/reader/MessageUtil.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/reader/MessageUtil.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/reader/MessageUtil.java index a2429db380..1b0bba1f9c 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/reader/MessageUtil.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/reader/MessageUtil.java @@ -11,18 +11,18 @@ * permissions and limitations under the License. */ -package org.hornetq.reader; +package org.apache.activemq6.reader; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQPropertyConversionException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; +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.Message; +import org.apache.activemq6.api.core.SimpleString; /** * static methods intended for import static on JMS like messages. @@ -196,6 +196,6 @@ public class MessageUtil { return message.containsProperty(new SimpleString(name)) || name.equals(MessageUtil.JMSXDELIVERYCOUNT) || MessageUtil.JMSXGROUPID.equals(name) && - message.containsProperty(org.hornetq.api.core.Message.HDR_GROUP_ID); + message.containsProperty(org.apache.activemq6.api.core.Message.HDR_GROUP_ID); } } diff --git a/hornetq-core-client/src/main/java/org/hornetq/reader/StreamMessageUtil.java b/activemq6-core-client/src/main/java/org/apache/activemq6/reader/StreamMessageUtil.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/reader/StreamMessageUtil.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/reader/StreamMessageUtil.java index edefc01af1..b92132e509 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/reader/StreamMessageUtil.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/reader/StreamMessageUtil.java @@ -11,12 +11,12 @@ * permissions and limitations under the License. */ -package org.hornetq.reader; +package org.apache.activemq6.reader; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.utils.DataConstants; +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.utils.DataConstants; /** * @author Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/reader/TextMessageUtil.java b/activemq6-core-client/src/main/java/org/apache/activemq6/reader/TextMessageUtil.java similarity index 87% rename from hornetq-core-client/src/main/java/org/hornetq/reader/TextMessageUtil.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/reader/TextMessageUtil.java index 9601f5efa8..8821e4e6bf 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/reader/TextMessageUtil.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/reader/TextMessageUtil.java @@ -11,11 +11,11 @@ * permissions and limitations under the License. */ -package org.hornetq.reader; +package org.apache.activemq6.reader; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; /** * @author Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/reader/package-info.java b/activemq6-core-client/src/main/java/org/apache/activemq6/reader/package-info.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/reader/package-info.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/reader/package-info.java index 5e75719283..55cf5b5528 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/reader/package-info.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/reader/package-info.java @@ -18,4 +18,4 @@ * this is done at the server's * @author Clebert Suconic */ -package org.hornetq.reader; \ No newline at end of file +package org.apache.activemq6.reader; \ No newline at end of file diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/protocol/AbstractRemotingConnection.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/AbstractRemotingConnection.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/protocol/AbstractRemotingConnection.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/AbstractRemotingConnection.java index f5a910e557..e826e0b8c7 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/protocol/AbstractRemotingConnection.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/AbstractRemotingConnection.java @@ -11,21 +11,21 @@ * permissions and limitations under the License. */ -package org.hornetq.spi.core.protocol; +package org.apache.activemq6.spi.core.protocol; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executor; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.spi.core.remoting.Connection; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.core.remoting.CloseListener; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.spi.core.remoting.Connection; /** * @author Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/protocol/ConnectionEntry.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/ConnectionEntry.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/protocol/ConnectionEntry.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/ConnectionEntry.java index 5b60aacd42..2ebc470412 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/protocol/ConnectionEntry.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/ConnectionEntry.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.protocol; +package org.apache.activemq6.spi.core.protocol; import java.util.concurrent.Executor; diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/protocol/RemotingConnection.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/RemotingConnection.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/protocol/RemotingConnection.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/RemotingConnection.java index 932f771e2e..51a048d816 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/protocol/RemotingConnection.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/RemotingConnection.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.protocol; +package org.apache.activemq6.spi.core.protocol; import java.util.List; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.Connection; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.remoting.CloseListener; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.Connection; /** * A RemotingConnection is a connection between a client and a server. diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/AbstractConnector.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/AbstractConnector.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/AbstractConnector.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/AbstractConnector.java index e56f1ac11e..98c477cabe 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/AbstractConnector.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/AbstractConnector.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; import java.util.Map; diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/BufferDecoder.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/BufferDecoder.java similarity index 78% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/BufferDecoder.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/BufferDecoder.java index bb34546f9d..23e853c4f6 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/BufferDecoder.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/BufferDecoder.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; -import org.hornetq.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffer; /** * A BufferDecoder @@ -24,7 +24,7 @@ import org.hornetq.api.core.HornetQBuffer; public interface BufferDecoder { /** - * called by the remoting system prior to {@link org.hornetq.spi.core.remoting.BufferHandler#bufferReceived(Object, org.hornetq.api.core.HornetQBuffer)}. + * called by the remoting system prior to {@link org.apache.activemq6.spi.core.remoting.BufferHandler#bufferReceived(Object, org.hornetq.api.core.HornetQBuffer)}. *

* The implementation should return true if there is enough data in the buffer to decode. otherwise false. * * @param buffer the buffer diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/BufferHandler.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/BufferHandler.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/BufferHandler.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/BufferHandler.java index 6ea9a572ec..3f3ae91fbc 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/BufferHandler.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/BufferHandler.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; -import org.hornetq.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffer; /** * A BufferHandler that will handle buffers received by an acceptor. diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ClientProtocolManager.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ClientProtocolManager.java similarity index 89% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ClientProtocolManager.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ClientProtocolManager.java index 8ae772b529..f11faf1ea1 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ClientProtocolManager.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ClientProtocolManager.java @@ -11,16 +11,16 @@ * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; import java.util.List; import java.util.concurrent.locks.Lock; import io.netty.channel.ChannelPipeline; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * @author Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ClientProtocolManagerFactory.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ClientProtocolManagerFactory.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ClientProtocolManagerFactory.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ClientProtocolManagerFactory.java index 448f92da2e..49e81f994f 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ClientProtocolManagerFactory.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ClientProtocolManagerFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; import java.io.Serializable; diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/Connection.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/Connection.java similarity index 92% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/Connection.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/Connection.java index 69c338b3d5..5bd747bee1 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/Connection.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/Connection.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; import io.netty.channel.ChannelFutureListener; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.security.HornetQPrincipal; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.security.HornetQPrincipal; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * The connection used by a channel to write data to. diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConnectionLifeCycleListener.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConnectionLifeCycleListener.java index 1f1562e129..6d1413833a 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConnectionLifeCycleListener.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.server.HornetQComponent; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.server.HornetQComponent; /** * A ConnectionLifeCycleListener is called by the remoting implementation to notify of connection events. diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/Connector.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/Connector.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/Connector.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/Connector.java index 474f18918c..349213bb4e 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/Connector.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/Connector.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; import java.util.Map; diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ConnectorFactory.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConnectorFactory.java similarity index 91% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ConnectorFactory.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConnectorFactory.java index 5d0b458b03..b309a75506 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ConnectorFactory.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConnectorFactory.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.TransportConfigurationHelper; +import org.apache.activemq6.api.core.TransportConfigurationHelper; /** * A ConnectorFactory is used by the client for creating connectors. *

- * A Connector is used to connect to an {@link org.hornetq.spi.core.remoting.Acceptor}. + * A Connector is used to connect to an {@link org.apache.activemq6.spi.core.remoting.Acceptor}. * * @author Tim Fox */ diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ConsumerContext.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConsumerContext.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ConsumerContext.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConsumerContext.java index 082bcd4a2b..51e4155fbc 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ConsumerContext.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConsumerContext.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; /** * @author Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ReadyListener.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ReadyListener.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ReadyListener.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ReadyListener.java index d7adc4781b..7829410e71 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/ReadyListener.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ReadyListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; /** * A ReadyListener diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/SessionContext.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/SessionContext.java similarity index 90% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/SessionContext.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/SessionContext.java index 87d97de900..abc8657e60 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/SessionContext.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/SessionContext.java @@ -11,28 +11,28 @@ * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; import javax.transaction.xa.XAException; import javax.transaction.xa.Xid; import java.util.HashMap; import java.util.concurrent.Executor; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.core.client.impl.ClientConsumerInternal; -import org.hornetq.core.client.impl.ClientLargeMessageInternal; -import org.hornetq.core.client.impl.ClientMessageInternal; -import org.hornetq.core.client.impl.ClientProducerCreditsImpl; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.utils.IDGenerator; -import org.hornetq.utils.SimpleIDGenerator; +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.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.core.client.impl.ClientConsumerInternal; +import org.apache.activemq6.core.client.impl.ClientLargeMessageInternal; +import org.apache.activemq6.core.client.impl.ClientMessageInternal; +import org.apache.activemq6.core.client.impl.ClientProducerCreditsImpl; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.utils.IDGenerator; +import org.apache.activemq6.utils.SimpleIDGenerator; /** * @author Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/TopologyResponseHandler.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/TopologyResponseHandler.java similarity index 86% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/TopologyResponseHandler.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/TopologyResponseHandler.java index f7b99ec9e6..05ef1bebf3 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/TopologyResponseHandler.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/TopologyResponseHandler.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * @author Clebert Suconic diff --git a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/package-info.java b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/package-info.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/package-info.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/package-info.java index bf3744bb8d..f6cebebaae 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/spi/core/remoting/package-info.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/package-info.java @@ -16,5 +16,5 @@ * This package defines the Service Provide Interface that * remoting providers must implement to be supported by HornetQ. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/BufferHelper.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/BufferHelper.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/utils/BufferHelper.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/BufferHelper.java index 867c1925cf..fb19e41d89 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/BufferHelper.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/BufferHelper.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; /** * Helper methods to read and write from HornetQBuffer. diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/ConfigurationHelper.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/ConfigurationHelper.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/utils/ConfigurationHelper.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/ConfigurationHelper.java index 83f4b811ee..bf619cfe26 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/ConfigurationHelper.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/ConfigurationHelper.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; import java.util.HashSet; import java.util.Map; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/ConfirmationWindowWarning.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/ConfirmationWindowWarning.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/utils/ConfirmationWindowWarning.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/ConfirmationWindowWarning.java index 18873c24f6..85d703408e 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/ConfirmationWindowWarning.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/ConfirmationWindowWarning.java @@ -13,7 +13,7 @@ /** * */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/DeflaterReader.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/DeflaterReader.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/utils/DeflaterReader.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/DeflaterReader.java index b0950df394..c735fa0441 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/DeflaterReader.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/DeflaterReader.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.io.IOException; import java.io.InputStream; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/ExecutorFactory.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/ExecutorFactory.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/utils/ExecutorFactory.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/ExecutorFactory.java index b834dd6f5a..b2d00f2aa8 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/ExecutorFactory.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/ExecutorFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.concurrent.Executor; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/FutureLatch.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/FutureLatch.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/utils/FutureLatch.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/FutureLatch.java index 51a32a0e2b..c4fa561d39 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/FutureLatch.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/FutureLatch.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/HornetQBufferInputStream.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/HornetQBufferInputStream.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/utils/HornetQBufferInputStream.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/HornetQBufferInputStream.java index 65b2c1d629..cb2edde2d6 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/HornetQBufferInputStream.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/HornetQBufferInputStream.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.io.IOException; import java.io.InputStream; -import org.hornetq.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffer; /** * Used to send large messages diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/IDGenerator.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/IDGenerator.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/utils/IDGenerator.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/IDGenerator.java index a556095038..0d31ff7f73 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/IDGenerator.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/IDGenerator.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; /** * Generator of record IDs for the journals. diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/InflaterReader.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/InflaterReader.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/utils/InflaterReader.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/InflaterReader.java index 67983b86b4..13eea8b129 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/InflaterReader.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/InflaterReader.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.io.IOException; import java.io.InputStream; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/InflaterWriter.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/InflaterWriter.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/utils/InflaterWriter.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/InflaterWriter.java index 2c4a378efc..e2a46912f3 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/InflaterWriter.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/InflaterWriter.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.io.IOException; import java.io.OutputStream; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/JNDIUtil.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/JNDIUtil.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/utils/JNDIUtil.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/JNDIUtil.java index c11f81ee75..0af4b02588 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/JNDIUtil.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/JNDIUtil.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.StringTokenizer; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/LinkedList.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedList.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/utils/LinkedList.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedList.java index e73425ac53..3d288e835f 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/LinkedList.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedList.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; /** * A LinkedList diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/LinkedListImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedListImpl.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/utils/LinkedListImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedListImpl.java index 834646aa1e..382d47108f 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/LinkedListImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedListImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.lang.reflect.Array; import java.util.NoSuchElementException; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/LinkedListIterator.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedListIterator.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/utils/LinkedListIterator.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedListIterator.java index 74c123a20e..8100a789f3 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/LinkedListIterator.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedListIterator.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.Iterator; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/MemorySize.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/MemorySize.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/utils/MemorySize.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/MemorySize.java index bf92b9577a..b9633b6390 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/MemorySize.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/MemorySize.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; -import org.hornetq.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientLogger; import java.lang.ref.WeakReference; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/ObjectInputStreamWithClassLoader.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/ObjectInputStreamWithClassLoader.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/utils/ObjectInputStreamWithClassLoader.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/ObjectInputStreamWithClassLoader.java index c7cf8db610..077225d96d 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/ObjectInputStreamWithClassLoader.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/ObjectInputStreamWithClassLoader.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.io.IOException; import java.io.InputStream; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/OrderedExecutorFactory.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/OrderedExecutorFactory.java similarity index 96% rename from hornetq-core-client/src/main/java/org/hornetq/utils/OrderedExecutorFactory.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/OrderedExecutorFactory.java index 54ef00a6c9..7c8ee02880 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/OrderedExecutorFactory.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/OrderedExecutorFactory.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Executor; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.core.client.HornetQClientLogger; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.core.client.HornetQClientLogger; /** diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/PriorityLinkedList.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/PriorityLinkedList.java similarity index 93% rename from hornetq-core-client/src/main/java/org/hornetq/utils/PriorityLinkedList.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/PriorityLinkedList.java index 5766870b79..668f95b497 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/PriorityLinkedList.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/PriorityLinkedList.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; /** diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/PriorityLinkedListImpl.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/PriorityLinkedListImpl.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/utils/PriorityLinkedListImpl.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/PriorityLinkedListImpl.java index d72054c396..50e7f97e54 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/PriorityLinkedListImpl.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/PriorityLinkedListImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.lang.reflect.Array; import java.util.NoSuchElementException; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/Random.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/Random.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/utils/Random.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/Random.java index 678d003862..45a0131747 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/Random.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/Random.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.io.Serializable; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/SecurityFormatter.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SecurityFormatter.java similarity index 94% rename from hornetq-core-client/src/main/java/org/hornetq/utils/SecurityFormatter.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/SecurityFormatter.java index a77869b711..89de2fb5d7 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/SecurityFormatter.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SecurityFormatter.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; -import org.hornetq.core.security.Role; +import org.apache.activemq6.core.security.Role; import java.util.ArrayList; import java.util.HashSet; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/SimpleIDGenerator.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SimpleIDGenerator.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/utils/SimpleIDGenerator.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/SimpleIDGenerator.java index f31b014eb2..3ab77b9c2d 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/SimpleIDGenerator.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SimpleIDGenerator.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; /** * A SimpleIDGenerator diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/SizeFormatterUtil.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SizeFormatterUtil.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/utils/SizeFormatterUtil.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/SizeFormatterUtil.java index 324411c1f6..2214469798 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/SizeFormatterUtil.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SizeFormatterUtil.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; /** * A SizeFormatterUtil diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/SoftValueHashMap.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SoftValueHashMap.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/utils/SoftValueHashMap.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/SoftValueHashMap.java index 2285bf9c6b..dbff41b940 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/SoftValueHashMap.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SoftValueHashMap.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; @@ -24,7 +24,7 @@ import java.util.Set; import java.util.TreeSet; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientLogger; /** * A SoftValueHashMap diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/TimeAndCounterIDGenerator.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/TimeAndCounterIDGenerator.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/utils/TimeAndCounterIDGenerator.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/TimeAndCounterIDGenerator.java index 8a85fc759b..7aa6cb6f1e 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/TimeAndCounterIDGenerator.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/TimeAndCounterIDGenerator.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; import java.util.concurrent.atomic.AtomicLong; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/TokenBucketLimiter.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/TokenBucketLimiter.java similarity index 97% rename from hornetq-core-client/src/main/java/org/hornetq/utils/TokenBucketLimiter.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/TokenBucketLimiter.java index 83690c71e4..d4ae6f78cf 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/TokenBucketLimiter.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/TokenBucketLimiter.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; /** * This class can throttle to a specific rate, using an algorithm based on the Jeff Mesnil diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONArray.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONArray.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONArray.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONArray.java index 4d5bc3cb17..982570f98e 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONArray.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONArray.java @@ -34,7 +34,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package org.hornetq.utils.json; +package org.apache.activemq6.utils.json; import java.io.IOException; import java.io.Writer; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONException.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONException.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONException.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONException.java index d50b025b0f..f1b47c91e9 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONException.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONException.java @@ -34,7 +34,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package org.hornetq.utils.json; +package org.apache.activemq6.utils.json; /** * The JSONException is thrown by the JSON.org classes then things are amiss. diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONObject.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONObject.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONObject.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONObject.java index 1e8934bfcd..bf74a3e3fb 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONObject.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONObject.java @@ -34,7 +34,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package org.hornetq.utils.json; +package org.apache.activemq6.utils.json; import java.io.IOException; import java.io.Writer; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONString.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONString.java similarity index 98% rename from hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONString.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONString.java index 9be4a829ef..7679041fcb 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONString.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONString.java @@ -34,7 +34,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package org.hornetq.utils.json; +package org.apache.activemq6.utils.json; /** * The JSONString interface allows a toJSONString() diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONTokener.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONTokener.java similarity index 99% rename from hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONTokener.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONTokener.java index bf061f6c0e..19cc40768f 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/json/JSONTokener.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONTokener.java @@ -34,7 +34,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package org.hornetq.utils.json; +package org.apache.activemq6.utils.json; import java.io.BufferedReader; import java.io.IOException; diff --git a/hornetq-core-client/src/main/java/org/hornetq/utils/package-info.java b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/package-info.java similarity index 95% rename from hornetq-core-client/src/main/java/org/hornetq/utils/package-info.java rename to activemq6-core-client/src/main/java/org/apache/activemq6/utils/package-info.java index 8fe774fee2..c5324810f0 100644 --- a/hornetq-core-client/src/main/java/org/hornetq/utils/package-info.java +++ b/activemq6-core-client/src/main/java/org/apache/activemq6/utils/package-info.java @@ -15,5 +15,5 @@ *
* This package defines the utilities class used by HornetQ. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; diff --git a/hornetq-core-client/src/main/resources/HornetQDefaultConfiguration.txt b/activemq6-core-client/src/main/resources/HornetQDefaultConfiguration.txt similarity index 95% rename from hornetq-core-client/src/main/resources/HornetQDefaultConfiguration.txt rename to activemq6-core-client/src/main/resources/HornetQDefaultConfiguration.txt index 47f14f7d9d..23d4b713ae 100644 --- a/hornetq-core-client/src/main/resources/HornetQDefaultConfiguration.txt +++ b/activemq6-core-client/src/main/resources/HornetQDefaultConfiguration.txt @@ -1,7 +1,7 @@ -package org.hornetq.api.config; +package org.apache.activemq6.api.config; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.impl.JournalConstants; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.impl.JournalConstants; /** * Default values of HornetQ configuration parameters. diff --git a/hornetq-core-client/src/main/resources/hornetq-version.properties b/activemq6-core-client/src/main/resources/hornetq-version.properties similarity index 100% rename from hornetq-core-client/src/main/resources/hornetq-version.properties rename to activemq6-core-client/src/main/resources/hornetq-version.properties diff --git a/hornetq-core-client/src/main/resources/hqDefaults.xsl b/activemq6-core-client/src/main/resources/hqDefaults.xsl similarity index 100% rename from hornetq-core-client/src/main/resources/hqDefaults.xsl rename to activemq6-core-client/src/main/resources/hqDefaults.xsl diff --git a/hornetq-core-client/src/test/java/org/hornetq/tests/CoreUnitTestCase.java b/activemq6-core-client/src/test/java/org/apache/activemq6/tests/CoreUnitTestCase.java similarity index 96% rename from hornetq-core-client/src/test/java/org/hornetq/tests/CoreUnitTestCase.java rename to activemq6-core-client/src/test/java/org/apache/activemq6/tests/CoreUnitTestCase.java index 9ada44f952..bee87847ae 100644 --- a/hornetq-core-client/src/test/java/org/hornetq/tests/CoreUnitTestCase.java +++ b/activemq6-core-client/src/test/java/org/apache/activemq6/tests/CoreUnitTestCase.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests; +package org.apache.activemq6.tests; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.core.client.HornetQClientLogger; +import org.apache.activemq6.core.client.HornetQClientLogger; import org.junit.Assert; import org.junit.Rule; import org.junit.rules.TestRule; diff --git a/hornetq-core-client/src/test/java/org/hornetq/tests/util/RandomUtil.java b/activemq6-core-client/src/test/java/org/apache/activemq6/tests/util/RandomUtil.java similarity index 93% rename from hornetq-core-client/src/test/java/org/hornetq/tests/util/RandomUtil.java rename to activemq6-core-client/src/test/java/org/apache/activemq6/tests/util/RandomUtil.java index 82f604f262..de35d402d2 100644 --- a/hornetq-core-client/src/test/java/org/hornetq/tests/util/RandomUtil.java +++ b/activemq6-core-client/src/test/java/org/apache/activemq6/tests/util/RandomUtil.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.util; +package org.apache.activemq6.tests.util; import javax.transaction.xa.Xid; import java.util.Random; import java.util.UUID; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.transaction.impl.XidImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.transaction.impl.XidImpl; /** * @author Jeff Mesnil diff --git a/hornetq-core-client/src/test/java/org/hornetq/tests/util/SilentTestCase.java b/activemq6-core-client/src/test/java/org/apache/activemq6/tests/util/SilentTestCase.java similarity index 97% rename from hornetq-core-client/src/test/java/org/hornetq/tests/util/SilentTestCase.java rename to activemq6-core-client/src/test/java/org/apache/activemq6/tests/util/SilentTestCase.java index 9e91c8ba34..159dcd0cac 100644 --- a/hornetq-core-client/src/test/java/org/hornetq/tests/util/SilentTestCase.java +++ b/activemq6-core-client/src/test/java/org/apache/activemq6/tests/util/SilentTestCase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.util; +package org.apache.activemq6.tests.util; import org.junit.Before; import org.junit.After; diff --git a/hornetq-core-client/src/test/java/org/hornetq/util/CompressionUtilTest.java b/activemq6-core-client/src/test/java/org/apache/activemq6/util/CompressionUtilTest.java similarity index 96% rename from hornetq-core-client/src/test/java/org/hornetq/util/CompressionUtilTest.java rename to activemq6-core-client/src/test/java/org/apache/activemq6/util/CompressionUtilTest.java index a0568afc84..58cebf9bcd 100644 --- a/hornetq-core-client/src/test/java/org/hornetq/util/CompressionUtilTest.java +++ b/activemq6-core-client/src/test/java/org/apache/activemq6/util/CompressionUtilTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.util; +package org.apache.activemq6.util; import org.junit.Test; @@ -23,9 +23,9 @@ import java.util.zip.Deflater; import org.junit.Assert; -import org.hornetq.utils.DeflaterReader; -import org.hornetq.utils.InflaterReader; -import org.hornetq.utils.InflaterWriter; +import org.apache.activemq6.utils.DeflaterReader; +import org.apache.activemq6.utils.InflaterReader; +import org.apache.activemq6.utils.InflaterWriter; /** * A CompressionUtilTest diff --git a/hornetq-core-client/src/test/java/org/hornetq/util/ConcurrentHashSetTest.java b/activemq6-core-client/src/test/java/org/apache/activemq6/util/ConcurrentHashSetTest.java similarity index 95% rename from hornetq-core-client/src/test/java/org/hornetq/util/ConcurrentHashSetTest.java rename to activemq6-core-client/src/test/java/org/apache/activemq6/util/ConcurrentHashSetTest.java index 5f2417e9df..9c49640d80 100644 --- a/hornetq-core-client/src/test/java/org/hornetq/util/ConcurrentHashSetTest.java +++ b/activemq6-core-client/src/test/java/org/apache/activemq6/util/ConcurrentHashSetTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.util; +package org.apache.activemq6.util; import org.junit.Before; import org.junit.After; @@ -21,9 +21,9 @@ import java.util.Iterator; import org.junit.Assert; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.ConcurrentSet; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.ConcurrentSet; /** * @author Jeff Mesnil diff --git a/hornetq-core-client/src/test/java/org/hornetq/util/TimeAndCounterIDGeneratorTest.java b/activemq6-core-client/src/test/java/org/apache/activemq6/util/TimeAndCounterIDGeneratorTest.java similarity index 96% rename from hornetq-core-client/src/test/java/org/hornetq/util/TimeAndCounterIDGeneratorTest.java rename to activemq6-core-client/src/test/java/org/apache/activemq6/util/TimeAndCounterIDGeneratorTest.java index 393a07ae13..29b17ef4ee 100644 --- a/hornetq-core-client/src/test/java/org/hornetq/util/TimeAndCounterIDGeneratorTest.java +++ b/activemq6-core-client/src/test/java/org/apache/activemq6/util/TimeAndCounterIDGeneratorTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.util; +package org.apache.activemq6.util; import org.junit.Test; @@ -19,9 +19,9 @@ import java.util.concurrent.CountDownLatch; import org.junit.Assert; -import org.hornetq.tests.CoreUnitTestCase; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.TimeAndCounterIDGenerator; +import org.apache.activemq6.tests.CoreUnitTestCase; +import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.TimeAndCounterIDGenerator; /** * A TimeAndCounterIDGeneratorTest diff --git a/hornetq-core-client/src/test/java/org/hornetq/util/TypedPropertiesConversionTest.java b/activemq6-core-client/src/test/java/org/apache/activemq6/util/TypedPropertiesConversionTest.java similarity index 97% rename from hornetq-core-client/src/test/java/org/hornetq/util/TypedPropertiesConversionTest.java rename to activemq6-core-client/src/test/java/org/apache/activemq6/util/TypedPropertiesConversionTest.java index 4f9a458c1a..defac6d9f6 100644 --- a/hornetq-core-client/src/test/java/org/hornetq/util/TypedPropertiesConversionTest.java +++ b/activemq6-core-client/src/test/java/org/apache/activemq6/util/TypedPropertiesConversionTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.util; -import org.hornetq.api.core.HornetQPropertyConversionException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.utils.TypedProperties; +package org.apache.activemq6.util; +import org.apache.activemq6.api.core.HornetQPropertyConversionException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.utils.TypedProperties; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/hornetq-core-client/src/test/java/org/hornetq/util/TypedPropertiesTest.java b/activemq6-core-client/src/test/java/org/apache/activemq6/util/TypedPropertiesTest.java similarity index 96% rename from hornetq-core-client/src/test/java/org/hornetq/util/TypedPropertiesTest.java rename to activemq6-core-client/src/test/java/org/apache/activemq6/util/TypedPropertiesTest.java index 9209551d2c..72a63f2e37 100644 --- a/hornetq-core-client/src/test/java/org/hornetq/util/TypedPropertiesTest.java +++ b/activemq6-core-client/src/test/java/org/apache/activemq6/util/TypedPropertiesTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.util; +package org.apache.activemq6.util; import java.util.Iterator; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.SimpleString; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.utils.TypedProperties; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/hornetq-core-client/src/test/java/org/hornetq/util/XMLUtilTest.java b/activemq6-core-client/src/test/java/org/apache/activemq6/util/XMLUtilTest.java similarity index 64% rename from hornetq-core-client/src/test/java/org/hornetq/util/XMLUtilTest.java rename to activemq6-core-client/src/test/java/org/apache/activemq6/util/XMLUtilTest.java index 224f055ed4..6153bcab95 100644 --- a/hornetq-core-client/src/test/java/org/hornetq/util/XMLUtilTest.java +++ b/activemq6-core-client/src/test/java/org/apache/activemq6/util/XMLUtilTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.util; +package org.apache.activemq6.util; import org.junit.Test; import org.junit.Assert; -import org.hornetq.tests.util.SilentTestCase; -import org.hornetq.utils.XMLUtil; +import org.apache.activemq6.tests.util.SilentTestCase; +import org.apache.activemq6.utils.XMLUtil; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -36,9 +36,9 @@ public class XMLUtilTest extends SilentTestCase { String document = "foo"; - Element e = org.hornetq.utils.XMLUtil.stringToElement(document); + Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(document); - Assert.assertEquals("foo", org.hornetq.utils.XMLUtil.getTextContent(e)); + Assert.assertEquals("foo", org.apache.activemq6.utils.XMLUtil.getTextContent(e)); } @Test @@ -48,7 +48,7 @@ public class XMLUtilTest extends SilentTestCase Element e = XMLUtil.stringToElement(document); - Assert.assertEquals("foo", org.hornetq.utils.XMLUtil.getTextContent(e)); + Assert.assertEquals("foo", org.apache.activemq6.utils.XMLUtil.getTextContent(e)); } @Test @@ -56,11 +56,11 @@ public class XMLUtilTest extends SilentTestCase { String document = ""; - Element e = org.hornetq.utils.XMLUtil.stringToElement(document); + Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(document); - String s = org.hornetq.utils.XMLUtil.getTextContent(e); + String s = org.apache.activemq6.utils.XMLUtil.getTextContent(e); - Element subelement = org.hornetq.utils.XMLUtil.stringToElement(s); + Element subelement = org.apache.activemq6.utils.XMLUtil.stringToElement(s); Assert.assertEquals("a", subelement.getNodeName()); } @@ -70,11 +70,11 @@ public class XMLUtilTest extends SilentTestCase { String document = ""; - Element e = org.hornetq.utils.XMLUtil.stringToElement(document); + Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(document); - String s = org.hornetq.utils.XMLUtil.getTextContent(e); + String s = org.apache.activemq6.utils.XMLUtil.getTextContent(e); - Element subelement = org.hornetq.utils.XMLUtil.stringToElement(s); + Element subelement = org.apache.activemq6.utils.XMLUtil.stringToElement(s); Assert.assertEquals("a", subelement.getNodeName()); } @@ -84,11 +84,11 @@ public class XMLUtilTest extends SilentTestCase { String document = ""; - Element e = org.hornetq.utils.XMLUtil.stringToElement(document); + Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(document); - String s = org.hornetq.utils.XMLUtil.getTextContent(e); + String s = org.apache.activemq6.utils.XMLUtil.getTextContent(e); - Element subelement = org.hornetq.utils.XMLUtil.stringToElement(s); + Element subelement = org.apache.activemq6.utils.XMLUtil.stringToElement(s); Assert.assertEquals("a", subelement.getNodeName()); NodeList nl = subelement.getChildNodes(); @@ -112,7 +112,7 @@ public class XMLUtilTest extends SilentTestCase String s = ""; String s2 = ""; - XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), org.hornetq.utils.XMLUtil.stringToElement(s2)); + XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), org.apache.activemq6.utils.XMLUtil.stringToElement(s2)); } @Test @@ -121,7 +121,7 @@ public class XMLUtilTest extends SilentTestCase String s = ""; String s2 = ""; - XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), org.hornetq.utils.XMLUtil.stringToElement(s2)); + XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), org.apache.activemq6.utils.XMLUtil.stringToElement(s2)); } @Test @@ -132,7 +132,7 @@ public class XMLUtilTest extends SilentTestCase try { - org.hornetq.utils.XMLUtil.assertEquivalent(org.hornetq.utils.XMLUtil.stringToElement(s), + org.apache.activemq6.utils.XMLUtil.assertEquivalent(org.apache.activemq6.utils.XMLUtil.stringToElement(s), XMLUtil.stringToElement(s2)); Assert.fail("this should throw exception"); } @@ -148,8 +148,8 @@ public class XMLUtilTest extends SilentTestCase String s = ""; String s2 = ""; - org.hornetq.utils.XMLUtil.assertEquivalent(org.hornetq.utils.XMLUtil.stringToElement(s), - org.hornetq.utils.XMLUtil.stringToElement(s2)); + org.apache.activemq6.utils.XMLUtil.assertEquivalent(org.apache.activemq6.utils.XMLUtil.stringToElement(s), + org.apache.activemq6.utils.XMLUtil.stringToElement(s2)); } @Test @@ -158,8 +158,8 @@ public class XMLUtilTest extends SilentTestCase String s = ""; String s2 = ""; - org.hornetq.utils.XMLUtil.assertEquivalent(org.hornetq.utils.XMLUtil.stringToElement(s), - org.hornetq.utils.XMLUtil.stringToElement(s2)); + org.apache.activemq6.utils.XMLUtil.assertEquivalent(org.apache.activemq6.utils.XMLUtil.stringToElement(s), + org.apache.activemq6.utils.XMLUtil.stringToElement(s2)); } @Test @@ -168,8 +168,8 @@ public class XMLUtilTest extends SilentTestCase String s = ""; String s2 = ""; - org.hornetq.utils.XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), - org.hornetq.utils.XMLUtil.stringToElement(s2)); + org.apache.activemq6.utils.XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), + org.apache.activemq6.utils.XMLUtil.stringToElement(s2)); } @Test @@ -180,8 +180,8 @@ public class XMLUtilTest extends SilentTestCase try { - org.hornetq.utils.XMLUtil.assertEquivalent(org.hornetq.utils.XMLUtil.stringToElement(s), - org.hornetq.utils.XMLUtil.stringToElement(s2)); + org.apache.activemq6.utils.XMLUtil.assertEquivalent(org.apache.activemq6.utils.XMLUtil.stringToElement(s), + org.apache.activemq6.utils.XMLUtil.stringToElement(s2)); Assert.fail("this should throw exception"); } catch (IllegalArgumentException e) @@ -197,25 +197,25 @@ public class XMLUtilTest extends SilentTestCase String s = ""; String s2 = ""; - org.hornetq.utils.XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), - org.hornetq.utils.XMLUtil.stringToElement(s2)); + org.apache.activemq6.utils.XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), + org.apache.activemq6.utils.XMLUtil.stringToElement(s2)); } @Test public void testElementToString_1() throws Exception { String s = "somethingelse"; - Element e = org.hornetq.utils.XMLUtil.stringToElement(s); - String tostring = org.hornetq.utils.XMLUtil.elementToString(e); - Element convertedAgain = org.hornetq.utils.XMLUtil.stringToElement(tostring); - org.hornetq.utils.XMLUtil.assertEquivalent(e, convertedAgain); + Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(s); + String tostring = org.apache.activemq6.utils.XMLUtil.elementToString(e); + Element convertedAgain = org.apache.activemq6.utils.XMLUtil.stringToElement(tostring); + org.apache.activemq6.utils.XMLUtil.assertEquivalent(e, convertedAgain); } @Test public void testElementToString_2() throws Exception { String s = ""; - Element e = org.hornetq.utils.XMLUtil.stringToElement(s); + Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(s); String tostring = XMLUtil.elementToString(e); Element convertedAgain = XMLUtil.stringToElement(tostring); XMLUtil.assertEquivalent(e, convertedAgain); @@ -225,20 +225,20 @@ public class XMLUtilTest extends SilentTestCase public void testElementToString_3() throws Exception { String s = ""; - Element e = org.hornetq.utils.XMLUtil.stringToElement(s); + Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(s); String tostring = XMLUtil.elementToString(e); - Element convertedAgain = org.hornetq.utils.XMLUtil.stringToElement(tostring); - org.hornetq.utils.XMLUtil.assertEquivalent(e, convertedAgain); + Element convertedAgain = org.apache.activemq6.utils.XMLUtil.stringToElement(tostring); + org.apache.activemq6.utils.XMLUtil.assertEquivalent(e, convertedAgain); } @Test public void testElementToString_4() throws Exception { String s = ""; - Element e = org.hornetq.utils.XMLUtil.stringToElement(s); + Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(s); String tostring = XMLUtil.elementToString(e); - Element convertedAgain = org.hornetq.utils.XMLUtil.stringToElement(tostring); - org.hornetq.utils.XMLUtil.assertEquivalent(e, convertedAgain); + Element convertedAgain = org.apache.activemq6.utils.XMLUtil.stringToElement(tostring); + org.apache.activemq6.utils.XMLUtil.assertEquivalent(e, convertedAgain); } @Test @@ -260,7 +260,7 @@ public class XMLUtilTest extends SilentTestCase + ""; System.setProperty("sysprop1", "test1"); System.setProperty("sysprop2", "content4"); - String replaced = org.hornetq.utils.XMLUtil.replaceSystemProps(before); + String replaced = org.apache.activemq6.utils.XMLUtil.replaceSystemProps(before); Assert.assertEquals(after, replaced); } diff --git a/hornetq-dto/pom.xml b/activemq6-dto/pom.xml similarity index 95% rename from hornetq-dto/pom.xml rename to activemq6-dto/pom.xml index ed253c870f..632b3616d5 100644 --- a/hornetq-dto/pom.xml +++ b/activemq6-dto/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-dto + activemq6-dto jar - HornetQ DTO + ActiveMQ6 DTO ${project.basedir}/.. diff --git a/hornetq-dto/src/main/java/org/hornetq/dto/BasicSecurityDTO.java b/activemq6-dto/src/main/java/org/apache/activemq6/dto/BasicSecurityDTO.java similarity index 96% rename from hornetq-dto/src/main/java/org/hornetq/dto/BasicSecurityDTO.java rename to activemq6-dto/src/main/java/org/apache/activemq6/dto/BasicSecurityDTO.java index d9836b515d..f41463462e 100644 --- a/hornetq-dto/src/main/java/org/hornetq/dto/BasicSecurityDTO.java +++ b/activemq6-dto/src/main/java/org/apache/activemq6/dto/BasicSecurityDTO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.dto; +package org.apache.activemq6.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/hornetq-dto/src/main/java/org/hornetq/dto/BrokerDTO.java b/activemq6-dto/src/main/java/org/apache/activemq6/dto/BrokerDTO.java similarity index 97% rename from hornetq-dto/src/main/java/org/hornetq/dto/BrokerDTO.java rename to activemq6-dto/src/main/java/org/apache/activemq6/dto/BrokerDTO.java index 9c31e80061..9f9a720fbf 100644 --- a/hornetq-dto/src/main/java/org/hornetq/dto/BrokerDTO.java +++ b/activemq6-dto/src/main/java/org/apache/activemq6/dto/BrokerDTO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.dto; +package org.apache.activemq6.dto; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/hornetq-dto/src/main/java/org/hornetq/dto/CoreDTO.java b/activemq6-dto/src/main/java/org/apache/activemq6/dto/CoreDTO.java similarity index 96% rename from hornetq-dto/src/main/java/org/hornetq/dto/CoreDTO.java rename to activemq6-dto/src/main/java/org/apache/activemq6/dto/CoreDTO.java index 7cd62a83f3..682f51aefb 100644 --- a/hornetq-dto/src/main/java/org/hornetq/dto/CoreDTO.java +++ b/activemq6-dto/src/main/java/org/apache/activemq6/dto/CoreDTO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.dto; +package org.apache.activemq6.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/hornetq-dto/src/main/java/org/hornetq/dto/JmsDTO.java b/activemq6-dto/src/main/java/org/apache/activemq6/dto/JmsDTO.java similarity index 96% rename from hornetq-dto/src/main/java/org/hornetq/dto/JmsDTO.java rename to activemq6-dto/src/main/java/org/apache/activemq6/dto/JmsDTO.java index 699029816c..370c14c5c8 100644 --- a/hornetq-dto/src/main/java/org/hornetq/dto/JmsDTO.java +++ b/activemq6-dto/src/main/java/org/apache/activemq6/dto/JmsDTO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.dto; +package org.apache.activemq6.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/hornetq-dto/src/main/java/org/hornetq/dto/NamingDTO.java b/activemq6-dto/src/main/java/org/apache/activemq6/dto/NamingDTO.java similarity index 97% rename from hornetq-dto/src/main/java/org/hornetq/dto/NamingDTO.java rename to activemq6-dto/src/main/java/org/apache/activemq6/dto/NamingDTO.java index 8e614ae27b..e28351bb5b 100644 --- a/hornetq-dto/src/main/java/org/hornetq/dto/NamingDTO.java +++ b/activemq6-dto/src/main/java/org/apache/activemq6/dto/NamingDTO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.dto; +package org.apache.activemq6.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/hornetq-dto/src/main/java/org/hornetq/dto/SecurityDTO.java b/activemq6-dto/src/main/java/org/apache/activemq6/dto/SecurityDTO.java similarity index 96% rename from hornetq-dto/src/main/java/org/hornetq/dto/SecurityDTO.java rename to activemq6-dto/src/main/java/org/apache/activemq6/dto/SecurityDTO.java index bf52ae3c3a..d0042cd3ff 100644 --- a/hornetq-dto/src/main/java/org/hornetq/dto/SecurityDTO.java +++ b/activemq6-dto/src/main/java/org/apache/activemq6/dto/SecurityDTO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.dto; +package org.apache.activemq6.dto; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/hornetq-dto/src/main/java/org/hornetq/dto/XmlUtil.java b/activemq6-dto/src/main/java/org/apache/activemq6/dto/XmlUtil.java similarity index 94% rename from hornetq-dto/src/main/java/org/hornetq/dto/XmlUtil.java rename to activemq6-dto/src/main/java/org/apache/activemq6/dto/XmlUtil.java index 58037ff3e8..923d8d5d01 100644 --- a/hornetq-dto/src/main/java/org/hornetq/dto/XmlUtil.java +++ b/activemq6-dto/src/main/java/org/apache/activemq6/dto/XmlUtil.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.dto; +package org.apache.activemq6.dto; import javax.xml.XMLConstants; import javax.xml.bind.JAXBContext; @@ -81,12 +81,12 @@ public class XmlUtil public static T decode(Class clazz, File configuration) throws Exception { - JAXBContext jaxbContext = JAXBContext.newInstance("org.hornetq.dto"); + JAXBContext jaxbContext = JAXBContext.newInstance("org.apache.activemq6.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/hornetq/dto/hornetq.xsd"); + InputStream xsdStream = XmlUtil.class.getClassLoader().getResourceAsStream("org.apache.activemq6/dto/hornetq.xsd"); StreamSource xsdSource = new StreamSource(xsdStream); Schema schema = sf.newSchema(xsdSource); unmarshaller.setSchema(schema); diff --git a/hornetq-dto/src/main/java/org/hornetq/dto/package-info.java b/activemq6-dto/src/main/java/org/apache/activemq6/dto/package-info.java similarity index 96% rename from hornetq-dto/src/main/java/org/hornetq/dto/package-info.java rename to activemq6-dto/src/main/java/org/apache/activemq6/dto/package-info.java index 4da6f699b1..698e2ccab3 100644 --- a/hornetq-dto/src/main/java/org/hornetq/dto/package-info.java +++ b/activemq6-dto/src/main/java/org/apache/activemq6/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.hornetq.dto; \ No newline at end of file +package org.apache.activemq6.dto; \ No newline at end of file diff --git a/hornetq-dto/src/main/resources/org/hornetq/dto/jaxb.index b/activemq6-dto/src/main/resources/org/apache/activemq6/dto/jaxb.index similarity index 100% rename from hornetq-dto/src/main/resources/org/hornetq/dto/jaxb.index rename to activemq6-dto/src/main/resources/org/apache/activemq6/dto/jaxb.index diff --git a/hornetq-jms-client/pom.xml b/activemq6-jms-client/pom.xml similarity index 88% rename from hornetq-jms-client/pom.xml rename to activemq6-jms-client/pom.xml index de667e7b17..f8565e2cae 100644 --- a/hornetq-jms-client/pom.xml +++ b/activemq6-jms-client/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-jms-client + activemq6-jms-client jar - HornetQ JMS Client + ActiveMQ6 JMS Client ${project.basedir}/.. @@ -22,8 +22,8 @@ jboss-logging-processor - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/HornetQJMSClient.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/HornetQJMSClient.java similarity index 92% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/HornetQJMSClient.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/HornetQJMSClient.java index 8f1f65dcdf..4ae9ed5bf4 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/HornetQJMSClient.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms; +package org.apache.activemq6.api.jms; import javax.jms.Queue; import javax.jms.Topic; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.jms.client.HornetQQueueConnectionFactory; -import org.hornetq.jms.client.HornetQTopicConnectionFactory; -import org.hornetq.jms.client.HornetQXAConnectionFactory; -import org.hornetq.jms.client.HornetQXAQueueConnectionFactory; -import org.hornetq.jms.client.HornetQXATopicConnectionFactory; +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; /** * A utility class for creating HornetQ client-side JMS managed resources. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/HornetQJMSConstants.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/HornetQJMSConstants.java similarity index 97% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/HornetQJMSConstants.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/HornetQJMSConstants.java index a58f9dea8f..f3ecb437f1 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/HornetQJMSConstants.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms; +package org.apache.activemq6.api.jms; /** * Constants for HornetQ for property keys used for HornetQ specific extensions to JMS. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/JMSFactoryType.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/JMSFactoryType.java similarity index 98% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/JMSFactoryType.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/JMSFactoryType.java index 78458ec264..b435e52d0a 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/JMSFactoryType.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms; +package org.apache.activemq6.api.jms; /** * A JMSFactoryType diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/ConnectionFactoryControl.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/ConnectionFactoryControl.java similarity index 96% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/ConnectionFactoryControl.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/ConnectionFactoryControl.java index 1ebd3fd85b..416fb70f64 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/ConnectionFactoryControl.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms.management; +package org.apache.activemq6.api.jms.management; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.Operation; -import org.hornetq.api.core.management.Parameter; +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; /** * A ConnectionFactoryControl is used to manage a JMS ConnectionFactory.
@@ -281,7 +281,7 @@ public interface ConnectionFactoryControl /** - * @see org.hornetq.api.core.client.ServerLocator#getProducerWindowSize() + * @see org.apache.activemq6.api.core.client.ServerLocator#getProducerWindowSize() */ int getProducerWindowSize(); diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/DestinationControl.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/DestinationControl.java similarity index 92% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/DestinationControl.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/DestinationControl.java index 11de5486ec..8cf2a96b6b 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/DestinationControl.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms.management; +package org.apache.activemq6.api.jms.management; import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.management.Operation; -import org.hornetq.api.core.management.Parameter; +import org.apache.activemq6.api.core.management.Operation; +import org.apache.activemq6.api.core.management.Parameter; /** * A DestinationControl is used to manage a JMS Destination. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSConnectionInfo.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSConnectionInfo.java similarity index 95% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSConnectionInfo.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSConnectionInfo.java index 09bb6cbd84..fdec725c22 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSConnectionInfo.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms.management; +package org.apache.activemq6.api.jms.management; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; /** * A JMSConnectionInfo diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSConsumerInfo.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSConsumerInfo.java similarity index 96% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSConsumerInfo.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSConsumerInfo.java index a8562f1426..7d629e8213 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSConsumerInfo.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms.management; +package org.apache.activemq6.api.jms.management; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; /** * Helper class to create Java Objects from the diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSManagementHelper.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSManagementHelper.java similarity index 93% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSManagementHelper.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSManagementHelper.java index 3781a67008..f65875ab6a 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSManagementHelper.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms.management; +package org.apache.activemq6.api.jms.management; import javax.jms.JMSException; import javax.jms.Message; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.jms.client.HornetQMessage; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.jms.client.HornetQMessage; /** * Helper class to use JMS messages to manage HornetQ server resources. @@ -25,7 +25,7 @@ import org.hornetq.jms.client.HornetQMessage; */ public class JMSManagementHelper { - private static org.hornetq.api.core.Message getCoreMessage(final Message jmsMessage) + private static org.apache.activemq6.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.hornetq.api.core.management.ResourceNames + * @see org.apache.activemq6.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.hornetq.api.core.management.ResourceNames + * @see org.apache.activemq6.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.hornetq.api.core.management.ResourceNames + * @see org.apache.activemq6.api.core.management.ResourceNames */ public static void putOperationInvocation(final Message message, final String resourceName, diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSQueueControl.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSQueueControl.java similarity index 98% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSQueueControl.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSQueueControl.java index ae7cba1814..c617250106 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSQueueControl.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms.management; +package org.apache.activemq6.api.jms.management; import java.util.Map; import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.management.Operation; -import org.hornetq.api.core.management.Parameter; +import org.apache.activemq6.api.core.management.Operation; +import org.apache.activemq6.api.core.management.Parameter; /** * A JMSQueueControl is used to manage a JMS queue. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSServerControl.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSServerControl.java similarity index 98% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSServerControl.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSServerControl.java index f58692e225..ca6f6217a1 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSServerControl.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms.management; +package org.apache.activemq6.api.jms.management; import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.management.Operation; -import org.hornetq.api.core.management.Parameter; +import org.apache.activemq6.api.core.management.Operation; +import org.apache.activemq6.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. *
* {@code liveConnectorsTransportClassNames} are the class names - * of the {@link org.hornetq.spi.core.remoting.ConnectorFactory} to connect to the live servers - * and {@code liveConnectorTransportParams} are Map<String, Object> for the corresponding {@link org.hornetq.api.core.TransportConfiguration}'s parameters. + * 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. */ void createConnectionFactory(String name, boolean ha, diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSSessionInfo.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSSessionInfo.java similarity index 88% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSSessionInfo.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSSessionInfo.java index 242c31d01a..bc7fac343b 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/JMSSessionInfo.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms.management; +package org.apache.activemq6.api.jms.management; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONException; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONException; +import org.apache.activemq6.utils.json.JSONObject; /** * A JMSSessionInfo diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/SubscriptionInfo.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/SubscriptionInfo.java similarity index 96% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/SubscriptionInfo.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/SubscriptionInfo.java index 2992d4578a..8bffddf166 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/SubscriptionInfo.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms.management; +package org.apache.activemq6.api.jms.management; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; /** * Helper class to create Java Objects from the diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/TopicControl.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/TopicControl.java similarity index 97% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/TopicControl.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/TopicControl.java index 62a6eee1fb..1ef88c8aaa 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/TopicControl.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms.management; +package org.apache.activemq6.api.jms.management; import java.util.Map; import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.management.Operation; -import org.hornetq.api.core.management.Parameter; +import org.apache.activemq6.api.core.management.Operation; +import org.apache.activemq6.api.core.management.Parameter; /** * A TopicControl is used to manage a JMS Topic. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/package-info.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/package-info.java similarity index 94% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/package-info.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/package-info.java index c2e34e1553..1e75322ea9 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/management/package-info.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.api.jms.management; +package org.apache.activemq6.api.jms.management; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/package-info.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/package-info.java similarity index 95% rename from hornetq-jms-client/src/main/java/org/hornetq/api/jms/package-info.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/package-info.java index f011305299..ef279c2b02 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/api/jms/package-info.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/package-info.java @@ -17,5 +17,5 @@ * HornetQ JMS managed resources (ConnectionFactory, Queue and Topic). * */ -package org.hornetq.api.jms; +package org.apache.activemq6.api.jms; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQBytesMessage.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQBytesMessage.java similarity index 80% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQBytesMessage.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQBytesMessage.java index 2cf4154f5d..c916af2679 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQBytesMessage.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.BytesMessage; import javax.jms.JMSException; import javax.jms.MessageEOFException; import javax.jms.MessageFormatException; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.message.impl.MessageImpl; +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.hornetq.reader.BytesMessageUtil.bytesMessageReset; -import static org.hornetq.reader.BytesMessageUtil.bytesReadBoolean; -import static org.hornetq.reader.BytesMessageUtil.bytesReadByte; -import static org.hornetq.reader.BytesMessageUtil.bytesReadBytes; -import static org.hornetq.reader.BytesMessageUtil.bytesReadChar; -import static org.hornetq.reader.BytesMessageUtil.bytesReadDouble; -import static org.hornetq.reader.BytesMessageUtil.bytesReadFloat; -import static org.hornetq.reader.BytesMessageUtil.bytesReadInt; -import static org.hornetq.reader.BytesMessageUtil.bytesReadLong; -import static org.hornetq.reader.BytesMessageUtil.bytesReadShort; -import static org.hornetq.reader.BytesMessageUtil.bytesReadUTF; -import static org.hornetq.reader.BytesMessageUtil.bytesReadUnsignedByte; -import static org.hornetq.reader.BytesMessageUtil.bytesReadUnsignedShort; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteBoolean; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteByte; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteBytes; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteChar; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteDouble; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteFloat; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteInt; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteLong; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteObject; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteShort; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteUTF; +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; /** * HornetQ implementation of a JMS {@link BytesMessage}. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnection.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnection.java similarity index 95% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnection.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnection.java index 5d4413b266..bd59895a11 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnection.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.FailoverEventListener; -import org.hornetq.api.core.client.FailoverEventType; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.jms.HornetQJMSConstants; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.version.Version; -import org.hornetq.reader.MessageUtil; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.UUIDGenerator; -import org.hornetq.utils.VersionLoader; +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; /** * HornetQ implementation of a JMS Connection. @@ -79,9 +79,9 @@ public class HornetQConnection extends HornetQConnectionForContextImpl implement private final int connectionType; - private final Set sessions = new org.hornetq.utils.ConcurrentHashSet(); + private final Set sessions = new org.apache.activemq6.utils.ConcurrentHashSet(); - private final Set tempQueues = new org.hornetq.utils.ConcurrentHashSet(); + private final Set tempQueues = new org.apache.activemq6.utils.ConcurrentHashSet(); private final Set knownDestinations = new ConcurrentHashSet(); diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnectionFactory.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionFactory.java similarity index 97% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnectionFactory.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionFactory.java index 58893faba0..9fe7aaea12 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnectionFactory.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory; -import org.hornetq.jms.referenceable.SerializableObjectRefAddr; +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; /** * HornetQ implementation of a JMS ConnectionFactory. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnectionForContext.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionForContext.java similarity index 96% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnectionForContext.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionForContext.java index 2d958430c4..80528b41d5 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnectionForContext.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionForContext.java @@ -13,7 +13,7 @@ /** * */ -package org.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.JMSContext; import javax.jms.XAJMSContext; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnectionForContextImpl.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionForContextImpl.java similarity index 91% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnectionForContextImpl.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionForContextImpl.java index 12b91b9328..b77d08d678 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnectionForContextImpl.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionForContextImpl.java @@ -13,7 +13,7 @@ /** * */ -package org.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.api.jms.HornetQJMSConstants; -import org.hornetq.utils.ReferenceCounter; -import org.hornetq.utils.ReferenceCounterUtil; +import org.apache.activemq6.api.jms.HornetQJMSConstants; +import org.apache.activemq6.utils.ReferenceCounter; +import org.apache.activemq6.utils.ReferenceCounterUtil; public abstract class HornetQConnectionForContextImpl implements HornetQConnectionForContext { diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnectionMetaData.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionMetaData.java similarity index 96% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnectionMetaData.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionMetaData.java index 6035950f18..453cb9ee3f 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQConnectionMetaData.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.core.version.Version; +import org.apache.activemq6.core.version.Version; /** * HornetQ implementation of a JMS ConnectionMetaData. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQDestination.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQDestination.java similarity index 97% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQDestination.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQDestination.java index 39bd3a3cec..7ecc457153 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQDestination.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.jms.referenceable.DestinationObjectFactory; -import org.hornetq.jms.referenceable.SerializableObjectRefAddr; +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; /** * HornetQ implementation of a JMS Destination. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSClientBundle.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSClientBundle.java similarity index 93% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSClientBundle.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSClientBundle.java index 0f8f592eb4..d5af6dfebe 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSClientBundle.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.IllegalStateException; @@ -21,10 +21,10 @@ import javax.jms.JMSRuntimeException; import javax.jms.MessageNotReadableException; import javax.jms.MessageNotWriteableException; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.HornetQInvalidFilterExpressionException; -import org.hornetq.api.core.HornetQNonExistentQueueException; -import org.hornetq.api.core.SimpleString; +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.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSClientLogger.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSClientLogger.java similarity index 98% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSClientLogger.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSClientLogger.java index 2cdab8c88f..1111b984b1 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSClientLogger.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSConnectionFactory.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSConnectionFactory.java similarity index 88% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSConnectionFactory.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSConnectionFactory.java index 6ece144fc1..d1d1debadf 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSConnectionFactory.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.QueueConnectionFactory; import javax.jms.TopicConnectionFactory; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ServerLocator; /** diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSConsumer.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSConsumer.java similarity index 99% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSConsumer.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSConsumer.java index cccaf3fdbf..bdbeb7dbd2 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSConsumer.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.JMSConsumer; import javax.jms.JMSException; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSContext.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSContext.java similarity index 99% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSContext.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSContext.java index 27b8e2dca1..ba3364dff7 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSContext.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.BytesMessage; import javax.jms.ConnectionMetaData; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSProducer.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSProducer.java similarity index 98% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSProducer.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSProducer.java index 9a9eb5902d..f39f9ca224 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQJMSProducer.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.api.core.HornetQPropertyConversionException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.HornetQPropertyConversionException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.utils.TypedProperties; /** * NOTE: this class forwards {@link #setDisableMessageID(boolean)} and diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMapMessage.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMapMessage.java similarity index 95% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMapMessage.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMapMessage.java index d8d9cf7757..b6a8f04b8d 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMapMessage.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQPropertyConversionException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.utils.TypedProperties; +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 static org.hornetq.reader.MapMessageUtil.writeBodyMap; -import static org.hornetq.reader.MapMessageUtil.readBodyMap; +import static org.apache.activemq6.reader.MapMessageUtil.writeBodyMap; +import static org.apache.activemq6.reader.MapMessageUtil.readBodyMap; /** * HornetQ implementation of a JMS MapMessage. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMessage.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMessage.java similarity index 96% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMessage.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMessage.java index 16fb52ef53..4c1091142d 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMessage.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQPropertyConversionException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.jms.HornetQJMSConstants; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.reader.MessageUtil; -import org.hornetq.utils.UUID; +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; /** @@ -63,7 +63,7 @@ import org.hornetq.utils.UUID; public class HornetQMessage implements javax.jms.Message { // Constants ----------------------------------------------------- - public static final byte TYPE = org.hornetq.api.core.Message.DEFAULT_TYPE; + public static final byte TYPE = org.apache.activemq6.api.core.Message.DEFAULT_TYPE; public static Map coreMaptoJMSMap(final Map coreMessage) { @@ -642,7 +642,7 @@ public class HornetQMessage implements javax.jms.Message { if (MessageUtil.JMSXGROUPID.equals(name)) { - return message.getStringProperty(org.hornetq.api.core.Message.HDR_GROUP_ID); + return message.getStringProperty(org.apache.activemq6.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.hornetq.api.core.Message.HDR_GROUP_ID, SimpleString.toSimpleString(value)); + message.putStringProperty(org.apache.activemq6.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.hornetq.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME); + value = message.getLongProperty(org.apache.activemq6.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.hornetq.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME, deliveryTime); + message.putLongProperty(org.apache.activemq6.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME, deliveryTime); } @Override diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMessageConsumer.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMessageConsumer.java similarity index 94% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMessageConsumer.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMessageConsumer.java index d3ff4653b0..ed3a972b93 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMessageConsumer.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.jms.HornetQJMSConstants; +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; /** * HornetQ implementation of a JMS MessageConsumer. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMessageProducer.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMessageProducer.java similarity index 96% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMessageProducer.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMessageProducer.java index b60815510e..9d96772f66 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMessageProducer.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.utils.UUID; -import org.hornetq.utils.UUIDGenerator; +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; /** * HornetQ implementation of a JMS MessageProducer. * @@ -556,7 +556,7 @@ public class HornetQMessageProducer implements MessageProducer, QueueSender, Top } @Override - public void sendAcknowledged(org.hornetq.api.core.Message clientMessage) + public void sendAcknowledged(org.apache.activemq6.api.core.Message clientMessage) { if (jmsMessage instanceof StreamMessage) { diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQObjectMessage.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQObjectMessage.java similarity index 93% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQObjectMessage.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQObjectMessage.java index ff1e4526a6..e01dc1b3bc 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQObjectMessage.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; +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; /** * 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.hornetq.utils.ObjectInputStreamWithClassLoader(bais); + ObjectInputStream ois = new org.apache.activemq6.utils.ObjectInputStreamWithClassLoader(bais); Serializable object = (Serializable)ois.readObject(); return object; } diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQQueue.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQQueue.java similarity index 96% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQQueue.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQQueue.java index 46ec8f0862..c6f40bd374 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQQueue.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.Queue; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; /** * HornetQ implementation of a JMS Queue. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQQueueBrowser.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQQueueBrowser.java similarity index 93% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQQueueBrowser.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQQueueBrowser.java index 96da339cbc..091ba10dad 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQQueueBrowser.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; +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; /** * HornetQ implementation of a JMS QueueBrowser. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQQueueConnectionFactory.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQQueueConnectionFactory.java similarity index 86% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQQueueConnectionFactory.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQQueueConnectionFactory.java index e7e3a06937..8a07fe51b0 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQQueueConnectionFactory.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.QueueConnectionFactory; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.jms.JMSFactoryType; +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; /** * A class that represents a QueueConnectionFactory. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQSession.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQSession.java similarity index 98% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQSession.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQSession.java index b99e56b42a..4be89fe2f5 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQSession.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.selector.filter.FilterException; -import org.hornetq.selector.SelectorParser; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQQueueExistsException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSession.AddressQuery; -import org.hornetq.api.core.client.ClientSession.QueueQuery; +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; /** * HornetQ implementation of a JMS Session. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQStreamMessage.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQStreamMessage.java similarity index 89% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQStreamMessage.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQStreamMessage.java index 4f3e89945a..86182a8fbc 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQStreamMessage.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.JMSException; import javax.jms.MessageEOFException; import javax.jms.MessageFormatException; import javax.jms.StreamMessage; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.client.impl.ClientMessageImpl; -import org.hornetq.utils.DataConstants; +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.hornetq.reader.StreamMessageUtil.streamReadBoolean; -import static org.hornetq.reader.StreamMessageUtil.streamReadByte; -import static org.hornetq.reader.StreamMessageUtil.streamReadBytes; -import static org.hornetq.reader.StreamMessageUtil.streamReadChar; -import static org.hornetq.reader.StreamMessageUtil.streamReadDouble; -import static org.hornetq.reader.StreamMessageUtil.streamReadFloat; -import static org.hornetq.reader.StreamMessageUtil.streamReadInteger; -import static org.hornetq.reader.StreamMessageUtil.streamReadLong; -import static org.hornetq.reader.StreamMessageUtil.streamReadObject; -import static org.hornetq.reader.StreamMessageUtil.streamReadShort; -import static org.hornetq.reader.StreamMessageUtil.streamReadString; +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; /** * HornetQ implementation of a JMS StreamMessage. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTemporaryQueue.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTemporaryQueue.java similarity index 98% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTemporaryQueue.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTemporaryQueue.java index 929e953bd3..e8ad86b847 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTemporaryQueue.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.TemporaryQueue; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTemporaryTopic.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTemporaryTopic.java similarity index 97% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTemporaryTopic.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTemporaryTopic.java index 496dc2eee6..442f0fcc3b 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTemporaryTopic.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.TemporaryTopic; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTextMessage.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTextMessage.java similarity index 88% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTextMessage.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTextMessage.java index 96b7a4548a..4684cb2682 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTextMessage.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.JMSException; import javax.jms.TextMessage; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; +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 static org.hornetq.reader.TextMessageUtil.readBodyText; -import static org.hornetq.reader.TextMessageUtil.writeBodyText; +import static org.apache.activemq6.reader.TextMessageUtil.readBodyText; +import static org.apache.activemq6.reader.TextMessageUtil.writeBodyText; /** diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTopic.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTopic.java similarity index 96% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTopic.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTopic.java index f39fd28284..9b1d8359c8 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTopic.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.Topic; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; /** * HornetQ implementation of a JMS Topic. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTopicConnectionFactory.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTopicConnectionFactory.java similarity index 86% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTopicConnectionFactory.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTopicConnectionFactory.java index bf7c33aa2b..26b0e72c07 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQTopicConnectionFactory.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.TopicConnectionFactory; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.jms.JMSFactoryType; +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; /** * A class that represents a TopicConnectionFactory. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXAConnection.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAConnection.java similarity index 95% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXAConnection.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAConnection.java index 089cdace0a..e6b0edff61 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXAConnection.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.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.hornetq.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ClientSessionFactory; /** * HornetQ implementation of a JMS XAConnection. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXAConnectionFactory.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAConnectionFactory.java similarity index 87% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXAConnectionFactory.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAConnectionFactory.java index e2d2e3d70e..b0ae3d71a5 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXAConnectionFactory.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.XAQueueConnectionFactory; import javax.jms.XATopicConnectionFactory; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.jms.JMSFactoryType; +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; /** * A class that represents a XAConnectionFactory. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXAJMSContext.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAJMSContext.java similarity index 95% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXAJMSContext.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAJMSContext.java index 5d49d55a5a..040f7db981 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXAJMSContext.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.XAJMSContext; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXAQueueConnectionFactory.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAQueueConnectionFactory.java similarity index 86% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXAQueueConnectionFactory.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAQueueConnectionFactory.java index 2d71f896dc..c8875ece72 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXAQueueConnectionFactory.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.XAQueueConnectionFactory; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.jms.JMSFactoryType; +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; /** * A class that represents a XAQueueConnectionFactory. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXASession.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXASession.java similarity index 93% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXASession.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXASession.java index f44c4c2793..65aa0679ad 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXASession.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/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.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.XAQueueSession; import javax.jms.XATopicSession; -import org.hornetq.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSession; /** * A HornetQXASession diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXATopicConnectionFactory.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXATopicConnectionFactory.java similarity index 86% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXATopicConnectionFactory.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXATopicConnectionFactory.java index bdc6c47107..d626c14316 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQXATopicConnectionFactory.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXATopicConnectionFactory.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.XATopicConnectionFactory; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.jms.JMSFactoryType; +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; /** * A class that represents a XATopicConnectionFactory. diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/JMSExceptionHelper.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JMSExceptionHelper.java similarity index 96% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/JMSExceptionHelper.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JMSExceptionHelper.java index dfe06ddf25..ba5a224995 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/JMSExceptionHelper.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JMSExceptionHelper.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.InvalidDestinationException; import javax.jms.InvalidSelectorException; import javax.jms.JMSException; import javax.jms.JMSSecurityException; -import org.hornetq.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQException; /** * diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/JMSMessageListenerWrapper.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JMSMessageListenerWrapper.java similarity index 92% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/JMSMessageListenerWrapper.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JMSMessageListenerWrapper.java index bf081b7be9..5f339ae615 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/JMSMessageListenerWrapper.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JMSMessageListenerWrapper.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.MessageListener; import javax.jms.Session; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.jms.HornetQJMSConstants; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.jms.HornetQJMSConstants; /** * diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/JmsExceptionUtils.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JmsExceptionUtils.java similarity index 98% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/JmsExceptionUtils.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JmsExceptionUtils.java index 5c75cd5e92..1f75bce22d 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/JmsExceptionUtils.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JmsExceptionUtils.java @@ -13,7 +13,7 @@ /** * */ -package org.hornetq.jms.client; +package org.apache.activemq6.jms.client; import javax.jms.IllegalStateRuntimeException; import javax.jms.InvalidClientIDException; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/SelectorTranslator.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/SelectorTranslator.java similarity index 99% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/SelectorTranslator.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/SelectorTranslator.java index b5d671ea9d..34ef757db7 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/SelectorTranslator.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/SelectorTranslator.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.client; +package org.apache.activemq6.jms.client; import java.util.ArrayList; import java.util.List; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/ThreadAwareContext.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/ThreadAwareContext.java similarity index 98% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/ThreadAwareContext.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/ThreadAwareContext.java index 06f07ca0ac..a479685559 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/ThreadAwareContext.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/ThreadAwareContext.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.client; +package org.apache.activemq6.jms.client; -import org.hornetq.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.ConcurrentHashSet; import javax.jms.IllegalStateException; import java.util.Set; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/package-info.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/package-info.java similarity index 83% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/client/package-info.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/package-info.java index f731cf441d..69314b529d 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/client/package-info.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/package-info.java @@ -14,9 +14,9 @@ * Implementation of the JMS API. *
* Classes in this package are not meant to be used directly - * except {@link org.hornetq.jms.client.HornetQConnectionFactory} which can be instantiated directly + * except {@link org.apache.activemq6.jms.client.HornetQConnectionFactory} which can be instantiated directly * if JMS resources are not looked up in JNDI. * */ -package org.hornetq.jms.client; +package org.apache.activemq6.jms.client; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/referenceable/ConnectionFactoryObjectFactory.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/ConnectionFactoryObjectFactory.java similarity index 96% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/referenceable/ConnectionFactoryObjectFactory.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/ConnectionFactoryObjectFactory.java index d5f591ee64..ee1d271f70 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/referenceable/ConnectionFactoryObjectFactory.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/ConnectionFactoryObjectFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.referenceable; +package org.apache.activemq6.jms.referenceable; import java.util.Hashtable; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/referenceable/DestinationObjectFactory.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/DestinationObjectFactory.java similarity index 96% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/referenceable/DestinationObjectFactory.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/DestinationObjectFactory.java index 896ef3be2d..e27e50e836 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/referenceable/DestinationObjectFactory.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/DestinationObjectFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.referenceable; +package org.apache.activemq6.jms.referenceable; import java.util.Hashtable; diff --git a/hornetq-jms-client/src/main/java/org/hornetq/jms/referenceable/SerializableObjectRefAddr.java b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/SerializableObjectRefAddr.java similarity index 97% rename from hornetq-jms-client/src/main/java/org/hornetq/jms/referenceable/SerializableObjectRefAddr.java rename to activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/SerializableObjectRefAddr.java index 005ad4fcc1..55a442e408 100644 --- a/hornetq-jms-client/src/main/java/org/hornetq/jms/referenceable/SerializableObjectRefAddr.java +++ b/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/SerializableObjectRefAddr.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.referenceable; +package org.apache.activemq6.jms.referenceable; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/hornetq-jms-server/pom.xml b/activemq6-jms-server/pom.xml similarity index 85% rename from hornetq-jms-server/pom.xml rename to activemq6-jms-server/pom.xml index 60a7c46724..63be95440d 100644 --- a/hornetq-jms-server/pom.xml +++ b/activemq6-jms-server/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-jms-server + activemq6-jms-server jar - HornetQ JMS Server + ActiveMQ6 JMS Server ${project.basedir}/.. @@ -22,18 +22,18 @@ jboss-logging-processor - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/ConnectionFactoryFactory.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/ConnectionFactoryFactory.java similarity index 92% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/ConnectionFactoryFactory.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/ConnectionFactoryFactory.java index 99403e6086..158b114abe 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/ConnectionFactoryFactory.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/ConnectionFactoryFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.bridge; +package org.apache.activemq6.jms.bridge; /** * A ConnectionFactoryFactory diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/DestinationFactory.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/DestinationFactory.java similarity index 95% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/DestinationFactory.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/DestinationFactory.java index 805dcd64f0..2379316927 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/DestinationFactory.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/DestinationFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.bridge; +package org.apache.activemq6.jms.bridge; import javax.jms.Destination; diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/HornetQJMSBridgeLogger.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/HornetQJMSBridgeLogger.java similarity index 99% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/HornetQJMSBridgeLogger.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/HornetQJMSBridgeLogger.java index 688c7d07cc..edae39246f 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/HornetQJMSBridgeLogger.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/HornetQJMSBridgeLogger.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.jms.bridge; +package org.apache.activemq6.jms.bridge; import javax.management.ObjectName; diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/JMSBridge.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/JMSBridge.java similarity index 92% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/JMSBridge.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/JMSBridge.java index b8165c4841..ca862130ee 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/JMSBridge.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/JMSBridge.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.bridge; +package org.apache.activemq6.jms.bridge; import javax.transaction.TransactionManager; -import org.hornetq.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQComponent; /** * @author Tim Fox diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/JMSBridgeControl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/JMSBridgeControl.java similarity index 94% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/JMSBridgeControl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/JMSBridgeControl.java index 44212094a0..207dde2239 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/JMSBridgeControl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/JMSBridgeControl.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.bridge; +package org.apache.activemq6.jms.bridge; -import org.hornetq.api.core.management.HornetQComponentControl; +import org.apache.activemq6.api.core.management.HornetQComponentControl; /** * A JMSBridgeControl diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/QualityOfServiceMode.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/QualityOfServiceMode.java similarity index 99% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/QualityOfServiceMode.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/QualityOfServiceMode.java index 338d2c946b..fc02211e38 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/QualityOfServiceMode.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/QualityOfServiceMode.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.bridge; +package org.apache.activemq6.jms.bridge; /** *

Quality of server (QoS) levels

diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JMSBridgeControlImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JMSBridgeControlImpl.java similarity index 96% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JMSBridgeControlImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JMSBridgeControlImpl.java index 3125d00413..281dcd4505 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JMSBridgeControlImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JMSBridgeControlImpl.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.bridge.impl; +package org.apache.activemq6.jms.bridge.impl; import javax.management.StandardMBean; -import org.hornetq.jms.bridge.JMSBridge; -import org.hornetq.jms.bridge.JMSBridgeControl; -import org.hornetq.jms.bridge.QualityOfServiceMode; +import org.apache.activemq6.jms.bridge.JMSBridge; +import org.apache.activemq6.jms.bridge.JMSBridgeControl; +import org.apache.activemq6.jms.bridge.QualityOfServiceMode; /** * A JMSBridgeControlImpl diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JMSBridgeImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JMSBridgeImpl.java similarity index 94% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JMSBridgeImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JMSBridgeImpl.java index ace70efdd7..be78986fda 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JMSBridgeImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JMSBridgeImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.bridge.impl; +package org.apache.activemq6.jms.bridge.impl; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -45,27 +45,27 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.client.FailoverEventListener; -import org.hornetq.api.core.client.FailoverEventType; -import org.hornetq.api.jms.HornetQJMSConstants; -import org.hornetq.jms.bridge.ConnectionFactoryFactory; -import org.hornetq.jms.bridge.DestinationFactory; -import org.hornetq.jms.bridge.HornetQJMSBridgeLogger; -import org.hornetq.jms.bridge.JMSBridge; -import org.hornetq.jms.bridge.JMSBridgeControl; -import org.hornetq.jms.bridge.QualityOfServiceMode; -import org.hornetq.jms.client.HornetQConnection; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.jms.server.HornetQJMSServerBundle; -import org.hornetq.jms.server.recovery.HornetQRegistryBase; -import org.hornetq.jms.server.recovery.XARecoveryConfig; -import org.hornetq.utils.ClassloadingUtil; -import org.hornetq.utils.DefaultSensitiveStringCodec; -import org.hornetq.utils.PasswordMaskingUtil; -import org.hornetq.utils.SensitiveDataCodec; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.client.FailoverEventListener; +import org.apache.activemq6.api.core.client.FailoverEventType; +import org.apache.activemq6.api.jms.HornetQJMSConstants; +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq6.jms.bridge.DestinationFactory; +import org.apache.activemq6.jms.bridge.HornetQJMSBridgeLogger; +import org.apache.activemq6.jms.bridge.JMSBridge; +import org.apache.activemq6.jms.bridge.JMSBridgeControl; +import org.apache.activemq6.jms.bridge.QualityOfServiceMode; +import org.apache.activemq6.jms.client.HornetQConnection; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.jms.server.HornetQJMSServerBundle; +import org.apache.activemq6.jms.server.recovery.HornetQRegistryBase; +import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; +import org.apache.activemq6.utils.ClassloadingUtil; +import org.apache.activemq6.utils.DefaultSensitiveStringCodec; +import org.apache.activemq6.utils.PasswordMaskingUtil; +import org.apache.activemq6.utils.SensitiveDataCodec; /** * A JMSBridge @@ -163,7 +163,7 @@ public final class JMSBridgeImpl implements JMSBridge private int forwardMode; - private String transactionManagerLocatorClass = "org.hornetq.integration.jboss.tm.JBoss5TransactionManagerLocator"; + private String transactionManagerLocatorClass = "org.apache.activemq6.integration.jboss.tm.JBoss5TransactionManagerLocator"; private String transactionManagerLocatorMethod = "getTm"; diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JNDIConnectionFactoryFactory.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIConnectionFactoryFactory.java similarity index 88% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JNDIConnectionFactoryFactory.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIConnectionFactoryFactory.java index 3d82f55ddc..8f0d1a762b 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JNDIConnectionFactoryFactory.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIConnectionFactoryFactory.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.bridge.impl; +package org.apache.activemq6.jms.bridge.impl; import java.util.Hashtable; -import org.hornetq.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; /** diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JNDIDestinationFactory.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIDestinationFactory.java similarity index 91% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JNDIDestinationFactory.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIDestinationFactory.java index aeab78af6a..ee41965972 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JNDIDestinationFactory.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIDestinationFactory.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.bridge.impl; +package org.apache.activemq6.jms.bridge.impl; import java.util.Hashtable; import javax.jms.Destination; -import org.hornetq.jms.bridge.DestinationFactory; +import org.apache.activemq6.jms.bridge.DestinationFactory; /** diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JNDIFactorySupport.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIFactorySupport.java similarity index 97% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JNDIFactorySupport.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIFactorySupport.java index 8a13fff033..46fa3ce5c9 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/bridge/impl/JNDIFactorySupport.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIFactorySupport.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.bridge.impl; +package org.apache.activemq6.jms.bridge.impl; import java.util.Hashtable; diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSConnectionFactoryControlImpl.java similarity index 95% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSConnectionFactoryControlImpl.java index 806bba4c2f..74fa619c40 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSConnectionFactoryControlImpl.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.management.impl; +package org.apache.activemq6.jms.management.impl; import javax.management.MBeanInfo; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.Parameter; -import org.hornetq.api.jms.management.ConnectionFactoryControl; -import org.hornetq.core.management.impl.MBeanInfoHelper; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.Parameter; +import org.apache.activemq6.api.jms.management.ConnectionFactoryControl; +import org.apache.activemq6.core.management.impl.MBeanInfoHelper; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; /** * @author Jeff Mesnil diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSQueueControlImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSQueueControlImpl.java similarity index 92% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSQueueControlImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSQueueControlImpl.java index 9c597e2410..f15eaff843 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSQueueControlImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSQueueControlImpl.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.management.impl; +package org.apache.activemq6.jms.management.impl; import javax.management.MBeanInfo; import javax.management.StandardMBean; import java.util.Map; -import org.hornetq.api.core.FilterConstants; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.management.MessageCounterInfo; -import org.hornetq.api.core.management.Operation; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.core.management.impl.MBeanInfoHelper; -import org.hornetq.core.messagecounter.MessageCounter; -import org.hornetq.core.messagecounter.impl.MessageCounterHelper; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.jms.client.SelectorTranslator; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.api.core.FilterConstants; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.management.MessageCounterInfo; +import org.apache.activemq6.api.core.management.Operation; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.api.jms.management.JMSQueueControl; +import org.apache.activemq6.core.management.impl.MBeanInfoHelper; +import org.apache.activemq6.core.messagecounter.MessageCounter; +import org.apache.activemq6.core.messagecounter.impl.MessageCounterHelper; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.jms.client.SelectorTranslator; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; /** * @author Jeff Mesnil diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSServerControlImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSServerControlImpl.java similarity index 95% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSServerControlImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSServerControlImpl.java index f575b1db54..aa8da34ffc 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSServerControlImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSServerControlImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.management.impl; +package org.apache.activemq6.jms.management.impl; import javax.jms.JMSRuntimeException; import javax.management.ListenerNotFoundException; @@ -29,35 +29,35 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.management.Parameter; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.api.jms.management.ConnectionFactoryControl; -import org.hornetq.api.jms.management.DestinationControl; -import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.management.impl.AbstractControl; -import org.hornetq.core.management.impl.MBeanInfoHelper; -import org.hornetq.core.server.ServerConsumer; -import org.hornetq.core.server.ServerSession; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.server.HornetQJMSServerLogger; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.hornetq.jms.server.management.JMSNotificationType; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.utils.TypedProperties; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.api.core.management.Parameter; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.api.jms.management.ConnectionFactoryControl; +import org.apache.activemq6.api.jms.management.DestinationControl; +import org.apache.activemq6.api.jms.management.JMSQueueControl; +import org.apache.activemq6.api.jms.management.JMSServerControl; +import org.apache.activemq6.api.jms.management.TopicControl; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.management.impl.AbstractControl; +import org.apache.activemq6.core.management.impl.MBeanInfoHelper; +import org.apache.activemq6.core.server.ServerConsumer; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.server.HornetQJMSServerLogger; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.jms.server.management.JMSNotificationType; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; /** * @author Jeff Mesnil * @author Tim Fox */ public class JMSServerControlImpl extends AbstractControl implements JMSServerControl, NotificationEmitter, - org.hornetq.core.server.management.NotificationListener + org.apache.activemq6.core.server.management.NotificationListener { // Constants ----------------------------------------------------- @@ -888,7 +888,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo // Protected ----------------------------------------------------- /* (non-Javadoc) - * @see org.hornetq.core.management.impl.AbstractControl#fillMBeanOperationInfo() + * @see org.apache.activemq6.core.management.impl.AbstractControl#fillMBeanOperationInfo() */ @Override protected MBeanOperationInfo[] fillMBeanOperationInfo() @@ -1036,7 +1036,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo } @Override - public void onNotification(org.hornetq.core.server.management.Notification notification) + public void onNotification(org.apache.activemq6.core.server.management.Notification notification) { if (!(notification.getType() instanceof JMSNotificationType)) return; JMSNotificationType type = (JMSNotificationType) notification.getType(); diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSTopicControlImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSTopicControlImpl.java similarity index 93% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSTopicControlImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSTopicControlImpl.java index f38ba8aa93..53730cc898 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/management/impl/JMSTopicControlImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSTopicControlImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.management.impl; +package org.apache.activemq6.jms.management.impl; import java.util.ArrayList; import java.util.Collections; @@ -20,21 +20,21 @@ import java.util.Map; import javax.management.MBeanInfo; import javax.management.StandardMBean; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.management.AddressControl; -import org.hornetq.api.core.management.HornetQServerControl; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.core.management.impl.MBeanInfoHelper; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.jms.client.SelectorTranslator; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.management.AddressControl; +import org.apache.activemq6.api.core.management.HornetQServerControl; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.api.jms.management.TopicControl; +import org.apache.activemq6.core.management.impl.MBeanInfoHelper; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.jms.client.SelectorTranslator; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; /** * @author Jeff Mesnil diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/JMSStorageManager.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/JMSStorageManager.java similarity index 80% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/JMSStorageManager.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/JMSStorageManager.java index fb276bd5da..921c3527b7 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/JMSStorageManager.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/JMSStorageManager.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.persistence; +package org.apache.activemq6.jms.persistence; import java.util.List; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.jms.persistence.config.PersistedConnectionFactory; -import org.hornetq.jms.persistence.config.PersistedDestination; -import org.hornetq.jms.persistence.config.PersistedJNDI; -import org.hornetq.jms.persistence.config.PersistedType; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq6.jms.persistence.config.PersistedDestination; +import org.apache.activemq6.jms.persistence.config.PersistedJNDI; +import org.apache.activemq6.jms.persistence.config.PersistedType; /** * A JMSPersistence diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/config/PersistedConnectionFactory.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedConnectionFactory.java similarity index 88% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/config/PersistedConnectionFactory.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedConnectionFactory.java index a935fe383d..33e4bdb19d 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/config/PersistedConnectionFactory.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedConnectionFactory.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.persistence.config; +package org.apache.activemq6.jms.persistence.config; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; /** * A PersistedConnectionFactory diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/config/PersistedDestination.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedDestination.java similarity index 91% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/config/PersistedDestination.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedDestination.java index c940c1ba52..365377392a 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/config/PersistedDestination.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedDestination.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.persistence.config; +package org.apache.activemq6.jms.persistence.config; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.utils.BufferHelper; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.utils.BufferHelper; +import org.apache.activemq6.utils.DataConstants; /** * A PersistedDestination diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/config/PersistedJNDI.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedJNDI.java similarity index 93% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/config/PersistedJNDI.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedJNDI.java index b858da995a..0a2feb0d96 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/config/PersistedJNDI.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedJNDI.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.persistence.config; +package org.apache.activemq6.jms.persistence.config; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.utils.BufferHelper; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.utils.BufferHelper; +import org.apache.activemq6.utils.DataConstants; /** * A PersistedJNDI diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/config/PersistedType.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedType.java similarity index 96% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/config/PersistedType.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedType.java index 62b0fd5aa3..c3bbbd3c25 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/config/PersistedType.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedType.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.persistence.config; +package org.apache.activemq6.jms.persistence.config; /** * A PersistedType diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java similarity index 89% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java index dbcc8c7a2c..829f080650 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.persistence.impl.journal; +package org.apache.activemq6.jms.persistence.impl.journal; import java.io.File; import java.util.ArrayList; @@ -18,25 +18,25 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.Pair; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.replication.ReplicatedJournal; -import org.hornetq.core.replication.ReplicationManager; -import org.hornetq.core.server.JournalType; -import org.hornetq.jms.persistence.JMSStorageManager; -import org.hornetq.jms.persistence.config.PersistedConnectionFactory; -import org.hornetq.jms.persistence.config.PersistedDestination; -import org.hornetq.jms.persistence.config.PersistedJNDI; -import org.hornetq.jms.persistence.config.PersistedType; -import org.hornetq.utils.IDGenerator; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.replication.ReplicatedJournal; +import org.apache.activemq6.core.replication.ReplicationManager; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.jms.persistence.JMSStorageManager; +import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq6.jms.persistence.config.PersistedDestination; +import org.apache.activemq6.jms.persistence.config.PersistedJNDI; +import org.apache.activemq6.jms.persistence.config.PersistedType; +import org.apache.activemq6.utils.IDGenerator; /** * A JournalJMSStorageManagerImpl diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java similarity index 84% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java index 1f3b3e0e98..095bc80a37 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.persistence.impl.nullpm; +package org.apache.activemq6.jms.persistence.impl.nullpm; import java.util.Collections; import java.util.List; -import org.hornetq.jms.persistence.JMSStorageManager; -import org.hornetq.jms.persistence.config.PersistedConnectionFactory; -import org.hornetq.jms.persistence.config.PersistedDestination; -import org.hornetq.jms.persistence.config.PersistedJNDI; -import org.hornetq.jms.persistence.config.PersistedType; +import org.apache.activemq6.jms.persistence.JMSStorageManager; +import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq6.jms.persistence.config.PersistedDestination; +import org.apache.activemq6.jms.persistence.config.PersistedJNDI; +import org.apache.activemq6.jms.persistence.config.PersistedType; /** * A NullJMSStorageManagerImpl diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/HornetQJMSServerBundle.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/HornetQJMSServerBundle.java similarity index 91% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/HornetQJMSServerBundle.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/HornetQJMSServerBundle.java index 614b54a131..b607b98a7c 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/HornetQJMSServerBundle.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/HornetQJMSServerBundle.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server; +package org.apache.activemq6.jms.server; -import org.hornetq.api.core.HornetQAddressExistsException; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.HornetQInternalErrorException; +import org.apache.activemq6.api.core.HornetQAddressExistsException; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.HornetQInternalErrorException; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/HornetQJMSServerLogger.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/HornetQJMSServerLogger.java similarity index 96% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/HornetQJMSServerLogger.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/HornetQJMSServerLogger.java index 49536e2f04..1077a291d5 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/HornetQJMSServerLogger.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/HornetQJMSServerLogger.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server; +package org.apache.activemq6.jms.server; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.jms.server.recovery.XARecoveryConfig; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/JMSServerConfigParser.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/JMSServerConfigParser.java similarity index 86% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/JMSServerConfigParser.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/JMSServerConfigParser.java index b30ee90880..4071d6e626 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/JMSServerConfigParser.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/JMSServerConfigParser.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server; +package org.apache.activemq6.jms.server; import java.io.InputStream; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.config.JMSQueueConfiguration; -import org.hornetq.jms.server.config.TopicConfiguration; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq6.jms.server.config.TopicConfiguration; import org.w3c.dom.Node; /** diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/JMSServerManager.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/JMSServerManager.java similarity index 95% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/JMSServerManager.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/JMSServerManager.java index f5930773d3..6261521c77 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/JMSServerManager.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/JMSServerManager.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server; +package org.apache.activemq6.jms.server; import java.util.List; import java.util.Set; import javax.naming.Context; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.spi.core.naming.BindingRegistry; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.spi.core.naming.BindingRegistry; /** * The JMS Management interface. diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/ConnectionFactoryConfiguration.java similarity index 96% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/ConnectionFactoryConfiguration.java index 747b72a0ce..7948fe3d81 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/ConnectionFactoryConfiguration.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.config; +package org.apache.activemq6.jms.server.config; import java.util.List; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.journal.EncodingSupport; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.journal.EncodingSupport; /** * A ConnectionFactoryConfiguration for {@link javax.jms.ConnectionFactory} objects. diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/JMSConfiguration.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/JMSConfiguration.java similarity index 96% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/JMSConfiguration.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/JMSConfiguration.java index a7f332ae49..63c98fe745 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/JMSConfiguration.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/JMSConfiguration.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.config; +package org.apache.activemq6.jms.server.config; import java.util.List; diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/JMSQueueConfiguration.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/JMSQueueConfiguration.java similarity index 95% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/JMSQueueConfiguration.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/JMSQueueConfiguration.java index 1f810b1920..cf0a387efa 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/JMSQueueConfiguration.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/JMSQueueConfiguration.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.config; +package org.apache.activemq6.jms.server.config; /** * A QeueConfiguration diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/TopicConfiguration.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/TopicConfiguration.java similarity index 94% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/TopicConfiguration.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/TopicConfiguration.java index 0675262508..96f047ccf9 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/TopicConfiguration.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/TopicConfiguration.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.config; +package org.apache.activemq6.jms.server.config; /** * A TopicConfiguration diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java similarity index 97% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java index 08fc42fa20..29517086ba 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.config.impl; +package org.apache.activemq6.jms.server.config.impl; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.utils.BufferHelper; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.utils.BufferHelper; +import org.apache.activemq6.utils.DataConstants; /** * This class contains the configuration properties of a connection factory. diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/JMSConfigurationImpl.java similarity index 87% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/JMSConfigurationImpl.java index eaa8761b6c..91508aa19b 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/JMSConfigurationImpl.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.config.impl; +package org.apache.activemq6.jms.server.config.impl; import java.util.ArrayList; import java.util.List; import javax.naming.Context; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.config.JMSQueueConfiguration; -import org.hornetq.jms.server.config.TopicConfiguration; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq6.jms.server.config.TopicConfiguration; /** diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/JMSQueueConfigurationImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/JMSQueueConfigurationImpl.java similarity index 95% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/JMSQueueConfigurationImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/JMSQueueConfigurationImpl.java index 2fccc6f2ba..a81aa88a00 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/JMSQueueConfigurationImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/JMSQueueConfigurationImpl.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.config.impl; +package org.apache.activemq6.jms.server.config.impl; -import org.hornetq.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; /** diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/TopicConfigurationImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/TopicConfigurationImpl.java similarity index 94% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/TopicConfigurationImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/TopicConfigurationImpl.java index e105437b72..c495e9ef97 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/TopicConfigurationImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/TopicConfigurationImpl.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.config.impl; +package org.apache.activemq6.jms.server.config.impl; -import org.hornetq.jms.server.config.TopicConfiguration; +import org.apache.activemq6.jms.server.config.TopicConfiguration; /** diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/TransportConfigurationEncodingSupport.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/TransportConfigurationEncodingSupport.java similarity index 94% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/TransportConfigurationEncodingSupport.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/TransportConfigurationEncodingSupport.java index f3a250d133..deac43a61b 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/config/impl/TransportConfigurationEncodingSupport.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/TransportConfigurationEncodingSupport.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.config.impl; +package org.apache.activemq6.jms.server.config.impl; import java.util.ArrayList; import java.util.HashMap; @@ -18,11 +18,11 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.utils.BufferHelper; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.utils.BufferHelper; +import org.apache.activemq6.utils.DataConstants; /** * A TransportConfigurationEncodingSupport diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/embedded/EmbeddedJMS.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/embedded/EmbeddedJMS.java similarity index 88% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/embedded/EmbeddedJMS.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/embedded/EmbeddedJMS.java index 0221f7447c..56931d0869 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/embedded/EmbeddedJMS.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/embedded/EmbeddedJMS.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.embedded; +package org.apache.activemq6.jms.server.embedded; import javax.naming.Context; -import org.hornetq.core.registry.JndiBindingRegistry; -import org.hornetq.core.registry.MapBindingRegistry; -import org.hornetq.core.server.embedded.EmbeddedHornetQ; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.spi.core.naming.BindingRegistry; +import org.apache.activemq6.core.registry.JndiBindingRegistry; +import org.apache.activemq6.core.registry.MapBindingRegistry; +import org.apache.activemq6.core.server.embedded.EmbeddedHornetQ; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.spi.core.naming.BindingRegistry; /** * Simple bootstrap class that parses hornetq config files (server and jms and security) and starts diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerConfigParserImpl.java similarity index 94% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerConfigParserImpl.java index c0b95837ca..5080f16f6f 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerConfigParserImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.impl; +package org.apache.activemq6.jms.server.impl; import java.io.InputStream; import java.io.InputStreamReader; @@ -18,24 +18,24 @@ import java.io.Reader; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.impl.Validators; -import org.hornetq.jms.server.HornetQJMSServerBundle; -import org.hornetq.jms.server.HornetQJMSServerLogger; -import org.hornetq.jms.server.JMSServerConfigParser; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.config.JMSQueueConfiguration; -import org.hornetq.jms.server.config.TopicConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.config.impl.JMSQueueConfigurationImpl; -import org.hornetq.jms.server.config.impl.TopicConfigurationImpl; -import org.hornetq.utils.XMLConfigurationUtil; -import org.hornetq.utils.XMLUtil; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.impl.Validators; +import org.apache.activemq6.jms.server.HornetQJMSServerBundle; +import org.apache.activemq6.jms.server.HornetQJMSServerLogger; +import org.apache.activemq6.jms.server.JMSServerConfigParser; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq6.jms.server.config.TopicConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.JMSQueueConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.TopicConfigurationImpl; +import org.apache.activemq6.utils.XMLConfigurationUtil; +import org.apache.activemq6.utils.XMLUtil; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; @@ -60,7 +60,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser public JMSConfiguration parseConfiguration(final InputStream stream) throws Exception { Reader reader = new InputStreamReader(stream); - String xml = org.hornetq.utils.XMLUtil.readerToString(reader); + String xml = org.apache.activemq6.utils.XMLUtil.readerToString(reader); xml = XMLUtil.replaceSystemProps(xml); return parseConfiguration(XMLUtil.stringToElement(xml)); } @@ -78,7 +78,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser Element e = (Element) rootnode; - org.hornetq.utils.XMLUtil.validate(rootnode, "schema/hornetq-jms.xsd"); + org.apache.activemq6.utils.XMLUtil.validate(rootnode, "schema/hornetq-jms.xsd"); String[] elements = new String[]{JMSServerDeployer.QUEUE_NODE_NAME, JMSServerDeployer.TOPIC_NODE_NAME, diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/JMSServerDeployer.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerDeployer.java similarity index 90% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/JMSServerDeployer.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerDeployer.java index 4452d12e85..ec3dbd9372 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/JMSServerDeployer.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerDeployer.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.impl; +package org.apache.activemq6.jms.server.impl; -import org.hornetq.core.deployers.DeploymentManager; -import org.hornetq.core.deployers.impl.XmlDeployer; -import org.hornetq.jms.server.JMSServerConfigParser; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.JMSQueueConfiguration; -import org.hornetq.jms.server.config.TopicConfiguration; +import org.apache.activemq6.core.deployers.DeploymentManager; +import org.apache.activemq6.core.deployers.impl.XmlDeployer; +import org.apache.activemq6.jms.server.JMSServerConfigParser; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq6.jms.server.config.TopicConfiguration; import org.w3c.dom.Node; /** @@ -80,7 +80,7 @@ public class JMSServerDeployer extends XmlDeployer @Override public void validate(final Node rootNode) throws Exception { - org.hornetq.utils.XMLUtil.validate(rootNode, "schema/hornetq-jms.xsd"); + org.apache.activemq6.utils.XMLUtil.validate(rootNode, "schema/hornetq-jms.xsd"); } /** diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/JMSServerManagerImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerManagerImpl.java similarity index 94% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/JMSServerManagerImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerManagerImpl.java index 08c6a274ac..5ffff6d4df 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/JMSServerManagerImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerManagerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.impl; +package org.apache.activemq6.jms.server.impl; import javax.naming.Context; import javax.naming.InitialContext; @@ -31,62 +31,62 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.AddressControl; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.deployers.DeploymentManager; -import org.hornetq.core.deployers.impl.FileDeploymentManager; -import org.hornetq.core.deployers.impl.XmlDeployer; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.registry.JndiBindingRegistry; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.ActivateCallback; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionDetail; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.client.HornetQTopic; -import org.hornetq.jms.client.SelectorTranslator; -import org.hornetq.jms.persistence.JMSStorageManager; -import org.hornetq.jms.persistence.config.PersistedConnectionFactory; -import org.hornetq.jms.persistence.config.PersistedDestination; -import org.hornetq.jms.persistence.config.PersistedJNDI; -import org.hornetq.jms.persistence.config.PersistedType; -import org.hornetq.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; -import org.hornetq.jms.persistence.impl.nullpm.NullJMSStorageManagerImpl; -import org.hornetq.jms.server.HornetQJMSServerBundle; -import org.hornetq.jms.server.HornetQJMSServerLogger; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.config.JMSQueueConfiguration; -import org.hornetq.jms.server.config.TopicConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.hornetq.jms.server.management.JMSManagementService; -import org.hornetq.jms.server.management.JMSNotificationType; -import org.hornetq.jms.server.management.impl.JMSManagementServiceImpl; -import org.hornetq.jms.transaction.JMSTransactionDetail; -import org.hornetq.spi.core.naming.BindingRegistry; -import org.hornetq.utils.TimeAndCounterIDGenerator; -import org.hornetq.utils.TypedProperties; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.AddressControl; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.deployers.DeploymentManager; +import org.apache.activemq6.core.deployers.impl.FileDeploymentManager; +import org.apache.activemq6.core.deployers.impl.XmlDeployer; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.registry.JndiBindingRegistry; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.ActivateCallback; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionDetail; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQQueue; +import org.apache.activemq6.jms.client.HornetQTopic; +import org.apache.activemq6.jms.client.SelectorTranslator; +import org.apache.activemq6.jms.persistence.JMSStorageManager; +import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq6.jms.persistence.config.PersistedDestination; +import org.apache.activemq6.jms.persistence.config.PersistedJNDI; +import org.apache.activemq6.jms.persistence.config.PersistedType; +import org.apache.activemq6.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; +import org.apache.activemq6.jms.persistence.impl.nullpm.NullJMSStorageManagerImpl; +import org.apache.activemq6.jms.server.HornetQJMSServerBundle; +import org.apache.activemq6.jms.server.HornetQJMSServerLogger; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq6.jms.server.config.TopicConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.jms.server.management.JMSManagementService; +import org.apache.activemq6.jms.server.management.JMSNotificationType; +import org.apache.activemq6.jms.server.management.impl.JMSManagementServiceImpl; +import org.apache.activemq6.jms.transaction.JMSTransactionDetail; +import org.apache.activemq6.spi.core.naming.BindingRegistry; +import org.apache.activemq6.utils.TimeAndCounterIDGenerator; +import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; /** * A Deployer used to create and add to JNDI queues, topics and connection @@ -514,7 +514,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback } // We have to perform the server.stop outside of the lock because of backup activation issues. // See https://bugzilla.redhat.com/show_bug.cgi?id=959616 - // And org.hornetq.byteman.tests.StartStopDeadlockTest which is validating for this case here + // And org.apache.activemq6.byteman.tests.StartStopDeadlockTest which is validating for this case here server.stop(); } @@ -849,7 +849,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback } /* (non-Javadoc) - * @see org.hornetq.jms.server.JMSServerManager#removeTopicFromJNDI(java.lang.String, java.lang.String) + * @see org.apache.activemq6.jms.server.JMSServerManager#removeTopicFromJNDI(java.lang.String, java.lang.String) */ public boolean removeTopicFromJNDI(final String name) throws Exception { diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/StandaloneNamingServer.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/StandaloneNamingServer.java similarity index 93% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/StandaloneNamingServer.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/StandaloneNamingServer.java index ad4aa5ae1e..7255e1e5d2 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/StandaloneNamingServer.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/StandaloneNamingServer.java @@ -11,15 +11,15 @@ * permissions and limitations under the License. */ -package org.hornetq.jms.server.impl; +package org.apache.activemq6.jms.server.impl; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.hornetq.core.server.ActivateCallback; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.ActivateCallback; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; import org.jnp.server.Main; import org.jnp.server.NamingBeanImpl; diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/management/JMSManagementService.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/JMSManagementService.java similarity index 74% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/management/JMSManagementService.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/JMSManagementService.java index 2e976ce6e3..a72fbbe04f 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/management/JMSManagementService.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/JMSManagementService.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.management; +package org.apache.activemq6.jms.server.management; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.core.server.Queue; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.client.HornetQTopic; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.api.jms.management.JMSServerControl; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQQueue; +import org.apache.activemq6.jms.client.HornetQTopic; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; /** * @author Jeff Mesnil diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/management/JMSNotificationType.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/JMSNotificationType.java similarity index 86% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/management/JMSNotificationType.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/JMSNotificationType.java index 0476265bbb..3de5f3ebea 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/management/JMSNotificationType.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/JMSNotificationType.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.management; +package org.apache.activemq6.jms.server.management; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.NotificationType; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.NotificationType; public enum JMSNotificationType implements NotificationType { diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/impl/JMSManagementServiceImpl.java similarity index 81% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/impl/JMSManagementServiceImpl.java index af72f8c38f..ee2964969a 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/impl/JMSManagementServiceImpl.java @@ -10,32 +10,32 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.management.impl; +package org.apache.activemq6.jms.server.management.impl; import javax.management.ObjectName; -import org.hornetq.api.core.management.AddressControl; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.management.ConnectionFactoryControl; -import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.core.messagecounter.MessageCounter; -import org.hornetq.core.messagecounter.MessageCounterManager; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.client.HornetQTopic; -import org.hornetq.jms.management.impl.JMSConnectionFactoryControlImpl; -import org.hornetq.jms.management.impl.JMSQueueControlImpl; -import org.hornetq.jms.management.impl.JMSServerControlImpl; -import org.hornetq.jms.management.impl.JMSTopicControlImpl; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.management.JMSManagementService; +import org.apache.activemq6.api.core.management.AddressControl; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.api.jms.management.ConnectionFactoryControl; +import org.apache.activemq6.api.jms.management.JMSQueueControl; +import org.apache.activemq6.api.jms.management.JMSServerControl; +import org.apache.activemq6.api.jms.management.TopicControl; +import org.apache.activemq6.core.messagecounter.MessageCounter; +import org.apache.activemq6.core.messagecounter.MessageCounterManager; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQQueue; +import org.apache.activemq6.jms.client.HornetQTopic; +import org.apache.activemq6.jms.management.impl.JMSConnectionFactoryControlImpl; +import org.apache.activemq6.jms.management.impl.JMSQueueControlImpl; +import org.apache.activemq6.jms.management.impl.JMSServerControlImpl; +import org.apache.activemq6.jms.management.impl.JMSTopicControlImpl; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.management.JMSManagementService; /* * @author Jeff Mesnil diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/HornetQRecoveryRegistry.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQRecoveryRegistry.java similarity index 97% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/HornetQRecoveryRegistry.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQRecoveryRegistry.java index d31a12dbaf..094c4bebb6 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/HornetQRecoveryRegistry.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQRecoveryRegistry.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.recovery; +package org.apache.activemq6.jms.server.recovery; import javax.transaction.xa.XAResource; import java.util.HashSet; @@ -18,9 +18,9 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.jms.server.HornetQJMSServerLogger; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.jms.server.HornetQJMSServerLogger; import org.jboss.tm.XAResourceRecovery; /** diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/HornetQRegistryBase.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQRegistryBase.java similarity index 97% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/HornetQRegistryBase.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQRegistryBase.java index 9053ffe82f..a0b7f5e8dd 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/HornetQRegistryBase.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQRegistryBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.recovery; +package org.apache.activemq6.jms.server.recovery; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/HornetQXAResourceRecovery.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQXAResourceRecovery.java similarity index 89% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/HornetQXAResourceRecovery.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQXAResourceRecovery.java index 57a85c70c3..947ddb66e5 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/HornetQXAResourceRecovery.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQXAResourceRecovery.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.recovery; +package org.apache.activemq6.jms.server.recovery; import javax.transaction.xa.XAResource; import java.util.HashMap; import java.util.Map; import com.arjuna.ats.jta.recovery.XAResourceRecovery; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.jms.server.HornetQJMSServerLogger; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.jms.server.HornetQJMSServerLogger; /** * A XAResourceRecovery instance that can be used to recover any JMS provider. @@ -29,19 +29,19 @@ import org.hornetq.jms.server.HornetQJMSServerLogger; * To enable this add the following to the jbossts-properties file * 
  * <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
- *                 value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/>
+ *                 value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/>
  *
*

* you'll need something like this if the HornetQ Server is remote * 

  *      <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ2"
- *                  value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445"/>
+ *                  value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445"/>
  *
*

* you'll need something like this if the HornetQ Server is remote and has failover configured * 

  *             <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ2"
- *                       value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=5446"/>
+ *                       value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=5446"/>
  *
* * @author Tim Fox diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQXAResourceWrapper.java similarity index 95% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQXAResourceWrapper.java index c2d4ad70aa..c8183621ed 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQXAResourceWrapper.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.recovery; +package org.apache.activemq6.jms.server.recovery; import java.util.Arrays; @@ -18,15 +18,15 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.jms.server.HornetQJMSServerLogger; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.client.SessionFailureListener; +import org.apache.activemq6.jms.server.HornetQJMSServerLogger; /** * XAResourceWrapper. diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/RecoveryDiscovery.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/RecoveryDiscovery.java similarity index 90% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/RecoveryDiscovery.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/RecoveryDiscovery.java index 0fbfd5a285..4291a53ad2 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/RecoveryDiscovery.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/RecoveryDiscovery.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.recovery; +package org.apache.activemq6.jms.server.recovery; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.jms.server.HornetQJMSServerLogger; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.jms.server.HornetQJMSServerLogger; /** *

This class will have a simple Connection Factory and will listen diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/XARecoveryConfig.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/XARecoveryConfig.java similarity index 93% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/XARecoveryConfig.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/XARecoveryConfig.java index 6c4fb6c5cf..7319f2b3b6 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/XARecoveryConfig.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/XARecoveryConfig.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.server.recovery; +package org.apache.activemq6.jms.server.recovery; import java.util.Arrays; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; /** * diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/package-info.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/package-info.java similarity index 95% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/package-info.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/package-info.java index 4459d13206..efcf98a978 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/server/recovery/package-info.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/package-info.java @@ -18,5 +18,5 @@ * III - For each topology member found on the DiscoveryUnits, the RegistryBase will registry a HornetQResourceRecovery * that will exist per server */ -package org.hornetq.jms.server.recovery; +package org.apache.activemq6.jms.server.recovery; diff --git a/hornetq-jms-server/src/main/java/org/hornetq/jms/transaction/JMSTransactionDetail.java b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/transaction/JMSTransactionDetail.java similarity index 76% rename from hornetq-jms-server/src/main/java/org/hornetq/jms/transaction/JMSTransactionDetail.java rename to activemq6-jms-server/src/main/java/org/apache/activemq6/jms/transaction/JMSTransactionDetail.java index e48d1c0437..d3ef9b1703 100644 --- a/hornetq-jms-server/src/main/java/org/hornetq/jms/transaction/JMSTransactionDetail.java +++ b/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/transaction/JMSTransactionDetail.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.transaction; +package org.apache.activemq6.jms.transaction; import java.util.Map; import javax.transaction.xa.Xid; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionDetail; -import org.hornetq.jms.client.HornetQBytesMessage; -import org.hornetq.jms.client.HornetQMapMessage; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.jms.client.HornetQObjectMessage; -import org.hornetq.jms.client.HornetQStreamMessage; -import org.hornetq.jms.client.HornetQTextMessage; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionDetail; +import org.apache.activemq6.jms.client.HornetQBytesMessage; +import org.apache.activemq6.jms.client.HornetQMapMessage; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.jms.client.HornetQObjectMessage; +import org.apache.activemq6.jms.client.HornetQStreamMessage; +import org.apache.activemq6.jms.client.HornetQTextMessage; /** * A JMSTransactionDetail diff --git a/hornetq-jms-server/src/main/resources/schema/hornetq-jms.xsd b/activemq6-jms-server/src/main/resources/schema/hornetq-jms.xsd similarity index 100% rename from hornetq-jms-server/src/main/resources/schema/hornetq-jms.xsd rename to activemq6-jms-server/src/main/resources/schema/hornetq-jms.xsd diff --git a/hornetq-journal/pom.xml b/activemq6-journal/pom.xml similarity index 86% rename from hornetq-journal/pom.xml rename to activemq6-journal/pom.xml index d0edab3e69..efd1912afe 100644 --- a/hornetq-journal/pom.xml +++ b/activemq6-journal/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-journal + activemq6-journal jar - HornetQ Journal + ActiveMQ6 Journal ${project.basedir}/.. @@ -35,13 +35,13 @@ test - org.hornetq - hornetq-commons + org.apache.activemq6 + activemq6-commons ${project.version} - org.hornetq - hornetq-native + org.apache.activemq6 + activemq6-native ${project.version} diff --git a/hornetq-journal/src/main/java/org/hornetq/core/asyncio/AIOCallback.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/AIOCallback.java similarity index 96% rename from hornetq-journal/src/main/java/org/hornetq/core/asyncio/AIOCallback.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/AIOCallback.java index 872b831167..d92fedb909 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/asyncio/AIOCallback.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/AIOCallback.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.asyncio; +package org.apache.activemq6.core.asyncio; /** * The interface used for AIO Callbacks. diff --git a/hornetq-journal/src/main/java/org/hornetq/core/asyncio/AsynchronousFile.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/AsynchronousFile.java similarity index 95% rename from hornetq-journal/src/main/java/org/hornetq/core/asyncio/AsynchronousFile.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/AsynchronousFile.java index 1acee1900e..fad8661848 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/asyncio/AsynchronousFile.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/AsynchronousFile.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.asyncio; +package org.apache.activemq6.core.asyncio; import java.nio.ByteBuffer; -import org.hornetq.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQException; /** * diff --git a/hornetq-journal/src/main/java/org/hornetq/core/asyncio/BufferCallback.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/BufferCallback.java similarity index 95% rename from hornetq-journal/src/main/java/org/hornetq/core/asyncio/BufferCallback.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/BufferCallback.java index 6be59bdffc..189fb40f13 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/asyncio/BufferCallback.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/BufferCallback.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.asyncio; +package org.apache.activemq6.core.asyncio; import java.nio.ByteBuffer; diff --git a/hornetq-journal/src/main/java/org/hornetq/core/asyncio/IOExceptionListener.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/IOExceptionListener.java similarity index 94% rename from hornetq-journal/src/main/java/org/hornetq/core/asyncio/IOExceptionListener.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/IOExceptionListener.java index 2299528628..892c1d0dca 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/asyncio/IOExceptionListener.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/IOExceptionListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.asyncio; +package org.apache.activemq6.core.asyncio; /** * A IOExceptionListener diff --git a/hornetq-journal/src/main/java/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/impl/AsynchronousFileImpl.java similarity index 97% rename from hornetq-journal/src/main/java/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/impl/AsynchronousFileImpl.java index 255aceec5c..9ee4b0a824 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/impl/AsynchronousFileImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.asyncio.impl; +package org.apache.activemq6.core.asyncio.impl; import java.nio.ByteBuffer; import java.nio.channels.FileLock; @@ -24,15 +24,15 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.core.asyncio.AIOCallback; -import org.hornetq.core.asyncio.AsynchronousFile; -import org.hornetq.core.asyncio.BufferCallback; -import org.hornetq.core.asyncio.IOExceptionListener; -import org.hornetq.core.libaio.Native; -import org.hornetq.journal.HornetQJournalLogger; -import org.hornetq.utils.ReusableLatch; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.core.asyncio.AIOCallback; +import org.apache.activemq6.core.asyncio.AsynchronousFile; +import org.apache.activemq6.core.asyncio.BufferCallback; +import org.apache.activemq6.core.asyncio.IOExceptionListener; +import org.apache.activemq6.core.libaio.Native; +import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq6.utils.ReusableLatch; /** * AsynchronousFile implementation diff --git a/hornetq-journal/src/main/java/org/hornetq/core/asyncio/impl/HornetQFileLock.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/impl/HornetQFileLock.java similarity index 92% rename from hornetq-journal/src/main/java/org/hornetq/core/asyncio/impl/HornetQFileLock.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/impl/HornetQFileLock.java index 8c01a4d1bf..ba2514a2ef 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/asyncio/impl/HornetQFileLock.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/impl/HornetQFileLock.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.asyncio.impl; +package org.apache.activemq6.core.asyncio.impl; import java.io.IOException; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; -import org.hornetq.core.libaio.Native; +import org.apache.activemq6.core.libaio.Native; /** * A HornetQFileLock diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/EncodingSupport.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/EncodingSupport.java similarity index 91% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/EncodingSupport.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/EncodingSupport.java index 86d16b2a33..f53143418a 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/EncodingSupport.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/EncodingSupport.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; -import org.hornetq.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffer; /** * diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/IOAsyncTask.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOAsyncTask.java similarity index 80% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/IOAsyncTask.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOAsyncTask.java index 9ea594703b..e130481209 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/IOAsyncTask.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOAsyncTask.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; -import org.hornetq.core.asyncio.AIOCallback; +import org.apache.activemq6.core.asyncio.AIOCallback; /** * * This class is just a direct extension of AIOCallback. - * Just to avoid the direct dependency of org.hornetq.core.asynciio.AIOCallback from the journal. + * Just to avoid the direct dependency of org.apache.activemq6.core.asynciio.AIOCallback from the journal. * * @author Clebert Suconic * diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/IOCompletion.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOCompletion.java similarity index 94% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/IOCompletion.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOCompletion.java index d34397fea5..f1d5915a5d 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/IOCompletion.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOCompletion.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; /** * A IOCompletion diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/IOCriticalErrorListener.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOCriticalErrorListener.java similarity index 94% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/IOCriticalErrorListener.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOCriticalErrorListener.java index 4d32b1213c..fba45e86e6 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/IOCriticalErrorListener.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOCriticalErrorListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; /** * A IOCriticalErrorListener diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/Journal.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/Journal.java similarity index 97% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/Journal.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/Journal.java index c54143e704..85c65e9f84 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/Journal.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/Journal.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; import java.util.List; import java.util.Map; -import org.hornetq.core.journal.impl.JournalFile; -import org.hornetq.core.server.HornetQComponent; +import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq6.core.server.HornetQComponent; /** * Most methods on the journal provide a blocking version where you select the sync mode and a non @@ -26,7 +26,7 @@ import org.hornetq.core.server.HornetQComponent; * make sense on the NIO operations. * @author Tim Fox * @author Clebert Suconic - * @see org.hornetq.utils.IDGenerator + * @see org.apache.activemq6.utils.IDGenerator */ public interface Journal extends HornetQComponent { diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/JournalLoadInformation.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/JournalLoadInformation.java similarity index 98% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/JournalLoadInformation.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/JournalLoadInformation.java index 855be281f4..ed1b18d1bc 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/JournalLoadInformation.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/JournalLoadInformation.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; /** * This is a POJO containing information about the journal during load time. diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/LoaderCallback.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/LoaderCallback.java similarity index 95% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/LoaderCallback.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/LoaderCallback.java index 016437cf9a..3d1c156b4f 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/LoaderCallback.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/LoaderCallback.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; /** * diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/PreparedTransactionInfo.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/PreparedTransactionInfo.java similarity index 96% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/PreparedTransactionInfo.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/PreparedTransactionInfo.java index 82698fb639..9ae3eb0225 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/PreparedTransactionInfo.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/PreparedTransactionInfo.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; import java.util.ArrayList; import java.util.List; diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/RecordInfo.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/RecordInfo.java similarity index 98% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/RecordInfo.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/RecordInfo.java index e413ad2a84..fb78b24501 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/RecordInfo.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/RecordInfo.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; /** * A RecordInfo diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/SequentialFile.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/SequentialFile.java similarity index 95% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/SequentialFile.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/SequentialFile.java index 2ba8d50f8f..94cdfb35c6 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/SequentialFile.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/SequentialFile.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.journal.impl.TimedBuffer; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.journal.impl.TimedBuffer; /** * A SequentialFile diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/SequentialFileFactory.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/SequentialFileFactory.java similarity index 98% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/SequentialFileFactory.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/SequentialFileFactory.java index 555250dd3f..04926416ea 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/SequentialFileFactory.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/SequentialFileFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; import java.nio.ByteBuffer; import java.util.List; diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/TestableJournal.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/TestableJournal.java similarity index 94% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/TestableJournal.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/TestableJournal.java index 36e5703cc1..8f578bbe43 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/TestableJournal.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/TestableJournal.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; -import org.hornetq.core.journal.impl.JournalFile; +import org.apache.activemq6.core.journal.impl.JournalFile; /** * diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/TransactionFailureCallback.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/TransactionFailureCallback.java similarity index 96% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/TransactionFailureCallback.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/TransactionFailureCallback.java index ac1da35f11..09d66d6b07 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/TransactionFailureCallback.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/TransactionFailureCallback.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal; +package org.apache.activemq6.core.journal; import java.util.List; diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AIOSequentialFile.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AIOSequentialFile.java similarity index 93% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AIOSequentialFile.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AIOSequentialFile.java index d8fc6c81e9..11236c74d7 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AIOSequentialFile.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AIOSequentialFile.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.Executor; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.asyncio.AsynchronousFile; -import org.hornetq.core.asyncio.BufferCallback; -import org.hornetq.core.asyncio.IOExceptionListener; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.asyncio.AsynchronousFile; +import org.apache.activemq6.core.asyncio.BufferCallback; +import org.apache.activemq6.core.asyncio.IOExceptionListener; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; /** * diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AIOSequentialFileFactory.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AIOSequentialFileFactory.java similarity index 92% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AIOSequentialFileFactory.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AIOSequentialFileFactory.java index 97948fb278..eb46fd3b8e 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AIOSequentialFileFactory.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AIOSequentialFileFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; import java.nio.ByteBuffer; import java.security.AccessController; @@ -20,14 +20,14 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.core.asyncio.BufferCallback; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.journal.IOCriticalErrorListener; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.libaio.Native; -import org.hornetq.journal.HornetQJournalLogger; -import org.hornetq.utils.HornetQThreadFactory; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.core.asyncio.BufferCallback; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.journal.IOCriticalErrorListener; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.libaio.Native; +import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq6.utils.HornetQThreadFactory; /** * A AIOSequentialFileFactory @@ -168,7 +168,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFileFactory#releaseBuffer(java.nio.ByteBuffer) + * @see org.apache.activemq6.core.journal.SequentialFileFactory#releaseBuffer(java.nio.ByteBuffer) */ @Override public synchronized void releaseBuffer(final ByteBuffer buffer) @@ -226,7 +226,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor private volatile long bufferReuseLastTime = System.currentTimeMillis(); /** - * This queue is fed by {@link org.hornetq.core.journal.impl.AIOSequentialFileFactory.ReuseBuffersController.LocalBufferCallback} + * This queue is fed by {@link org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory.ReuseBuffersController.LocalBufferCallback} * which is called directly by NIO or NIO. On the case of the AIO this is almost called by the native layer as * soon as the buffer is not being used any more and ready to be reused or GCed */ diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractJournalUpdateTask.java similarity index 92% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractJournalUpdateTask.java index 913af3e254..54ab464c6d 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractJournalUpdateTask.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.Pair; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.dataformat.ByteArrayEncoding; -import org.hornetq.core.journal.impl.dataformat.JournalAddRecord; -import org.hornetq.core.journal.impl.dataformat.JournalInternalRecord; -import org.hornetq.utils.ConcurrentHashSet; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecord; +import org.apache.activemq6.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq6.utils.ConcurrentHashSet; /** * diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFile.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractSequentialFile.java similarity index 94% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFile.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractSequentialFile.java index cab8ef9d83..1f4362a810 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFile.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractSequentialFile.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; import java.io.File; import java.io.IOException; @@ -21,16 +21,16 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQIOErrorException; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.journal.HornetQJournalBundle; -import org.hornetq.journal.HornetQJournalLogger; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQIOErrorException; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.journal.HornetQJournalBundle; +import org.apache.activemq6.journal.HornetQJournalLogger; /** * A AbstractSequentialFile diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFileFactory.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractSequentialFileFactory.java similarity index 93% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFileFactory.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractSequentialFileFactory.java index e25eb141c1..4a4c8f2c84 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFileFactory.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractSequentialFileFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; import java.io.File; import java.io.FilenameFilter; @@ -24,12 +24,12 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.core.journal.IOCriticalErrorListener; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.journal.HornetQJournalLogger; -import org.hornetq.utils.HornetQThreadFactory; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.core.journal.IOCriticalErrorListener; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq6.utils.HornetQThreadFactory; /** * diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/CompactJournal.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/CompactJournal.java similarity index 90% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/CompactJournal.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/CompactJournal.java index 26105d646a..849219aa03 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/CompactJournal.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/CompactJournal.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; -import org.hornetq.core.journal.IOCriticalErrorListener; +import org.apache.activemq6.core.journal.IOCriticalErrorListener; /** * This is an undocumented class, that will open a journal and force compacting on it. @@ -29,7 +29,7 @@ public final class CompactJournal // NO_UCD { if (arg.length != 4) { - System.err.println("Use: java -cp hornetq-core.jar org.hornetq.core.journal.impl.CompactJournal "); + System.err.println("Use: java -cp hornetq-core.jar org.apache.activemq6.core.journal.impl.CompactJournal "); return; } diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/DummyCallback.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/DummyCallback.java similarity index 92% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/DummyCallback.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/DummyCallback.java index d807ff5a28..c2eaabed9f 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/DummyCallback.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/DummyCallback.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; -import org.hornetq.journal.HornetQJournalLogger; +import org.apache.activemq6.journal.HornetQJournalLogger; /** * A DummyCallback diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/ExportJournal.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/ExportJournal.java similarity index 93% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/ExportJournal.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/ExportJournal.java index 023f6966f5..aaad661fc7 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/ExportJournal.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/ExportJournal.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; import java.io.BufferedOutputStream; import java.io.File; @@ -18,16 +18,16 @@ import java.io.FileOutputStream; import java.io.PrintStream; import java.util.List; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.utils.Base64; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.utils.Base64; /** * Use this class to export the journal data. You can use it as a main class or through its native method {@link ExportJournal#exportJournal(String, String, String, int, int, String)} * * If you use the main method, use it as * - * Example: java -cp hornetq-core.jar org.hornetq.core.journal.impl.ExportJournal /journalDir hornetq-data hq 2 10485760 /tmp/export.dat + * Example: java -cp hornetq-core.jar org.apache.activemq6.core.journal.impl.ExportJournal /journalDir hornetq-data hq 2 10485760 /tmp/export.dat * * @author Clebert Suconic * @@ -50,7 +50,7 @@ public class ExportJournal { if (arg.length != 5) { - System.err.println("Use: java -cp hornetq-core.jar org.hornetq.core.journal.impl.ExportJournal "); + System.err.println("Use: java -cp hornetq-core.jar org.apache.activemq6.core.journal.impl.ExportJournal "); return; } diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/FileWrapperJournal.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/FileWrapperJournal.java similarity index 87% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/FileWrapperJournal.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/FileWrapperJournal.java index 0e83d4506a..c7eb8e085c 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/FileWrapperJournal.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/FileWrapperJournal.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; import java.util.List; import java.util.Map; @@ -19,24 +19,24 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQUnsupportedPacketException; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.IOCompletion; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.JournalLoadInformation; -import org.hornetq.core.journal.LoaderCallback; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.TransactionFailureCallback; -import org.hornetq.core.journal.impl.dataformat.JournalAddRecord; -import org.hornetq.core.journal.impl.dataformat.JournalAddRecordTX; -import org.hornetq.core.journal.impl.dataformat.JournalCompleteRecordTX; -import org.hornetq.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; -import org.hornetq.core.journal.impl.dataformat.JournalDeleteRecord; -import org.hornetq.core.journal.impl.dataformat.JournalDeleteRecordTX; -import org.hornetq.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQUnsupportedPacketException; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.IOCompletion; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.JournalLoadInformation; +import org.apache.activemq6.core.journal.LoaderCallback; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.TransactionFailureCallback; +import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecord; +import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecordTX; +import org.apache.activemq6.core.journal.impl.dataformat.JournalCompleteRecordTX; +import org.apache.activemq6.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; +import org.apache.activemq6.core.journal.impl.dataformat.JournalDeleteRecord; +import org.apache.activemq6.core.journal.impl.dataformat.JournalDeleteRecordTX; +import org.apache.activemq6.core.journal.impl.dataformat.JournalInternalRecord; /** * Journal used at a replicating backup server during the synchronization of data with the 'live' diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/ImportJournal.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/ImportJournal.java similarity index 97% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/ImportJournal.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/ImportJournal.java index 0f23d4c882..314fb94854 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/ImportJournal.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/ImportJournal.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; import java.io.BufferedReader; import java.io.File; @@ -23,8 +23,8 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.utils.Base64; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.utils.Base64; /** * Use this class to import the journal data from a listed file. You can use it as a main class or @@ -40,7 +40,7 @@ import org.hornetq.utils.Base64; * Example: * * 

- * java -cp hornetq-core.jar org.hornetq.core.journal.impl.ExportJournal /journalDir hornetq-data hq 2 10485760 /tmp/export.dat
+ * java -cp hornetq-core.jar org.apache.activemq6.core.journal.impl.ExportJournal /journalDir hornetq-data hq 2 10485760 /tmp/export.dat
  *
* @author Clebert Suconic */ @@ -61,7 +61,7 @@ public class ImportJournal { if (arg.length != 5) { - System.err.println("Use: java -cp hornetq-core.jar:netty.jar org.hornetq.core.journal.impl.ImportJournal "); + System.err.println("Use: java -cp hornetq-core.jar:netty.jar org.apache.activemq6.core.journal.impl.ImportJournal "); return; } diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalBase.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalBase.java similarity index 95% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalBase.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalBase.java index 408742159d..04e5a22bc2 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalBase.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalBase.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.IOCompletion; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.IOCompletion; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.impl.dataformat.ByteArrayEncoding; abstract class JournalBase implements Journal { diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalCompactor.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalCompactor.java similarity index 94% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalCompactor.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalCompactor.java index f8661bfcde..4fa1020ac0 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalCompactor.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalCompactor.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; import java.util.ArrayList; import java.util.HashMap; @@ -20,21 +20,21 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.Pair; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.dataformat.ByteArrayEncoding; -import org.hornetq.core.journal.impl.dataformat.JournalAddRecord; -import org.hornetq.core.journal.impl.dataformat.JournalAddRecordTX; -import org.hornetq.core.journal.impl.dataformat.JournalCompleteRecordTX; -import org.hornetq.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; -import org.hornetq.core.journal.impl.dataformat.JournalDeleteRecordTX; -import org.hornetq.core.journal.impl.dataformat.JournalInternalRecord; -import org.hornetq.core.journal.impl.dataformat.JournalRollbackRecordTX; -import org.hornetq.journal.HornetQJournalLogger; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecord; +import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecordTX; +import org.apache.activemq6.core.journal.impl.dataformat.JournalCompleteRecordTX; +import org.apache.activemq6.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; +import org.apache.activemq6.core.journal.impl.dataformat.JournalDeleteRecordTX; +import org.apache.activemq6.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq6.core.journal.impl.dataformat.JournalRollbackRecordTX; +import org.apache.activemq6.journal.HornetQJournalLogger; /** * A JournalCompactor diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalConstants.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalConstants.java similarity index 95% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalConstants.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalConstants.java index 55855e4647..1b5ab65329 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalConstants.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalConstants.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; public final class JournalConstants { diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFile.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFile.java similarity index 94% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFile.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFile.java index dd5c1c242f..87f3dbef51 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFile.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFile.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; -import org.hornetq.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFile; /** * diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFileImpl.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFileImpl.java similarity index 97% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFileImpl.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFileImpl.java index f5659db7d7..8aeee12249 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFileImpl.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFileImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFile; /** * diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFilesRepository.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFilesRepository.java similarity index 98% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFilesRepository.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFilesRepository.java index 7541417353..56ab68ff6e 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFilesRepository.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFilesRepository.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; import java.security.AccessController; import java.security.PrivilegedActionException; @@ -27,9 +27,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.journal.HornetQJournalLogger; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.journal.HornetQJournalLogger; /** * This is a helper class for the Journal, which will control access to dataFiles, openedFiles and freeFiles diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalImpl.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalImpl.java similarity index 98% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalImpl.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalImpl.java index 05a85d571a..b54b0040d2 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalImpl.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl; +package org.apache.activemq6.core.journal.impl; import java.io.Serializable; import java.nio.ByteBuffer; @@ -39,33 +39,33 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.Pair; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.IOCompletion; -import org.hornetq.core.journal.JournalLoadInformation; -import org.hornetq.core.journal.LoaderCallback; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.TestableJournal; -import org.hornetq.core.journal.TransactionFailureCallback; -import org.hornetq.core.journal.impl.dataformat.ByteArrayEncoding; -import org.hornetq.core.journal.impl.dataformat.JournalAddRecord; -import org.hornetq.core.journal.impl.dataformat.JournalAddRecordTX; -import org.hornetq.core.journal.impl.dataformat.JournalCompleteRecordTX; -import org.hornetq.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; -import org.hornetq.core.journal.impl.dataformat.JournalDeleteRecord; -import org.hornetq.core.journal.impl.dataformat.JournalDeleteRecordTX; -import org.hornetq.core.journal.impl.dataformat.JournalInternalRecord; -import org.hornetq.core.journal.impl.dataformat.JournalRollbackRecordTX; -import org.hornetq.journal.HornetQJournalBundle; -import org.hornetq.journal.HornetQJournalLogger; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.IOCompletion; +import org.apache.activemq6.core.journal.JournalLoadInformation; +import org.apache.activemq6.core.journal.LoaderCallback; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.TestableJournal; +import org.apache.activemq6.core.journal.TransactionFailureCallback; +import org.apache.activemq6.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecord; +import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecordTX; +import org.apache.activemq6.core.journal.impl.dataformat.JournalCompleteRecordTX; +import org.apache.activemq6.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; +import org.apache.activemq6.core.journal.impl.dataformat.JournalDeleteRecord; +import org.apache.activemq6.core.journal.impl.dataformat.JournalDeleteRecordTX; +import org.apache.activemq6.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq6.core.journal.impl.dataformat.JournalRollbackRecordTX; +import org.apache.activemq6.journal.HornetQJournalBundle; +import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.DataConstants; /** *

A circular log implementation.

* A transaction record (Commit or Prepare), will hold the number of elements the transaction has in * the current file. *

- * While loading the {@link org.hornetq.core.journal.impl.JournalFile}, the number of operations found is matched against this + * While loading the {@link org.apache.activemq6.core.journal.impl.JournalFile}, the number of operations found is matched against this * number. If for any reason there are missing operations, the transaction will be ignored. *

* We can't just use a global counter as reclaiming could delete files after the transaction was diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecord.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalDeleteRecord.java similarity index 88% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecord.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalDeleteRecord.java index 82093fb07d..188418e0e5 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecord.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalDeleteRecord.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl.dataformat; +package org.apache.activemq6.core.journal.impl.dataformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.impl.JournalImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.impl.JournalImpl; /** * A JournalDeleteRecord diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecordTX.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalDeleteRecordTX.java similarity index 88% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecordTX.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalDeleteRecordTX.java index 9d7a9992a8..bdbd7efc7a 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecordTX.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalDeleteRecordTX.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl.dataformat; +package org.apache.activemq6.core.journal.impl.dataformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.impl.JournalImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.impl.JournalImpl; /** * A JournalDeleteRecordTX diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/dataformat/JournalInternalRecord.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalInternalRecord.java similarity index 90% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/dataformat/JournalInternalRecord.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalInternalRecord.java index 94523a1622..5b5f707e82 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/dataformat/JournalInternalRecord.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalInternalRecord.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl.dataformat; +package org.apache.activemq6.core.journal.impl.dataformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.EncodingSupport; /** * A InternalEncoder diff --git a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/dataformat/JournalRollbackRecordTX.java b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalRollbackRecordTX.java similarity index 88% rename from hornetq-journal/src/main/java/org/hornetq/core/journal/impl/dataformat/JournalRollbackRecordTX.java rename to activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalRollbackRecordTX.java index 291197ee8e..5f07256c9b 100644 --- a/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/dataformat/JournalRollbackRecordTX.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalRollbackRecordTX.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.journal.impl.dataformat; +package org.apache.activemq6.core.journal.impl.dataformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.impl.JournalImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.impl.JournalImpl; /** * A JournalRollbackRecordTX diff --git a/hornetq-journal/src/main/java/org/hornetq/journal/HornetQJournalBundle.java b/activemq6-journal/src/main/java/org/apache/activemq6/journal/HornetQJournalBundle.java similarity index 95% rename from hornetq-journal/src/main/java/org/hornetq/journal/HornetQJournalBundle.java rename to activemq6-journal/src/main/java/org/apache/activemq6/journal/HornetQJournalBundle.java index 90c6c919ed..6601263b0c 100644 --- a/hornetq-journal/src/main/java/org/hornetq/journal/HornetQJournalBundle.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/journal/HornetQJournalBundle.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.journal; +package org.apache.activemq6.journal; -import org.hornetq.api.core.HornetQIOErrorException; +import org.apache.activemq6.api.core.HornetQIOErrorException; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; import org.jboss.logging.Messages; diff --git a/hornetq-journal/src/main/java/org/hornetq/journal/HornetQJournalLogger.java b/activemq6-journal/src/main/java/org/apache/activemq6/journal/HornetQJournalLogger.java similarity index 99% rename from hornetq-journal/src/main/java/org/hornetq/journal/HornetQJournalLogger.java rename to activemq6-journal/src/main/java/org/apache/activemq6/journal/HornetQJournalLogger.java index 3d66687faa..db7a9f3792 100644 --- a/hornetq-journal/src/main/java/org/hornetq/journal/HornetQJournalLogger.java +++ b/activemq6-journal/src/main/java/org/apache/activemq6/journal/HornetQJournalLogger.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.journal; +package org.apache.activemq6.journal; -import org.hornetq.core.journal.impl.JournalFile; +import org.apache.activemq6.core.journal.impl.JournalFile; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; diff --git a/hornetq-journal/src/test/java/org/hornetq/tests/asyncio/LibaioDependencyCheckTest.java b/activemq6-journal/src/test/java/org/apache/activemq6/tests/asyncio/LibaioDependencyCheckTest.java similarity index 93% rename from hornetq-journal/src/test/java/org/hornetq/tests/asyncio/LibaioDependencyCheckTest.java rename to activemq6-journal/src/test/java/org/apache/activemq6/tests/asyncio/LibaioDependencyCheckTest.java index fb529a5e9a..742635a7ef 100644 --- a/hornetq-journal/src/test/java/org/hornetq/tests/asyncio/LibaioDependencyCheckTest.java +++ b/activemq6-journal/src/test/java/org/apache/activemq6/tests/asyncio/LibaioDependencyCheckTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.asyncio; +package org.apache.activemq6.tests.asyncio; import org.junit.Test; import org.junit.Assert; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; /** * A LibaioDependencyCheckTest diff --git a/hornetq-native/README b/activemq6-native/README similarity index 100% rename from hornetq-native/README rename to activemq6-native/README diff --git a/hornetq-native/bin/libHornetQAIO32.so b/activemq6-native/bin/libHornetQAIO32.so similarity index 100% rename from hornetq-native/bin/libHornetQAIO32.so rename to activemq6-native/bin/libHornetQAIO32.so diff --git a/hornetq-native/bin/libHornetQAIO64.so b/activemq6-native/bin/libHornetQAIO64.so similarity index 100% rename from hornetq-native/bin/libHornetQAIO64.so rename to activemq6-native/bin/libHornetQAIO64.so diff --git a/hornetq-native/compile-native.sh b/activemq6-native/compile-native.sh similarity index 100% rename from hornetq-native/compile-native.sh rename to activemq6-native/compile-native.sh diff --git a/hornetq-native/pom.xml b/activemq6-native/pom.xml similarity index 92% rename from hornetq-native/pom.xml rename to activemq6-native/pom.xml index e35df968e1..d6929e48dd 100644 --- a/hornetq-native/pom.xml +++ b/activemq6-native/pom.xml @@ -1,20 +1,20 @@ - HornetQ Native POM + ActiveMQ6 Native POM 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-native + activemq6-native ${native-package-type} - org.hornetq - hornetq-commons + org.apache.activemq6 + activemq6-commons ${project.version} diff --git a/hornetq-native/src/main/c/AIOController.cpp b/activemq6-native/src/main/c/AIOController.cpp similarity index 100% rename from hornetq-native/src/main/c/AIOController.cpp rename to activemq6-native/src/main/c/AIOController.cpp diff --git a/hornetq-native/src/main/c/AIOController.h b/activemq6-native/src/main/c/AIOController.h similarity index 100% rename from hornetq-native/src/main/c/AIOController.h rename to activemq6-native/src/main/c/AIOController.h diff --git a/hornetq-native/src/main/c/AIOException.h b/activemq6-native/src/main/c/AIOException.h similarity index 100% rename from hornetq-native/src/main/c/AIOException.h rename to activemq6-native/src/main/c/AIOException.h diff --git a/hornetq-native/src/main/c/AsyncFile.cpp b/activemq6-native/src/main/c/AsyncFile.cpp similarity index 100% rename from hornetq-native/src/main/c/AsyncFile.cpp rename to activemq6-native/src/main/c/AsyncFile.cpp diff --git a/hornetq-native/src/main/c/AsyncFile.h b/activemq6-native/src/main/c/AsyncFile.h similarity index 100% rename from hornetq-native/src/main/c/AsyncFile.h rename to activemq6-native/src/main/c/AsyncFile.h diff --git a/hornetq-native/src/main/c/CallbackAdapter.h b/activemq6-native/src/main/c/CallbackAdapter.h similarity index 100% rename from hornetq-native/src/main/c/CallbackAdapter.h rename to activemq6-native/src/main/c/CallbackAdapter.h diff --git a/hornetq-native/src/main/c/JAIODatatypes.h b/activemq6-native/src/main/c/JAIODatatypes.h similarity index 100% rename from hornetq-native/src/main/c/JAIODatatypes.h rename to activemq6-native/src/main/c/JAIODatatypes.h diff --git a/hornetq-native/src/main/c/JNICallbackAdapter.cpp b/activemq6-native/src/main/c/JNICallbackAdapter.cpp similarity index 100% rename from hornetq-native/src/main/c/JNICallbackAdapter.cpp rename to activemq6-native/src/main/c/JNICallbackAdapter.cpp diff --git a/hornetq-native/src/main/c/JNICallbackAdapter.h b/activemq6-native/src/main/c/JNICallbackAdapter.h similarity index 100% rename from hornetq-native/src/main/c/JNICallbackAdapter.h rename to activemq6-native/src/main/c/JNICallbackAdapter.h diff --git a/hornetq-native/src/main/c/JNI_AsynchronousFileImpl.cpp b/activemq6-native/src/main/c/JNI_AsynchronousFileImpl.cpp similarity index 100% rename from hornetq-native/src/main/c/JNI_AsynchronousFileImpl.cpp rename to activemq6-native/src/main/c/JNI_AsynchronousFileImpl.cpp diff --git a/hornetq-native/src/main/c/JavaUtilities.cpp b/activemq6-native/src/main/c/JavaUtilities.cpp similarity index 100% rename from hornetq-native/src/main/c/JavaUtilities.cpp rename to activemq6-native/src/main/c/JavaUtilities.cpp diff --git a/hornetq-native/src/main/c/JavaUtilities.h b/activemq6-native/src/main/c/JavaUtilities.h similarity index 100% rename from hornetq-native/src/main/c/JavaUtilities.h rename to activemq6-native/src/main/c/JavaUtilities.h diff --git a/hornetq-native/src/main/c/LockClass.h b/activemq6-native/src/main/c/LockClass.h similarity index 100% rename from hornetq-native/src/main/c/LockClass.h rename to activemq6-native/src/main/c/LockClass.h diff --git a/hornetq-native/src/main/c/Version.h b/activemq6-native/src/main/c/Version.h similarity index 100% rename from hornetq-native/src/main/c/Version.h rename to activemq6-native/src/main/c/Version.h diff --git a/hornetq-native/src/main/java/org/hornetq/core/libaio/Native.java b/activemq6-native/src/main/java/org/apache/activemq6/core/libaio/Native.java similarity index 94% rename from hornetq-native/src/main/java/org/hornetq/core/libaio/Native.java rename to activemq6-native/src/main/java/org/apache/activemq6/core/libaio/Native.java index 81f9465cf3..c7705d9cd4 100644 --- a/hornetq-native/src/main/java/org/hornetq/core/libaio/Native.java +++ b/activemq6-native/src/main/java/org/apache/activemq6/core/libaio/Native.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.libaio; +package org.apache.activemq6.core.libaio; import java.nio.ByteBuffer; -import org.hornetq.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQException; /** * @author Clebert Suconic @@ -53,7 +53,7 @@ public class Native public static native void writeInternal(ByteBuffer handle, long positionToWrite, long size, ByteBuffer bytes) throws HornetQException; /** - *This is using org.hornetq.core.asyncio.AIOCallback + *This is using org.apache.activemq6.core.asyncio.AIOCallback */ public static native void read(Object thisObject, ByteBuffer handle, long position, long size, ByteBuffer buffer, Object aioPackageCallback) throws HornetQException; diff --git a/hornetq-protocols/hornetq-amqp-protocol/pom.xml b/activemq6-protocols/activemq6-amqp-protocol/pom.xml similarity index 74% rename from hornetq-protocols/hornetq-amqp-protocol/pom.xml rename to activemq6-protocols/activemq6-amqp-protocol/pom.xml index b1079d3898..b0664154f8 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/pom.xml +++ b/activemq6-protocols/activemq6-amqp-protocol/pom.xml @@ -1,13 +1,13 @@ - hornetq-protocols - org.hornetq - 2.5.0-SNAPSHOT + activemq6-protocols + org.apache.activemq6 + 6.0.0-SNAPSHOT 4.0.0 - hornetq-amqp-protocol + activemq6-amqp-protocol ${project.basedir}/../.. @@ -16,13 +16,13 @@ - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} @@ -38,13 +38,13 @@ jboss-logging - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-proton-plug + org.apache.activemq6 + activemq6-proton-plug ${project.version} diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/HornetQProtonRemotingConnection.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/HornetQProtonRemotingConnection.java similarity index 89% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/HornetQProtonRemotingConnection.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/HornetQProtonRemotingConnection.java index 8c6f7788da..e526d52db6 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/HornetQProtonRemotingConnection.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/HornetQProtonRemotingConnection.java @@ -11,15 +11,15 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton; +package org.apache.activemq6.core.protocol.proton; import java.util.concurrent.Executor; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.client.HornetQClientLogger; -import org.hornetq.spi.core.protocol.AbstractRemotingConnection; -import org.hornetq.spi.core.remoting.Connection; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.client.HornetQClientLogger; +import org.apache.activemq6.spi.core.protocol.AbstractRemotingConnection; +import org.apache.activemq6.spi.core.remoting.Connection; import org.proton.plug.AMQPConnectionContext; /** diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/ProtonProtocolManager.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/ProtonProtocolManager.java similarity index 76% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/ProtonProtocolManager.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/ProtonProtocolManager.java index 8086925ab9..8398866cd1 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/ProtonProtocolManager.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/ProtonProtocolManager.java @@ -11,25 +11,25 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton; +package org.apache.activemq6.core.protocol.proton; import java.util.concurrent.Executor; import io.netty.channel.ChannelPipeline; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.protocol.proton.converter.ProtonMessageConverter; -import org.hornetq.core.protocol.proton.plug.HornetQProtonConnectionCallback; -import org.hornetq.core.remoting.impl.netty.NettyServerConnection; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationListener; -import org.hornetq.spi.core.protocol.ConnectionEntry; -import org.hornetq.spi.core.protocol.MessageConverter; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.Connection; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.protocol.proton.converter.ProtonMessageConverter; +import org.apache.activemq6.core.protocol.proton.plug.HornetQProtonConnectionCallback; +import org.apache.activemq6.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationListener; +import org.apache.activemq6.spi.core.protocol.ConnectionEntry; +import org.apache.activemq6.spi.core.protocol.MessageConverter; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.Connection; import org.proton.plug.AMQPServerConnectionContext; import org.proton.plug.context.server.ProtonServerConnectionContextFactory; diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/ProtonProtocolManagerFactory.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/ProtonProtocolManagerFactory.java similarity index 81% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/ProtonProtocolManagerFactory.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/ProtonProtocolManagerFactory.java index c0144b7c5d..68cc9a59f7 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/ProtonProtocolManagerFactory.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/ProtonProtocolManagerFactory.java @@ -11,12 +11,12 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton; +package org.apache.activemq6.core.protocol.proton; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.protocol.ProtocolManagerFactory; import java.util.List; diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/HornetQJMSVendor.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/HornetQJMSVendor.java similarity index 67% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/HornetQJMSVendor.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/HornetQJMSVendor.java index 3126b28d72..725ecfc501 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/HornetQJMSVendor.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/HornetQJMSVendor.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton.converter; +package org.apache.activemq6.core.protocol.proton.converter; import javax.jms.BytesMessage; import javax.jms.Destination; @@ -22,15 +22,15 @@ import javax.jms.StreamMessage; import javax.jms.TextMessage; import org.apache.qpid.proton.jms.JMSVendor; -import org.hornetq.core.buffers.impl.ResetLimitWrappedHornetQBuffer; -import org.hornetq.core.protocol.proton.converter.jms.ServerJMSBytesMessage; -import org.hornetq.core.protocol.proton.converter.jms.ServerJMSMapMessage; -import org.hornetq.core.protocol.proton.converter.jms.ServerJMSMessage; -import org.hornetq.core.protocol.proton.converter.jms.ServerJMSStreamMessage; -import org.hornetq.core.protocol.proton.converter.jms.ServerJMSTextMessage; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.utils.IDGenerator; +import org.apache.activemq6.core.buffers.impl.ResetLimitWrappedHornetQBuffer; +import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSBytesMessage; +import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSMapMessage; +import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSMessage; +import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSStreamMessage; +import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSTextMessage; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.utils.IDGenerator; /** * @author Clebert Suconic @@ -49,25 +49,25 @@ public class HornetQJMSVendor extends JMSVendor @Override public BytesMessage createBytesMessage() { - return new ServerJMSBytesMessage(newMessage(org.hornetq.api.core.Message.BYTES_TYPE), 0); + return new ServerJMSBytesMessage(newMessage(org.apache.activemq6.api.core.Message.BYTES_TYPE), 0); } @Override public StreamMessage createStreamMessage() { - return new ServerJMSStreamMessage(newMessage(org.hornetq.api.core.Message.STREAM_TYPE), 0); + return new ServerJMSStreamMessage(newMessage(org.apache.activemq6.api.core.Message.STREAM_TYPE), 0); } @Override public Message createMessage() { - return new ServerJMSMessage(newMessage(org.hornetq.api.core.Message.DEFAULT_TYPE), 0 ); + return new ServerJMSMessage(newMessage(org.apache.activemq6.api.core.Message.DEFAULT_TYPE), 0 ); } @Override public TextMessage createTextMessage() { - return new ServerJMSTextMessage(newMessage(org.hornetq.api.core.Message.TEXT_TYPE), 0); + return new ServerJMSTextMessage(newMessage(org.apache.activemq6.api.core.Message.TEXT_TYPE), 0); } @Override @@ -79,7 +79,7 @@ public class HornetQJMSVendor extends JMSVendor @Override public MapMessage createMapMessage() { - return new ServerJMSMapMessage(newMessage(org.hornetq.api.core.Message.MAP_TYPE), 0); + return new ServerJMSMapMessage(newMessage(org.apache.activemq6.api.core.Message.MAP_TYPE), 0); } @Override @@ -122,13 +122,13 @@ public class HornetQJMSVendor extends JMSVendor { switch (messageType) { - case org.hornetq.api.core.Message.STREAM_TYPE: + case org.apache.activemq6.api.core.Message.STREAM_TYPE: return new ServerJMSStreamMessage(wrapped, deliveryCount); - case org.hornetq.api.core.Message.BYTES_TYPE: + case org.apache.activemq6.api.core.Message.BYTES_TYPE: return new ServerJMSBytesMessage(wrapped, deliveryCount); - case org.hornetq.api.core.Message.MAP_TYPE: + case org.apache.activemq6.api.core.Message.MAP_TYPE: return new ServerJMSMapMessage(wrapped, deliveryCount); - case org.hornetq.api.core.Message.TEXT_TYPE: + case org.apache.activemq6.api.core.Message.TEXT_TYPE: return new ServerJMSTextMessage(wrapped, deliveryCount); default: return new ServerJMSMessage(wrapped, deliveryCount); diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/ProtonMessageConverter.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/ProtonMessageConverter.java similarity index 88% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/ProtonMessageConverter.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/ProtonMessageConverter.java index 495c76a0e6..8081f6cd8b 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/ProtonMessageConverter.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/ProtonMessageConverter.java @@ -11,16 +11,16 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton.converter; +package org.apache.activemq6.core.protocol.proton.converter; import org.apache.qpid.proton.jms.EncodedMessage; import org.apache.qpid.proton.jms.InboundTransformer; import org.apache.qpid.proton.jms.JMSMappingInboundTransformer; import org.apache.qpid.proton.jms.JMSMappingOutboundTransformer; -import org.hornetq.core.protocol.proton.converter.jms.ServerJMSMessage; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.spi.core.protocol.MessageConverter; -import org.hornetq.utils.IDGenerator; +import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSMessage; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.spi.core.protocol.MessageConverter; +import org.apache.activemq6.utils.IDGenerator; /** * @author Clebert Suconic diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java similarity index 69% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java index 840fb35b71..532f7216b2 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java @@ -11,38 +11,38 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton.converter.jms; +package org.apache.activemq6.core.protocol.proton.converter.jms; import javax.jms.BytesMessage; import javax.jms.JMSException; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.message.impl.MessageInternal; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.message.impl.MessageInternal; -import static org.hornetq.reader.BytesMessageUtil.bytesMessageReset; -import static org.hornetq.reader.BytesMessageUtil.bytesReadBoolean; -import static org.hornetq.reader.BytesMessageUtil.bytesReadByte; -import static org.hornetq.reader.BytesMessageUtil.bytesReadBytes; -import static org.hornetq.reader.BytesMessageUtil.bytesReadChar; -import static org.hornetq.reader.BytesMessageUtil.bytesReadDouble; -import static org.hornetq.reader.BytesMessageUtil.bytesReadFloat; -import static org.hornetq.reader.BytesMessageUtil.bytesReadInt; -import static org.hornetq.reader.BytesMessageUtil.bytesReadLong; -import static org.hornetq.reader.BytesMessageUtil.bytesReadShort; -import static org.hornetq.reader.BytesMessageUtil.bytesReadUTF; -import static org.hornetq.reader.BytesMessageUtil.bytesReadUnsignedByte; -import static org.hornetq.reader.BytesMessageUtil.bytesReadUnsignedShort; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteBoolean; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteByte; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteBytes; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteChar; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteDouble; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteFloat; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteInt; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteLong; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteObject; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteShort; -import static org.hornetq.reader.BytesMessageUtil.bytesWriteUTF; +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; /** diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSMapMessage.java similarity index 94% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSMapMessage.java index 43730984b4..ad809048e2 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSMapMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton.converter.jms; +package org.apache.activemq6.core.protocol.proton.converter.jms; import javax.jms.JMSException; import javax.jms.MapMessage; @@ -20,14 +20,14 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Set; -import org.hornetq.api.core.HornetQPropertyConversionException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.utils.TypedProperties; +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.core.message.impl.MessageInternal; +import org.apache.activemq6.utils.TypedProperties; -import static org.hornetq.reader.MapMessageUtil.readBodyMap; -import static org.hornetq.reader.MapMessageUtil.writeBodyMap; +import static org.apache.activemq6.reader.MapMessageUtil.readBodyMap; +import static org.apache.activemq6.reader.MapMessageUtil.writeBodyMap; /** * HornetQ implementation of a JMS MapMessage. diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSMessage.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSMessage.java similarity index 96% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSMessage.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSMessage.java index 2c5e6e26b0..e6f0d8f8e1 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSMessage.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSMessage.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton.converter.jms; +package org.apache.activemq6.core.protocol.proton.converter.jms; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -20,12 +20,12 @@ import javax.jms.Message; import java.util.Collections; import java.util.Enumeration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.reader.MessageUtil; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQQueue; +import org.apache.activemq6.reader.MessageUtil; /** * @author Clebert Suconic diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java similarity index 88% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java index 14a59544ce..d190d4517e 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java @@ -10,31 +10,31 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton.converter.jms; +package org.apache.activemq6.core.protocol.proton.converter.jms; import javax.jms.JMSException; import javax.jms.MessageEOFException; import javax.jms.MessageFormatException; import javax.jms.StreamMessage; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.utils.DataConstants; +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.core.message.impl.MessageInternal; +import org.apache.activemq6.utils.DataConstants; -import static org.hornetq.reader.MessageUtil.getBodyBuffer; -import static org.hornetq.reader.StreamMessageUtil.streamReadBoolean; -import static org.hornetq.reader.StreamMessageUtil.streamReadByte; -import static org.hornetq.reader.StreamMessageUtil.streamReadBytes; -import static org.hornetq.reader.StreamMessageUtil.streamReadChar; -import static org.hornetq.reader.StreamMessageUtil.streamReadDouble; -import static org.hornetq.reader.StreamMessageUtil.streamReadFloat; -import static org.hornetq.reader.StreamMessageUtil.streamReadInteger; -import static org.hornetq.reader.StreamMessageUtil.streamReadLong; -import static org.hornetq.reader.StreamMessageUtil.streamReadObject; -import static org.hornetq.reader.StreamMessageUtil.streamReadShort; -import static org.hornetq.reader.StreamMessageUtil.streamReadString; +import static org.apache.activemq6.reader.MessageUtil.getBodyBuffer; +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; public final class ServerJMSStreamMessage extends ServerJMSMessage implements StreamMessage { diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSTextMessage.java similarity index 88% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSTextMessage.java index 5455e6edbf..6d484272db 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSTextMessage.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton.converter.jms; +package org.apache.activemq6.core.protocol.proton.converter.jms; import javax.jms.JMSException; import javax.jms.TextMessage; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.message.impl.MessageInternal; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.message.impl.MessageInternal; -import static org.hornetq.reader.TextMessageUtil.readBodyText; -import static org.hornetq.reader.TextMessageUtil.writeBodyText; +import static org.apache.activemq6.reader.TextMessageUtil.readBodyText; +import static org.apache.activemq6.reader.TextMessageUtil.writeBodyText; /** diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/package-info.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/package-info.java similarity index 92% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/package-info.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/package-info.java index acc5a0ddf8..d3ea9b2f57 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/converter/jms/package-info.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/package-info.java @@ -18,4 +18,4 @@ * @author Clebert Suconic */ -package org.hornetq.core.protocol.proton.converter.jms; \ No newline at end of file +package org.apache.activemq6.core.protocol.proton.converter.jms; \ No newline at end of file diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/plug/HornetQProtonConnectionCallback.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/HornetQProtonConnectionCallback.java similarity index 87% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/plug/HornetQProtonConnectionCallback.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/HornetQProtonConnectionCallback.java index 43e1d2b983..55fb67e84c 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/plug/HornetQProtonConnectionCallback.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/HornetQProtonConnectionCallback.java @@ -11,19 +11,19 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton.plug; +package org.apache.activemq6.core.protocol.proton.plug; import java.util.concurrent.TimeUnit; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; -import org.hornetq.core.buffers.impl.ChannelBufferWrapper; -import org.hornetq.core.protocol.proton.HornetQProtonRemotingConnection; -import org.hornetq.core.protocol.proton.ProtonProtocolManager; -import org.hornetq.core.protocol.proton.sasl.HornetQPlainSASL; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.utils.ReusableLatch; +import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq6.core.protocol.proton.HornetQProtonRemotingConnection; +import org.apache.activemq6.core.protocol.proton.ProtonProtocolManager; +import org.apache.activemq6.core.protocol.proton.sasl.HornetQPlainSASL; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.utils.ReusableLatch; import org.proton.plug.AMQPConnectionCallback; import org.proton.plug.AMQPConnectionContext; import org.proton.plug.AMQPSessionCallback; diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java similarity index 92% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java index cbb2c7777c..85e367010d 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton.plug; +package org.apache.activemq6.core.protocol.proton.plug; import io.netty.buffer.ByteBuf; @@ -23,20 +23,20 @@ import org.apache.qpid.proton.engine.Link; import org.apache.qpid.proton.engine.Receiver; import org.apache.qpid.proton.jms.EncodedMessage; import org.apache.qpid.proton.message.ProtonJMessage; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.protocol.proton.ProtonProtocolManager; -import org.hornetq.core.server.QueueQueryResult; -import org.hornetq.core.server.ServerConsumer; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.ServerSession; -import org.hornetq.spi.core.protocol.SessionCallback; -import org.hornetq.spi.core.remoting.ReadyListener; -import org.hornetq.utils.ByteUtil; -import org.hornetq.utils.IDGenerator; -import org.hornetq.utils.SimpleIDGenerator; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.protocol.proton.ProtonProtocolManager; +import org.apache.activemq6.core.server.QueueQueryResult; +import org.apache.activemq6.core.server.ServerConsumer; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq6.spi.core.remoting.ReadyListener; +import org.apache.activemq6.utils.ByteUtil; +import org.apache.activemq6.utils.IDGenerator; +import org.apache.activemq6.utils.SimpleIDGenerator; +import org.apache.activemq6.utils.UUIDGenerator; import org.proton.plug.AMQPConnectionContext; import org.proton.plug.AMQPSessionCallback; import org.proton.plug.AMQPSessionContext; diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/plug/package-info.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/package-info.java similarity index 92% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/plug/package-info.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/package-info.java index 5612b2a5bd..9bdf3053a5 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/plug/package-info.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/package-info.java @@ -15,4 +15,4 @@ * This package contains classes for integration with the ProtonPlug * @author Clebert Suconic */ -package org.hornetq.core.protocol.proton.plug; \ No newline at end of file +package org.apache.activemq6.core.protocol.proton.plug; \ No newline at end of file diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/sasl/HornetQPlainSASL.java b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/sasl/HornetQPlainSASL.java similarity index 87% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/sasl/HornetQPlainSASL.java rename to activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/sasl/HornetQPlainSASL.java index 43e7f29fdb..b92b7ee757 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/main/java/org/hornetq/core/protocol/proton/sasl/HornetQPlainSASL.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/sasl/HornetQPlainSASL.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton.sasl; +package org.apache.activemq6.core.protocol.proton.sasl; -import org.hornetq.core.security.SecurityStore; -import org.hornetq.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.core.security.SecurityStore; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; import org.proton.plug.sasl.ServerSASLPlain; /** diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory b/activemq6-protocols/activemq6-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory similarity index 100% rename from hornetq-protocols/hornetq-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory rename to activemq6-protocols/activemq6-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory diff --git a/hornetq-protocols/hornetq-amqp-protocol/src/test/java/org/hornetq/core/protocol/proton/TestConversions.java b/activemq6-protocols/activemq6-amqp-protocol/src/test/java/org/apache/activemq6/core/protocol/proton/TestConversions.java similarity index 95% rename from hornetq-protocols/hornetq-amqp-protocol/src/test/java/org/hornetq/core/protocol/proton/TestConversions.java rename to activemq6-protocols/activemq6-amqp-protocol/src/test/java/org/apache/activemq6/core/protocol/proton/TestConversions.java index 029a7630f6..c8848091c4 100644 --- a/hornetq-protocols/hornetq-amqp-protocol/src/test/java/org/hornetq/core/protocol/proton/TestConversions.java +++ b/activemq6-protocols/activemq6-amqp-protocol/src/test/java/org/apache/activemq6/core/protocol/proton/TestConversions.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.proton; +package org.apache.activemq6.core.protocol.proton; import java.nio.ByteBuffer; import java.util.HashMap; @@ -30,17 +30,17 @@ import org.apache.qpid.proton.jms.EncodedMessage; import org.apache.qpid.proton.message.Message; import org.apache.qpid.proton.message.ProtonJMessage; import org.apache.qpid.proton.message.impl.MessageImpl; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.protocol.proton.converter.ProtonMessageConverter; -import org.hornetq.core.protocol.proton.converter.jms.ServerJMSBytesMessage; -import org.hornetq.core.protocol.proton.converter.jms.ServerJMSMapMessage; -import org.hornetq.core.protocol.proton.converter.jms.ServerJMSMessage; -import org.hornetq.core.protocol.proton.converter.jms.ServerJMSStreamMessage; -import org.hornetq.core.protocol.proton.converter.jms.ServerJMSTextMessage; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.utils.SimpleIDGenerator; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.protocol.proton.converter.ProtonMessageConverter; +import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSBytesMessage; +import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSMapMessage; +import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSMessage; +import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSStreamMessage; +import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSTextMessage; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.utils.SimpleIDGenerator; import org.junit.Assert; import org.junit.Test; import org.proton.plug.util.NettyWritable; diff --git a/hornetq-protocols/hornetq-openwire-protocol/pom.xml b/activemq6-protocols/activemq6-openwire-protocol/pom.xml similarity index 74% rename from hornetq-protocols/hornetq-openwire-protocol/pom.xml rename to activemq6-protocols/activemq6-openwire-protocol/pom.xml index 447ceb0e96..e3d858bcdb 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/pom.xml +++ b/activemq6-protocols/activemq6-openwire-protocol/pom.xml @@ -1,13 +1,13 @@ - hornetq-protocols - org.hornetq - 2.5.0-SNAPSHOT + activemq6-protocols + org.apache.activemq6 + 6.0.0-SNAPSHOT 4.0.0 - hornetq-openwire-protocol + activemq6-openwire-protocol ${project.parent.parent.basedir} @@ -35,13 +35,13 @@ slf4j-api - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/AMQConnectorImpl.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/AMQConnectorImpl.java similarity index 91% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/AMQConnectorImpl.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/AMQConnectorImpl.java index 3732a54d35..792aa0d010 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/AMQConnectorImpl.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/AMQConnectorImpl.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire; +package org.apache.activemq6.core.protocol.openwire; import org.apache.activemq.command.BrokerInfo; import org.apache.activemq.command.ConnectionControl; -import org.hornetq.core.protocol.openwire.amq.AMQConnector; -import org.hornetq.core.protocol.openwire.amq.AMQConnectorStatistics; -import org.hornetq.spi.core.remoting.Acceptor; +import org.apache.activemq6.core.protocol.openwire.amq.AMQConnector; +import org.apache.activemq6.core.protocol.openwire.amq.AMQConnectorStatistics; +import org.apache.activemq6.spi.core.remoting.Acceptor; public class AMQConnectorImpl implements AMQConnector { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/AMQTransactionImpl.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/AMQTransactionImpl.java similarity index 84% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/AMQTransactionImpl.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/AMQTransactionImpl.java index d0d5a30a6f..6b796d1b0a 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/AMQTransactionImpl.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/AMQTransactionImpl.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire; +package org.apache.activemq6.core.protocol.openwire; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.impl.RefsOperation; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.impl.RefsOperation; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; import javax.transaction.xa.Xid; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/BrokerState.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/BrokerState.java similarity index 93% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/BrokerState.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/BrokerState.java index fb67b1df2e..4c2149a68c 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/BrokerState.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/BrokerState.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire; +package org.apache.activemq6.core.protocol.openwire; /** * The class holds related states of an activemq broker. diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/DataInputWrapper.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/DataInputWrapper.java similarity index 96% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/DataInputWrapper.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/DataInputWrapper.java index 911f034efa..10e077d9ad 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/DataInputWrapper.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/DataInputWrapper.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire; +package org.apache.activemq6.core.protocol.openwire; import java.io.DataInput; import java.io.IOException; import java.nio.ByteBuffer; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.utils.UTF8Util; -import org.hornetq.utils.UTF8Util.StringUtilBuffer; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.utils.UTF8Util; +import org.apache.activemq6.utils.UTF8Util.StringUtilBuffer; public class DataInputWrapper implements DataInput { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/NotEnoughBytesException.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/NotEnoughBytesException.java similarity index 93% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/NotEnoughBytesException.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/NotEnoughBytesException.java index 940649f73a..ce423b0c33 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/NotEnoughBytesException.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/NotEnoughBytesException.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire; +package org.apache.activemq6.core.protocol.openwire; import java.io.IOException; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireConnection.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireConnection.java similarity index 96% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireConnection.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireConnection.java index 78aae2fd56..253f823c15 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireConnection.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireConnection.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire; +package org.apache.activemq6.core.protocol.openwire; import java.io.IOException; import java.util.ArrayList; @@ -75,29 +75,29 @@ import org.apache.activemq.thread.TaskRunnerFactory; import org.apache.activemq.transport.TransmitCallback; import org.apache.activemq.util.ByteSequence; import org.apache.activemq.wireformat.WireFormat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQSecurityException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.openwire.amq.AMQBrokerStoppedException; -import org.hornetq.core.protocol.openwire.amq.AMQConnectionContext; -import org.hornetq.core.protocol.openwire.amq.AMQConsumerBrokerExchange; -import org.hornetq.core.protocol.openwire.amq.AMQMapTransportConnectionStateRegister; -import org.hornetq.core.protocol.openwire.amq.AMQMessageAuthorizationPolicy; -import org.hornetq.core.protocol.openwire.amq.AMQProducerBrokerExchange; -import org.hornetq.core.protocol.openwire.amq.AMQSession; -import org.hornetq.core.protocol.openwire.amq.AMQSingleTransportConnectionStateRegister; -import org.hornetq.core.protocol.openwire.amq.AMQTransaction; -import org.hornetq.core.protocol.openwire.amq.AMQTransportConnectionState; -import org.hornetq.core.protocol.openwire.amq.AMQTransportConnectionStateRegister; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.utils.ConcurrentHashSet; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQSecurityException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.openwire.amq.AMQBrokerStoppedException; +import org.apache.activemq6.core.protocol.openwire.amq.AMQConnectionContext; +import org.apache.activemq6.core.protocol.openwire.amq.AMQConsumerBrokerExchange; +import org.apache.activemq6.core.protocol.openwire.amq.AMQMapTransportConnectionStateRegister; +import org.apache.activemq6.core.protocol.openwire.amq.AMQMessageAuthorizationPolicy; +import org.apache.activemq6.core.protocol.openwire.amq.AMQProducerBrokerExchange; +import org.apache.activemq6.core.protocol.openwire.amq.AMQSession; +import org.apache.activemq6.core.protocol.openwire.amq.AMQSingleTransportConnectionStateRegister; +import org.apache.activemq6.core.protocol.openwire.amq.AMQTransaction; +import org.apache.activemq6.core.protocol.openwire.amq.AMQTransportConnectionState; +import org.apache.activemq6.core.protocol.openwire.amq.AMQTransportConnectionStateRegister; +import org.apache.activemq6.core.remoting.CloseListener; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.utils.ConcurrentHashSet; /** * Represents an activemq connection. diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireMessageConverter.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireMessageConverter.java similarity index 93% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireMessageConverter.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireMessageConverter.java index 10246220a7..70b98a7070 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireMessageConverter.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireMessageConverter.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire; +package org.apache.activemq6.core.protocol.openwire; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -45,16 +45,16 @@ import org.apache.activemq.util.ByteSequence; import org.apache.activemq.util.MarshallingSupport; import org.apache.activemq.wireformat.WireFormat; import org.fusesource.hawtbuf.UTF8Buffer; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQPropertyConversionException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.openwire.amq.AMQConsumer; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.spi.core.protocol.MessageConverter; -import org.hornetq.utils.DataConstants; -import org.hornetq.utils.TypedProperties; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQPropertyConversionException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.openwire.amq.AMQConsumer; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.spi.core.protocol.MessageConverter; +import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq6.utils.UUIDGenerator; public class OpenWireMessageConverter implements MessageConverter { @@ -121,14 +121,14 @@ public class OpenWireMessageConverter implements MessageConverter HornetQBuffer body = coreMessage.getBodyBuffer(); switch (coreType) { - case org.hornetq.api.core.Message.TEXT_TYPE: + case org.apache.activemq6.api.core.Message.TEXT_TYPE: ByteArrayInputStream tis = new ByteArrayInputStream(contents); DataInputStream tdataIn = new DataInputStream(tis); String text = MarshallingSupport.readUTF8(tdataIn); tdataIn.close(); body.writeNullableSimpleString(new SimpleString(text)); break; - case org.hornetq.api.core.Message.MAP_TYPE: + case org.apache.activemq6.api.core.Message.MAP_TYPE: InputStream mis = new ByteArrayInputStream(contents); DataInputStream mdataIn = new DataInputStream(mis); Map map = MarshallingSupport.unmarshalPrimitiveMap(mdataIn); @@ -137,11 +137,11 @@ public class OpenWireMessageConverter implements MessageConverter loadMapIntoProperties(props, map); props.encode(body); break; - case org.hornetq.api.core.Message.OBJECT_TYPE: + case org.apache.activemq6.api.core.Message.OBJECT_TYPE: body.writeInt(contents.length); body.writeBytes(contents.data, contents.offset, contents.length); break; - case org.hornetq.api.core.Message.STREAM_TYPE: + case org.apache.activemq6.api.core.Message.STREAM_TYPE: InputStream sis = new ByteArrayInputStream(contents); DataInputStream sdis = new DataInputStream(sis); int stype = sdis.read(); @@ -384,17 +384,17 @@ public class OpenWireMessageConverter implements MessageConverter case CommandTypes.ACTIVEMQ_BLOB_MESSAGE: throw new IllegalStateException("We don't support BLOB type yet!"); case CommandTypes.ACTIVEMQ_BYTES_MESSAGE: - return org.hornetq.api.core.Message.BYTES_TYPE; + return org.apache.activemq6.api.core.Message.BYTES_TYPE; case CommandTypes.ACTIVEMQ_MAP_MESSAGE: - return org.hornetq.api.core.Message.MAP_TYPE; + return org.apache.activemq6.api.core.Message.MAP_TYPE; case CommandTypes.ACTIVEMQ_OBJECT_MESSAGE: - return org.hornetq.api.core.Message.OBJECT_TYPE; + return org.apache.activemq6.api.core.Message.OBJECT_TYPE; case CommandTypes.ACTIVEMQ_STREAM_MESSAGE: - return org.hornetq.api.core.Message.STREAM_TYPE; + return org.apache.activemq6.api.core.Message.STREAM_TYPE; case CommandTypes.ACTIVEMQ_TEXT_MESSAGE: - return org.hornetq.api.core.Message.TEXT_TYPE; + return org.apache.activemq6.api.core.Message.TEXT_TYPE; case CommandTypes.ACTIVEMQ_MESSAGE: - return org.hornetq.api.core.Message.DEFAULT_TYPE; + return org.apache.activemq6.api.core.Message.DEFAULT_TYPE; default: throw new IllegalStateException("Unknown ActiveMQ message type: " + amqType); } @@ -421,22 +421,22 @@ public class OpenWireMessageConverter implements MessageConverter byte coreType = coreMessage.getType(); switch (coreType) { - case org.hornetq.api.core.Message.BYTES_TYPE: + case org.apache.activemq6.api.core.Message.BYTES_TYPE: amqMsg = new ActiveMQBytesMessage(); break; - case org.hornetq.api.core.Message.MAP_TYPE: + case org.apache.activemq6.api.core.Message.MAP_TYPE: amqMsg = new ActiveMQMapMessage(); break; - case org.hornetq.api.core.Message.OBJECT_TYPE: + case org.apache.activemq6.api.core.Message.OBJECT_TYPE: amqMsg = new ActiveMQObjectMessage(); break; - case org.hornetq.api.core.Message.STREAM_TYPE: + case org.apache.activemq6.api.core.Message.STREAM_TYPE: amqMsg = new ActiveMQStreamMessage(); break; - case org.hornetq.api.core.Message.TEXT_TYPE: + case org.apache.activemq6.api.core.Message.TEXT_TYPE: amqMsg = new ActiveMQTextMessage(); break; - case org.hornetq.api.core.Message.DEFAULT_TYPE: + case org.apache.activemq6.api.core.Message.DEFAULT_TYPE: amqMsg = new ActiveMQMessage(); break; default: @@ -467,7 +467,7 @@ public class OpenWireMessageConverter implements MessageConverter byte[] bytes = null; synchronized (buffer) { - if (coreType == org.hornetq.api.core.Message.TEXT_TYPE) + if (coreType == org.apache.activemq6.api.core.Message.TEXT_TYPE) { SimpleString text = buffer.readNullableSimpleString(); @@ -480,7 +480,7 @@ public class OpenWireMessageConverter implements MessageConverter out.close(); } } - else if (coreType == org.hornetq.api.core.Message.MAP_TYPE) + else if (coreType == org.apache.activemq6.api.core.Message.MAP_TYPE) { TypedProperties mapData = new TypedProperties(); mapData.decode(buffer); @@ -492,13 +492,13 @@ public class OpenWireMessageConverter implements MessageConverter bytes = out.toByteArray(); dataOut.close(); } - else if (coreType == org.hornetq.api.core.Message.OBJECT_TYPE) + else if (coreType == org.apache.activemq6.api.core.Message.OBJECT_TYPE) { int len = buffer.readInt(); bytes = new byte[len]; buffer.readBytes(bytes); } - else if (coreType == org.hornetq.api.core.Message.STREAM_TYPE) + else if (coreType == org.apache.activemq6.api.core.Message.STREAM_TYPE) { ByteArrayOutputStream out = new ByteArrayOutputStream(buffer.readableBytes()); DataOutputStream dataOut = new DataOutputStream(out); diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireProtocolManager.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireProtocolManager.java similarity index 94% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireProtocolManager.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireProtocolManager.java index 320651eeea..2e9a4e169c 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireProtocolManager.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireProtocolManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire; +package org.apache.activemq6.core.protocol.openwire; import java.util.ArrayList; import java.util.Collections; @@ -57,27 +57,27 @@ import org.apache.activemq.state.SessionState; import org.apache.activemq.util.IdGenerator; import org.apache.activemq.util.InetAddressUtil; import org.apache.activemq.util.LongSequenceGenerator; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.protocol.openwire.amq.AMQConnectionContext; -import org.hornetq.core.protocol.openwire.amq.AMQPersistenceAdapter; -import org.hornetq.core.protocol.openwire.amq.AMQProducerBrokerExchange; -import org.hornetq.core.protocol.openwire.amq.AMQServerSession; -import org.hornetq.core.protocol.openwire.amq.AMQSession; -import org.hornetq.core.protocol.openwire.amq.AMQTransportConnectionState; -import org.hornetq.core.remoting.impl.netty.NettyServerConnection; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.spi.core.protocol.ConnectionEntry; -import org.hornetq.spi.core.protocol.MessageConverter; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.protocol.openwire.amq.AMQConnectionContext; +import org.apache.activemq6.core.protocol.openwire.amq.AMQPersistenceAdapter; +import org.apache.activemq6.core.protocol.openwire.amq.AMQProducerBrokerExchange; +import org.apache.activemq6.core.protocol.openwire.amq.AMQServerSession; +import org.apache.activemq6.core.protocol.openwire.amq.AMQSession; +import org.apache.activemq6.core.protocol.openwire.amq.AMQTransportConnectionState; +import org.apache.activemq6.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.spi.core.protocol.ConnectionEntry; +import org.apache.activemq6.spi.core.protocol.MessageConverter; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; public class OpenWireProtocolManager implements ProtocolManager { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireProtocolManagerFactory.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireProtocolManagerFactory.java similarity index 81% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireProtocolManagerFactory.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireProtocolManagerFactory.java index f8542bcbf6..d9bdc719f0 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireProtocolManagerFactory.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireProtocolManagerFactory.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire; +package org.apache.activemq6.core.protocol.openwire; import java.util.List; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.protocol.ProtocolManagerFactory; /** * A OpenWireProtocolManagerFactory diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireUtil.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireUtil.java similarity index 88% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireUtil.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireUtil.java index 8662dc1234..028e549aa9 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/OpenWireUtil.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireUtil.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire; +package org.apache.activemq6.core.protocol.openwire; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.util.ByteSequence; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.SimpleString; public class OpenWireUtil { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/SendingResult.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/SendingResult.java similarity index 87% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/SendingResult.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/SendingResult.java index 158bc620b7..4e8c553d03 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/SendingResult.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/SendingResult.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire; +package org.apache.activemq6.core.protocol.openwire; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.paging.impl.PagingStoreImpl; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.paging.impl.PagingStoreImpl; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; /** * @author Howard Gao diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java similarity index 97% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java index 29c490f26c..fca3b662d3 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import org.apache.activemq.ActiveMQMessageAudit; import org.apache.activemq.command.Message; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQBrokerStoppedException.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQBrokerStoppedException.java similarity index 95% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQBrokerStoppedException.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQBrokerStoppedException.java index 22eb20eec8..3d29f1010d 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQBrokerStoppedException.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQBrokerStoppedException.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; public class AMQBrokerStoppedException extends IllegalStateException { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConnectionContext.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnectionContext.java similarity index 97% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConnectionContext.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnectionContext.java index 435d3b97b4..b0eece41a7 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConnectionContext.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnectionContext.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.io.IOException; import java.util.concurrent.ConcurrentHashMap; @@ -24,8 +24,8 @@ import org.apache.activemq.command.WireFormatInfo; import org.apache.activemq.command.XATransactionId; import org.apache.activemq.filter.MessageEvaluationContext; import org.apache.activemq.state.ConnectionState; -import org.hornetq.core.protocol.openwire.OpenWireConnection; -import org.hornetq.core.protocol.openwire.OpenWireProtocolManager; +import org.apache.activemq6.core.protocol.openwire.OpenWireConnection; +import org.apache.activemq6.core.protocol.openwire.OpenWireProtocolManager; public class AMQConnectionContext { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConnector.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnector.java similarity index 93% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConnector.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnector.java index e256736e35..41ce0438de 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConnector.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnector.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import org.apache.activemq.command.BrokerInfo; import org.apache.activemq.command.ConnectionControl; -import org.hornetq.core.protocol.openwire.OpenWireConnection; +import org.apache.activemq6.core.protocol.openwire.OpenWireConnection; public interface AMQConnector { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConnectorStatistics.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnectorStatistics.java similarity index 98% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConnectorStatistics.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnectorStatistics.java index ffe477bee8..64bce2bbcd 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConnectorStatistics.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnectorStatistics.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import org.apache.activemq.management.CountStatisticImpl; import org.apache.activemq.management.PollCountStatisticImpl; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConsumer.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConsumer.java similarity index 96% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConsumer.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConsumer.java index 60e1ec283a..01e1c0b0f5 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConsumer.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConsumer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.io.IOException; import java.util.Iterator; @@ -27,12 +27,12 @@ import org.apache.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageId; import org.apache.activemq.command.TransactionId; import org.apache.activemq.wireformat.WireFormat; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.openwire.OpenWireMessageConverter; -import org.hornetq.core.protocol.openwire.OpenWireUtil; -import org.hornetq.core.server.QueueQueryResult; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.jms.client.HornetQDestination; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.openwire.OpenWireMessageConverter; +import org.apache.activemq6.core.protocol.openwire.OpenWireUtil; +import org.apache.activemq6.core.server.QueueQueryResult; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.jms.client.HornetQDestination; public class AMQConsumer implements BrowserListener { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java similarity index 97% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java index 4c8c29e448..cf2d6f9a80 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; public class AMQConsumerBrokerExchange { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQDeadLetterStrategy.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDeadLetterStrategy.java similarity index 97% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQDeadLetterStrategy.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDeadLetterStrategy.java index 7df132d78d..8467c9a6d0 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQDeadLetterStrategy.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDeadLetterStrategy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.Message; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQDestination.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDestination.java similarity index 99% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQDestination.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDestination.java index b2c5ad22fe..6042b786cd 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQDestination.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDestination.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.io.IOException; import java.util.List; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQDestinationStatistics.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDestinationStatistics.java similarity index 99% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQDestinationStatistics.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDestinationStatistics.java index 035db4e8db..6294db232d 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQDestinationStatistics.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDestinationStatistics.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import org.apache.activemq.management.CountStatisticImpl; import org.apache.activemq.management.PollCountStatisticImpl; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java similarity index 98% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java index d9c4495f1d..595cd3057d 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.util.ArrayList; import java.util.HashMap; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java similarity index 94% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java index 6cdd593ce7..48996f6256 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import org.apache.activemq.command.Message; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQMessageStore.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMessageStore.java similarity index 92% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQMessageStore.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMessageStore.java index df62d6213a..5d5caf81ce 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQMessageStore.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMessageStore.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; public interface AMQMessageStore { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQPersistenceAdapter.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQPersistenceAdapter.java similarity index 97% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQPersistenceAdapter.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQPersistenceAdapter.java index f717c59c77..7a9a5abc35 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQPersistenceAdapter.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQPersistenceAdapter.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.io.IOException; import java.util.Set; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQProducer.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQProducer.java similarity index 94% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQProducer.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQProducer.java index 16fcf7431f..c20725c7bb 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQProducer.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQProducer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import org.apache.activemq.command.ProducerInfo; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQProducerBrokerExchange.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQProducerBrokerExchange.java similarity index 99% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQProducerBrokerExchange.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQProducerBrokerExchange.java index 9191ee1566..d86e418683 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQProducerBrokerExchange.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQProducerBrokerExchange.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSecurityContext.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSecurityContext.java similarity index 97% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSecurityContext.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSecurityContext.java index 7efd30bad4..7724890f52 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSecurityContext.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSecurityContext.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.security.Principal; import java.util.Collections; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQServerConsumer.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerConsumer.java similarity index 87% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQServerConsumer.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerConsumer.java index 2954142f9c..a753d8d32a 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQServerConsumer.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerConsumer.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.util.List; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.protocol.openwire.OpenWireMessageConverter; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.core.server.impl.ServerConsumerImpl; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.spi.core.protocol.SessionCallback; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.QueueBinding; +import org.apache.activemq6.core.protocol.openwire.OpenWireMessageConverter; +import org.apache.activemq6.core.server.HandleStatus; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.core.server.impl.ServerConsumerImpl; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.spi.core.protocol.SessionCallback; public class AMQServerConsumer extends ServerConsumerImpl { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQServerSession.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerSession.java similarity index 86% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQServerSession.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerSession.java index 0711f01520..e265f994b6 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQServerSession.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerSession.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.util.ArrayList; import java.util.HashMap; @@ -22,38 +22,38 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.filter.impl.FilterImpl; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.protocol.openwire.AMQTransactionImpl; -import org.hornetq.core.security.SecurityStore; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerConsumer; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.RefsOperation; -import org.hornetq.core.server.impl.ServerConsumerImpl; -import org.hornetq.core.server.impl.ServerSessionImpl; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.TransactionPropertyIndexes; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.protocol.SessionCallback; -import org.hornetq.utils.TypedProperties; -import org.hornetq.utils.UUID; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.filter.impl.FilterImpl; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.QueueBinding; +import org.apache.activemq6.core.protocol.openwire.AMQTransactionImpl; +import org.apache.activemq6.core.security.SecurityStore; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerConsumer; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.RefsOperation; +import org.apache.activemq6.core.server.impl.ServerConsumerImpl; +import org.apache.activemq6.core.server.impl.ServerSessionImpl; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq6.utils.UUID; public class AMQServerSession extends ServerSessionImpl { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQServerSessionFactory.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerSessionFactory.java similarity index 69% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQServerSessionFactory.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerSessionFactory.java index db044a0675..70734506d3 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQServerSessionFactory.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerSessionFactory.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.security.SecurityStore; -import org.hornetq.core.server.ServerSessionFactory; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.ServerSessionImpl; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.protocol.SessionCallback; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.security.SecurityStore; +import org.apache.activemq6.core.server.ServerSessionFactory; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.ServerSessionImpl; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.protocol.SessionCallback; public class AMQServerSessionFactory implements ServerSessionFactory { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSession.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSession.java similarity index 94% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSession.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSession.java index 34f0ff483c..5b67552664 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSession.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSession.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.io.IOException; import java.util.HashMap; @@ -43,21 +43,21 @@ import org.apache.activemq.command.TransactionId; import org.apache.activemq.command.TransactionInfo; import org.apache.activemq.command.XATransactionId; import org.apache.activemq.wireformat.WireFormat; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.paging.impl.PagingStoreImpl; -import org.hornetq.core.protocol.openwire.OpenWireConnection; -import org.hornetq.core.protocol.openwire.OpenWireMessageConverter; -import org.hornetq.core.protocol.openwire.OpenWireProtocolManager; -import org.hornetq.core.protocol.openwire.OpenWireUtil; -import org.hornetq.core.protocol.openwire.SendingResult; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.ServerConsumer; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.spi.core.protocol.SessionCallback; -import org.hornetq.spi.core.remoting.ReadyListener; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.paging.impl.PagingStoreImpl; +import org.apache.activemq6.core.protocol.openwire.OpenWireConnection; +import org.apache.activemq6.core.protocol.openwire.OpenWireMessageConverter; +import org.apache.activemq6.core.protocol.openwire.OpenWireProtocolManager; +import org.apache.activemq6.core.protocol.openwire.OpenWireUtil; +import org.apache.activemq6.core.protocol.openwire.SendingResult; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.ServerConsumer; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq6.spi.core.remoting.ReadyListener; public class AMQSession implements SessionCallback { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java similarity index 96% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java index d62956bd10..db57c2383a 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQQueue; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java similarity index 98% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java index 5ffe1acf7e..f9ba8074eb 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.util.ArrayList; import java.util.HashMap; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java similarity index 95% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java index 71c0952f15..3a94c4bfe6 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; public interface AMQSlowConsumerStrategy { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSubscription.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSubscription.java similarity index 99% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSubscription.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSubscription.java index 0eb84a2b36..011202bc4c 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSubscription.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSubscription.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.io.IOException; import java.util.List; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSubscriptionRecovery.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSubscriptionRecovery.java similarity index 95% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSubscriptionRecovery.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSubscriptionRecovery.java index 7cf1e8405b..eb94a28f96 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQSubscriptionRecovery.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSubscriptionRecovery.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import org.apache.activemq.broker.region.MessageReference; import org.apache.activemq.command.ActiveMQDestination; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQTransaction.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransaction.java similarity index 99% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQTransaction.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransaction.java index 1a477b9c26..a4fc76d118 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQTransaction.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransaction.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.io.IOException; import java.io.InterruptedIOException; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQTransactionFactory.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransactionFactory.java similarity index 74% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQTransactionFactory.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransactionFactory.java index 5632a63e4a..3577422f6f 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQTransactionFactory.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransactionFactory.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import javax.transaction.xa.Xid; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.protocol.openwire.AMQTransactionImpl; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionFactory; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.protocol.openwire.AMQTransactionImpl; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionFactory; public class AMQTransactionFactory implements TransactionFactory { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQTransportConnectionState.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransportConnectionState.java similarity index 94% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQTransportConnectionState.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransportConnectionState.java index be11e5b8a2..2cdeb75d0c 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQTransportConnectionState.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransportConnectionState.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.command.ConnectionInfo; import org.apache.activemq.state.ConnectionState; -import org.hornetq.core.protocol.openwire.OpenWireConnection; +import org.apache.activemq6.core.protocol.openwire.OpenWireConnection; /** * @See org.apache.activemq.broker.TransportConnectionState diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java similarity index 96% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java index d0e68f5d10..272558fea0 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import java.util.List; import java.util.Map; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/BrowserListener.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/BrowserListener.java similarity index 92% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/BrowserListener.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/BrowserListener.java index 12eaf23fbb..671371203a 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/BrowserListener.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/BrowserListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; interface BrowserListener { diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/MessageInfo.java b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/MessageInfo.java similarity index 95% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/MessageInfo.java rename to activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/MessageInfo.java index 6315d86e16..ca9884d295 100644 --- a/hornetq-protocols/hornetq-openwire-protocol/src/main/java/org/hornetq/core/protocol/openwire/amq/MessageInfo.java +++ b/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/MessageInfo.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.openwire.amq; +package org.apache.activemq6.core.protocol.openwire.amq; import org.apache.activemq.command.MessageId; diff --git a/hornetq-protocols/hornetq-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory b/activemq6-protocols/activemq6-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory similarity index 100% rename from hornetq-protocols/hornetq-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory rename to activemq6-protocols/activemq6-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory diff --git a/hornetq-protocols/hornetq-proton-plug/pom.xml b/activemq6-protocols/activemq6-proton-plug/pom.xml similarity index 79% rename from hornetq-protocols/hornetq-proton-plug/pom.xml rename to activemq6-protocols/activemq6-proton-plug/pom.xml index 98ece122c9..0031baca7a 100644 --- a/hornetq-protocols/hornetq-proton-plug/pom.xml +++ b/activemq6-protocols/activemq6-proton-plug/pom.xml @@ -1,13 +1,13 @@ - hornetq-protocols - org.hornetq - 2.5.0-SNAPSHOT + activemq6-protocols + org.apache.activemq6 + 6.0.0-SNAPSHOT 4.0.0 - hornetq-proton-plug + activemq6-proton-plug ${project.basedir}/../.. @@ -16,13 +16,13 @@ - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} @@ -38,8 +38,8 @@ jboss-logging - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPClientConnectionContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientConnectionContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPClientConnectionContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientConnectionContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPClientReceiverContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientReceiverContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPClientReceiverContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientReceiverContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPClientSenderContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientSenderContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPClientSenderContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientSenderContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPClientSessionContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientSessionContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPClientSessionContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientSessionContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionCallback.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPConnectionCallback.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionCallback.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPConnectionCallback.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPServerConnectionContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPServerConnectionContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPServerConnectionContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPServerConnectionContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPSessionCallback.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPSessionCallback.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPSessionCallback.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPSessionCallback.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPSessionContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPSessionContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/AMQPSessionContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPSessionContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/ClientSASL.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/ClientSASL.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/ClientSASL.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/ClientSASL.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/SASLResult.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/SASLResult.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/SASLResult.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/SASLResult.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/ServerSASL.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/ServerSASL.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/ServerSASL.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/ServerSASL.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/ProtonInitializable.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonInitializable.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/ProtonInitializable.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonInitializable.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/ProtonPlugSender.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonPlugSender.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/ProtonPlugSender.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonPlugSender.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPException.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPException.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPException.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPException.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPIllegalStateException.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPIllegalStateException.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPIllegalStateException.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPIllegalStateException.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInternalErrorException.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInternalErrorException.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInternalErrorException.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInternalErrorException.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInvalidFieldException.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInvalidFieldException.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInvalidFieldException.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInvalidFieldException.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPNotImplementedException.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPNotImplementedException.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPNotImplementedException.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPNotImplementedException.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPTimeoutException.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPTimeoutException.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPTimeoutException.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPTimeoutException.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/handler/EventHandler.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/EventHandler.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/handler/EventHandler.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/EventHandler.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/handler/Events.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/Events.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/handler/Events.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/Events.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/handler/ProtonHandler.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/ProtonHandler.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/handler/ProtonHandler.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/ProtonHandler.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/logger/HornetQAMQPProtocolMessageBundle.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/logger/HornetQAMQPProtocolMessageBundle.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/logger/HornetQAMQPProtocolMessageBundle.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/logger/HornetQAMQPProtocolMessageBundle.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/sasl/PlainSASLResult.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/PlainSASLResult.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/sasl/PlainSASLResult.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/PlainSASLResult.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/ByteUtil.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/ByteUtil.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/ByteUtil.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/ByteUtil.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/CodecCache.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/CodecCache.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/CodecCache.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/CodecCache.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/CreditsSemaphore.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/CreditsSemaphore.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/CreditsSemaphore.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/CreditsSemaphore.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/DebugInfo.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/DebugInfo.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/DebugInfo.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/DebugInfo.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/DeliveryUtil.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/DeliveryUtil.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/DeliveryUtil.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/DeliveryUtil.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/NettyWritable.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/NettyWritable.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/NettyWritable.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/NettyWritable.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java b/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java rename to activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/Constants.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/Constants.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/Constants.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/Constants.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/Connector.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalclient/Connector.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/Connector.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalclient/Connector.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java diff --git a/hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java b/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java similarity index 100% rename from hornetq-protocols/hornetq-proton-plug/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java rename to activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java diff --git a/hornetq-protocols/hornetq-stomp-protocol/pom.xml b/activemq6-protocols/activemq6-stomp-protocol/pom.xml similarity index 74% rename from hornetq-protocols/hornetq-stomp-protocol/pom.xml rename to activemq6-protocols/activemq6-stomp-protocol/pom.xml index 61f7f15d7c..574dd68235 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/pom.xml +++ b/activemq6-protocols/activemq6-stomp-protocol/pom.xml @@ -1,13 +1,13 @@ - hornetq-protocols - org.hornetq - 2.5.0-SNAPSHOT + activemq6-protocols + org.apache.activemq6 + 6.0.0-SNAPSHOT 4.0.0 - hornetq-stomp-protocol + activemq6-stomp-protocol ${project.basedir}/../.. @@ -27,8 +27,8 @@ jboss-logging - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/FrameEventListener.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/FrameEventListener.java similarity index 94% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/FrameEventListener.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/FrameEventListener.java index 0ee1befec3..d31c4b4da2 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/FrameEventListener.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/FrameEventListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; /** * diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/HornetQStompException.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompException.java similarity index 98% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/HornetQStompException.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompException.java index c55b72df18..f5f2a2aaa9 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/HornetQStompException.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompException.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/HornetQStompProtocolLogger.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompProtocolLogger.java similarity index 97% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/HornetQStompProtocolLogger.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompProtocolLogger.java index 0206e7a09e..7f5d71dfea 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/HornetQStompProtocolLogger.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompProtocolLogger.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/HornetQStompProtocolMessageBundle.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompProtocolMessageBundle.java similarity index 98% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/HornetQStompProtocolMessageBundle.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompProtocolMessageBundle.java index eac8d96b5f..fabcd87292 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/HornetQStompProtocolMessageBundle.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompProtocolMessageBundle.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; -import org.hornetq.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/SimpleBytes.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/SimpleBytes.java similarity index 96% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/SimpleBytes.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/SimpleBytes.java index 12bde25614..a4ca064939 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/SimpleBytes.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/SimpleBytes.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; import java.nio.charset.StandardCharsets; diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/Stomp.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/Stomp.java similarity index 98% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/Stomp.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/Stomp.java index bc6103eaa8..cd84bba7a8 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/Stomp.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/Stomp.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; /** * The standard verbs and headers used for the STOMP protocol. diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompCommands.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompCommands.java similarity index 95% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompCommands.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompCommands.java index 88dca17ffb..2d587fd696 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompCommands.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompCommands.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; public enum StompCommands { diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompConnection.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompConnection.java similarity index 94% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompConnection.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompConnection.java index f4c7a3dfbd..8d42133e66 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompConnection.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompConnection.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; import java.util.ArrayList; import java.util.Collections; @@ -20,25 +20,25 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.concurrent.CopyOnWriteArrayList; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.protocol.stomp.v10.StompFrameHandlerV10; -import org.hornetq.core.protocol.stomp.v12.StompFrameHandlerV12; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.utils.ConfigurationHelper; -import org.hornetq.utils.VersionLoader; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.protocol.stomp.v10.StompFrameHandlerV10; +import org.apache.activemq6.core.protocol.stomp.v12.StompFrameHandlerV12; +import org.apache.activemq6.core.remoting.CloseListener; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.utils.ConfigurationHelper; +import org.apache.activemq6.utils.VersionLoader; -import static org.hornetq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * A StompConnection diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompDecoder.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompDecoder.java similarity index 98% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompDecoder.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompDecoder.java index d515fa35c0..3b31491ab7 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompDecoder.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompDecoder.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffer; -import static org.hornetq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * A StompDecoder diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompFrame.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompFrame.java similarity index 97% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompFrame.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompFrame.java index a0d26c1e1b..5867e20e24 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompFrame.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompFrame.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; /** * Represents all the data in a STOMP frame. diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompProtocolManager.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompProtocolManager.java similarity index 89% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompProtocolManager.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompProtocolManager.java index a8e6f3e980..0e10f3942c 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompProtocolManager.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompProtocolManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -23,36 +23,36 @@ import java.util.concurrent.Executor; import io.netty.channel.ChannelPipeline; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.remoting.impl.netty.NettyServerConnection; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationListener; -import org.hornetq.spi.core.protocol.ConnectionEntry; -import org.hornetq.spi.core.protocol.MessageConverter; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.TypedProperties; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationListener; +import org.apache.activemq6.spi.core.protocol.ConnectionEntry; +import org.apache.activemq6.spi.core.protocol.MessageConverter; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq6.utils.UUIDGenerator; -import static org.hornetq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * StompProtocolManager diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompProtocolManagerFactory.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompProtocolManagerFactory.java similarity index 81% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompProtocolManagerFactory.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompProtocolManagerFactory.java index fe482e27af..ae42dadbb7 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompProtocolManagerFactory.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompProtocolManagerFactory.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; import java.util.List; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.protocol.ProtocolManagerFactory; /** * A StompProtocolManagerFactory diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompSession.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompSession.java similarity index 89% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompSession.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompSession.java index afc8b28036..4ed40e3871 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompSession.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompSession.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; import java.util.Iterator; import java.util.Map; @@ -18,30 +18,30 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.zip.Inflater; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.message.BodyEncoder; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.impl.journal.LargeServerMessageImpl; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.QueueQueryResult; -import org.hornetq.core.server.ServerConsumer; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.server.impl.ServerSessionImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.protocol.SessionCallback; -import org.hornetq.spi.core.remoting.ReadyListener; -import org.hornetq.utils.ConfigurationHelper; -import org.hornetq.utils.UUIDGenerator; +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.SimpleString; +import org.apache.activemq6.core.message.BodyEncoder; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageImpl; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.QueueQueryResult; +import org.apache.activemq6.core.server.ServerConsumer; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.server.impl.ServerSessionImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq6.spi.core.remoting.ReadyListener; +import org.apache.activemq6.utils.ConfigurationHelper; +import org.apache.activemq6.utils.UUIDGenerator; -import static org.hornetq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * A StompSession diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompSubscription.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompSubscription.java similarity index 97% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompSubscription.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompSubscription.java index a871101a13..3d6ad9ff5d 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompSubscription.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompSubscription.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; /** * A StompSubscription diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompUtils.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompUtils.java similarity index 93% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompUtils.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompUtils.java index 405c59f35c..3b60fbb771 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompUtils.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompUtils.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.impl.ClientMessageImpl; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.client.impl.ClientMessageImpl; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; /** * A StompUtils diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompVersions.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompVersions.java similarity index 95% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompVersions.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompVersions.java index c83ec3a6f1..860aff0a78 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompVersions.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompVersions.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; /** * Stomp Spec Versions diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/VersionedStompFrameHandler.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/VersionedStompFrameHandler.java similarity index 93% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/VersionedStompFrameHandler.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/VersionedStompFrameHandler.java index d55a882e5f..fc902443bd 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/VersionedStompFrameHandler.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/VersionedStompFrameHandler.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; import java.nio.charset.StandardCharsets; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.protocol.stomp.Stomp.Headers; -import org.hornetq.core.protocol.stomp.v10.StompFrameHandlerV10; -import org.hornetq.core.protocol.stomp.v11.StompFrameHandlerV11; -import org.hornetq.core.protocol.stomp.v12.StompFrameHandlerV12; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.protocol.stomp.Stomp.Headers; +import org.apache.activemq6.core.protocol.stomp.v10.StompFrameHandlerV10; +import org.apache.activemq6.core.protocol.stomp.v11.StompFrameHandlerV11; +import org.apache.activemq6.core.protocol.stomp.v12.StompFrameHandlerV12; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.utils.DataConstants; -import static org.hornetq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * @author Howard Gao diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v10/StompFrameHandlerV10.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v10/StompFrameHandlerV10.java similarity index 87% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v10/StompFrameHandlerV10.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v10/StompFrameHandlerV10.java index ca023760cf..13eed04677 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v10/StompFrameHandlerV10.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v10/StompFrameHandlerV10.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp.v10; +package org.apache.activemq6.core.protocol.stomp.v10; import java.util.Map; -import org.hornetq.core.protocol.stomp.FrameEventListener; -import org.hornetq.core.protocol.stomp.HornetQStompException; -import org.hornetq.core.protocol.stomp.Stomp; -import org.hornetq.core.protocol.stomp.StompConnection; -import org.hornetq.core.protocol.stomp.StompDecoder; -import org.hornetq.core.protocol.stomp.StompFrame; -import org.hornetq.core.protocol.stomp.VersionedStompFrameHandler; -import org.hornetq.core.server.HornetQServerLogger; +import org.apache.activemq6.core.protocol.stomp.FrameEventListener; +import org.apache.activemq6.core.protocol.stomp.HornetQStompException; +import org.apache.activemq6.core.protocol.stomp.Stomp; +import org.apache.activemq6.core.protocol.stomp.StompConnection; +import org.apache.activemq6.core.protocol.stomp.StompDecoder; +import org.apache.activemq6.core.protocol.stomp.StompFrame; +import org.apache.activemq6.core.protocol.stomp.VersionedStompFrameHandler; +import org.apache.activemq6.core.server.HornetQServerLogger; -import static org.hornetq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v10/StompFrameV10.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v10/StompFrameV10.java similarity index 87% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v10/StompFrameV10.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v10/StompFrameV10.java index c0f8473ac4..c62750b468 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v10/StompFrameV10.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v10/StompFrameV10.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp.v10; +package org.apache.activemq6.core.protocol.stomp.v10; -import org.hornetq.core.protocol.stomp.StompFrame; +import org.apache.activemq6.core.protocol.stomp.StompFrame; /** * diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v11/StompFrameHandlerV11.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v11/StompFrameHandlerV11.java similarity index 97% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v11/StompFrameHandlerV11.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v11/StompFrameHandlerV11.java index 07b9107ce3..a105e3ca46 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v11/StompFrameHandlerV11.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v11/StompFrameHandlerV11.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp.v11; +package org.apache.activemq6.core.protocol.stomp.v11; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.core.protocol.stomp.FrameEventListener; -import org.hornetq.core.protocol.stomp.HornetQStompException; -import org.hornetq.core.protocol.stomp.SimpleBytes; -import org.hornetq.core.protocol.stomp.Stomp; -import org.hornetq.core.protocol.stomp.StompConnection; -import org.hornetq.core.protocol.stomp.StompDecoder; -import org.hornetq.core.protocol.stomp.StompFrame; -import org.hornetq.core.protocol.stomp.VersionedStompFrameHandler; -import org.hornetq.core.server.HornetQServerLogger; +import org.apache.activemq6.core.protocol.stomp.FrameEventListener; +import org.apache.activemq6.core.protocol.stomp.HornetQStompException; +import org.apache.activemq6.core.protocol.stomp.SimpleBytes; +import org.apache.activemq6.core.protocol.stomp.Stomp; +import org.apache.activemq6.core.protocol.stomp.StompConnection; +import org.apache.activemq6.core.protocol.stomp.StompDecoder; +import org.apache.activemq6.core.protocol.stomp.StompFrame; +import org.apache.activemq6.core.protocol.stomp.VersionedStompFrameHandler; +import org.apache.activemq6.core.server.HornetQServerLogger; -import static org.hornetq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * @author Howard Gao diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v11/StompFrameV11.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v11/StompFrameV11.java similarity index 90% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v11/StompFrameV11.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v11/StompFrameV11.java index 2cfc426dd9..856c6a9f08 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v11/StompFrameV11.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v11/StompFrameV11.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp.v11; +package org.apache.activemq6.core.protocol.stomp.v11; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.core.protocol.stomp.Stomp; -import org.hornetq.core.protocol.stomp.StompFrame; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.core.protocol.stomp.Stomp; +import org.apache.activemq6.core.protocol.stomp.StompFrame; /** * @author Howard Gao diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v12/StompFrameHandlerV12.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v12/StompFrameHandlerV12.java similarity index 91% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v12/StompFrameHandlerV12.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v12/StompFrameHandlerV12.java index 3ca1701f0a..17391101e0 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v12/StompFrameHandlerV12.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v12/StompFrameHandlerV12.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp.v12; +package org.apache.activemq6.core.protocol.stomp.v12; -import org.hornetq.core.protocol.stomp.FrameEventListener; -import org.hornetq.core.protocol.stomp.HornetQStompException; -import org.hornetq.core.protocol.stomp.Stomp; -import org.hornetq.core.protocol.stomp.StompConnection; -import org.hornetq.core.protocol.stomp.StompDecoder; -import org.hornetq.core.protocol.stomp.StompFrame; -import org.hornetq.core.protocol.stomp.StompSubscription; -import org.hornetq.core.protocol.stomp.v11.StompFrameHandlerV11; -import org.hornetq.core.protocol.stomp.v11.StompFrameV11; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.core.protocol.stomp.FrameEventListener; +import org.apache.activemq6.core.protocol.stomp.HornetQStompException; +import org.apache.activemq6.core.protocol.stomp.Stomp; +import org.apache.activemq6.core.protocol.stomp.StompConnection; +import org.apache.activemq6.core.protocol.stomp.StompDecoder; +import org.apache.activemq6.core.protocol.stomp.StompFrame; +import org.apache.activemq6.core.protocol.stomp.StompSubscription; +import org.apache.activemq6.core.protocol.stomp.v11.StompFrameHandlerV11; +import org.apache.activemq6.core.protocol.stomp.v11.StompFrameV11; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.ServerMessage; -import static org.hornetq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * @author Howard Gao diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v12/StompFrameV12.java b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v12/StompFrameV12.java similarity index 91% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v12/StompFrameV12.java rename to activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v12/StompFrameV12.java index 2be74f1fb1..36fcbca9de 100644 --- a/hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/v12/StompFrameV12.java +++ b/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v12/StompFrameV12.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp.v12; +package org.apache.activemq6.core.protocol.stomp.v12; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.core.protocol.stomp.Stomp; -import org.hornetq.core.protocol.stomp.StompFrame; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.core.protocol.stomp.Stomp; +import org.apache.activemq6.core.protocol.stomp.StompFrame; /** * @author Howard Gao diff --git a/hornetq-protocols/hornetq-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory b/activemq6-protocols/activemq6-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory similarity index 100% rename from hornetq-protocols/hornetq-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory rename to activemq6-protocols/activemq6-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory diff --git a/hornetq-protocols/pom.xml b/activemq6-protocols/pom.xml similarity index 57% rename from hornetq-protocols/pom.xml rename to activemq6-protocols/pom.xml index 1ecde532cd..a03d67b657 100644 --- a/hornetq-protocols/pom.xml +++ b/activemq6-protocols/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - hornetq-pom - org.hornetq - 2.5.0-SNAPSHOT + activemq6-pom + org.apache.activemq6 + 6.0.0-SNAPSHOT 4.0.0 - hornetq-protocols + activemq6-protocols pom @@ -17,10 +17,10 @@ - hornetq-amqp-protocol - hornetq-stomp-protocol - hornetq-openwire-protocol - hornetq-proton-plug + activemq6-amqp-protocol + activemq6-stomp-protocol + activemq6-openwire-protocol + activemq6-proton-plug diff --git a/hornetq-ra/pom.xml b/activemq6-ra/pom.xml similarity index 77% rename from hornetq-ra/pom.xml rename to activemq6-ra/pom.xml index 561af3eb0c..8be562ec4d 100644 --- a/hornetq-ra/pom.xml +++ b/activemq6-ra/pom.xml @@ -1,15 +1,15 @@ - HornetQ RAR POM + ActiveMQ6 RAR POM 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-ra + activemq6-ra jar @@ -30,20 +30,20 @@ jboss-logging - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} provided - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} provided - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} provided diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/ConnectionFactoryProperties.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/ConnectionFactoryProperties.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/ConnectionFactoryProperties.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/ConnectionFactoryProperties.java index c58080d9a4..149072de1c 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/ConnectionFactoryProperties.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/ConnectionFactoryProperties.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import java.util.List; import java.util.Map; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRABundle.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRABundle.java similarity index 96% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRABundle.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRABundle.java index cdf76c4d97..50722564ec 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRABundle.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRABundle.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; -import org.hornetq.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.HornetQIllegalStateException; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRABytesMessage.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRABytesMessage.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRABytesMessage.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRABytesMessage.java index 2fafc1e3cd..69d7bc8d30 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRABytesMessage.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRABytesMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import java.util.Arrays; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionFactory.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionFactory.java similarity index 95% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionFactory.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionFactory.java index 2b39345261..4c479f8480 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionFactory.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.XAQueueConnectionFactory; import javax.jms.XATopicConnectionFactory; @@ -18,7 +18,7 @@ import javax.resource.Referenceable; import javax.resource.ResourceException; import java.io.Serializable; -import org.hornetq.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; /** * An aggregate interface for the JMS connection factories diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionFactoryImpl.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionFactoryImpl.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionFactoryImpl.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionFactoryImpl.java index dfc8315a83..d53abf6491 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionFactoryImpl.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionFactoryImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.Connection; import javax.jms.JMSContext; @@ -30,9 +30,9 @@ import javax.naming.Reference; import javax.resource.ResourceException; import javax.resource.spi.ConnectionManager; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory; -import org.hornetq.jms.referenceable.SerializableObjectRefAddr; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.referenceable.ConnectionFactoryObjectFactory; +import org.apache.activemq6.jms.referenceable.SerializableObjectRefAddr; /** * The connection factory diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionManager.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionManager.java similarity index 96% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionManager.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionManager.java index 333d0aaba0..a9996f4282 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionManager.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.resource.ResourceException; import javax.resource.spi.ConnectionManager; @@ -18,7 +18,7 @@ import javax.resource.spi.ConnectionRequestInfo; import javax.resource.spi.ManagedConnection; import javax.resource.spi.ManagedConnectionFactory; -import org.hornetq.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.ConcurrentHashSet; /** diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionMetaData.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionMetaData.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionMetaData.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionMetaData.java index fb160073b8..0e1617e7e4 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionMetaData.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionMetaData.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import java.util.Enumeration; import java.util.Vector; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionRequestInfo.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionRequestInfo.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionRequestInfo.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionRequestInfo.java index 52cd6cf10b..bbd00711fa 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAConnectionRequestInfo.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionRequestInfo.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.Session; import javax.resource.spi.ConnectionRequestInfo; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRACredential.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRACredential.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRACredential.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRACredential.java index 4ac6c72afd..e61c6363ee 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRACredential.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRACredential.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import java.io.Serializable; import java.security.AccessController; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAJMSContext.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAJMSContext.java similarity index 88% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAJMSContext.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAJMSContext.java index 2681c2619d..d6747a1f3d 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAJMSContext.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAJMSContext.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; -import org.hornetq.jms.client.HornetQConnectionForContext; -import org.hornetq.jms.client.HornetQJMSContext; -import org.hornetq.jms.client.ThreadAwareContext; +import org.apache.activemq6.jms.client.HornetQConnectionForContext; +import org.apache.activemq6.jms.client.HornetQJMSContext; +import org.apache.activemq6.jms.client.ThreadAwareContext; import javax.jms.ExceptionListener; import javax.jms.JMSContext; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRALocalTransaction.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRALocalTransaction.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRALocalTransaction.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRALocalTransaction.java index 8b5323387e..8d354b2387 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRALocalTransaction.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRALocalTransaction.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.JMSException; import javax.resource.ResourceException; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRALogger.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRALogger.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRALogger.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRALogger.java index 0de3ed6159..c2ea115d14 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRALogger.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRALogger.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; -import org.hornetq.ra.inflow.HornetQActivationSpec; +import org.apache.activemq6.ra.inflow.HornetQActivationSpec; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMCFProperties.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMCFProperties.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMCFProperties.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMCFProperties.java index ef8ba9b569..72198e9abd 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMCFProperties.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMCFProperties.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import java.io.Serializable; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnection.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAManagedConnection.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnection.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAManagedConnection.java index 055b3e130a..1fc25e097f 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnection.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAManagedConnection.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.ExceptionListener; import javax.jms.JMSException; @@ -42,10 +42,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.jms.client.HornetQConnection; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQXAConnection; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.jms.client.HornetQConnection; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQXAConnection; /** * The managed connection diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnectionFactory.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAManagedConnectionFactory.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnectionFactory.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAManagedConnectionFactory.java index e212229963..10fd4abace 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAManagedConnectionFactory.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAManagedConnectionFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.ConnectionMetaData; import javax.resource.ResourceException; @@ -25,8 +25,8 @@ import java.io.PrintWriter; import java.util.Iterator; import java.util.Set; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.recovery.XARecoveryConfig; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; /** * HornetQ ManagedConnectionFactory diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMapMessage.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMapMessage.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMapMessage.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMapMessage.java index 62a839fab6..660cdeb06f 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMapMessage.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMapMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import java.util.Arrays; import java.util.Enumeration; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMessage.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessage.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMessage.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessage.java index e6f1419ee2..8a8f89c852 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMessage.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.Destination; import javax.jms.JMSException; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMessageConsumer.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageConsumer.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMessageConsumer.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageConsumer.java index 7cbb24d427..ffdccdc925 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMessageConsumer.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageConsumer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.BytesMessage; import javax.jms.JMSException; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMessageListener.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageListener.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMessageListener.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageListener.java index 503fa24f95..fe2127a9c0 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMessageListener.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.Message; import javax.jms.MessageListener; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMessageProducer.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageProducer.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMessageProducer.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageProducer.java index 38fb85364a..7490f6b0af 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMessageProducer.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageProducer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.CompletionListener; import javax.jms.Destination; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMetaData.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMetaData.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMetaData.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMetaData.java index 6ba996f5ee..9fc55c4a0d 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAMetaData.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMetaData.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.resource.ResourceException; import javax.resource.spi.ManagedConnectionMetaData; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAObjectMessage.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAObjectMessage.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAObjectMessage.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAObjectMessage.java index d6663b313b..4bb8a37e1a 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAObjectMessage.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAObjectMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import java.io.Serializable; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAProperties.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAProperties.java similarity index 94% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAProperties.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAProperties.java index 6e7e4e9cf9..a9d2c08601 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAProperties.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAProperties.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import java.io.Serializable; import java.util.Hashtable; -import org.hornetq.api.core.HornetQException; -import org.hornetq.utils.DefaultSensitiveStringCodec; -import org.hornetq.utils.PasswordMaskingUtil; -import org.hornetq.utils.SensitiveDataCodec; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.utils.DefaultSensitiveStringCodec; +import org.apache.activemq6.utils.PasswordMaskingUtil; +import org.apache.activemq6.utils.SensitiveDataCodec; /** @@ -59,7 +59,7 @@ public class HornetQRAProperties extends ConnectionFactoryProperties implements * Class used to locate the Transaction Manager. * Using JBoss5 as the default locator */ - private String transactionManagerLocatorClass = "org.hornetq.integration.jboss.tm.JBoss5TransactionManagerLocator;org.hornetq.integration.jboss.tm.JBoss4TransactionManagerLocator"; + private String transactionManagerLocatorClass = "org.apache.activemq6.integration.jboss.tm.JBoss5TransactionManagerLocator;org.hornetq.integration.jboss.tm.JBoss4TransactionManagerLocator"; /** * Method used to locate the TM diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAQueueReceiver.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAQueueReceiver.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAQueueReceiver.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAQueueReceiver.java index 71c19c7fae..15534ac4f8 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAQueueReceiver.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAQueueReceiver.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.JMSException; import javax.jms.Queue; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAQueueSender.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAQueueSender.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAQueueSender.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAQueueSender.java index d1e87e6ed8..e916111699 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAQueueSender.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAQueueSender.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.JMSException; import javax.jms.Message; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAService.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAService.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAService.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAService.java index 9fe80e4706..aef91c274f 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAService.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAService.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import java.util.Set; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASession.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASession.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASession.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASession.java index e4ace2b12b..f4b7725b8c 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASession.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASession.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.BytesMessage; import javax.jms.Destination; @@ -49,8 +49,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.jms.client.HornetQSession; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.jms.client.HornetQSession; /** diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASessionFactory.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASessionFactory.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASessionFactory.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASessionFactory.java index a38c98fdb9..09aea666af 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASessionFactory.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASessionFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.JMSException; import javax.jms.TemporaryQueue; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASessionFactoryImpl.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASessionFactoryImpl.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASessionFactoryImpl.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASessionFactoryImpl.java index 58a88a47b4..6a19f49b8e 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRASessionFactoryImpl.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASessionFactoryImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.ConnectionConsumer; import javax.jms.ConnectionMetaData; @@ -41,9 +41,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.hornetq.api.jms.HornetQJMSConstants; -import org.hornetq.jms.client.HornetQConnectionForContext; -import org.hornetq.jms.client.HornetQConnectionForContextImpl; +import org.apache.activemq6.api.jms.HornetQJMSConstants; +import org.apache.activemq6.jms.client.HornetQConnectionForContext; +import org.apache.activemq6.jms.client.HornetQConnectionForContextImpl; /** * Implements the JMS Connection API and produces {@link HornetQRASession} objects. diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAStreamMessage.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAStreamMessage.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAStreamMessage.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAStreamMessage.java index ec698c3f5f..5b376d2fee 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAStreamMessage.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAStreamMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import java.util.Arrays; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRATextMessage.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATextMessage.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRATextMessage.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATextMessage.java index 8a63d7d37d..9ee7fd9b04 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRATextMessage.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATextMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.JMSException; import javax.jms.TextMessage; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRATopicPublisher.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATopicPublisher.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRATopicPublisher.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATopicPublisher.java index 6c6645d22d..7141be72c7 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRATopicPublisher.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATopicPublisher.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.JMSException; import javax.jms.Message; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRATopicSubscriber.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATopicSubscriber.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRATopicSubscriber.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATopicSubscriber.java index b24a3d3002..b557141572 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRATopicSubscriber.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATopicSubscriber.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.JMSException; import javax.jms.Topic; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAXAJMSContext.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAXAJMSContext.java similarity index 85% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAXAJMSContext.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAXAJMSContext.java index 88e36f29f6..719dba0be5 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAXAJMSContext.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAXAJMSContext.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; -import org.hornetq.jms.client.HornetQConnectionForContext; -import org.hornetq.jms.client.ThreadAwareContext; +import org.apache.activemq6.jms.client.HornetQConnectionForContext; +import org.apache.activemq6.jms.client.ThreadAwareContext; import javax.jms.XAJMSContext; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAXAResource.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAXAResource.java similarity index 96% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAXAResource.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAXAResource.java index 053b4f29e2..af2676a3ff 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRAXAResource.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAXAResource.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.client.impl.HornetQXAResource; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.client.impl.HornetQXAResource; /** * HornetQXAResource. diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRaUtils.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRaUtils.java similarity index 99% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQRaUtils.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRaUtils.java index 465158818d..30a43cd78c 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQRaUtils.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRaUtils.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.naming.Context; import javax.transaction.TransactionManager; diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQResourceAdapter.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQResourceAdapter.java similarity index 97% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQResourceAdapter.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQResourceAdapter.java index d72ee447a9..00fafd3381 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQResourceAdapter.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQResourceAdapter.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.jms.Session; import javax.resource.ResourceException; @@ -34,22 +34,22 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.hornetq.api.core.BroadcastEndpointFactoryConfiguration; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.JGroupsBroadcastGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.ra.inflow.HornetQActivation; -import org.hornetq.ra.inflow.HornetQActivationSpec; -import org.hornetq.ra.recovery.RecoveryManager; -import org.hornetq.utils.SensitiveDataCodec; +import org.apache.activemq6.api.core.BroadcastEndpointFactoryConfiguration; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.JGroupsBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.ra.inflow.HornetQActivation; +import org.apache.activemq6.ra.inflow.HornetQActivationSpec; +import org.apache.activemq6.ra.recovery.RecoveryManager; +import org.apache.activemq6.utils.SensitiveDataCodec; import org.jgroups.JChannel; /** @@ -1808,7 +1808,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @param transactionManagerLocatorClass - * @see org.hornetq.ra.HornetQRAProperties#setTransactionManagerLocatorClass(java.lang.String) + * @see org.apache.activemq6.ra.HornetQRAProperties#setTransactionManagerLocatorClass(java.lang.String) */ public void setTransactionManagerLocatorClass(String transactionManagerLocatorClass) { @@ -1817,7 +1817,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @return - * @see org.hornetq.ra.HornetQRAProperties#getTransactionManagerLocatorClass() + * @see org.apache.activemq6.ra.HornetQRAProperties#getTransactionManagerLocatorClass() */ public String getTransactionManagerLocatorClass() { @@ -1826,7 +1826,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @return - * @see org.hornetq.ra.HornetQRAProperties#getJgroupsChannelLocatorClass() + * @see org.apache.activemq6.ra.HornetQRAProperties#getJgroupsChannelLocatorClass() */ public String getJgroupsChannelLocatorClass() { @@ -1835,7 +1835,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @return - * @see org.hornetq.ra.HornetQRAProperties#setJgroupsChannelLocatorClass() + * @see org.apache.activemq6.ra.HornetQRAProperties#setJgroupsChannelLocatorClass() */ public void setJgroupsChannelLocatorClass(String jgroupsChannelLocatorClass) { @@ -1844,7 +1844,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @return - * @see org.hornetq.ra.HornetQRAProperties#getJgroupsChannelRefName() + * @see org.apache.activemq6.ra.HornetQRAProperties#getJgroupsChannelRefName() */ public String getJgroupsChannelRefName() { @@ -1853,7 +1853,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @return - * @see org.hornetq.ra.HornetQRAProperties#setJgroupsChannelRefName() + * @see org.apache.activemq6.ra.HornetQRAProperties#setJgroupsChannelRefName() */ public void setJgroupsChannelRefName(String jgroupsChannelRefName) { @@ -1862,7 +1862,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @return - * @see org.hornetq.ra.HornetQRAProperties#getTransactionManagerLocatorMethod() + * @see org.apache.activemq6.ra.HornetQRAProperties#getTransactionManagerLocatorMethod() */ public String getTransactionManagerLocatorMethod() { @@ -1871,7 +1871,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @param transactionManagerLocatorMethod - * @see org.hornetq.ra.HornetQRAProperties#setTransactionManagerLocatorMethod(java.lang.String) + * @see org.apache.activemq6.ra.HornetQRAProperties#setTransactionManagerLocatorMethod(java.lang.String) */ public void setTransactionManagerLocatorMethod(String transactionManagerLocatorMethod) { diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQXAResourceWrapper.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQXAResourceWrapper.java similarity index 96% rename from hornetq-ra/src/main/java/org/hornetq/ra/HornetQXAResourceWrapper.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQXAResourceWrapper.java index 043f35be40..c632635a40 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/HornetQXAResourceWrapper.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQXAResourceWrapper.java @@ -11,14 +11,14 @@ * permissions and limitations under the License. */ -package org.hornetq.ra; +package org.apache.activemq6.ra; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.core.client.impl.HornetQXAResource; -import org.hornetq.utils.VersionLoader; +import org.apache.activemq6.core.client.impl.HornetQXAResource; +import org.apache.activemq6.utils.VersionLoader; /** * @author Martyn Taylor diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQActivation.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQActivation.java similarity index 95% rename from hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQActivation.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQActivation.java index d75be855d0..e687b2f110 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQActivation.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQActivation.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra.inflow; +package org.apache.activemq6.ra.inflow; import javax.jms.Destination; import javax.jms.Message; @@ -29,25 +29,25 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQNonExistentQueueException; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.server.recovery.XARecoveryConfig; -import org.hornetq.ra.HornetQRABundle; -import org.hornetq.ra.HornetQRAConnectionFactory; -import org.hornetq.ra.HornetQRALogger; -import org.hornetq.ra.HornetQRaUtils; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.utils.FutureLatch; -import org.hornetq.utils.SensitiveDataCodec; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQNonExistentQueueException; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +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.jms.HornetQJMSClient; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; +import org.apache.activemq6.ra.HornetQRABundle; +import org.apache.activemq6.ra.HornetQRAConnectionFactory; +import org.apache.activemq6.ra.HornetQRALogger; +import org.apache.activemq6.ra.HornetQRaUtils; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.utils.FutureLatch; +import org.apache.activemq6.utils.SensitiveDataCodec; /** * The activation. diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQActivationSpec.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQActivationSpec.java similarity index 98% rename from hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQActivationSpec.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQActivationSpec.java index f9ce2f246b..99de0a8ef9 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQActivationSpec.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQActivationSpec.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra.inflow; +package org.apache.activemq6.ra.inflow; import javax.jms.Queue; import javax.jms.Session; @@ -27,10 +27,10 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.List; -import org.hornetq.ra.ConnectionFactoryProperties; -import org.hornetq.ra.HornetQRALogger; -import org.hornetq.ra.HornetQRaUtils; -import org.hornetq.ra.HornetQResourceAdapter; +import org.apache.activemq6.ra.ConnectionFactoryProperties; +import org.apache.activemq6.ra.HornetQRALogger; +import org.apache.activemq6.ra.HornetQRaUtils; +import org.apache.activemq6.ra.HornetQResourceAdapter; /** * The activation spec diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQMessageHandler.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQMessageHandler.java similarity index 93% rename from hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQMessageHandler.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQMessageHandler.java index eeb5b06255..2dd20b64c9 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/inflow/HornetQMessageHandler.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQMessageHandler.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.ra.inflow; +package org.apache.activemq6.ra.inflow; import javax.jms.MessageListener; import javax.resource.ResourceException; @@ -21,21 +21,21 @@ import javax.transaction.TransactionManager; import javax.transaction.xa.XAResource; import java.util.UUID; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession.QueueQuery; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.core.client.impl.ClientConsumerInternal; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.ra.HornetQRALogger; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.ra.HornetQXAResourceWrapper; -import org.hornetq.utils.FutureLatch; +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.ClientSession.QueueQuery; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.core.client.impl.ClientConsumerInternal; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.ra.HornetQRALogger; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.ra.HornetQXAResourceWrapper; +import org.apache.activemq6.utils.FutureLatch; /** * The message handler diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/package.html b/activemq6-ra/src/main/java/org/apache/activemq6/ra/package.html similarity index 100% rename from hornetq-ra/src/main/java/org/hornetq/ra/package.html rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/package.html diff --git a/hornetq-ra/src/main/java/org/hornetq/ra/recovery/RecoveryManager.java b/activemq6-ra/src/main/java/org/apache/activemq6/ra/recovery/RecoveryManager.java similarity index 90% rename from hornetq-ra/src/main/java/org/hornetq/ra/recovery/RecoveryManager.java rename to activemq6-ra/src/main/java/org/apache/activemq6/ra/recovery/RecoveryManager.java index d14b1731b4..82b4f135d6 100644 --- a/hornetq-ra/src/main/java/org/hornetq/ra/recovery/RecoveryManager.java +++ b/activemq6-ra/src/main/java/org/apache/activemq6/ra/recovery/RecoveryManager.java @@ -11,18 +11,18 @@ * permissions and limitations under the License. */ -package org.hornetq.ra.recovery; +package org.apache.activemq6.ra.recovery; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.Set; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.recovery.HornetQRegistryBase; -import org.hornetq.jms.server.recovery.XARecoveryConfig; -import org.hornetq.ra.HornetQRALogger; -import org.hornetq.utils.ClassloadingUtil; -import org.hornetq.utils.ConcurrentHashSet; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.server.recovery.HornetQRegistryBase; +import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; +import org.apache.activemq6.ra.HornetQRALogger; +import org.apache.activemq6.utils.ClassloadingUtil; +import org.apache.activemq6.utils.ConcurrentHashSet; /** * @author Andy Taylor diff --git a/hornetq-rest/pom.xml b/activemq6-rest/pom.xml similarity index 87% rename from hornetq-rest/pom.xml rename to activemq6-rest/pom.xml index 666f95e81d..4951a2daf7 100644 --- a/hornetq-rest/pom.xml +++ b/activemq6-rest/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - HornetQ REST Interface Implementation - org.hornetq.rest - hornetq-rest + ActiveMQ6 REST Interface Implementation + org.apache.activemq6.rest + activemq6-rest jar @@ -65,13 +65,13 @@ netty-all - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${hornetq.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${hornetq.version} diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/HornetQRestBundle.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/HornetQRestBundle.java similarity index 96% rename from hornetq-rest/src/main/java/org/hornetq/rest/HornetQRestBundle.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/HornetQRestBundle.java index 661d301d90..4be89cdead 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/HornetQRestBundle.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/HornetQRestBundle.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest; +package org.apache.activemq6.rest; import org.jboss.logging.annotations.MessageBundle; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/HornetQRestLogger.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/HornetQRestLogger.java similarity index 95% rename from hornetq-rest/src/main/java/org/hornetq/rest/HornetQRestLogger.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/HornetQRestLogger.java index 170288b9c7..2d5c451c01 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/HornetQRestLogger.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/HornetQRestLogger.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.hornetq.rest; +package org.apache.activemq6.rest; -import org.hornetq.api.core.HornetQException; -import org.hornetq.rest.queue.push.xml.XmlLink; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.rest.queue.push.xml.XmlLink; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/Hornetq.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/Hornetq.java similarity index 97% rename from hornetq-rest/src/main/java/org/hornetq/rest/Hornetq.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/Hornetq.java index 1af83aa28a..a7a5fc1ddb 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/Hornetq.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/Hornetq.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest; +package org.apache.activemq6.rest; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.MessageBodyReader; @@ -22,8 +22,8 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.lang.reflect.Type; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.rest.util.HttpMessageHelper; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.rest.util.HttpMessageHelper; import org.jboss.resteasy.core.Headers; import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.jboss.resteasy.util.GenericType; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/HttpHeaderProperty.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/HttpHeaderProperty.java similarity index 97% rename from hornetq-rest/src/main/java/org/hornetq/rest/HttpHeaderProperty.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/HttpHeaderProperty.java index cd0075a9f5..41dded2920 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/HttpHeaderProperty.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/HttpHeaderProperty.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest; +package org.apache.activemq6.rest; public class HttpHeaderProperty { diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/Jms.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/Jms.java similarity index 98% rename from hornetq-rest/src/main/java/org/hornetq/rest/Jms.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/Jms.java index 548e4e6b60..8601557ac3 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/Jms.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/Jms.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest; +package org.apache.activemq6.rest; -import org.hornetq.rest.util.HttpMessageHelper; +import org.apache.activemq6.rest.util.HttpMessageHelper; import org.jboss.resteasy.core.Headers; import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.jboss.resteasy.util.GenericType; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/MessageServiceConfiguration.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/MessageServiceConfiguration.java similarity index 99% rename from hornetq-rest/src/main/java/org/hornetq/rest/MessageServiceConfiguration.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/MessageServiceConfiguration.java index 2a4aad3084..3de3ca757a 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/MessageServiceConfiguration.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/MessageServiceConfiguration.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest; +package org.apache.activemq6.rest; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/MessageServiceManager.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/MessageServiceManager.java similarity index 88% rename from hornetq-rest/src/main/java/org/hornetq/rest/MessageServiceManager.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/MessageServiceManager.java index d07a0bf765..8969393459 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/MessageServiceManager.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/MessageServiceManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest; +package org.apache.activemq6.rest; import java.io.InputStreamReader; import java.io.Reader; @@ -22,21 +22,21 @@ import java.util.concurrent.Executors; import javax.xml.bind.JAXBContext; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.rest.queue.DestinationSettings; -import org.hornetq.rest.queue.QueueServiceManager; -import org.hornetq.rest.topic.TopicServiceManager; -import org.hornetq.rest.util.CustomHeaderLinkStrategy; -import org.hornetq.rest.util.LinkHeaderLinkStrategy; -import org.hornetq.rest.util.LinkStrategy; -import org.hornetq.rest.util.TimeoutTask; -import org.hornetq.spi.core.naming.BindingRegistry; -import org.hornetq.utils.XMLUtil; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.rest.queue.DestinationSettings; +import org.apache.activemq6.rest.queue.QueueServiceManager; +import org.apache.activemq6.rest.topic.TopicServiceManager; +import org.apache.activemq6.rest.util.CustomHeaderLinkStrategy; +import org.apache.activemq6.rest.util.LinkHeaderLinkStrategy; +import org.apache.activemq6.rest.util.LinkStrategy; +import org.apache.activemq6.rest.util.TimeoutTask; +import org.apache.activemq6.spi.core.naming.BindingRegistry; +import org.apache.activemq6.utils.XMLUtil; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/UnknownMediaType.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/UnknownMediaType.java similarity index 96% rename from hornetq-rest/src/main/java/org/hornetq/rest/UnknownMediaType.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/UnknownMediaType.java index a5c695b75e..7a224a2030 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/UnknownMediaType.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/UnknownMediaType.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest; +package org.apache.activemq6.rest; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/UnmarshalException.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/UnmarshalException.java similarity index 96% rename from hornetq-rest/src/main/java/org/hornetq/rest/UnmarshalException.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/UnmarshalException.java index ce22554407..be40eba9d1 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/UnmarshalException.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/UnmarshalException.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest; +package org.apache.activemq6.rest; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/integration/EmbeddedRestHornetQ.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/EmbeddedRestHornetQ.java similarity index 93% rename from hornetq-rest/src/main/java/org/hornetq/rest/integration/EmbeddedRestHornetQ.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/EmbeddedRestHornetQ.java index e4c4f4e201..c97fb43e90 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/integration/EmbeddedRestHornetQ.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/EmbeddedRestHornetQ.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.integration; +package org.apache.activemq6.rest.integration; -import org.hornetq.core.server.embedded.EmbeddedHornetQ; +import org.apache.activemq6.core.server.embedded.EmbeddedHornetQ; import org.jboss.resteasy.plugins.server.tjws.TJWSEmbeddedJaxrsServer; -import org.hornetq.rest.MessageServiceManager; +import org.apache.activemq6.rest.MessageServiceManager; import org.jboss.resteasy.test.TestPortProvider; /** diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/integration/EmbeddedRestHornetQJMS.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/EmbeddedRestHornetQJMS.java similarity index 86% rename from hornetq-rest/src/main/java/org/hornetq/rest/integration/EmbeddedRestHornetQJMS.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/EmbeddedRestHornetQJMS.java index d9e8dc294c..fd21185875 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/integration/EmbeddedRestHornetQJMS.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/EmbeddedRestHornetQJMS.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.integration; +package org.apache.activemq6.rest.integration; -import org.hornetq.jms.server.embedded.EmbeddedJMS; -import org.hornetq.spi.core.naming.BindingRegistry; +import org.apache.activemq6.jms.server.embedded.EmbeddedJMS; +import org.apache.activemq6.spi.core.naming.BindingRegistry; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/integration/HornetqBootstrapListener.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/HornetqBootstrapListener.java similarity index 93% rename from hornetq-rest/src/main/java/org/hornetq/rest/integration/HornetqBootstrapListener.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/HornetqBootstrapListener.java index 7be7fcf273..ca1a524219 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/integration/HornetqBootstrapListener.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/HornetqBootstrapListener.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.integration; +package org.apache.activemq6.rest.integration; -import org.hornetq.jms.server.embedded.EmbeddedJMS; +import org.apache.activemq6.jms.server.embedded.EmbeddedJMS; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/integration/RestMessagingBootstrapListener.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/RestMessagingBootstrapListener.java similarity index 95% rename from hornetq-rest/src/main/java/org/hornetq/rest/integration/RestMessagingBootstrapListener.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/RestMessagingBootstrapListener.java index c417602191..20d2b028bc 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/integration/RestMessagingBootstrapListener.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/RestMessagingBootstrapListener.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.integration; +package org.apache.activemq6.rest.integration; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import org.hornetq.rest.MessageServiceManager; +import org.apache.activemq6.rest.MessageServiceManager; import org.jboss.resteasy.spi.Registry; /** diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/integration/ServletContextBindingRegistry.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/ServletContextBindingRegistry.java similarity index 93% rename from hornetq-rest/src/main/java/org/hornetq/rest/integration/ServletContextBindingRegistry.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/ServletContextBindingRegistry.java index ce3a1f1400..ab153dc1d4 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/integration/ServletContextBindingRegistry.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/ServletContextBindingRegistry.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.integration; +package org.apache.activemq6.rest.integration; -import org.hornetq.spi.core.naming.BindingRegistry; +import org.apache.activemq6.spi.core.naming.BindingRegistry; import javax.servlet.ServletContext; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/AcknowledgedQueueConsumer.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/AcknowledgedQueueConsumer.java similarity index 94% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/AcknowledgedQueueConsumer.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/AcknowledgedQueueConsumer.java index 7a75d74572..b0d28c3b55 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/AcknowledgedQueueConsumer.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/AcknowledgedQueueConsumer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; import javax.ws.rs.DefaultValue; import javax.ws.rs.FormParam; @@ -25,14 +25,14 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import java.net.URI; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.util.Constants; -import org.hornetq.rest.util.LinkStrategy; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.util.Constants; +import org.apache.activemq6.rest.util.LinkStrategy; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/Acknowledgement.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/Acknowledgement.java similarity index 94% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/Acknowledgement.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/Acknowledgement.java index feaa470505..827c22e561 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/Acknowledgement.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/Acknowledgement.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; -import org.hornetq.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientMessage; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumedHttpMessage.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedHttpMessage.java similarity index 93% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumedHttpMessage.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedHttpMessage.java index 34cc45781c..b3c038d1a9 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumedHttpMessage.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedHttpMessage.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; -import org.hornetq.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientMessage; import javax.ws.rs.core.Response; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumedMessage.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedMessage.java similarity index 89% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumedMessage.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedMessage.java index 3d3c72d203..568c652f63 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumedMessage.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedMessage.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.HttpHeaderProperty; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.HttpHeaderProperty; import javax.ws.rs.core.Response; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumedObjectMessage.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedObjectMessage.java similarity index 94% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumedObjectMessage.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedObjectMessage.java index 617ebbab15..b8c5be192a 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumedObjectMessage.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedObjectMessage.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; -import org.hornetq.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientMessage; import javax.ws.rs.core.Response; import java.io.ByteArrayInputStream; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumersResource.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumersResource.java similarity index 97% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumersResource.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumersResource.java index a822ed8285..1795a47df0 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumersResource.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumersResource.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; import javax.ws.rs.DELETE; import javax.ws.rs.DefaultValue; @@ -28,10 +28,10 @@ import javax.ws.rs.core.UriInfo; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.util.TimeoutTask; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.util.TimeoutTask; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/DestinationResource.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationResource.java similarity index 97% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/DestinationResource.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationResource.java index c8003bf862..39b23c22fe 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/DestinationResource.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationResource.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/DestinationServiceManager.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationServiceManager.java similarity index 89% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/DestinationServiceManager.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationServiceManager.java index f05c4d6f83..ceb71dad0b 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/DestinationServiceManager.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationServiceManager.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.rest.util.LinkStrategy; -import org.hornetq.rest.util.TimeoutTask; -import org.hornetq.spi.core.naming.BindingRegistry; +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.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.rest.util.LinkStrategy; +import org.apache.activemq6.rest.util.TimeoutTask; +import org.apache.activemq6.spi.core.naming.BindingRegistry; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/DestinationSettings.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationSettings.java similarity index 97% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/DestinationSettings.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationSettings.java index 801b990481..5b798890cb 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/DestinationSettings.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationSettings.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/PostMessage.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessage.java similarity index 93% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/PostMessage.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessage.java index 8407faac85..a1db60ddcc 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/PostMessage.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; import javax.ws.rs.POST; import javax.ws.rs.PUT; @@ -28,16 +28,16 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.util.HttpMessageHelper; -import org.hornetq.utils.UUID; -import org.hornetq.utils.UUIDGenerator; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.util.HttpMessageHelper; +import org.apache.activemq6.utils.UUID; +import org.apache.activemq6.utils.UUIDGenerator; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/PostMessageDupsOk.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessageDupsOk.java similarity index 92% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/PostMessageDupsOk.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessageDupsOk.java index 148f1f6b4a..cf76564701 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/PostMessageDupsOk.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessageDupsOk.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.rest.HornetQRestLogger; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.rest.HornetQRestLogger; import javax.ws.rs.POST; import javax.ws.rs.QueryParam; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/PostMessageNoDups.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessageNoDups.java similarity index 93% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/PostMessageNoDups.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessageNoDups.java index 449c79e8c2..0f1d20454e 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/PostMessageNoDups.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessageNoDups.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; -import org.hornetq.rest.HornetQRestLogger; +import org.apache.activemq6.rest.HornetQRestLogger; import javax.ws.rs.POST; import javax.ws.rs.core.Context; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueConsumer.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueConsumer.java similarity index 94% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueConsumer.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueConsumer.java index 32395d175c..1a2dcd8a14 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueConsumer.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueConsumer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; import javax.ws.rs.DefaultValue; import javax.ws.rs.HeaderParam; @@ -24,15 +24,15 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import java.net.URI; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.jms.client.SelectorTranslator; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.util.Constants; -import org.hornetq.rest.util.LinkStrategy; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.jms.client.SelectorTranslator; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.util.Constants; +import org.apache.activemq6.rest.util.LinkStrategy; /** * Auto-acknowleged consumer diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueDeployment.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueDeployment.java similarity index 96% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueDeployment.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueDeployment.java index b9cb2615ba..4c2f4f807a 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueDeployment.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueDeployment.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueDestinationsResource.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueDestinationsResource.java similarity index 90% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueDestinationsResource.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueDestinationsResource.java index 538ccca564..069bcedd1e 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueDestinationsResource.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueDestinationsResource.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; import javax.ws.rs.Consumes; import javax.ws.rs.POST; @@ -25,17 +25,17 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.server.config.JMSQueueConfiguration; -import org.hornetq.jms.server.impl.JMSServerConfigParserImpl; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.queue.push.PushConsumerResource; -import org.hornetq.rest.queue.push.xml.PushRegistration; -import org.hornetq.rest.util.Constants; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQQueue; +import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq6.jms.server.impl.JMSServerConfigParserImpl; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.queue.push.PushConsumerResource; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.rest.util.Constants; import org.w3c.dom.Document; /** diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueResource.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueResource.java similarity index 95% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueResource.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueResource.java index 8a31f93463..54210e15ee 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueResource.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueResource.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.DELETE; @@ -23,10 +23,10 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.queue.push.PushConsumerResource; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.queue.push.PushConsumerResource; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueServiceManager.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueServiceManager.java similarity index 91% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueServiceManager.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueServiceManager.java index e2232707df..09267854b7 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueServiceManager.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueServiceManager.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue; +package org.apache.activemq6.rest.queue; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.rest.queue.push.FilePushStore; -import org.hornetq.rest.queue.push.PushStore; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.rest.queue.push.FilePushStore; +import org.apache.activemq6.rest.queue.push.PushStore; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/FilePushStore.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/FilePushStore.java similarity index 94% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/FilePushStore.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/FilePushStore.java index 776adeaae9..81df305e53 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/FilePushStore.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/FilePushStore.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push; +package org.apache.activemq6.rest.queue.push; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -21,9 +21,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.queue.push.xml.PushRegistration; -import org.hornetq.rest.topic.PushTopicRegistration; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.rest.topic.PushTopicRegistration; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/HornetQPushStrategy.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/HornetQPushStrategy.java similarity index 94% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/HornetQPushStrategy.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/HornetQPushStrategy.java index 61e35b7efc..3979fbfde2 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/HornetQPushStrategy.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/HornetQPushStrategy.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push; +package org.apache.activemq6.rest.queue.push; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.rest.queue.push.xml.XmlHttpHeader; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.rest.queue.push.xml.XmlHttpHeader; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.specimpl.ResteasyUriBuilder; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumer.java similarity index 89% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumer.java index af750a7c72..8e445bb2c3 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumer.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push; +package org.apache.activemq6.rest.queue.push; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.jms.client.SelectorTranslator; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.jms.client.SelectorTranslator; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; import java.util.ArrayList; import java.util.List; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumerMessageHandler.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumerMessageHandler.java similarity index 87% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumerMessageHandler.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumerMessageHandler.java index 75f67c1872..3bd286813e 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumerMessageHandler.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumerMessageHandler.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push; +package org.apache.activemq6.rest.queue.push; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.rest.HornetQRestLogger; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.rest.HornetQRestLogger; public class PushConsumerMessageHandler implements MessageHandler { diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumerResource.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumerResource.java similarity index 95% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumerResource.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumerResource.java index 2aaa01cb5c..b573057a7a 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumerResource.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumerResource.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push; +package org.apache.activemq6.rest.queue.push; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -28,9 +28,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushStore.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushStore.java similarity index 90% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushStore.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushStore.java index 391e84ca89..7de6c62974 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushStore.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushStore.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push; +package org.apache.activemq6.rest.queue.push; -import org.hornetq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; import java.util.List; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushStrategy.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushStrategy.java similarity index 88% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushStrategy.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushStrategy.java index 195af743db..1bcb0f1963 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushStrategy.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushStrategy.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push; +package org.apache.activemq6.rest.queue.push; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/UriStrategy.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/UriStrategy.java similarity index 95% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/UriStrategy.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/UriStrategy.java index eb62569001..0ea598bcd3 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/UriStrategy.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/UriStrategy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push; +package org.apache.activemq6.rest.queue.push; import javax.ws.rs.core.UriBuilder; import java.io.IOException; @@ -33,12 +33,12 @@ import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.ExecutionContext; import org.apache.http.protocol.HttpContext; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.queue.push.xml.BasicAuth; -import org.hornetq.rest.queue.push.xml.PushRegistration; -import org.hornetq.rest.queue.push.xml.XmlHttpHeader; -import org.hornetq.rest.util.HttpMessageHelper; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.queue.push.xml.BasicAuth; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.rest.queue.push.xml.XmlHttpHeader; +import org.apache.activemq6.rest.util.HttpMessageHelper; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.client.core.executors.ApacheHttpClient4Executor; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/UriTemplateStrategy.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/UriTemplateStrategy.java similarity index 90% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/UriTemplateStrategy.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/UriTemplateStrategy.java index 5076022a38..a11b224256 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/UriTemplateStrategy.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/UriTemplateStrategy.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push; +package org.apache.activemq6.rest.queue.push; -import org.hornetq.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientMessage; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/Authentication.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/Authentication.java similarity index 96% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/Authentication.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/Authentication.java index 6672c7571f..e0b66bf0c4 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/Authentication.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/Authentication.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push.xml; +package org.apache.activemq6.rest.queue.push.xml; import java.io.Serializable; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/AuthenticationType.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/AuthenticationType.java similarity index 95% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/AuthenticationType.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/AuthenticationType.java index d3a3ca24ba..20233f8695 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/AuthenticationType.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/AuthenticationType.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push.xml; +package org.apache.activemq6.rest.queue.push.xml; import javax.xml.bind.annotation.XmlSeeAlso; import java.io.Serializable; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/BasicAuth.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/BasicAuth.java similarity index 96% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/BasicAuth.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/BasicAuth.java index 37fa567301..5f3920148d 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/BasicAuth.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/BasicAuth.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push.xml; +package org.apache.activemq6.rest.queue.push.xml; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/DigestAuth.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/DigestAuth.java similarity index 94% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/DigestAuth.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/DigestAuth.java index d28934aaa5..4d9ba6eb92 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/DigestAuth.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/DigestAuth.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push.xml; +package org.apache.activemq6.rest.queue.push.xml; import javax.xml.bind.annotation.XmlRootElement; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/PushRegistration.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/PushRegistration.java similarity index 99% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/PushRegistration.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/PushRegistration.java index 20876ceafe..5451ebf488 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/PushRegistration.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/PushRegistration.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push.xml; +package org.apache.activemq6.rest.queue.push.xml; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/XmlHttpHeader.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/XmlHttpHeader.java similarity index 97% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/XmlHttpHeader.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/XmlHttpHeader.java index 8676928a52..48b4156c46 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/XmlHttpHeader.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/XmlHttpHeader.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push.xml; +package org.apache.activemq6.rest.queue.push.xml; import java.io.Serializable; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/XmlLink.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/XmlLink.java similarity index 97% rename from hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/XmlLink.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/XmlLink.java index fd77b905d7..2f98768f27 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/xml/XmlLink.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/XmlLink.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.queue.push.xml; +package org.apache.activemq6.rest.queue.push.xml; import java.io.Serializable; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/AcknowledgedSubscriptionResource.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/AcknowledgedSubscriptionResource.java similarity index 85% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/AcknowledgedSubscriptionResource.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/AcknowledgedSubscriptionResource.java index aa1ac5e3a7..6e3cb6deac 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/AcknowledgedSubscriptionResource.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/AcknowledgedSubscriptionResource.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.rest.queue.AcknowledgedQueueConsumer; -import org.hornetq.rest.queue.DestinationServiceManager; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.rest.queue.AcknowledgedQueueConsumer; +import org.apache.activemq6.rest.queue.DestinationServiceManager; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/FileTopicPushStore.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/FileTopicPushStore.java similarity index 89% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/FileTopicPushStore.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/FileTopicPushStore.java index daca3e9f11..f4afa523ca 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/FileTopicPushStore.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/FileTopicPushStore.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; import java.util.ArrayList; import java.util.List; -import org.hornetq.rest.queue.push.FilePushStore; -import org.hornetq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.rest.queue.push.FilePushStore; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/PushSubscription.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushSubscription.java similarity index 79% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/PushSubscription.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushSubscription.java index 581f1f4de0..c2264f5451 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/PushSubscription.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushSubscription.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.queue.push.PushConsumer; -import org.hornetq.rest.queue.push.PushStore; -import org.hornetq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.queue.push.PushConsumer; +import org.apache.activemq6.rest.queue.push.PushStore; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/PushSubscriptionsResource.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushSubscriptionsResource.java similarity index 95% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/PushSubscriptionsResource.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushSubscriptionsResource.java index 4820906ee4..0c99efd6c9 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/PushSubscriptionsResource.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushSubscriptionsResource.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.queue.push.PushConsumer; +import org.apache.activemq6.api.core.HornetQException; +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.rest.HornetQRestLogger; +import org.apache.activemq6.rest.queue.push.PushConsumer; import javax.ws.rs.DELETE; import javax.ws.rs.GET; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/PushTopicRegistration.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushTopicRegistration.java similarity index 92% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/PushTopicRegistration.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushTopicRegistration.java index bffc9bc0ea..092ef8af28 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/PushTopicRegistration.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushTopicRegistration.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -18,7 +18,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.hornetq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/Subscription.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/Subscription.java similarity index 95% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/Subscription.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/Subscription.java index 8e8e31b43d..97986b9f87 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/Subscription.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/Subscription.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionResource.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/SubscriptionResource.java similarity index 85% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionResource.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/SubscriptionResource.java index 63d01a8157..74b9a85a17 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionResource.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/SubscriptionResource.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.rest.queue.DestinationServiceManager; -import org.hornetq.rest.queue.QueueConsumer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.rest.queue.DestinationServiceManager; +import org.apache.activemq6.rest.queue.QueueConsumer; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionsResource.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/SubscriptionsResource.java similarity index 96% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionsResource.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/SubscriptionsResource.java index 6ffb9639cf..0d11709569 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionsResource.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/SubscriptionsResource.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; import javax.ws.rs.DELETE; import javax.ws.rs.DefaultValue; @@ -28,16 +28,16 @@ import javax.ws.rs.core.UriInfo; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.queue.AcknowledgedQueueConsumer; -import org.hornetq.rest.queue.Acknowledgement; -import org.hornetq.rest.queue.DestinationServiceManager; -import org.hornetq.rest.queue.QueueConsumer; -import org.hornetq.rest.util.TimeoutTask; +import org.apache.activemq6.api.core.HornetQException; +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.rest.HornetQRestLogger; +import org.apache.activemq6.rest.queue.AcknowledgedQueueConsumer; +import org.apache.activemq6.rest.queue.Acknowledgement; +import org.apache.activemq6.rest.queue.DestinationServiceManager; +import org.apache.activemq6.rest.queue.QueueConsumer; +import org.apache.activemq6.rest.util.TimeoutTask; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicDeployment.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicDeployment.java similarity index 91% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicDeployment.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicDeployment.java index 8e3c25d416..e9b0431926 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicDeployment.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicDeployment.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; -import org.hornetq.rest.queue.DestinationSettings; +import org.apache.activemq6.rest.queue.DestinationSettings; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicDestinationsResource.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicDestinationsResource.java similarity index 90% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicDestinationsResource.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicDestinationsResource.java index eccbdb562c..e893c18262 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicDestinationsResource.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicDestinationsResource.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; import javax.ws.rs.Consumes; import javax.ws.rs.POST; @@ -25,18 +25,18 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQTopic; -import org.hornetq.jms.server.config.TopicConfiguration; -import org.hornetq.jms.server.impl.JMSServerConfigParserImpl; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.queue.DestinationSettings; -import org.hornetq.rest.queue.PostMessage; -import org.hornetq.rest.queue.PostMessageDupsOk; -import org.hornetq.rest.queue.PostMessageNoDups; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQTopic; +import org.apache.activemq6.jms.server.config.TopicConfiguration; +import org.apache.activemq6.jms.server.impl.JMSServerConfigParserImpl; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.queue.DestinationSettings; +import org.apache.activemq6.rest.queue.PostMessage; +import org.apache.activemq6.rest.queue.PostMessageDupsOk; +import org.apache.activemq6.rest.queue.PostMessageNoDups; import org.w3c.dom.Document; /** diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicPushStore.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicPushStore.java similarity index 89% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicPushStore.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicPushStore.java index a06ca27e8d..32c6456f96 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicPushStore.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicPushStore.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; -import org.hornetq.rest.queue.push.PushStore; +import org.apache.activemq6.rest.queue.push.PushStore; import java.util.List; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicResource.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicResource.java similarity index 95% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicResource.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicResource.java index 04635aaf87..98d5b86a98 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicResource.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicResource.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -22,11 +22,11 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.queue.DestinationResource; -import org.hornetq.rest.queue.PostMessage; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.queue.DestinationResource; +import org.apache.activemq6.rest.queue.PostMessage; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicServiceManager.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicServiceManager.java similarity index 93% rename from hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicServiceManager.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicServiceManager.java index e5199fe76d..5d188ec929 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/topic/TopicServiceManager.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicServiceManager.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.topic; +package org.apache.activemq6.rest.topic; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.rest.queue.DestinationServiceManager; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.rest.queue.DestinationServiceManager; import java.util.ArrayList; import java.util.List; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/util/Constants.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/Constants.java similarity index 95% rename from hornetq-rest/src/main/java/org/hornetq/rest/util/Constants.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/util/Constants.java index ff64b20236..c22f102dd6 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/util/Constants.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/Constants.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.util; +package org.apache.activemq6.rest.util; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/util/CustomHeaderLinkStrategy.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/CustomHeaderLinkStrategy.java similarity index 97% rename from hornetq-rest/src/main/java/org/hornetq/rest/util/CustomHeaderLinkStrategy.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/util/CustomHeaderLinkStrategy.java index 04e9b10cc6..e22eaa2482 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/util/CustomHeaderLinkStrategy.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/CustomHeaderLinkStrategy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.util; +package org.apache.activemq6.rest.util; import javax.ws.rs.core.Response; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/util/HttpMessageHelper.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/HttpMessageHelper.java similarity index 95% rename from hornetq-rest/src/main/java/org/hornetq/rest/util/HttpMessageHelper.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/util/HttpMessageHelper.java index 9ecddca7e2..1ba303b39a 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/util/HttpMessageHelper.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/HttpMessageHelper.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.util; +package org.apache.activemq6.rest.util; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.rest.HornetQRestLogger; -import org.hornetq.rest.HttpHeaderProperty; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.rest.HornetQRestLogger; +import org.apache.activemq6.rest.HttpHeaderProperty; import org.jboss.resteasy.client.ClientRequest; import javax.ws.rs.core.HttpHeaders; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/util/LinkHeaderLinkStrategy.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/LinkHeaderLinkStrategy.java similarity index 97% rename from hornetq-rest/src/main/java/org/hornetq/rest/util/LinkHeaderLinkStrategy.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/util/LinkHeaderLinkStrategy.java index 8d3ebd9d2f..fe4c83e381 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/util/LinkHeaderLinkStrategy.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/LinkHeaderLinkStrategy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.util; +package org.apache.activemq6.rest.util; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/util/LinkStrategy.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/LinkStrategy.java similarity index 95% rename from hornetq-rest/src/main/java/org/hornetq/rest/util/LinkStrategy.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/util/LinkStrategy.java index 603a72705f..70e1308811 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/util/LinkStrategy.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/LinkStrategy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.util; +package org.apache.activemq6.rest.util; import javax.ws.rs.core.Response; diff --git a/hornetq-rest/src/main/java/org/hornetq/rest/util/TimeoutTask.java b/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/TimeoutTask.java similarity index 98% rename from hornetq-rest/src/main/java/org/hornetq/rest/util/TimeoutTask.java rename to activemq6-rest/src/main/java/org/apache/activemq6/rest/util/TimeoutTask.java index 8fda541aa7..98fe593d96 100644 --- a/hornetq-rest/src/main/java/org/hornetq/rest/util/TimeoutTask.java +++ b/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/TimeoutTask.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.util; +package org.apache.activemq6.rest.util; import java.util.ArrayList; import java.util.HashMap; @@ -19,7 +19,7 @@ import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.rest.HornetQRestLogger; +import org.apache.activemq6.rest.HornetQRestLogger; /** * @author Bill Burke diff --git a/hornetq-rest/src/main/resources/schema/hornetq-rest.xsd b/activemq6-rest/src/main/resources/schema/hornetq-rest.xsd similarity index 100% rename from hornetq-rest/src/main/resources/schema/hornetq-rest.xsd rename to activemq6-rest/src/main/resources/schema/hornetq-rest.xsd diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/AutoAckQueueTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/AutoAckQueueTest.java similarity index 96% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/AutoAckQueueTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/AutoAckQueueTest.java index 7598936cae..b99cee1c67 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/AutoAckQueueTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/AutoAckQueueTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.queue.QueueDeployment; -import org.hornetq.rest.util.Constants; +import org.apache.activemq6.rest.queue.QueueDeployment; +import org.apache.activemq6.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/AutoAckTopicTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/AutoAckTopicTest.java similarity index 98% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/AutoAckTopicTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/AutoAckTopicTest.java index 8b7feb08ab..6bf6ad3f4c 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/AutoAckTopicTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/AutoAckTopicTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.topic.TopicDeployment; +import org.apache.activemq6.rest.topic.TopicDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/ClientAckQueueTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/ClientAckQueueTest.java similarity index 98% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/ClientAckQueueTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/ClientAckQueueTest.java index 4b8c99debe..52482232fc 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/ClientAckQueueTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/ClientAckQueueTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.queue.QueueDeployment; -import org.hornetq.rest.util.Constants; -import org.hornetq.rest.util.CustomHeaderLinkStrategy; -import org.hornetq.rest.util.LinkHeaderLinkStrategy; +import org.apache.activemq6.rest.queue.QueueDeployment; +import org.apache.activemq6.rest.util.Constants; +import org.apache.activemq6.rest.util.CustomHeaderLinkStrategy; +import org.apache.activemq6.rest.util.LinkHeaderLinkStrategy; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/ClientAckTopicTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/ClientAckTopicTest.java similarity index 98% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/ClientAckTopicTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/ClientAckTopicTest.java index e8b2d55430..a50fb1e917 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/ClientAckTopicTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/ClientAckTopicTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.topic.TopicDeployment; -import org.hornetq.rest.util.Constants; -import org.hornetq.rest.util.CustomHeaderLinkStrategy; -import org.hornetq.rest.util.LinkHeaderLinkStrategy; +import org.apache.activemq6.rest.topic.TopicDeployment; +import org.apache.activemq6.rest.util.Constants; +import org.apache.activemq6.rest.util.CustomHeaderLinkStrategy; +import org.apache.activemq6.rest.util.LinkHeaderLinkStrategy; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/CreateDestinationTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/CreateDestinationTest.java similarity index 98% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/CreateDestinationTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/CreateDestinationTest.java index 71e809859c..bd9eea4bee 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/CreateDestinationTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/CreateDestinationTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.util.Constants; +import org.apache.activemq6.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/DupQueueTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/DupQueueTest.java similarity index 98% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/DupQueueTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/DupQueueTest.java index 2e972cab06..16fd569335 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/DupQueueTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/DupQueueTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.queue.QueueDeployment; -import org.hornetq.rest.util.Constants; +import org.apache.activemq6.rest.queue.QueueDeployment; +import org.apache.activemq6.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/Embedded.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/Embedded.java similarity index 84% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/Embedded.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/Embedded.java index aa6aff1cca..da2b32da03 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/Embedded.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/Embedded.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; import org.jboss.resteasy.plugins.server.tjws.TJWSEmbeddedJaxrsServer; -import org.hornetq.rest.MessageServiceConfiguration; -import org.hornetq.rest.MessageServiceManager; +import org.apache.activemq6.rest.MessageServiceConfiguration; +import org.apache.activemq6.rest.MessageServiceManager; import org.jboss.resteasy.test.TestPortProvider; /** diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/EmbeddedTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/EmbeddedTest.java similarity index 96% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/EmbeddedTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/EmbeddedTest.java index 7601626758..ce0eb41fff 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/EmbeddedTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/EmbeddedTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -20,9 +20,9 @@ import javax.jms.ObjectMessage; import javax.jms.Session; import java.io.Serializable; -import org.hornetq.rest.HttpHeaderProperty; -import org.hornetq.rest.integration.EmbeddedRestHornetQJMS; -import org.hornetq.spi.core.naming.BindingRegistry; +import org.apache.activemq6.rest.HttpHeaderProperty; +import org.apache.activemq6.rest.integration.EmbeddedRestHornetQJMS; +import org.apache.activemq6.spi.core.naming.BindingRegistry; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/FindDestinationTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/FindDestinationTest.java similarity index 98% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/FindDestinationTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/FindDestinationTest.java index b6edb7ff70..1d79347dd1 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/FindDestinationTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/FindDestinationTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/JMSTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/JMSTest.java similarity index 97% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/JMSTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/JMSTest.java index 054dcdb276..97f441aa7f 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/JMSTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/JMSTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -26,11 +26,11 @@ import java.io.Serializable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.rest.HttpHeaderProperty; -import org.hornetq.rest.Jms; -import org.hornetq.rest.queue.QueueDeployment; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.rest.HttpHeaderProperty; +import org.apache.activemq6.rest.Jms; +import org.apache.activemq6.rest.queue.QueueDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/MessageTestBase.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/MessageTestBase.java similarity index 92% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/MessageTestBase.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/MessageTestBase.java index 6e714bee24..d90488dcab 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/MessageTestBase.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/MessageTestBase.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; import java.lang.reflect.Field; -import org.hornetq.rest.MessageServiceManager; -import org.hornetq.rest.util.LinkHeaderLinkStrategy; -import org.hornetq.rest.util.LinkStrategy; +import org.apache.activemq6.rest.MessageServiceManager; +import org.apache.activemq6.rest.util.LinkHeaderLinkStrategy; +import org.apache.activemq6.rest.util.LinkStrategy; import org.jboss.resteasy.client.ClientExecutor; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.client.core.BaseClientResponse; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushQueueConsumerTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PersistentPushQueueConsumerTest.java similarity index 92% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushQueueConsumerTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PersistentPushQueueConsumerTest.java index bbf4ba6a8c..b0cde78b31 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushQueueConsumerTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PersistentPushQueueConsumerTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.rest.MessageServiceManager; -import org.hornetq.rest.queue.QueueDeployment; -import org.hornetq.rest.queue.push.xml.PushRegistration; -import org.hornetq.rest.queue.push.xml.XmlLink; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.rest.MessageServiceManager; +import org.apache.activemq6.rest.queue.QueueDeployment; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.rest.queue.push.xml.XmlLink; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushTopicConsumerTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PersistentPushTopicConsumerTest.java similarity index 91% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushTopicConsumerTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PersistentPushTopicConsumerTest.java index 135286a53b..3a38f37a16 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushTopicConsumerTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PersistentPushTopicConsumerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; import javax.ws.rs.Consumes; import javax.ws.rs.POST; @@ -18,18 +18,18 @@ import javax.ws.rs.Path; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.rest.MessageServiceManager; -import org.hornetq.rest.queue.push.xml.XmlLink; -import org.hornetq.rest.topic.PushTopicRegistration; -import org.hornetq.rest.topic.TopicDeployment; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.rest.MessageServiceManager; +import org.apache.activemq6.rest.queue.push.xml.XmlLink; +import org.apache.activemq6.rest.topic.PushTopicRegistration; +import org.apache.activemq6.rest.topic.TopicDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/PushQueueConsumerTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PushQueueConsumerTest.java similarity index 97% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/PushQueueConsumerTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PushQueueConsumerTest.java index 21c85c6b5f..a5e56999f8 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/PushQueueConsumerTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PushQueueConsumerTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.queue.QueueDeployment; -import org.hornetq.rest.queue.push.HornetQPushStrategy; -import org.hornetq.rest.queue.push.xml.PushRegistration; -import org.hornetq.rest.queue.push.xml.XmlLink; -import org.hornetq.rest.util.Constants; +import org.apache.activemq6.rest.queue.QueueDeployment; +import org.apache.activemq6.rest.queue.push.HornetQPushStrategy; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.rest.queue.push.xml.XmlLink; +import org.apache.activemq6.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/PushTopicConsumerTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PushTopicConsumerTest.java similarity index 97% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/PushTopicConsumerTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PushTopicConsumerTest.java index 909cffb373..34972f7c5f 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/PushTopicConsumerTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PushTopicConsumerTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; import javax.ws.rs.PUT; import javax.ws.rs.Path; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.rest.queue.QueueDeployment; -import org.hornetq.rest.queue.push.HornetQPushStrategy; -import org.hornetq.rest.queue.push.xml.XmlLink; -import org.hornetq.rest.topic.PushTopicRegistration; -import org.hornetq.rest.topic.TopicDeployment; +import org.apache.activemq6.rest.queue.QueueDeployment; +import org.apache.activemq6.rest.queue.push.HornetQPushStrategy; +import org.apache.activemq6.rest.queue.push.xml.XmlLink; +import org.apache.activemq6.rest.topic.PushTopicRegistration; +import org.apache.activemq6.rest.topic.TopicDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/RawAckTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RawAckTest.java similarity index 81% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/RawAckTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RawAckTest.java index a3eed8c987..084a7bd270 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/RawAckTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RawAckTest.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; import java.util.HashMap; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/RepostingQueueTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RepostingQueueTest.java similarity index 99% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/RepostingQueueTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RepostingQueueTest.java index 2cbdd9449c..0b85d180b5 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/RepostingQueueTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RepostingQueueTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.queue.QueueDeployment; -import org.hornetq.rest.util.Constants; +import org.apache.activemq6.rest.queue.QueueDeployment; +import org.apache.activemq6.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/RepostingTopicTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RepostingTopicTest.java similarity index 99% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/RepostingTopicTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RepostingTopicTest.java index 6951393324..4dc4acd48b 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/RepostingTopicTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RepostingTopicTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.topic.TopicDeployment; -import org.hornetq.rest.util.Constants; +import org.apache.activemq6.rest.topic.TopicDeployment; +import org.apache.activemq6.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/RoundtripTimeTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RoundtripTimeTest.java similarity index 96% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/RoundtripTimeTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RoundtripTimeTest.java index b05320e877..c7f1559d92 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/RoundtripTimeTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RoundtripTimeTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.queue.QueueDeployment; +import org.apache.activemq6.rest.queue.QueueDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/SelectorTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/SelectorTest.java similarity index 96% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/SelectorTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/SelectorTest.java index e32034adb3..5ce44d7cab 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/SelectorTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/SelectorTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -23,12 +23,12 @@ import javax.ws.rs.Path; import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.rest.HttpHeaderProperty; -import org.hornetq.rest.queue.push.xml.XmlLink; -import org.hornetq.rest.topic.PushTopicRegistration; -import org.hornetq.rest.topic.TopicDeployment; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.rest.HttpHeaderProperty; +import org.apache.activemq6.rest.queue.push.xml.XmlLink; +import org.apache.activemq6.rest.topic.PushTopicRegistration; +import org.apache.activemq6.rest.topic.TopicDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/SessionTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/SessionTest.java similarity index 98% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/SessionTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/SessionTest.java index 1fc6c1240c..00453d8294 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/SessionTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/SessionTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.queue.QueueDeployment; -import org.hornetq.rest.topic.TopicDeployment; -import org.hornetq.rest.util.Constants; +import org.apache.activemq6.rest.queue.QueueDeployment; +import org.apache.activemq6.rest.topic.TopicDeployment; +import org.apache.activemq6.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/TransformTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/TransformTest.java similarity index 95% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/TransformTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/TransformTest.java index 37d509a323..d7235f7999 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/TransformTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/TransformTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.rest.Hornetq; -import org.hornetq.rest.queue.QueueDeployment; +import org.apache.activemq6.api.core.Message; +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.MessageHandler; +import org.apache.activemq6.rest.Hornetq; +import org.apache.activemq6.rest.queue.QueueDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/Util.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/Util.java similarity index 94% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/Util.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/Util.java index f86c5cd6a7..1ecab83634 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/Util.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/Util.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.util.Constants; +import org.apache.activemq6.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/hornetq-rest/src/test/java/org/hornetq/rest/test/XmlTest.java b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/XmlTest.java similarity index 94% rename from hornetq-rest/src/test/java/org/hornetq/rest/test/XmlTest.java rename to activemq6-rest/src/test/java/org/apache/activemq6/rest/test/XmlTest.java index dbd1a88131..41181763c9 100644 --- a/hornetq-rest/src/test/java/org/hornetq/rest/test/XmlTest.java +++ b/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/XmlTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.rest.test; +package org.apache.activemq6.rest.test; -import org.hornetq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; import org.junit.Test; import javax.xml.bind.JAXBContext; diff --git a/hornetq-rest/src/test/resources/hornetq-configuration.xml b/activemq6-rest/src/test/resources/hornetq-configuration.xml similarity index 100% rename from hornetq-rest/src/test/resources/hornetq-configuration.xml rename to activemq6-rest/src/test/resources/hornetq-configuration.xml diff --git a/hornetq-rest/src/test/resources/hornetq-jms.xml b/activemq6-rest/src/test/resources/hornetq-jms.xml similarity index 100% rename from hornetq-rest/src/test/resources/hornetq-jms.xml rename to activemq6-rest/src/test/resources/hornetq-jms.xml diff --git a/hornetq-rest/src/test/resources/hornetq-rest.xml b/activemq6-rest/src/test/resources/hornetq-rest.xml similarity index 100% rename from hornetq-rest/src/test/resources/hornetq-rest.xml rename to activemq6-rest/src/test/resources/hornetq-rest.xml diff --git a/hornetq-rest/src/test/resources/hornetq-users.xml b/activemq6-rest/src/test/resources/hornetq-users.xml similarity index 100% rename from hornetq-rest/src/test/resources/hornetq-users.xml rename to activemq6-rest/src/test/resources/hornetq-users.xml diff --git a/hornetq-selector/pom.xml b/activemq6-selector/pom.xml similarity index 92% rename from hornetq-selector/pom.xml rename to activemq6-selector/pom.xml index 3ff0614c67..ec13074199 100644 --- a/hornetq-selector/pom.xml +++ b/activemq6-selector/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-selector + activemq6-selector jar - HornetQ Selector Implementation + ActiveMQ6 Selector Implementation ${project.basedir}/.. diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/LRUCache.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/LRUCache.java similarity index 98% rename from hornetq-selector/src/main/java/org/hornetq/selector/LRUCache.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/LRUCache.java index eecda1188a..bbf64a1b68 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/LRUCache.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/LRUCache.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector; +package org.apache.activemq6.selector; import java.util.LinkedHashMap; import java.util.Map; diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/SelectorParser.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/SelectorParser.java similarity index 91% rename from hornetq-selector/src/main/java/org/hornetq/selector/SelectorParser.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/SelectorParser.java index 14482aba11..1cd131095c 100644 --- a/hornetq-selector/src/main/java/org/hornetq/selector/SelectorParser.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/SelectorParser.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector; +package org.apache.activemq6.selector; import java.io.StringReader; -import org.hornetq.selector.filter.BooleanExpression; -import org.hornetq.selector.filter.ComparisonExpression; -import org.hornetq.selector.filter.FilterException; -import org.hornetq.selector.hyphenated.HyphenatedParser; -import org.hornetq.selector.strict.StrictParser; +import org.apache.activemq6.selector.filter.BooleanExpression; +import org.apache.activemq6.selector.filter.ComparisonExpression; +import org.apache.activemq6.selector.filter.FilterException; +import org.apache.activemq6.selector.hyphenated.HyphenatedParser; +import org.apache.activemq6.selector.strict.StrictParser; /** */ diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/ArithmeticExpression.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ArithmeticExpression.java similarity index 99% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/ArithmeticExpression.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ArithmeticExpression.java index 5571d3942d..d4c0bcaef0 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/ArithmeticExpression.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ArithmeticExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; /** diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/BinaryExpression.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/BinaryExpression.java similarity index 98% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/BinaryExpression.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/BinaryExpression.java index 476090efdf..8a2ff1cc72 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/BinaryExpression.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/BinaryExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; /** diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/BooleanExpression.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/BooleanExpression.java similarity index 96% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/BooleanExpression.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/BooleanExpression.java index a41c7d4dfc..b8c66f78c7 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/BooleanExpression.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/BooleanExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; /** diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/ComparisonExpression.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ComparisonExpression.java similarity index 99% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/ComparisonExpression.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ComparisonExpression.java index 584b804617..3e07f48883 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/ComparisonExpression.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ComparisonExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; import java.util.HashSet; import java.util.List; diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/ConstantExpression.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ConstantExpression.java similarity index 99% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/ConstantExpression.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ConstantExpression.java index 4e50967bd7..2d09092873 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/ConstantExpression.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ConstantExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; import java.math.BigDecimal; diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/Expression.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/Expression.java similarity index 95% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/Expression.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/Expression.java index 4376d108a1..952ea6c615 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/Expression.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/Expression.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; /** diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/FilterException.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/FilterException.java similarity index 96% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/FilterException.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/FilterException.java index 06877efb77..5eb1543d10 100644 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/FilterException.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/FilterException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; public class FilterException extends Exception { diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/Filterable.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/Filterable.java similarity index 97% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/Filterable.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/Filterable.java index e78ef18be1..a7fa30e147 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/Filterable.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/Filterable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; /** * A Filterable is the object being evaluated by the filters. It provides diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/LogicExpression.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/LogicExpression.java similarity index 98% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/LogicExpression.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/LogicExpression.java index 472a679edc..f438239740 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/LogicExpression.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/LogicExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; /** diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/PropertyExpression.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/PropertyExpression.java similarity index 97% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/PropertyExpression.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/PropertyExpression.java index e90a92f0e7..62b8a42038 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/PropertyExpression.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/PropertyExpression.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; /** diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/UnaryExpression.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/UnaryExpression.java similarity index 99% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/UnaryExpression.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/UnaryExpression.java index ee77595de7..20676e1a07 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/UnaryExpression.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/UnaryExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; import java.math.BigDecimal; import java.util.Collection; diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/XPathExpression.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XPathExpression.java similarity index 98% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/XPathExpression.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XPathExpression.java index 9be11ee6ca..31dca0b0e1 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/XPathExpression.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XPathExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; /** * Used to evaluate an XPath Expression in a JMS selector. diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/XQueryExpression.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XQueryExpression.java similarity index 97% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/XQueryExpression.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XQueryExpression.java index 0a3b8816c1..683c0334e0 100755 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/XQueryExpression.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XQueryExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; /** diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/XalanXPathEvaluator.java b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XalanXPathEvaluator.java similarity index 98% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/XalanXPathEvaluator.java rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XalanXPathEvaluator.java index 3ae872efd6..42cce7fe90 100644 --- a/hornetq-selector/src/main/java/org/hornetq/selector/filter/XalanXPathEvaluator.java +++ b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XalanXPathEvaluator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.hornetq.selector.filter; +package org.apache.activemq6.selector.filter; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/hornetq-selector/src/main/java/org/hornetq/selector/filter/package.html b/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/package.html similarity index 100% rename from hornetq-selector/src/main/java/org/hornetq/selector/filter/package.html rename to activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/package.html diff --git a/hornetq-selector/src/main/javacc/HyphenatedParser.jj b/activemq6-selector/src/main/javacc/HyphenatedParser.jj similarity index 99% rename from hornetq-selector/src/main/javacc/HyphenatedParser.jj rename to activemq6-selector/src/main/javacc/HyphenatedParser.jj index 2cd62ae65a..f493a58885 100755 --- a/hornetq-selector/src/main/javacc/HyphenatedParser.jj +++ b/activemq6-selector/src/main/javacc/HyphenatedParser.jj @@ -47,12 +47,12 @@ PARSER_BEGIN(HyphenatedParser) * limitations under the License. */ -package org.hornetq.selector.hyphenated; +package org.apache.activemq6.selector.hyphenated; import java.io.*; import java.util.*; -import org.hornetq.selector.filter.*; +import org.apache.activemq6.selector.filter.*; /** * JMS Selector Parser generated by JavaCC diff --git a/hornetq-selector/src/main/javacc/StrictParser.jj b/activemq6-selector/src/main/javacc/StrictParser.jj similarity index 99% rename from hornetq-selector/src/main/javacc/StrictParser.jj rename to activemq6-selector/src/main/javacc/StrictParser.jj index 88b05d0d15..aade103400 100755 --- a/hornetq-selector/src/main/javacc/StrictParser.jj +++ b/activemq6-selector/src/main/javacc/StrictParser.jj @@ -47,12 +47,12 @@ PARSER_BEGIN(StrictParser) * limitations under the License. */ -package org.hornetq.selector.strict; +package org.apache.activemq6.selector.strict; import java.io.*; import java.util.*; -import org.hornetq.selector.filter.*; +import org.apache.activemq6.selector.filter.*; /** * JMS Selector Parser generated by JavaCC diff --git a/hornetq-selector/src/test/java/org/hornetq/selector/SelectorParserTest.java b/activemq6-selector/src/test/java/org/apache/activemq6/selector/SelectorParserTest.java similarity index 87% rename from hornetq-selector/src/test/java/org/hornetq/selector/SelectorParserTest.java rename to activemq6-selector/src/test/java/org/apache/activemq6/selector/SelectorParserTest.java index 1dda085ec3..fcfb976b33 100755 --- a/hornetq-selector/src/test/java/org/hornetq/selector/SelectorParserTest.java +++ b/activemq6-selector/src/test/java/org/apache/activemq6/selector/SelectorParserTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector; +package org.apache.activemq6.selector; -import org.hornetq.selector.filter.BooleanExpression; -import org.hornetq.selector.filter.ComparisonExpression; -import org.hornetq.selector.filter.Expression; -import org.hornetq.selector.filter.LogicExpression; -import org.hornetq.selector.filter.PropertyExpression; -import org.hornetq.selector.filter.XPathExpression; +import org.apache.activemq6.selector.filter.BooleanExpression; +import org.apache.activemq6.selector.filter.ComparisonExpression; +import org.apache.activemq6.selector.filter.Expression; +import org.apache.activemq6.selector.filter.LogicExpression; +import org.apache.activemq6.selector.filter.PropertyExpression; +import org.apache.activemq6.selector.filter.XPathExpression; import org.junit.Assert; import org.junit.Test; diff --git a/hornetq-selector/src/test/java/org/hornetq/selector/SelectorTest.java b/activemq6-selector/src/test/java/org/apache/activemq6/selector/SelectorTest.java similarity index 98% rename from hornetq-selector/src/test/java/org/hornetq/selector/SelectorTest.java rename to activemq6-selector/src/test/java/org/apache/activemq6/selector/SelectorTest.java index 67c59e68ae..1fe0b3ce28 100755 --- a/hornetq-selector/src/test/java/org/hornetq/selector/SelectorTest.java +++ b/activemq6-selector/src/test/java/org/apache/activemq6/selector/SelectorTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.selector; +package org.apache.activemq6.selector; import java.util.HashMap; -import org.hornetq.selector.filter.BooleanExpression; -import org.hornetq.selector.filter.FilterException; -import org.hornetq.selector.filter.Filterable; +import org.apache.activemq6.selector.filter.BooleanExpression; +import org.apache.activemq6.selector.filter.FilterException; +import org.apache.activemq6.selector.filter.Filterable; import org.junit.Assert; import org.junit.Test; diff --git a/hornetq-server/pom.xml b/activemq6-server/pom.xml similarity index 84% rename from hornetq-server/pom.xml rename to activemq6-server/pom.xml index 7695bde048..b4d231839e 100644 --- a/hornetq-server/pom.xml +++ b/activemq6-server/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-server + activemq6-server jar - HornetQ Server + ActiveMQ6 Server ${project.basedir}/.. @@ -35,23 +35,23 @@ test - org.hornetq - hornetq-commons + org.apache.activemq6 + activemq6-commons ${project.version} - org.hornetq - hornetq-journal + org.apache.activemq6 + activemq6-journal ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client test-jar ${project.version} test diff --git a/hornetq-server/src/main/java/org/hornetq/api/core/management/MessageCounterInfo.java b/activemq6-server/src/main/java/org/apache/activemq6/api/core/management/MessageCounterInfo.java similarity index 97% rename from hornetq-server/src/main/java/org/hornetq/api/core/management/MessageCounterInfo.java rename to activemq6-server/src/main/java/org/apache/activemq6/api/core/management/MessageCounterInfo.java index 9812da4d56..d7b1d63dc8 100644 --- a/hornetq-server/src/main/java/org/hornetq/api/core/management/MessageCounterInfo.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/api/core/management/MessageCounterInfo.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.api.core.management; +package org.apache.activemq6.api.core.management; import java.text.DateFormat; import java.util.Date; -import org.hornetq.core.messagecounter.MessageCounter; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.core.messagecounter.MessageCounter; +import org.apache.activemq6.utils.json.JSONObject; /** * Helper class to create Java Objects from the diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/BackupStrategy.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/BackupStrategy.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/config/BackupStrategy.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/BackupStrategy.java index 010b7bcfda..f265b85802 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/BackupStrategy.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/BackupStrategy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config; +package org.apache.activemq6.core.config; public enum BackupStrategy diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/BridgeConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/BridgeConfiguration.java similarity index 98% rename from hornetq-server/src/main/java/org/hornetq/core/config/BridgeConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/BridgeConfiguration.java index 70a18b3b4f..14dacdf99b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/BridgeConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/BridgeConfiguration.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config; +package org.apache.activemq6.core.config; import java.io.Serializable; import java.util.List; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.client.HornetQClient; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; /** * A BridgeConfiguration diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/ClusterConnectionConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ClusterConnectionConfiguration.java similarity index 98% rename from hornetq-server/src/main/java/org/hornetq/core/config/ClusterConnectionConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/ClusterConnectionConfiguration.java index e3ea8ee6a0..46e870d4c0 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/ClusterConnectionConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ClusterConnectionConfiguration.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config; +package org.apache.activemq6.core.config; import java.io.Serializable; import java.util.Collections; import java.util.List; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.client.HornetQClient; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; /** * A ClusterConnectionConfiguration diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/Configuration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/Configuration.java similarity index 78% rename from hornetq-server/src/main/java/org/hornetq/core/config/Configuration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/Configuration.java index 084a7e2e61..ce4f4bb385 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/Configuration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/Configuration.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config; +package org.apache.activemq6.core.config; import java.io.Serializable; import java.util.List; import java.util.Map; import java.util.Set; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.core.settings.impl.AddressSettings; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq6.core.settings.impl.AddressSettings; /** * A Configuration is used to configure HornetQ servers. @@ -48,7 +48,7 @@ public interface Configuration extends Serializable * * @return the name of the group * - * @deprecated replaced by {@link org.hornetq.core.server.cluster.ha.HAPolicy#getBackupGroupName()} + * @deprecated replaced by {@link org.apache.activemq6.core.server.cluster.ha.HAPolicy#getBackupGroupName()} */ @Deprecated String getBackupGroupName(); @@ -58,7 +58,7 @@ public interface Configuration extends Serializable * * @param nodeGroupName the node group name * - * @deprecated replaced by {@link org.hornetq.core.server.cluster.ha.HAPolicy} + * @deprecated replaced by {@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} */ @Deprecated Configuration setBackupGroupName(String nodeGroupName); @@ -75,7 +75,7 @@ public interface Configuration extends Serializable * * @return {@code true} if the backup will stop when the live server restarts * - * @deprecated you should replace by using the correct{@link org.hornetq.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} */ @Deprecated boolean isAllowFailBack(); @@ -83,7 +83,7 @@ public interface Configuration extends Serializable /** * Returns whether delivery count is persisted before messages are delivered to the consumers.
* Default value is - * {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}. + * {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}. */ boolean isPersistDeliveryCountBeforeDelivery(); @@ -95,9 +95,9 @@ public interface Configuration extends Serializable /** * Returns {@code true} if this server is a backup, {@code false} if it is a live server.
* If a backup server has been activated, returns {@code false}.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_BACKUP}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_BACKUP}. * - * @deprecated replaced by {@link org.hornetq.core.server.cluster.ha.HAPolicy#isBackup()} + * @deprecated replaced by {@link org.apache.activemq6.core.server.cluster.ha.HAPolicy#isBackup()} */ @Deprecated boolean isBackup(); @@ -105,16 +105,16 @@ public interface Configuration extends Serializable /** * Formerly set whether this server is a backup or not. * - * @deprecated you should replace by using the correct{@link org.hornetq.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} */ @Deprecated Configuration setBackup(boolean backup); /** * Returns whether this server shares its data store with a corresponding live or backup server.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_SHARED_STORE}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_SHARED_STORE}. * - * @deprecated replaced by {@link org.hornetq.core.server.cluster.ha.HAPolicy#isSharedStore()} + * @deprecated replaced by {@link org.apache.activemq6.core.server.cluster.ha.HAPolicy#isSharedStore()} */ @Deprecated boolean isSharedStore(); @@ -122,14 +122,14 @@ public interface Configuration extends Serializable /** * Formerly set whether this server shares its data store with a backup or live server. * - * @deprecated you should replace by using the correct{@link org.hornetq.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} */ @Deprecated Configuration setSharedStore(boolean sharedStore); /** * Returns whether this server will use files to configure and deploy its resources.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_FILE_DEPLOYMENT_ENABLED}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_FILE_DEPLOYMENT_ENABLED}. */ boolean isFileDeploymentEnabled(); @@ -140,7 +140,7 @@ public interface Configuration extends Serializable /** * Returns whether this server is using persistence and store data.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSISTENCE_ENABLED}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_PERSISTENCE_ENABLED}. */ boolean isPersistenceEnabled(); @@ -151,7 +151,7 @@ public interface Configuration extends Serializable /** * Returns the period (in milliseconds) to scan configuration files used by deployment.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}. */ long getFileDeployerScanPeriod(); @@ -162,7 +162,7 @@ public interface Configuration extends Serializable /** * Returns the maximum number of threads in the thread pool of this server.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_THREAD_POOL_MAX_SIZE}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_THREAD_POOL_MAX_SIZE}. */ int getThreadPoolMaxSize(); @@ -173,7 +173,7 @@ public interface Configuration extends Serializable /** * Returns the maximum number of threads in the scheduled thread pool of this server.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. */ int getScheduledThreadPoolMaxSize(); @@ -184,7 +184,7 @@ public interface Configuration extends Serializable /** * Returns the interval time (in milliseconds) to invalidate security credentials.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_SECURITY_INVALIDATION_INTERVAL}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_SECURITY_INVALIDATION_INTERVAL}. */ long getSecurityInvalidationInterval(); @@ -195,7 +195,7 @@ public interface Configuration extends Serializable /** * Returns whether security is enabled for this server.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}. */ boolean isSecurityEnabled(); @@ -206,19 +206,19 @@ public interface Configuration extends Serializable /** * Returns whether this server is manageable using JMX or not.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. */ boolean isJMXManagementEnabled(); /** * Sets whether this server is manageable using JMX or not.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. */ Configuration setJMXManagementEnabled(boolean enabled); /** * Returns the domain used by JMX MBeans (provided JMX management is enabled).
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_DOMAIN}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_DOMAIN}. */ String getJMXDomain(); @@ -257,7 +257,7 @@ public interface Configuration extends Serializable * Sets the list of interceptors classes used by this server for incoming messages (i.e. those * being delivered to the server from clients). Invoking this method is the same as invoking * setIncomingInterceptorClassNames(List)
- * Classes must implement {@link org.hornetq.api.core.Interceptor}. + * Classes must implement {@link org.apache.activemq6.api.core.Interceptor}. *

* Deprecated but not immediately deleted, as embedded users may be using this file. * @@ -272,7 +272,7 @@ public interface Configuration extends Serializable * Sets the list of interceptors classes used by this server for incoming messages (i.e. those being delivered to * the server from clients). *
- * Classes must implement {@link org.hornetq.api.core.Interceptor}. + * Classes must implement {@link org.apache.activemq6.api.core.Interceptor}. */ Configuration setIncomingInterceptorClassNames(List interceptors); @@ -280,14 +280,14 @@ public interface Configuration extends Serializable * Sets the list of interceptors classes used by this server for outgoing messages (i.e. those being delivered to * clients from the server). *
- * Classes must implement {@link org.hornetq.api.core.Interceptor}. + * Classes must implement {@link org.apache.activemq6.api.core.Interceptor}. */ Configuration setOutgoingInterceptorClassNames(List interceptors); /** * Returns the connection time to live.
* This value overrides the connection time to live sent by the client.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}. */ long getConnectionTTLOverride(); @@ -299,7 +299,7 @@ public interface Configuration extends Serializable /** * Returns whether code coming from connection is executed asynchronously or not.
* Default value is - * {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}. + * {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}. */ boolean isAsyncConnectionExecutionEnabled(); @@ -420,7 +420,7 @@ public interface Configuration extends Serializable /** * Returns the management address of this server.
* Clients can send management messages to this address to manage this server.
- * Default value is {@link org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}. + * Default value is {@link org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}. */ SimpleString getManagementAddress(); @@ -433,7 +433,7 @@ public interface Configuration extends Serializable * Returns the management notification address of this server.
* Clients can bind queues to this address to receive management notifications emitted by this * server.
- * Default value is {@link org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS}. + * Default value is {@link org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS}. */ SimpleString getManagementNotificationAddress(); @@ -444,7 +444,7 @@ public interface Configuration extends Serializable /** * Returns the cluster user for this server.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_USER}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_USER}. */ String getClusterUser(); @@ -455,7 +455,7 @@ public interface Configuration extends Serializable /** * Returns the cluster password for this server.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}. */ String getClusterPassword(); @@ -465,7 +465,7 @@ public interface Configuration extends Serializable * @return true if clients should failover * @see #setFailoverOnServerShutdown(boolean) * - * @deprecated you should replace by using the correct{@link org.hornetq.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} */ @Deprecated boolean isFailoverOnServerShutdown(); @@ -474,11 +474,11 @@ public interface Configuration extends Serializable * Sets whether to allow clients to failover on server shutdown. *

* When a live server is restarted after failover the backup will shutdown if - * {@link org.hornetq.core.server.cluster.ha.HAPolicy#isAllowAutoFailBack()} is true. This is not regarded as a normal shutdown. In this + * {@link org.apache.activemq6.core.server.cluster.ha.HAPolicy#isAllowAutoFailBack()} is true. This is not regarded as a normal shutdown. In this * case {@code failoverOnServerShutdown} is ignored, and the server will behave as if it was set * to {@code true}. * - * @deprecated you should replace by using the correct {@link org.hornetq.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct {@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} */ @Deprecated Configuration setFailoverOnServerShutdown(boolean failoverOnServerShutdown); @@ -490,7 +490,7 @@ public interface Configuration extends Serializable /** * Returns the size of the cache for pre-creating message IDs.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}. */ int getIDCacheSize(); @@ -501,7 +501,7 @@ public interface Configuration extends Serializable /** * Returns whether message ID cache is persisted.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}. */ boolean isPersistIDCache(); @@ -514,7 +514,7 @@ public interface Configuration extends Serializable /** * Returns the file system directory used to store bindings.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}. */ String getBindingsDirectory(); @@ -526,7 +526,7 @@ public interface Configuration extends Serializable /** * The max number of concurrent reads allowed on paging. *

- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_MAX_CONCURRENT_PAGE_IO}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MAX_CONCURRENT_PAGE_IO}. */ int getPageMaxConcurrentIO(); @@ -539,7 +539,7 @@ public interface Configuration extends Serializable /** * Returns the file system directory used to store journal log.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_DIR}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_DIR}. */ String getJournalDirectory(); @@ -562,7 +562,7 @@ public interface Configuration extends Serializable /** * Returns whether the journal is synchronized when receiving transactional data.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}. */ boolean isJournalSyncTransactional(); @@ -573,7 +573,7 @@ public interface Configuration extends Serializable /** * Returns whether the journal is synchronized when receiving non-transactional data.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}. */ boolean isJournalSyncNonTransactional(); @@ -584,7 +584,7 @@ public interface Configuration extends Serializable /** * Returns the size (in bytes) of each journal files.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}. */ int getJournalFileSize(); @@ -595,7 +595,7 @@ public interface Configuration extends Serializable /** * Returns the minimal number of journal files before compacting.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}. */ int getJournalCompactMinFiles(); @@ -606,7 +606,7 @@ public interface Configuration extends Serializable /** * Returns the percentage of live data before compacting the journal.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}. */ int getJournalCompactPercentage(); @@ -617,7 +617,7 @@ public interface Configuration extends Serializable /** * Returns the number of journal files to pre-create.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}. */ int getJournalMinFiles(); @@ -630,7 +630,7 @@ public interface Configuration extends Serializable /** * Returns the maximum number of write requests that can be in the AIO queue at any given time.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}. */ int getJournalMaxIO_AIO(); @@ -642,7 +642,7 @@ public interface Configuration extends Serializable /** * Returns the timeout (in nanoseconds) used to flush buffers in the AIO queue. *
- * Default value is {@value org.hornetq.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO}. + * Default value is {@value org.apache.activemq6.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO}. */ int getJournalBufferTimeout_AIO(); @@ -654,7 +654,7 @@ public interface Configuration extends Serializable /** * Returns the buffer size (in bytes) for AIO. *
- * Default value is {@value org.hornetq.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_AIO}. + * Default value is {@value org.apache.activemq6.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_AIO}. */ int getJournalBufferSize_AIO(); @@ -665,7 +665,7 @@ public interface Configuration extends Serializable /** * Returns the maximum number of write requests for NIO journal.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}. */ int getJournalMaxIO_NIO(); @@ -677,7 +677,7 @@ public interface Configuration extends Serializable /** * Returns the timeout (in nanoseconds) used to flush buffers in the NIO. *
- * Default value is {@value org.hornetq.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO}. + * Default value is {@value org.apache.activemq6.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO}. */ int getJournalBufferTimeout_NIO(); @@ -689,7 +689,7 @@ public interface Configuration extends Serializable /** * Returns the buffer size (in bytes) for NIO. *
- * Default value is {@value org.hornetq.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_NIO}. + * Default value is {@value org.apache.activemq6.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_NIO}. */ int getJournalBufferSize_NIO(); @@ -700,7 +700,7 @@ public interface Configuration extends Serializable /** * Returns whether the bindings directory is created on this server startup.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}. */ boolean isCreateBindingsDir(); @@ -711,7 +711,7 @@ public interface Configuration extends Serializable /** * Returns whether the journal directory is created on this server startup.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}. */ boolean isCreateJournalDir(); @@ -750,7 +750,7 @@ public interface Configuration extends Serializable /** * Returns the file system directory used to store paging files.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_PAGING_DIR}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_PAGING_DIR}. */ String getPagingDirectory(); @@ -763,7 +763,7 @@ public interface Configuration extends Serializable /** * Returns the file system directory used to store large messages.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}. */ String getLargeMessagesDirectory(); @@ -776,7 +776,7 @@ public interface Configuration extends Serializable /** * Returns whether wildcard routing is supported by this server.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}. */ boolean isWildcardRoutingEnabled(); @@ -788,7 +788,7 @@ public interface Configuration extends Serializable /** * Returns the timeout (in milliseconds) after which transactions is removed from the resource * manager after it was created.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}. */ long getTransactionTimeout(); @@ -800,7 +800,7 @@ public interface Configuration extends Serializable /** * Returns whether message counter is enabled for this server.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}. */ boolean isMessageCounterEnabled(); @@ -811,7 +811,7 @@ public interface Configuration extends Serializable /** * Returns the sample period (in milliseconds) to take message counter snapshot.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}. */ long getMessageCounterSamplePeriod(); @@ -824,7 +824,7 @@ public interface Configuration extends Serializable /** * Returns the maximum number of days kept in memory for message counter.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}. */ int getMessageCounterMaxDayHistory(); @@ -838,7 +838,7 @@ public interface Configuration extends Serializable /** * Returns the frequency (in milliseconds) to scan transactions to detect which transactions have * timed out.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}. */ long getTransactionTimeoutScanPeriod(); @@ -851,7 +851,7 @@ public interface Configuration extends Serializable /** * Returns the frequency (in milliseconds) to scan messages to detect which messages have * expired.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}. */ long getMessageExpiryScanPeriod(); @@ -863,7 +863,7 @@ public interface Configuration extends Serializable /** * Returns the priority of the thread used to scan message expiration.
- * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}. */ int getMessageExpiryThreadPriority(); @@ -907,7 +907,7 @@ public interface Configuration extends Serializable /** * Returns the delay to wait before fail-back occurs on restart. * - * @deprecated replaced by {@link org.hornetq.core.server.cluster.ha.BackupPolicy#getFailbackDelay()} + * @deprecated replaced by {@link org.apache.activemq6.core.server.cluster.ha.BackupPolicy#getFailbackDelay()} */ @Deprecated long getFailbackDelay(); @@ -915,7 +915,7 @@ public interface Configuration extends Serializable /** * Sets the fail-back delay. * - * @deprecated replaced by {@link org.hornetq.core.server.cluster.ha.BackupPolicy#setFailbackDelay(long)} + * @deprecated replaced by {@link org.apache.activemq6.core.server.cluster.ha.BackupPolicy#setFailbackDelay(long)} */ @Deprecated Configuration setFailbackDelay(long delay); @@ -974,7 +974,7 @@ public interface Configuration extends Serializable * * @param clusterName * - * @deprecated you should replace by using the correct{@link org.hornetq.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} */ @Deprecated @@ -984,7 +984,7 @@ public interface Configuration extends Serializable * @return name of the cluster configuration to use * @see #setReplicationClustername(String) * - * @deprecated you should replace by using the correct{@link org.hornetq.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} */ @Deprecated String getReplicationClustername(); @@ -998,7 +998,7 @@ public interface Configuration extends Serializable /* * @see #setResolveProtocols() * @return whether HornetQ should resolve and use any Protocols available on the classpath - * Default value is {@value org.hornetq.api.config.HornetQDefaultConfiguration#DEFAULT_RESOLVE_PROTOCOLS}. + * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_RESOLVE_PROTOCOLS}. * */ boolean isResolveProtocols(); @@ -1010,7 +1010,7 @@ public interface Configuration extends Serializable * * @param maxSavedReplicatedJournalsSize * - * @deprecated you should replace by using the correct{@link org.hornetq.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} */ @Deprecated Configuration setMaxSavedReplicatedJournalSize(int maxSavedReplicatedJournalsSize); @@ -1019,7 +1019,7 @@ public interface Configuration extends Serializable * @return the number of backup journals to keep after failback has occurred * @see #setMaxSavedReplicatedJournalSize(int) * - * @deprecated you should replace by using the correct{@link org.hornetq.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} */ @Deprecated int getMaxSavedReplicatedJournalsSize(); diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/ConfigurationUtils.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ConfigurationUtils.java similarity index 80% rename from hornetq-server/src/main/java/org/hornetq/core/config/ConfigurationUtils.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/ConfigurationUtils.java index fe0c284189..497b70d501 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/ConfigurationUtils.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ConfigurationUtils.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config; +package org.apache.activemq6.core.config; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.core.config.ha.ColocatedPolicyConfiguration; -import org.hornetq.core.config.ha.LiveOnlyPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.cluster.ha.BackupPolicy; -import org.hornetq.core.server.cluster.ha.ColocatedPolicy; -import org.hornetq.core.server.cluster.ha.HAPolicy; -import org.hornetq.core.server.cluster.ha.LiveOnlyPolicy; -import org.hornetq.core.server.cluster.ha.ReplicaPolicy; -import org.hornetq.core.server.cluster.ha.ReplicatedPolicy; -import org.hornetq.core.server.cluster.ha.ScaleDownPolicy; -import org.hornetq.core.server.cluster.ha.SharedStoreMasterPolicy; -import org.hornetq.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.core.config.ha.ColocatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.cluster.ha.BackupPolicy; +import org.apache.activemq6.core.server.cluster.ha.ColocatedPolicy; +import org.apache.activemq6.core.server.cluster.ha.HAPolicy; +import org.apache.activemq6.core.server.cluster.ha.LiveOnlyPolicy; +import org.apache.activemq6.core.server.cluster.ha.ReplicaPolicy; +import org.apache.activemq6.core.server.cluster.ha.ReplicatedPolicy; +import org.apache.activemq6.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq6.core.server.cluster.ha.SharedStoreMasterPolicy; +import org.apache.activemq6.core.server.cluster.ha.SharedStoreSlavePolicy; public final class ConfigurationUtils { diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/ConnectorServiceConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ConnectorServiceConfiguration.java similarity index 98% rename from hornetq-server/src/main/java/org/hornetq/core/config/ConnectorServiceConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/ConnectorServiceConfiguration.java index 3121c1f756..737cf9b7ba 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/ConnectorServiceConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ConnectorServiceConfiguration.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config; +package org.apache.activemq6.core.config; import java.io.Serializable; import java.util.Map; diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/CoreQueueConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/CoreQueueConfiguration.java similarity index 98% rename from hornetq-server/src/main/java/org/hornetq/core/config/CoreQueueConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/CoreQueueConfiguration.java index 7ba64efe92..3925d0f80d 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/CoreQueueConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/CoreQueueConfiguration.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config; +package org.apache.activemq6.core.config; import java.io.Serializable; diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/DivertConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/DivertConfiguration.java similarity index 97% rename from hornetq-server/src/main/java/org/hornetq/core/config/DivertConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/DivertConfiguration.java index 45b11795d0..f61be7ae83 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/DivertConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/DivertConfiguration.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config; +package org.apache.activemq6.core.config; import java.io.Serializable; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.utils.UUIDGenerator; /** * A DivertConfiguration diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/HAPolicyConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/HAPolicyConfiguration.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/config/HAPolicyConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/HAPolicyConfiguration.java index c1d68ca8bb..c2836907ae 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/HAPolicyConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/HAPolicyConfiguration.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config; +package org.apache.activemq6.core.config; import java.io.Serializable; diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/ScaleDownConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ScaleDownConfiguration.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/config/ScaleDownConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/ScaleDownConfiguration.java index 9a685aa98c..84094751c2 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/ScaleDownConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ScaleDownConfiguration.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config; +package org.apache.activemq6.core.config; -import org.hornetq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; import java.io.Serializable; import java.util.ArrayList; diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/ha/ColocatedPolicyConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ColocatedPolicyConfiguration.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/config/ha/ColocatedPolicyConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ColocatedPolicyConfiguration.java index f5c930b6a0..ed4d94cfb1 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/ha/ColocatedPolicyConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ColocatedPolicyConfiguration.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.ha; +package org.apache.activemq6.core.config.ha; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.config.HAPolicyConfiguration; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.config.HAPolicyConfiguration; import java.util.ArrayList; import java.util.List; diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/ha/LiveOnlyPolicyConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/LiveOnlyPolicyConfiguration.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/config/ha/LiveOnlyPolicyConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/LiveOnlyPolicyConfiguration.java index 622af31ac1..1922e0e74f 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/ha/LiveOnlyPolicyConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/LiveOnlyPolicyConfiguration.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.ha; +package org.apache.activemq6.core.config.ha; -import org.hornetq.core.config.HAPolicyConfiguration; -import org.hornetq.core.config.ScaleDownConfiguration; +import org.apache.activemq6.core.config.HAPolicyConfiguration; +import org.apache.activemq6.core.config.ScaleDownConfiguration; public class LiveOnlyPolicyConfiguration implements HAPolicyConfiguration { diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/ha/ReplicaPolicyConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ReplicaPolicyConfiguration.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/config/ha/ReplicaPolicyConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ReplicaPolicyConfiguration.java index fa3eaf9c15..70be0a4601 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/ha/ReplicaPolicyConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ReplicaPolicyConfiguration.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.ha; +package org.apache.activemq6.core.config.ha; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.config.HAPolicyConfiguration; -import org.hornetq.core.config.ScaleDownConfiguration; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.config.HAPolicyConfiguration; +import org.apache.activemq6.core.config.ScaleDownConfiguration; public class ReplicaPolicyConfiguration implements HAPolicyConfiguration { diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/ha/ReplicatedPolicyConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ReplicatedPolicyConfiguration.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/config/ha/ReplicatedPolicyConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ReplicatedPolicyConfiguration.java index 5a1e2ec92d..f9a188bf1b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/ha/ReplicatedPolicyConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ReplicatedPolicyConfiguration.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.ha; +package org.apache.activemq6.core.config.ha; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.config.HAPolicyConfiguration; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.config.HAPolicyConfiguration; public class ReplicatedPolicyConfiguration implements HAPolicyConfiguration { diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/ha/SharedStoreMasterPolicyConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/SharedStoreMasterPolicyConfiguration.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/config/ha/SharedStoreMasterPolicyConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/SharedStoreMasterPolicyConfiguration.java index 60de542bea..76ea2a15c3 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/ha/SharedStoreMasterPolicyConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/SharedStoreMasterPolicyConfiguration.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.ha; +package org.apache.activemq6.core.config.ha; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.config.HAPolicyConfiguration; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.config.HAPolicyConfiguration; public class SharedStoreMasterPolicyConfiguration implements HAPolicyConfiguration { diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/ha/SharedStoreSlavePolicyConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/SharedStoreSlavePolicyConfiguration.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/config/ha/SharedStoreSlavePolicyConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/SharedStoreSlavePolicyConfiguration.java index a0c8da1452..cfd9618a83 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/ha/SharedStoreSlavePolicyConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/SharedStoreSlavePolicyConfiguration.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.ha; +package org.apache.activemq6.core.config.ha; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.config.HAPolicyConfiguration; -import org.hornetq.core.config.ScaleDownConfiguration; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.config.HAPolicyConfiguration; +import org.apache.activemq6.core.config.ScaleDownConfiguration; public class SharedStoreSlavePolicyConfiguration implements HAPolicyConfiguration { diff --git a/hornetq-server/src/main/java/org/hornetq/core/config/impl/ConfigurationImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/config/impl/ConfigurationImpl.java similarity index 97% rename from hornetq-server/src/main/java/org/hornetq/core/config/impl/ConfigurationImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/config/impl/ConfigurationImpl.java index 5d7f57c0fe..ac72db5708 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/config/impl/ConfigurationImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/config/impl/ConfigurationImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.impl; +package org.apache.activemq6.core.config.impl; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -24,26 +24,26 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ConnectorServiceConfiguration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.config.HAPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.core.settings.impl.AddressSettings; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ConnectorServiceConfiguration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.config.HAPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq6.core.settings.impl.AddressSettings; /** * @author Andy Taylor diff --git a/hornetq-server/src/main/java/org/hornetq/core/deployers/impl/QueueDeployer.java b/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/QueueDeployer.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/deployers/impl/QueueDeployer.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/QueueDeployer.java index 558a3b2dea..13e1df803c 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/deployers/impl/QueueDeployer.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/QueueDeployer.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.deployers.impl; +package org.apache.activemq6.core.deployers.impl; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.deployers.DeploymentManager; -import org.hornetq.core.server.HornetQServer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.deployers.DeploymentManager; +import org.apache.activemq6.core.server.HornetQServer; import org.w3c.dom.Node; /** @@ -52,7 +52,7 @@ public class QueueDeployer extends XmlDeployer @Override public void validate(final Node rootNode) throws Exception { - org.hornetq.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd"); + org.apache.activemq6.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd"); } /** diff --git a/hornetq-server/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java b/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/SecurityDeployer.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/SecurityDeployer.java index ef6d7674e5..9a741e0960 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/SecurityDeployer.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.deployers.impl; +package org.apache.activemq6.core.deployers.impl; import java.util.Set; -import org.hornetq.api.core.Pair; -import org.hornetq.core.deployers.DeploymentManager; -import org.hornetq.core.security.Role; -import org.hornetq.core.settings.HierarchicalRepository; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.deployers.DeploymentManager; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.settings.HierarchicalRepository; import org.w3c.dom.Node; /** @@ -60,7 +60,7 @@ public class SecurityDeployer extends XmlDeployer @Override public void validate(final Node rootNode) throws Exception { - org.hornetq.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd"); + org.apache.activemq6.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd"); } /** diff --git a/hornetq-server/src/main/java/org/hornetq/core/deployers/impl/XmlDeployer.java b/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/XmlDeployer.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/deployers/impl/XmlDeployer.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/XmlDeployer.java index a834d308bc..7a61f37a7d 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/deployers/impl/XmlDeployer.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/XmlDeployer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.deployers.impl; +package org.apache.activemq6.core.deployers.impl; import java.io.InputStreamReader; import java.io.Reader; @@ -22,11 +22,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.deployers.Deployer; -import org.hornetq.core.deployers.DeploymentManager; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.utils.XMLUtil; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.deployers.Deployer; +import org.apache.activemq6.core.deployers.DeploymentManager; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.utils.XMLUtil; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -286,9 +286,9 @@ public abstract class XmlDeployer implements Deployer protected Element getRootElement(final URI url) throws Exception { Reader reader = new InputStreamReader(url.toURL().openStream()); - String xml = org.hornetq.utils.XMLUtil.readerToString(reader); - xml = org.hornetq.utils.XMLUtil.replaceSystemProps(xml); - return org.hornetq.utils.XMLUtil.stringToElement(xml); + String xml = org.apache.activemq6.utils.XMLUtil.readerToString(reader); + xml = org.apache.activemq6.utils.XMLUtil.replaceSystemProps(xml); + return org.apache.activemq6.utils.XMLUtil.stringToElement(xml); } private boolean hasNodeChanged(final URI url, final Node child, final String name) diff --git a/hornetq-server/src/main/java/org/hornetq/core/filter/Filter.java b/activemq6-server/src/main/java/org/apache/activemq6/core/filter/Filter.java similarity index 84% rename from hornetq-server/src/main/java/org/hornetq/core/filter/Filter.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/filter/Filter.java index 839c4ea212..05f051d5f7 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/filter/Filter.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/filter/Filter.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.filter; +package org.apache.activemq6.core.filter; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.ServerMessage; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/filter/impl/FilterImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/filter/impl/FilterImpl.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/filter/impl/FilterImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/filter/impl/FilterImpl.java index b7c745ffea..b35a6cc456 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/filter/impl/FilterImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/filter/impl/FilterImpl.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.filter.impl; +package org.apache.activemq6.core.filter.impl; -import org.hornetq.selector.filter.BooleanExpression; -import org.hornetq.selector.filter.FilterException; -import org.hornetq.selector.filter.Filterable; -import org.hornetq.selector.SelectorParser; -import org.hornetq.api.core.FilterConstants; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.selector.filter.BooleanExpression; +import org.apache.activemq6.selector.filter.FilterException; +import org.apache.activemq6.selector.filter.Filterable; +import org.apache.activemq6.selector.SelectorParser; +import org.apache.activemq6.api.core.FilterConstants; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.ServerMessage; /** * This class implements a HornetQ filter diff --git a/hornetq-server/src/main/java/org/hornetq/core/management/impl/AbstractControl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AbstractControl.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/management/impl/AbstractControl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AbstractControl.java index 0cde3307df..f6838ae705 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/management/impl/AbstractControl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AbstractControl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.management.impl; +package org.apache.activemq6.core.management.impl; import javax.management.MBeanInfo; import javax.management.MBeanOperationInfo; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; -import org.hornetq.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.StorageManager; /** * A AbstractControl diff --git a/hornetq-server/src/main/java/org/hornetq/core/management/impl/AcceptorControlImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AcceptorControlImpl.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/management/impl/AcceptorControlImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AcceptorControlImpl.java index 9ac624bf03..76ee168051 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/management/impl/AcceptorControlImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AcceptorControlImpl.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.management.impl; +package org.apache.activemq6.core.management.impl; import java.util.Map; import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.AcceptorControl; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.spi.core.remoting.Acceptor; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.AcceptorControl; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.spi.core.remoting.Acceptor; /** * A AcceptorControl diff --git a/hornetq-server/src/main/java/org/hornetq/core/management/impl/AddressControlImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AddressControlImpl.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/management/impl/AddressControlImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AddressControlImpl.java index 3d62db1c28..fcbcdcb0ad 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/management/impl/AddressControlImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AddressControlImpl.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.management.impl; +package org.apache.activemq6.core.management.impl; import javax.management.MBeanOperationInfo; import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.AddressControl; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.AddressControl; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.QueueBinding; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; /** * @author Jeff Mesnil diff --git a/hornetq-server/src/main/java/org/hornetq/core/management/impl/BridgeControlImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/BridgeControlImpl.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/management/impl/BridgeControlImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/BridgeControlImpl.java index aac779e5e6..d75dd7b0b1 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/management/impl/BridgeControlImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/BridgeControlImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.management.impl; +package org.apache.activemq6.core.management.impl; import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.management.BridgeControl; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.cluster.Bridge; +import org.apache.activemq6.api.core.management.BridgeControl; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.cluster.Bridge; /** * A BridgeControl diff --git a/hornetq-server/src/main/java/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/BroadcastGroupControlImpl.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/BroadcastGroupControlImpl.java index 56f023865c..3871856273 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/BroadcastGroupControlImpl.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.management.impl; +package org.apache.activemq6.core.management.impl; import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.management.BroadcastGroupControl; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.cluster.BroadcastGroup; -import org.hornetq.utils.json.JSONArray; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.management.BroadcastGroupControl; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.cluster.BroadcastGroup; +import org.apache.activemq6.utils.json.JSONArray; /** * A BroadcastGroupControl diff --git a/hornetq-server/src/main/java/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/ClusterConnectionControlImpl.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/ClusterConnectionControlImpl.java index 07d6918f78..2c496e6148 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/ClusterConnectionControlImpl.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.management.impl; +package org.apache.activemq6.core.management.impl; import javax.management.MBeanOperationInfo; import java.util.List; import java.util.Map; -import org.hornetq.api.core.management.ClusterConnectionControl; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.utils.json.JSONArray; +import org.apache.activemq6.api.core.management.ClusterConnectionControl; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.utils.json.JSONArray; /** * A ClusterConnectionControl diff --git a/hornetq-server/src/main/java/org/hornetq/core/management/impl/DivertControlImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/DivertControlImpl.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/management/impl/DivertControlImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/DivertControlImpl.java index d70b21e75d..847d59b25e 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/management/impl/DivertControlImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/DivertControlImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.management.impl; +package org.apache.activemq6.core.management.impl; import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.management.DivertControl; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.Divert; +import org.apache.activemq6.api.core.management.DivertControl; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.Divert; /** * A DivertControl diff --git a/hornetq-server/src/main/java/org/hornetq/core/management/impl/HornetQServerControlImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/HornetQServerControlImpl.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/management/impl/HornetQServerControlImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/HornetQServerControlImpl.java index d60617806a..1a331dd9e1 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/management/impl/HornetQServerControlImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/HornetQServerControlImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.management.impl; +package org.apache.activemq6.core.management.impl; import java.text.DateFormat; import java.util.ArrayList; @@ -36,55 +36,55 @@ import javax.management.NotificationFilter; import javax.management.NotificationListener; import javax.transaction.xa.Xid; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.AddressControl; -import org.hornetq.api.core.management.BridgeControl; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.DivertControl; -import org.hornetq.api.core.management.HornetQServerControl; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.messagecounter.MessageCounterManager; -import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.config.PersistedAddressSetting; -import org.hornetq.core.persistence.config.PersistedRoles; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.DuplicateIDCache; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.remoting.server.RemotingService; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerConsumer; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.cluster.ha.HAPolicy; -import org.hornetq.core.server.cluster.ha.LiveOnlyPolicy; -import org.hornetq.core.server.cluster.ha.ScaleDownPolicy; -import org.hornetq.core.server.cluster.ha.SharedStoreSlavePolicy; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.settings.impl.SlowConsumerPolicy; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionDetail; -import org.hornetq.core.transaction.impl.CoreTransactionDetail; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.utils.SecurityFormatter; -import org.hornetq.utils.TypedProperties; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.AddressControl; +import org.apache.activemq6.api.core.management.BridgeControl; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.DivertControl; +import org.apache.activemq6.api.core.management.HornetQServerControl; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.messagecounter.MessageCounterManager; +import org.apache.activemq6.core.messagecounter.impl.MessageCounterManagerImpl; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq6.core.persistence.config.PersistedRoles; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.DuplicateIDCache; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.remoting.server.RemotingService; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerConsumer; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.core.server.cluster.ha.HAPolicy; +import org.apache.activemq6.core.server.cluster.ha.LiveOnlyPolicy; +import org.apache.activemq6.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq6.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionDetail; +import org.apache.activemq6.core.transaction.impl.CoreTransactionDetail; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.utils.SecurityFormatter; +import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; /** * @author Jeff Mesnil @@ -92,7 +92,7 @@ import org.hornetq.utils.json.JSONObject; * */ public class HornetQServerControlImpl extends AbstractControl implements HornetQServerControl, NotificationEmitter, - org.hornetq.core.server.management.NotificationListener + org.apache.activemq6.core.server.management.NotificationListener { // Constants ----------------------------------------------------- @@ -1414,7 +1414,7 @@ public class HornetQServerControlImpl extends AbstractControl implements HornetQ /* (non-Javadoc) - * @see org.hornetq.api.core.management.HornetQServerControl#listProducersInfoAsJSON() + * @see org.apache.activemq6.api.core.management.HornetQServerControl#listProducersInfoAsJSON() */ public String listProducersInfoAsJSON() throws Exception { @@ -2173,7 +2173,7 @@ public class HornetQServerControlImpl extends AbstractControl implements HornetQ } @Override - public void onNotification(org.hornetq.core.server.management.Notification notification) + public void onNotification(org.apache.activemq6.core.server.management.Notification notification) { if (!(notification.getType() instanceof CoreNotificationType)) return; CoreNotificationType type = (CoreNotificationType) notification.getType(); diff --git a/hornetq-server/src/main/java/org/hornetq/core/management/impl/MBeanInfoHelper.java b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/MBeanInfoHelper.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/management/impl/MBeanInfoHelper.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/MBeanInfoHelper.java index 6d200449bb..598e7bc9b7 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/management/impl/MBeanInfoHelper.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/MBeanInfoHelper.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.management.impl; +package org.apache.activemq6.core.management.impl; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -20,8 +20,8 @@ import java.util.List; import javax.management.MBeanOperationInfo; import javax.management.MBeanParameterInfo; -import org.hornetq.api.core.management.Operation; -import org.hornetq.api.core.management.Parameter; +import org.apache.activemq6.api.core.management.Operation; +import org.apache.activemq6.api.core.management.Parameter; /** * @author Jeff Mesnil diff --git a/hornetq-server/src/main/java/org/hornetq/core/management/impl/QueueControlImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/QueueControlImpl.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/management/impl/QueueControlImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/QueueControlImpl.java index 8208ad437e..0578ecb169 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/management/impl/QueueControlImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/QueueControlImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.management.impl; +package org.apache.activemq6.core.management.impl; import javax.management.MBeanOperationInfo; import java.util.ArrayList; @@ -19,29 +19,29 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.MessageCounterInfo; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.filter.impl.FilterImpl; -import org.hornetq.core.messagecounter.MessageCounter; -import org.hornetq.core.messagecounter.impl.MessageCounterHelper; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerConsumer; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.utils.LinkedListIterator; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONException; -import org.hornetq.utils.json.JSONObject; +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.management.MessageCounterInfo; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.filter.impl.FilterImpl; +import org.apache.activemq6.core.messagecounter.MessageCounter; +import org.apache.activemq6.core.messagecounter.impl.MessageCounterHelper; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerConsumer; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.utils.LinkedListIterator; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONException; +import org.apache.activemq6.utils.json.JSONObject; /** * @author Jeff Mesnil diff --git a/hornetq-server/src/main/java/org/hornetq/core/messagecounter/MessageCounter.java b/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/MessageCounter.java similarity index 99% rename from hornetq-server/src/main/java/org/hornetq/core/messagecounter/MessageCounter.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/MessageCounter.java index 96a08516d5..dec3d58788 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/messagecounter/MessageCounter.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/MessageCounter.java @@ -31,7 +31,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.hornetq.core.messagecounter; +package org.apache.activemq6.core.messagecounter; import java.text.DateFormat; import java.util.ArrayList; @@ -39,7 +39,7 @@ import java.util.Calendar; import java.util.GregorianCalendar; import java.util.List; -import org.hornetq.core.server.Queue; +import org.apache.activemq6.core.server.Queue; /** * This class stores message count informations for a given queue diff --git a/hornetq-server/src/main/java/org/hornetq/core/messagecounter/MessageCounterManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/MessageCounterManager.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/messagecounter/MessageCounterManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/MessageCounterManager.java index 7b690c4f3b..4e45084967 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/messagecounter/MessageCounterManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/MessageCounterManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.messagecounter; +package org.apache.activemq6.core.messagecounter; /** * @author Jeff Mesnil diff --git a/hornetq-server/src/main/java/org/hornetq/core/messagecounter/impl/MessageCounterHelper.java b/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/impl/MessageCounterHelper.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/messagecounter/impl/MessageCounterHelper.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/impl/MessageCounterHelper.java index d3911b61a0..b198ff1e17 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/messagecounter/impl/MessageCounterHelper.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/impl/MessageCounterHelper.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.messagecounter.impl; +package org.apache.activemq6.core.messagecounter.impl; import java.text.DateFormat; import java.util.Date; @@ -18,9 +18,9 @@ import java.util.GregorianCalendar; import java.util.List; import java.util.StringTokenizer; -import org.hornetq.api.core.management.DayCounterInfo; -import org.hornetq.core.messagecounter.MessageCounter; -import org.hornetq.core.messagecounter.MessageCounter.DayCounter; +import org.apache.activemq6.api.core.management.DayCounterInfo; +import org.apache.activemq6.core.messagecounter.MessageCounter; +import org.apache.activemq6.core.messagecounter.MessageCounter.DayCounter; /** * @author Jeff Mesnil diff --git a/hornetq-server/src/main/java/org/hornetq/core/messagecounter/impl/MessageCounterManagerImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/impl/MessageCounterManagerImpl.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/messagecounter/impl/MessageCounterManagerImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/impl/MessageCounterManagerImpl.java index 0d9558a742..a6d419d44a 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/messagecounter/impl/MessageCounterManagerImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/impl/MessageCounterManagerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.messagecounter.impl; +package org.apache.activemq6.core.messagecounter.impl; import java.util.HashMap; import java.util.HashSet; @@ -21,9 +21,9 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.messagecounter.MessageCounter; -import org.hornetq.core.messagecounter.MessageCounterManager; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.messagecounter.MessageCounter; +import org.apache.activemq6.core.messagecounter.MessageCounterManager; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/PageTransactionInfo.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PageTransactionInfo.java similarity index 85% rename from hornetq-server/src/main/java/org/hornetq/core/paging/PageTransactionInfo.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/PageTransactionInfo.java index 9cd9a89b26..4227f435ae 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/PageTransactionInfo.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PageTransactionInfo.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging; +package org.apache.activemq6.core.paging; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.paging.cursor.PagePosition; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.paging.cursor.PagePosition; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.transaction.Transaction; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/PagedMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagedMessage.java similarity index 83% rename from hornetq-server/src/main/java/org/hornetq/core/paging/PagedMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagedMessage.java index c9827dd204..21af7f2004 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/PagedMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagedMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging; +package org.apache.activemq6.core.paging; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.ServerMessage; /** * A Paged message. diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/PagingManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingManager.java similarity index 84% rename from hornetq-server/src/main/java/org/hornetq/core/paging/PagingManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingManager.java index 7e6b0e1a3d..7f0a4a3960 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/PagingManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingManager.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging; +package org.apache.activemq6.core.paging; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.settings.HierarchicalRepositoryChangeListener; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.settings.HierarchicalRepositoryChangeListener; /** * 

  *
  * +--------------+      1  +----------------+       N +--------------+       N +--------+       1 +-------------------+
- * | {@link org.hornetq.core.postoffice.PostOffice} |-------> |{@link PagingManager}|-------> |{@link PagingStore} | ------> | {@link org.hornetq.core.paging.impl.Page}  | ------> | {@link org.hornetq.core.journal.SequentialFile} |
+ * | {@link org.apache.activemq6.core.postoffice.PostOffice} |-------> |{@link PagingManager}|-------> |{@link PagingStore} | ------> | {@link org.hornetq.core.paging.impl.Page}  | ------> | {@link org.hornetq.core.journal.SequentialFile} |
  * +--------------+         +----------------+         +--------------+         +--------+         +-------------------+
  *                                                              |                  1 ^
  *                                                              |                    |
  *                                                              |                    |
  *                                                              |                    | 1
  *                                                              |            N +----------+
- *                                                              +------------> | {@link org.hornetq.core.postoffice.Address} |
+ *                                                              +------------> | {@link org.apache.activemq6.core.postoffice.Address} |
  *                                                                             +----------+
  *
* @author Clebert Suconic diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/PagingStore.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingStore.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/paging/PagingStore.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingStore.java index d151d72b5a..33e3148bd6 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/PagingStore.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingStore.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging; +package org.apache.activemq6.core.paging; import java.util.Collection; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.paging.cursor.PageCursorProvider; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.replication.ReplicationManager; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.RouteContextList; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.paging.cursor.PageCursorProvider; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.replication.ReplicationManager; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.RouteContextList; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.Transaction; /** *

@@ -154,7 +154,7 @@ public interface PagingStore extends HornetQComponent /** * Sends the pages with given IDs to the {@link ReplicationManager}. *

- * Sending is done here to avoid exposing the internal {@link org.hornetq.core.journal.SequentialFile}s. + * Sending is done here to avoid exposing the internal {@link org.apache.activemq6.core.journal.SequentialFile}s. * * @param replicator * @param pageIds diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/PagingStoreFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingStoreFactory.java similarity index 81% rename from hornetq-server/src/main/java/org/hornetq/core/paging/PagingStoreFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingStoreFactory.java index 8f2c186262..a43816368b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/PagingStoreFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingStoreFactory.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging; +package org.apache.activemq6.core.paging; import java.util.List; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; /** * The integration point between the PagingManger and the File System (aka SequentialFiles) diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/LivePageCache.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/LivePageCache.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/LivePageCache.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/LivePageCache.java index ca7b6ea9e8..25dd7af4de 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/LivePageCache.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/LivePageCache.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor; +package org.apache.activemq6.core.paging.cursor; -import org.hornetq.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagedMessage; /** * A LivePageCache diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PageCache.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageCache.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PageCache.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageCache.java index 7b435918e4..1a70fe7119 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PageCache.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageCache.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor; +package org.apache.activemq6.core.paging.cursor; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.utils.SoftValueHashMap; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.utils.SoftValueHashMap; /** * A PageCache diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PageCursorProvider.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageCursorProvider.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PageCursorProvider.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageCursorProvider.java index a4c9a070e6..77d41151a6 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PageCursorProvider.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageCursorProvider.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor; +package org.apache.activemq6.core.paging.cursor; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.paging.PagedMessage; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.paging.PagedMessage; /** * The provider of Cursor for a given Address diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PagePosition.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagePosition.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PagePosition.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagePosition.java index c48025ecda..8bee738a1a 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PagePosition.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagePosition.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor; +package org.apache.activemq6.core.paging.cursor; diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PageSubscription.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageSubscription.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PageSubscription.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageSubscription.java index c745f8d0cd..84efbcf66f 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PageSubscription.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageSubscription.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor; +package org.apache.activemq6.core.paging.cursor; import java.util.concurrent.Executor; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.server.Queue; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.utils.LinkedListIterator; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.utils.LinkedListIterator; /** * A PageCursor diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PageSubscriptionCounter.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageSubscriptionCounter.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PageSubscriptionCounter.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageSubscriptionCounter.java index 0650f65923..7f9d2d2397 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PageSubscriptionCounter.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageSubscriptionCounter.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor; +package org.apache.activemq6.core.paging.cursor; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.transaction.Transaction; /** * A PagingSubscriptionCounterInterface diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PagedReference.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagedReference.java similarity index 83% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PagedReference.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagedReference.java index df47bad698..7f93cfb9af 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PagedReference.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagedReference.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor; +package org.apache.activemq6.core.paging.cursor; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.server.MessageReference; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.server.MessageReference; /** * A PagedReference diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PagedReferenceImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagedReferenceImpl.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PagedReferenceImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagedReferenceImpl.java index a87bfa8a88..01d57966be 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/PagedReferenceImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagedReferenceImpl.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor; +package org.apache.activemq6.core.paging.cursor; import java.lang.ref.WeakReference; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.Message; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; /** * A InternalReference @@ -245,7 +245,7 @@ public class PagedReferenceImpl implements PagedReference } /* (non-Javadoc) - * @see org.hornetq.core.server.MessageReference#setConsumerId(java.lang.Long) + * @see org.apache.activemq6.core.server.MessageReference#setConsumerId(java.lang.Long) */ @Override public void setConsumerId(Long consumerID) @@ -254,7 +254,7 @@ public class PagedReferenceImpl implements PagedReference } /* (non-Javadoc) - * @see org.hornetq.core.server.MessageReference#getConsumerId() + * @see org.apache.activemq6.core.server.MessageReference#getConsumerId() */ @Override public Long getConsumerId() diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/LivePageCacheImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/LivePageCacheImpl.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/LivePageCacheImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/LivePageCacheImpl.java index dbb1dd7d48..9e8385f4e2 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/LivePageCacheImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/LivePageCacheImpl.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor.impl; +package org.apache.activemq6.core.paging.cursor.impl; import java.util.LinkedList; import java.util.List; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.cursor.LivePageCache; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.server.LargeServerMessage; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.cursor.LivePageCache; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.server.LargeServerMessage; /** * This is the same as PageCache, however this is for the page that's being currently written. diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageCacheImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageCacheImpl.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageCacheImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageCacheImpl.java index d6ec741fa5..9990e6189a 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageCacheImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageCacheImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor.impl; +package org.apache.activemq6.core.paging.cursor.impl; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.cursor.PageCache; -import org.hornetq.core.paging.impl.Page; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.cursor.PageCache; +import org.apache.activemq6.core.paging.impl.Page; /** * The caching associated to a single page. diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageCursorProviderImpl.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageCursorProviderImpl.java index 11a5ba4d32..309da5b523 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageCursorProviderImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor.impl; +package org.apache.activemq6.core.paging.cursor.impl; import java.util.ArrayList; import java.util.Collection; @@ -20,22 +20,22 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.cursor.PageCache; -import org.hornetq.core.paging.cursor.PageCursorProvider; -import org.hornetq.core.paging.cursor.PagePosition; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.paging.cursor.PagedReference; -import org.hornetq.core.paging.cursor.PagedReferenceImpl; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.impl.TransactionImpl; -import org.hornetq.utils.FutureLatch; -import org.hornetq.utils.SoftValueHashMap; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.cursor.PageCache; +import org.apache.activemq6.core.paging.cursor.PageCursorProvider; +import org.apache.activemq6.core.paging.cursor.PagePosition; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.paging.cursor.PagedReference; +import org.apache.activemq6.core.paging.cursor.PagedReferenceImpl; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.utils.FutureLatch; +import org.apache.activemq6.utils.SoftValueHashMap; /** * A PageProviderIMpl * diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PagePositionImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PagePositionImpl.java similarity index 97% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PagePositionImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PagePositionImpl.java index 12fda59728..5a51b12cd6 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PagePositionImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PagePositionImpl.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor.impl; +package org.apache.activemq6.core.paging.cursor.impl; -import org.hornetq.core.paging.cursor.PagePosition; +import org.apache.activemq6.core.paging.cursor.PagePosition; /** * A PagePosition diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageSubscriptionCounterImpl.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageSubscriptionCounterImpl.java index ddd088059b..8f945a5bd5 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageSubscriptionCounterImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor.impl; +package org.apache.activemq6.core.paging.cursor.impl; import java.util.ArrayList; import java.util.HashMap; @@ -20,17 +20,17 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.Pair; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.paging.cursor.PageSubscriptionCounter; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionOperation; -import org.hornetq.core.transaction.TransactionOperationAbstract; -import org.hornetq.core.transaction.TransactionPropertyIndexes; -import org.hornetq.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionOperation; +import org.apache.activemq6.core.transaction.TransactionOperationAbstract; +import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; /** * This class will encapsulate the persistent counters for the PagingSubscription diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageSubscriptionImpl.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageSubscriptionImpl.java index acd56f63b3..2b081328fa 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageSubscriptionImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.cursor.impl; +package org.apache.activemq6.core.paging.cursor.impl; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -28,30 +28,30 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.paging.PageTransactionInfo; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.cursor.PageCache; -import org.hornetq.core.paging.cursor.PageCursorProvider; -import org.hornetq.core.paging.cursor.PagePosition; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.paging.cursor.PageSubscriptionCounter; -import org.hornetq.core.paging.cursor.PagedReference; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionOperationAbstract; -import org.hornetq.core.transaction.TransactionPropertyIndexes; -import org.hornetq.core.transaction.impl.TransactionImpl; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.FutureLatch; -import org.hornetq.utils.LinkedListIterator; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.paging.PageTransactionInfo; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.cursor.PageCache; +import org.apache.activemq6.core.paging.cursor.PageCursorProvider; +import org.apache.activemq6.core.paging.cursor.PagePosition; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq6.core.paging.cursor.PagedReference; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionOperationAbstract; +import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.FutureLatch; +import org.apache.activemq6.utils.LinkedListIterator; /** * A PageCursorImpl diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/Page.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/Page.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/paging/impl/Page.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/Page.java index 296b1ab866..ab0979cefb 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/Page.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/Page.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.impl; +package org.apache.activemq6.core.paging.impl; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -18,20 +18,20 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.cursor.LivePageCache; -import org.hornetq.core.paging.cursor.PageSubscriptionCounter; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.cursor.LivePageCache; +import org.apache.activemq6.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.DataConstants; /** * @author Clebert Suconic diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/PageSyncTimer.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PageSyncTimer.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/paging/impl/PageSyncTimer.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PageSyncTimer.java index bfaec2ca27..8b890c9317 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/PageSyncTimer.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PageSyncTimer.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.impl; +package org.apache.activemq6.core.paging.impl; import java.util.LinkedList; import java.util.List; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.persistence.OperationContext; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.persistence.OperationContext; /** * This will batch multiple calls waiting to perform a sync in a single call. diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/PageTransactionInfoImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PageTransactionInfoImpl.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/paging/impl/PageTransactionInfoImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PageTransactionInfoImpl.java index c5d349044f..ce426d3541 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/PageTransactionInfoImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PageTransactionInfoImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.impl; +package org.apache.activemq6.core.paging.impl; import java.util.HashMap; import java.util.LinkedList; @@ -18,18 +18,18 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Pair; -import org.hornetq.core.paging.PageTransactionInfo; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.cursor.PagePosition; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionOperationAbstract; -import org.hornetq.core.transaction.TransactionPropertyIndexes; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.paging.PageTransactionInfo; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.cursor.PagePosition; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionOperationAbstract; +import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq6.utils.DataConstants; /** * @author Clebert Suconic @@ -160,7 +160,7 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo /* * This is to be used after paging. We will update the PageTransactions until they get all the messages delivered. On that case we will delete the page TX * (non-Javadoc) - * @see org.hornetq.core.paging.PageTransactionInfo#storeUpdate(org.hornetq.core.persistence.StorageManager, org.hornetq.core.transaction.Transaction, int) + * @see org.apache.activemq6.core.paging.PageTransactionInfo#storeUpdate(org.hornetq.core.persistence.StorageManager, org.hornetq.core.transaction.Transaction, int) */ public void storeUpdate(final StorageManager storageManager, final PagingManager pagingManager, final Transaction tx) throws Exception { diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagedMessageImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagedMessageImpl.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagedMessageImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagedMessageImpl.java index f67f3c94e9..99de370f55 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagedMessageImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagedMessageImpl.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.impl; +package org.apache.activemq6.core.paging.impl; import java.util.Arrays; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.utils.DataConstants; /** * This class represents a paged message diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagingManagerImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingManagerImpl.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagingManagerImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingManagerImpl.java index dc65e7590e..6e39b82fee 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagingManagerImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingManagerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.impl; +package org.apache.activemq6.core.paging.impl; import java.util.List; import java.util.Map; @@ -19,14 +19,14 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.paging.PageTransactionInfo; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.PagingStoreFactory; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.paging.PageTransactionInfo; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.PagingStoreFactory; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; /** * @author Clebert Suconic diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingStoreFactoryNIO.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingStoreFactoryNIO.java index c4160e258a..c3e38f85f2 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingStoreFactoryNIO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.impl; +package org.apache.activemq6.core.paging.impl; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -24,19 +24,19 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.IOCriticalErrorListener; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.PagingStoreFactory; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.IOCriticalErrorListener; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.PagingStoreFactory; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.UUIDGenerator; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingStoreImpl.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingStoreImpl.java index df06d41f86..2b0c66cb68 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingStoreImpl.java @@ -10,34 +10,34 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.paging.impl; +package org.apache.activemq6.core.paging.impl; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.paging.PageTransactionInfo; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.PagingStoreFactory; -import org.hornetq.core.paging.cursor.LivePageCache; -import org.hornetq.core.paging.cursor.PageCursorProvider; -import org.hornetq.core.paging.cursor.impl.LivePageCacheImpl; -import org.hornetq.core.paging.cursor.impl.PageCursorProviderImpl; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.replication.ReplicationManager; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.RouteContextList; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionOperation; -import org.hornetq.core.transaction.TransactionPropertyIndexes; -import org.hornetq.utils.FutureLatch; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.paging.PageTransactionInfo; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.PagingStoreFactory; +import org.apache.activemq6.core.paging.cursor.LivePageCache; +import org.apache.activemq6.core.paging.cursor.PageCursorProvider; +import org.apache.activemq6.core.paging.cursor.impl.LivePageCacheImpl; +import org.apache.activemq6.core.paging.cursor.impl.PageCursorProviderImpl; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.replication.ReplicationManager; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.RouteContextList; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionOperation; +import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq6.utils.FutureLatch; import java.text.DecimalFormat; import java.util.ArrayList; @@ -969,18 +969,18 @@ public class PagingStoreImpl implements PagingStore private long[] routeQueues(Transaction tx, RouteContextList ctx) throws Exception { - List durableQueues = ctx.getDurableQueues(); - List nonDurableQueues = ctx.getNonDurableQueues(); + List durableQueues = ctx.getDurableQueues(); + List nonDurableQueues = ctx.getNonDurableQueues(); long[] ids = new long[durableQueues.size() + nonDurableQueues.size()]; int i = 0; - for (org.hornetq.core.server.Queue q : durableQueues) + for (org.apache.activemq6.core.server.Queue q : durableQueues) { q.getPageSubscription().notEmpty(); ids[i++] = q.getID(); } - for (org.hornetq.core.server.Queue q : nonDurableQueues) + for (org.apache.activemq6.core.server.Queue q : nonDurableQueues) { q.getPageSubscription().getCounter().increment(tx, 1); q.getPageSubscription().notEmpty(); @@ -998,9 +998,9 @@ public class PagingStoreImpl implements PagingStore */ private void applyPageCounters(Transaction tx, Page page, RouteContextList ctx) throws Exception { - List durableQueues = ctx.getDurableQueues(); - List nonDurableQueues = ctx.getNonDurableQueues(); - for (org.hornetq.core.server.Queue q : durableQueues) + List durableQueues = ctx.getDurableQueues(); + List nonDurableQueues = ctx.getNonDurableQueues(); + for (org.apache.activemq6.core.server.Queue q : durableQueues) { if (tx == null) { @@ -1015,7 +1015,7 @@ public class PagingStoreImpl implements PagingStore } } - for (org.hornetq.core.server.Queue q : nonDurableQueues) + for (org.apache.activemq6.core.server.Queue q : nonDurableQueues) { q.getPageSubscription().getCounter().increment(tx, 1); } diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/GroupingInfo.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/GroupingInfo.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/GroupingInfo.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/GroupingInfo.java index 77026a7f45..76c6baef79 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/GroupingInfo.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/GroupingInfo.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence; +package org.apache.activemq6.core.persistence; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; /** * @author Andy Taylor diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/OperationContext.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/OperationContext.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/OperationContext.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/OperationContext.java index 941e9649f0..85a1f20639 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/OperationContext.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/OperationContext.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence; +package org.apache.activemq6.core.persistence; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.IOCompletion; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.IOCompletion; /** * This represents a set of operations done as part of replication. diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/QueueBindingInfo.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/QueueBindingInfo.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/QueueBindingInfo.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/QueueBindingInfo.java index 7fcdbfffb8..361edda8b7 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/QueueBindingInfo.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/QueueBindingInfo.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence; +package org.apache.activemq6.core.persistence; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; /** * A QueueBindingInfo diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/StorageManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/StorageManager.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/StorageManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/StorageManager.java index 559a3c9cf7..15cee5531c 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/StorageManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/StorageManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence; +package org.apache.activemq6.core.persistence; import javax.transaction.xa.Xid; import java.nio.ByteBuffer; @@ -19,34 +19,34 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.JournalLoadInformation; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.paging.PageTransactionInfo; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.cursor.PagePosition; -import org.hornetq.core.persistence.config.PersistedAddressSetting; -import org.hornetq.core.persistence.config.PersistedRoles; -import org.hornetq.core.persistence.impl.PageCountPending; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.replication.ReplicationManager; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.RouteContextList; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.group.impl.GroupBinding; -import org.hornetq.core.server.impl.JournalLoader; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.utils.IDGenerator; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.JournalLoadInformation; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.paging.PageTransactionInfo; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.cursor.PagePosition; +import org.apache.activemq6.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq6.core.persistence.config.PersistedRoles; +import org.apache.activemq6.core.persistence.impl.PageCountPending; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.replication.ReplicationManager; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.RouteContextList; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.group.impl.GroupBinding; +import org.apache.activemq6.core.server.impl.JournalLoader; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.utils.IDGenerator; /** * A StorageManager @@ -342,7 +342,7 @@ public interface StorageManager extends IDGenerator, HornetQComponent Journal getMessageJournal(); /** - * @see org.hornetq.core.persistence.impl.journal.JournalStorageManager#startReplication(org.hornetq.core.replication.ReplicationManager, org.hornetq.core.paging.PagingManager, String, boolean) + * @see org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager#startReplication(org.hornetq.core.replication.ReplicationManager, org.hornetq.core.paging.PagingManager, String, boolean) */ void startReplication(ReplicationManager replicationManager, PagingManager pagingManager, String nodeID, boolean autoFailBack) throws Exception; @@ -402,10 +402,10 @@ public interface StorageManager extends IDGenerator, HornetQComponent void readUnLock(); /** - * Closes the {@link org.hornetq.utils.IDGenerator} persisting the current record ID. + * Closes the {@link org.apache.activemq6.utils.IDGenerator} persisting the current record ID. *

* Effectively a "pre-stop" method. Necessary due to the "stop"-order at - * {@link org.hornetq.core.server.impl.HornetQServerImpl} + * {@link org.apache.activemq6.core.server.impl.HornetQServerImpl} */ void persistIdGenerator(); } diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/config/PersistedAddressSetting.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/config/PersistedAddressSetting.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/config/PersistedAddressSetting.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/config/PersistedAddressSetting.java index 878c55c22e..a4000150e8 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/config/PersistedAddressSetting.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/config/PersistedAddressSetting.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence.config; +package org.apache.activemq6.core.persistence.config; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.settings.impl.AddressSettings; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.settings.impl.AddressSettings; /** * A PersistedAddressSetting diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/config/PersistedRoles.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/config/PersistedRoles.java similarity index 97% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/config/PersistedRoles.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/config/PersistedRoles.java index 18a388aed3..5eadf5c97c 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/config/PersistedRoles.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/config/PersistedRoles.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence.config; +package org.apache.activemq6.core.persistence.config; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.EncodingSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.EncodingSupport; /** * A ConfiguredRoles diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/PageCountPending.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/PageCountPending.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/impl/PageCountPending.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/PageCountPending.java index 74b824dc1b..826b7edf34 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/PageCountPending.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/PageCountPending.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence.impl; +package org.apache.activemq6.core.persistence.impl; /** * @author Clebert Suconic diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/AddMessageRecord.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/AddMessageRecord.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/AddMessageRecord.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/AddMessageRecord.java index 9e7221c9ee..f7837b7855 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/AddMessageRecord.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/AddMessageRecord.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence.impl.journal; +package org.apache.activemq6.core.persistence.impl.journal; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.core.server.ServerMessage; public final class AddMessageRecord { diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/BatchingIDGenerator.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/BatchingIDGenerator.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/BatchingIDGenerator.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/BatchingIDGenerator.java index b16b3479a1..ca24d7bf52 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/BatchingIDGenerator.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/BatchingIDGenerator.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence.impl.journal; +package org.apache.activemq6.core.persistence.impl.journal; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.utils.DataConstants; -import org.hornetq.utils.IDGenerator; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq6.utils.IDGenerator; /** * An ID generator that allocates a batch of IDs of size {@link #checkpointSize} and records the ID diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/DescribeJournal.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/DescribeJournal.java similarity index 82% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/DescribeJournal.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/DescribeJournal.java index d00e0565df..364e7048e5 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/DescribeJournal.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/DescribeJournal.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence.impl.journal; +package org.apache.activemq6.core.persistence.impl.journal; import javax.transaction.xa.Xid; import java.io.PrintStream; @@ -19,60 +19,60 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.Message; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.TransactionFailureCallback; -import org.hornetq.core.journal.impl.JournalFile; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.JournalReaderCallback; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.paging.cursor.impl.PageSubscriptionCounterImpl; -import org.hornetq.core.paging.impl.PageTransactionInfoImpl; -import org.hornetq.core.persistence.impl.journal.BatchingIDGenerator.IDCounterEncoding; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.AckDescribe; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.DeliveryCountUpdateEncoding; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.DuplicateIDEncoding; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.HeuristicCompletionEncoding; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.LargeMessageEncoding; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.PageCountPendingImpl; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.PageCountRecord; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.PageCountRecordInc; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.PendingLargeMessageEncoding; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.RefEncoding; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.ScheduledDeliveryEncoding; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.utils.Base64; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.TransactionFailureCallback; +import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.JournalReaderCallback; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.paging.cursor.impl.PageSubscriptionCounterImpl; +import org.apache.activemq6.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq6.core.persistence.impl.journal.BatchingIDGenerator.IDCounterEncoding; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.AckDescribe; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.DeliveryCountUpdateEncoding; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.DuplicateIDEncoding; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.HeuristicCompletionEncoding; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.LargeMessageEncoding; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PageCountPendingImpl; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PageCountRecord; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PageCountRecordInc; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PendingLargeMessageEncoding; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.RefEncoding; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.ScheduledDeliveryEncoding; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.utils.Base64; +import org.apache.activemq6.utils.XidCodecSupport; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_REF; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.ADDRESS_SETTING_RECORD; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE_PENDING; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.ADD_MESSAGE; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.ADD_REF; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.DUPLICATE_ID; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.HEURISTIC_COMPLETION; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.ID_COUNTER_RECORD; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COMPLETE; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_INC; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_VALUE; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_PENDING_COUNTER; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.PAGE_TRANSACTION; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.QUEUE_BINDING_RECORD; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.SECURITY_RECORD; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.UPDATE_DELIVERY_COUNT; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_REF; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADDRESS_SETTING_RECORD; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE_PENDING; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADD_MESSAGE; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADD_REF; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.DUPLICATE_ID; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.HEURISTIC_COMPLETION; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ID_COUNTER_RECORD; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COMPLETE; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_INC; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_VALUE; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_PENDING_COUNTER; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_TRANSACTION; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.QUEUE_BINDING_RECORD; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.SECURITY_RECORD; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.UPDATE_DELIVERY_COUNT; /** * Outputs a String description of the Journals contents. diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/JournalRecordIds.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/JournalRecordIds.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/JournalRecordIds.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/JournalRecordIds.java index d7ea9a07f0..020dc05c4d 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/JournalRecordIds.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/JournalRecordIds.java @@ -13,7 +13,7 @@ /** * */ -package org.hornetq.core.persistence.impl.journal; +package org.apache.activemq6.core.persistence.impl.journal; /** * These record IDs definitions are meant to be public. @@ -33,7 +33,7 @@ public final class JournalRecordIds /** * Records storing the current recordID number. - * @see org.hornetq.utils.IDGenerator + * @see org.apache.activemq6.utils.IDGenerator * @see BatchingIDGenerator */ public static final byte ID_COUNTER_RECORD = 24; diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/JournalStorageManager.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/JournalStorageManager.java index 99573f8175..c0ff8381f2 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/JournalStorageManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence.impl.journal; +package org.apache.activemq6.core.persistence.impl.journal; import javax.transaction.xa.Xid; import java.io.File; @@ -41,85 +41,85 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.IOCriticalErrorListener; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.JournalLoadInformation; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.TransactionFailureCallback; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.journal.impl.JournalFile; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.paging.PageTransactionInfo; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.cursor.PagePosition; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.paging.cursor.PagedReferenceImpl; -import org.hornetq.core.paging.cursor.impl.PagePositionImpl; -import org.hornetq.core.paging.impl.PageTransactionInfoImpl; -import org.hornetq.core.persistence.GroupingInfo; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.QueueBindingInfo; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.config.PersistedAddressSetting; -import org.hornetq.core.persistence.config.PersistedRoles; -import org.hornetq.core.persistence.impl.PageCountPending; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.DuplicateIDCache; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping; -import org.hornetq.core.replication.ReplicatedJournal; -import org.hornetq.core.replication.ReplicationManager; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RouteContextList; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.group.impl.GroupBinding; -import org.hornetq.core.server.impl.JournalLoader; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.Transaction.State; -import org.hornetq.core.transaction.TransactionOperation; -import org.hornetq.core.transaction.TransactionOperationAbstract; -import org.hornetq.core.transaction.TransactionPropertyIndexes; -import org.hornetq.core.transaction.impl.TransactionImpl; -import org.hornetq.utils.Base64; -import org.hornetq.utils.ByteUtil; -import org.hornetq.utils.DataConstants; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.HornetQThreadFactory; -import org.hornetq.utils.XidCodecSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.IOCriticalErrorListener; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.JournalLoadInformation; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.TransactionFailureCallback; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.paging.PageTransactionInfo; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.cursor.PagePosition; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.paging.cursor.PagedReferenceImpl; +import org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq6.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq6.core.persistence.GroupingInfo; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.QueueBindingInfo; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq6.core.persistence.config.PersistedRoles; +import org.apache.activemq6.core.persistence.impl.PageCountPending; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.DuplicateIDCache; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping; +import org.apache.activemq6.core.replication.ReplicatedJournal; +import org.apache.activemq6.core.replication.ReplicationManager; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RouteContextList; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.group.impl.GroupBinding; +import org.apache.activemq6.core.server.impl.JournalLoader; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.Transaction.State; +import org.apache.activemq6.core.transaction.TransactionOperation; +import org.apache.activemq6.core.transaction.TransactionOperationAbstract; +import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.utils.Base64; +import org.apache.activemq6.utils.ByteUtil; +import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.HornetQThreadFactory; +import org.apache.activemq6.utils.XidCodecSupport; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE_PENDING; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.DUPLICATE_ID; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_INC; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_VALUE; -import static org.hornetq.core.persistence.impl.journal.JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE_PENDING; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.DUPLICATE_ID; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_INC; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_VALUE; +import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME; /** * Controls access to the journals and other storage files such as the ones used to store pages and @@ -352,7 +352,7 @@ public class JournalStorageManager implements StorageManager * To achieve (2), instead of writing directly to instances of {@link JournalImpl}, we write to * instances of {@link ReplicatedJournal}. *

- * At the backup-side replication is handled by {@link org.hornetq.core.replication.ReplicationEndpoint}. + * At the backup-side replication is handled by {@link org.apache.activemq6.core.replication.ReplicationEndpoint}. * * @param replicationManager * @param pagingManager @@ -3110,7 +3110,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.hornetq.core.journal.EncodingSupport#decode(org.hornetq.spi.core.remoting.HornetQBuffer) + * @see org.apache.activemq6.core.journal.EncodingSupport#decode(org.hornetq.spi.core.remoting.HornetQBuffer) */ public void decode(final HornetQBuffer buffer) { @@ -3118,7 +3118,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.hornetq.core.journal.EncodingSupport#encode(org.hornetq.spi.core.remoting.HornetQBuffer) + * @see org.apache.activemq6.core.journal.EncodingSupport#encode(org.hornetq.spi.core.remoting.HornetQBuffer) */ public void encode(final HornetQBuffer buffer) { @@ -3126,7 +3126,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.hornetq.core.journal.EncodingSupport#getEncodeSize() + * @see org.apache.activemq6.core.journal.EncodingSupport#getEncodeSize() */ public int getEncodeSize() { @@ -3149,7 +3149,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.hornetq.core.journal.EncodingSupport#decode(org.hornetq.spi.core.remoting.HornetQBuffer) + * @see org.apache.activemq6.core.journal.EncodingSupport#decode(org.hornetq.spi.core.remoting.HornetQBuffer) */ public void decode(final HornetQBuffer buffer) { @@ -3157,7 +3157,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.hornetq.core.journal.EncodingSupport#encode(org.hornetq.spi.core.remoting.HornetQBuffer) + * @see org.apache.activemq6.core.journal.EncodingSupport#encode(org.hornetq.spi.core.remoting.HornetQBuffer) */ public void encode(final HornetQBuffer buffer) { @@ -3165,7 +3165,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.hornetq.core.journal.EncodingSupport#getEncodeSize() + * @see org.apache.activemq6.core.journal.EncodingSupport#getEncodeSize() */ public int getEncodeSize() { @@ -3274,7 +3274,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.hornetq.core.journal.EncodingSupport#getEncodeSize() + * @see org.apache.activemq6.core.journal.EncodingSupport#getEncodeSize() */ @Override public int getEncodeSize() @@ -3283,7 +3283,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.hornetq.core.journal.EncodingSupport#encode(org.hornetq.api.core.HornetQBuffer) + * @see org.apache.activemq6.core.journal.EncodingSupport#encode(org.hornetq.api.core.HornetQBuffer) */ @Override public void encode(HornetQBuffer buffer) @@ -3293,7 +3293,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.hornetq.core.journal.EncodingSupport#decode(org.hornetq.api.core.HornetQBuffer) + * @see org.apache.activemq6.core.journal.EncodingSupport#decode(org.hornetq.api.core.HornetQBuffer) */ @Override public void decode(HornetQBuffer buffer) @@ -3466,7 +3466,7 @@ public class JournalStorageManager implements StorageManager * This is only used when loading a transaction. *

* it might be possible to merge the functionality of this class with - * {@link org.hornetq.core.persistence.impl.journal.JournalStorageManager.FinishPageMessageOperation} + * {@link org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.FinishPageMessageOperation} */ // TODO: merge this class with the one on the PagingStoreImpl private static class FinishPageMessageOperation extends TransactionOperationAbstract implements TransactionOperation diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/LargeServerMessageImpl.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/LargeServerMessageImpl.java index b77e9fca12..a872319213 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/LargeServerMessageImpl.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence.impl.journal; +package org.apache.activemq6.core.persistence.impl.journal; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.api.core.Message; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.message.BodyEncoder; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.utils.DataConstants; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.message.BodyEncoder; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq6.utils.TypedProperties; /** * A LargeServerMessageImpl @@ -510,7 +510,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } /* (non-Javadoc) - * @see org.hornetq.core.message.BodyEncoder#getLargeBodySize() + * @see org.apache.activemq6.core.message.BodyEncoder#getLargeBodySize() */ public long getLargeBodySize() { diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/LargeServerMessageInSync.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/LargeServerMessageInSync.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/LargeServerMessageInSync.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/LargeServerMessageInSync.java index 5e6bfbd965..ccfe730e3c 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/LargeServerMessageInSync.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/LargeServerMessageInSync.java @@ -13,18 +13,18 @@ /** * */ -package org.hornetq.core.persistence.impl.journal; +package org.apache.activemq6.core.persistence.impl.journal; import java.nio.ByteBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.StorageManager.LargeMessageExtension; -import org.hornetq.core.replication.ReplicatedLargeMessage; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.LargeServerMessage; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.StorageManager.LargeMessageExtension; +import org.apache.activemq6.core.replication.ReplicatedLargeMessage; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.LargeServerMessage; public final class LargeServerMessageInSync implements ReplicatedLargeMessage { diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/OperationContextImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/OperationContextImpl.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/OperationContextImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/OperationContextImpl.java index 2420508e49..6a22209605 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/OperationContextImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/OperationContextImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence.impl.journal; +package org.apache.activemq6.core.persistence.impl.journal; import java.util.Iterator; import java.util.LinkedList; @@ -19,13 +19,13 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.impl.SimpleWaitIOCallback; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.utils.ExecutorFactory; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.impl.SimpleWaitIOCallback; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.utils.ExecutorFactory; /** * @@ -250,7 +250,7 @@ public class OperationContextImpl implements OperationContext /* * (non-Javadoc) - * @see org.hornetq.core.replication.ReplicationToken#complete() + * @see org.apache.activemq6.core.replication.ReplicationToken#complete() */ public void complete() { diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java index a4b91eb251..b2e3289eb4 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence.impl.nullpm; +package org.apache.activemq6.core.persistence.impl.nullpm; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; /** * A NullStorageLargeServerMessage diff --git a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/nullpm/NullStorageManager.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/nullpm/NullStorageManager.java index 37866e96e2..d097ab319f 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/nullpm/NullStorageManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.persistence.impl.nullpm; +package org.apache.activemq6.core.persistence.impl.nullpm; import javax.transaction.xa.Xid; import java.nio.ByteBuffer; @@ -21,36 +21,36 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.JournalLoadInformation; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.paging.PageTransactionInfo; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.cursor.PagePosition; -import org.hornetq.core.persistence.GroupingInfo; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.QueueBindingInfo; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.config.PersistedAddressSetting; -import org.hornetq.core.persistence.config.PersistedRoles; -import org.hornetq.core.persistence.impl.PageCountPending; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.replication.ReplicationManager; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.RouteContextList; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.group.impl.GroupBinding; -import org.hornetq.core.server.impl.JournalLoader; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.JournalLoadInformation; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.paging.PageTransactionInfo; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.cursor.PagePosition; +import org.apache.activemq6.core.persistence.GroupingInfo; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.QueueBindingInfo; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq6.core.persistence.config.PersistedRoles; +import org.apache.activemq6.core.persistence.impl.PageCountPending; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.replication.ReplicationManager; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.RouteContextList; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.group.impl.GroupBinding; +import org.apache.activemq6.core.server.impl.JournalLoader; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.Transaction; /** * A NullStorageManager diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/Address.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Address.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/Address.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Address.java index b9433aabb5..ef0251ddac 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/Address.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Address.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice; +package org.apache.activemq6.core.postoffice; import java.util.List; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; /** * USed to hold a hierarchical style address, delimited by a '.'. diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/AddressManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/AddressManager.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/AddressManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/AddressManager.java index d3ddf36a7b..92077e6319 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/AddressManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/AddressManager.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice; +package org.apache.activemq6.core.postoffice; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.transaction.Transaction; /** * Used to maintain addresses and BindingsImpl. diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/Binding.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Binding.java similarity index 81% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/Binding.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Binding.java index 20e0572f8c..4585d77aa2 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/Binding.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Binding.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice; +package org.apache.activemq6.core.postoffice; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.server.Bindable; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.group.UnproposalListener; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.server.Bindable; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.group.UnproposalListener; /** * A Binding diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/BindingType.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/BindingType.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/BindingType.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/BindingType.java index 5bd1fee368..e546ce89bb 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/BindingType.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/BindingType.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice; +package org.apache.activemq6.core.postoffice; -import org.hornetq.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQMessageBundle; /** * A BindingType diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/Bindings.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Bindings.java similarity index 81% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/Bindings.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Bindings.java index f5f32c4dec..526ce68d80 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/Bindings.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Bindings.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice; +package org.apache.activemq6.core.postoffice; import java.util.Collection; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.group.UnproposalListener; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.group.UnproposalListener; /** * A Bindings diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/BindingsFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/BindingsFactory.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/BindingsFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/BindingsFactory.java index 6bace5c956..65643f7823 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/BindingsFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/BindingsFactory.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice; +package org.apache.activemq6.core.postoffice; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; /** * A factory for creating bindings diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/DuplicateIDCache.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/DuplicateIDCache.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/DuplicateIDCache.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/DuplicateIDCache.java index 3b4e80d47a..2b90c575a5 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/DuplicateIDCache.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/DuplicateIDCache.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice; +package org.apache.activemq6.core.postoffice; import java.util.List; -import org.hornetq.api.core.Pair; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.transaction.Transaction; /** * A DuplicateIDCache diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/PostOffice.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/PostOffice.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/PostOffice.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/PostOffice.java index 9ab647c7f4..070c5c8a4e 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/PostOffice.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/PostOffice.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice; +package org.apache.activemq6.core.postoffice; import java.util.Map; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.transaction.Transaction; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/QueueBinding.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/QueueBinding.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/QueueBinding.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/QueueBinding.java index 44a630221a..35a8e52b92 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/QueueBinding.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/QueueBinding.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice; +package org.apache.activemq6.core.postoffice; -import org.hornetq.core.server.Queue; +import org.apache.activemq6.core.server.Queue; /** * A QueueBinding diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/QueueInfo.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/QueueInfo.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/QueueInfo.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/QueueInfo.java index 1e15014707..ee3f463370 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/QueueInfo.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/QueueInfo.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice; +package org.apache.activemq6.core.postoffice; import java.io.Serializable; import java.util.List; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.HornetQMessageBundle; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.HornetQMessageBundle; /** * A QueueInfo diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/AddressImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/AddressImpl.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/AddressImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/AddressImpl.java index fcbc4b5289..e77ad38713 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/AddressImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/AddressImpl.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice.impl; +package org.apache.activemq6.core.postoffice.impl; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.postoffice.Address; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.postoffice.Address; /** * splits an address string into its hierarchical parts split by '.' diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/BindingsImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/BindingsImpl.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/BindingsImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/BindingsImpl.java index f54534526f..3781a6f10b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/BindingsImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/BindingsImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice.impl; +package org.apache.activemq6.core.postoffice.impl; import java.io.PrintWriter; import java.io.StringWriter; @@ -23,21 +23,21 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.cluster.RemoteQueueBinding; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.server.group.impl.Proposal; -import org.hornetq.core.server.group.impl.Response; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.server.group.impl.Proposal; +import org.apache.activemq6.core.server.group.impl.Response; /** * A BindingsImpl @@ -264,7 +264,7 @@ public final class BindingsImpl implements Bindings private void route(final ServerMessage message, final RoutingContext context, final boolean groupRouting) throws Exception { /* This is a special treatment for scaled-down messages involving SnF queues. - * See org.hornetq.core.server.impl.ScaleDownHandler.scaleDownMessages() for the logic that sends messages with this property + * See org.apache.activemq6.core.server.impl.ScaleDownHandler.scaleDownMessages() for the logic that sends messages with this property */ if (message.containsProperty(MessageImpl.HDR_SCALEDOWN_TO_IDS)) { diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/DivertBinding.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/DivertBinding.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/DivertBinding.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/DivertBinding.java index 0829647344..55e35f84ea 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/DivertBinding.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/DivertBinding.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice.impl; +package org.apache.activemq6.core.postoffice.impl; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.server.Bindable; -import org.hornetq.core.server.Divert; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.server.Bindable; +import org.apache.activemq6.core.server.Divert; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; /** * @author Tim Fox diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/DuplicateIDCacheImpl.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/DuplicateIDCacheImpl.java index d10294a907..e0e59f5cba 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/DuplicateIDCacheImpl.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice.impl; +package org.apache.activemq6.core.postoffice.impl; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.DuplicateIDCache; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionOperationAbstract; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.DuplicateIDCache; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionOperationAbstract; /** * A DuplicateIDCacheImpl diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/LocalQueueBinding.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/LocalQueueBinding.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/LocalQueueBinding.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/LocalQueueBinding.java index f23df92e16..cfcd90ffaf 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/LocalQueueBinding.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/LocalQueueBinding.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice.impl; +package org.apache.activemq6.core.postoffice.impl; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.server.Bindable; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.postoffice.QueueBinding; +import org.apache.activemq6.core.server.Bindable; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; /** * A LocalQueueBinding diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/PostOfficeImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/PostOfficeImpl.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/PostOfficeImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/PostOfficeImpl.java index 5b3e7cb722..ab5cffa25d 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/PostOfficeImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/PostOfficeImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice.impl; +package org.apache.activemq6.core.postoffice.impl; import java.util.ArrayList; import java.util.Collections; @@ -27,55 +27,55 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.hornetq.api.core.HornetQAddressFullException; -import org.hornetq.api.core.HornetQDuplicateIdException; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.HornetQNonExistentQueueException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.api.core.management.NotificationType; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.AddressManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.BindingsFactory; -import org.hornetq.core.postoffice.DuplicateIDCache; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.QueueInfo; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.QueueFactory; -import org.hornetq.core.server.RouteContextList; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.server.impl.RoutingContextImpl; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationListener; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionOperation; -import org.hornetq.core.transaction.TransactionOperationAbstract; -import org.hornetq.core.transaction.TransactionPropertyIndexes; -import org.hornetq.core.transaction.impl.TransactionImpl; -import org.hornetq.utils.TypedProperties; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.HornetQAddressFullException; +import org.apache.activemq6.api.core.HornetQDuplicateIdException; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.HornetQNonExistentQueueException; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.api.core.management.NotificationType; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.AddressManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.BindingsFactory; +import org.apache.activemq6.core.postoffice.DuplicateIDCache; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.QueueInfo; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.QueueFactory; +import org.apache.activemq6.core.server.RouteContextList; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.server.impl.RoutingContextImpl; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationListener; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionOperation; +import org.apache.activemq6.core.transaction.TransactionOperationAbstract; +import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq6.utils.UUIDGenerator; /** * A PostOfficeImpl diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/SimpleAddressManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/SimpleAddressManager.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/SimpleAddressManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/SimpleAddressManager.java index 08ad4f1c76..9453335ba7 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/SimpleAddressManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/SimpleAddressManager.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice.impl; +package org.apache.activemq6.core.postoffice.impl; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.postoffice.Address; -import org.hornetq.core.postoffice.AddressManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.BindingsFactory; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionOperationAbstract; -import org.hornetq.utils.ConcurrentHashSet; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.postoffice.Address; +import org.apache.activemq6.core.postoffice.AddressManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.BindingsFactory; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionOperationAbstract; +import org.apache.activemq6.utils.ConcurrentHashSet; /** * A simple address manager that maintains the addresses and bindings. diff --git a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/WildcardAddressManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/WildcardAddressManager.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/WildcardAddressManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/WildcardAddressManager.java index d9533b25aa..1816b76e58 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/postoffice/impl/WildcardAddressManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/WildcardAddressManager.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.postoffice.impl; +package org.apache.activemq6.core.postoffice.impl; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.postoffice.Address; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.BindingsFactory; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.postoffice.Address; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.BindingsFactory; +import org.apache.activemq6.core.transaction.Transaction; /** * extends the simple manager to allow wildcard addresses to be used. diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/ProtocolHandler.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/ProtocolHandler.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/ProtocolHandler.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/ProtocolHandler.java index d7edc4a056..3ced2530a2 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/ProtocolHandler.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/ProtocolHandler.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol; +package org.apache.activemq6.core.protocol; import java.util.List; import java.util.Map; @@ -31,18 +31,18 @@ import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpRequestDecoder; import io.netty.handler.codec.http.HttpResponseEncoder; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.buffers.impl.ChannelBufferWrapper; -import org.hornetq.core.protocol.stomp.WebSocketServerHandler; -import org.hornetq.core.remoting.impl.netty.ConnectionCreator; -import org.hornetq.core.remoting.impl.netty.HttpAcceptorHandler; -import org.hornetq.core.remoting.impl.netty.HttpKeepAliveRunnable; -import org.hornetq.core.remoting.impl.netty.NettyAcceptor; -import org.hornetq.core.remoting.impl.netty.NettyConnector; -import org.hornetq.core.remoting.impl.netty.NettyServerConnection; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.utils.ConfigurationHelper; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq6.core.protocol.stomp.WebSocketServerHandler; +import org.apache.activemq6.core.remoting.impl.netty.ConnectionCreator; +import org.apache.activemq6.core.remoting.impl.netty.HttpAcceptorHandler; +import org.apache.activemq6.core.remoting.impl.netty.HttpKeepAliveRunnable; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptor; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnector; +import org.apache.activemq6.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.utils.ConfigurationHelper; import static io.netty.handler.codec.http.HttpResponseStatus.FORBIDDEN; import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1; diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/ServerPacketDecoder.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/ServerPacketDecoder.java similarity index 50% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/ServerPacketDecoder.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/ServerPacketDecoder.java index d1ca3c7e3e..591242496f 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/ServerPacketDecoder.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/ServerPacketDecoder.java @@ -11,62 +11,62 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol; +package org.apache.activemq6.core.protocol; -import static org.hornetq.core.protocol.core.impl.PacketImpl.CLUSTER_CONNECT; -import static org.hornetq.core.protocol.core.impl.PacketImpl.CLUSTER_CONNECT_REPLY; -import static org.hornetq.core.protocol.core.impl.PacketImpl.NODE_ANNOUNCE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.BACKUP_REQUEST; -import static org.hornetq.core.protocol.core.impl.PacketImpl.BACKUP_REQUEST_RESPONSE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.QUORUM_VOTE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.QUORUM_VOTE_REPLY; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_APPEND; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_APPEND_TX; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_COMMIT_ROLLBACK; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_DELETE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_DELETE_TX; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_END; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_PAGE_EVENT; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_PAGE_WRITE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_PREPARE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_RESPONSE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_SEND; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SCALEDOWN_ANNOUNCEMENT; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CLUSTER_CONNECT; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CLUSTER_CONNECT_REPLY; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.NODE_ANNOUNCE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.BACKUP_REQUEST; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.BACKUP_REQUEST_RESPONSE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.QUORUM_VOTE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.QUORUM_VOTE_REPLY; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_APPEND; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_APPEND_TX; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_COMMIT_ROLLBACK; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_DELETE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_DELETE_TX; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_END; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_PAGE_EVENT; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_PAGE_WRITE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_PREPARE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_RESPONSE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_SEND; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SCALEDOWN_ANNOUNCEMENT; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.BackupRegistrationMessage; -import org.hornetq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterConnectMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; -import org.hornetq.core.protocol.core.impl.wireformat.NodeAnnounceMessage; -import org.hornetq.core.protocol.core.impl.wireformat.BackupRequestMessage; -import org.hornetq.core.protocol.core.impl.wireformat.BackupResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.QuorumVoteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationAddMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationCommitMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendLargeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupRegistrationMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterConnectMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.NodeAnnounceMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupRequestMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.QuorumVoteMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationCommitMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendLargeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; /** * @author Andy Taylor diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/ServerSessionPacketHandler.java similarity index 75% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/ServerSessionPacketHandler.java index d75b67e1c9..b5be6aba64 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/ServerSessionPacketHandler.java @@ -10,102 +10,102 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core; +package org.apache.activemq6.core.protocol.core; -import static org.hornetq.core.protocol.core.impl.PacketImpl.CREATE_QUEUE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.CREATE_SHARED_QUEUE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.DELETE_QUEUE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_ACKNOWLEDGE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_CLOSE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_COMMIT; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_CONSUMER_CLOSE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_CREATECONSUMER; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_EXPIRED; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_FLOWTOKEN; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_INDIVIDUAL_ACKNOWLEDGE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_ROLLBACK; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_SEND; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_START; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_STOP; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_COMMIT; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_END; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_FORGET; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_JOIN; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_PREPARE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_RESUME; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_ROLLBACK; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_START; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_FAILED; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_SUSPEND; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CREATE_QUEUE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CREATE_SHARED_QUEUE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.DELETE_QUEUE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_ACKNOWLEDGE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_CLOSE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_COMMIT; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_CONSUMER_CLOSE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_CREATECONSUMER; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_EXPIRED; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_FLOWTOKEN; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_INDIVIDUAL_ACKNOWLEDGE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_ROLLBACK; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_SEND; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_START; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_STOP; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_COMMIT; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_END; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_FORGET; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_JOIN; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_PREPARE; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_RESUME; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_ROLLBACK; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_START; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_FAILED; +import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_SUSPEND; import java.util.List; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.core.exception.HornetQXAException; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; -import org.hornetq.core.protocol.core.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.NullResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.RollbackMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; -import org.hornetq.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionExpireMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendLargeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXACommitMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAEndMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAForgetMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAJoinMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAResumeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXARollbackMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAStartMessage; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.impl.netty.NettyConnection; -import org.hornetq.core.server.BindingQueryResult; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.QueueQueryResult; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.ServerSession; -import org.hornetq.spi.core.remoting.Connection; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq6.core.exception.HornetQXAException; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateQueueMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.HornetQExceptionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.NullResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.RollbackMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionExpireMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendLargeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXACommitMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAEndMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAForgetMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAJoinMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAResumeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXARollbackMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAStartMessage; +import org.apache.activemq6.core.remoting.CloseListener; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnection; +import org.apache.activemq6.core.server.BindingQueryResult; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.QueueQueryResult; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.spi.core.remoting.Connection; /** * A ServerSessionPacketHandler diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreProtocolManager.java similarity index 85% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreProtocolManager.java index d0fe3acca7..b86078f4ef 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreProtocolManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl; +package org.apache.activemq6.core.protocol.core.impl; import java.nio.charset.StandardCharsets; import java.util.List; @@ -20,38 +20,38 @@ import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; import io.netty.channel.ChannelPipeline; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.protocol.ServerPacketDecoder; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.ChannelHandler; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.ServerSessionPacketHandler; -import org.hornetq.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; -import org.hornetq.core.protocol.core.impl.wireformat.Ping; -import org.hornetq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.impl.netty.HornetQFrameDecoder2; -import org.hornetq.core.remoting.impl.netty.NettyServerConnection; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.spi.core.protocol.ConnectionEntry; -import org.hornetq.spi.core.protocol.MessageConverter; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.Connection; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.protocol.ServerPacketDecoder; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.ChannelHandler; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.ServerSessionPacketHandler; +import org.apache.activemq6.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; +import org.apache.activemq6.core.protocol.core.impl.wireformat.Ping; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; +import org.apache.activemq6.core.remoting.CloseListener; +import org.apache.activemq6.core.remoting.impl.netty.HornetQFrameDecoder2; +import org.apache.activemq6.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.spi.core.protocol.ConnectionEntry; +import org.apache.activemq6.spi.core.protocol.MessageConverter; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.Connection; /** * A CoreProtocolManager diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/CoreProtocolManagerFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreProtocolManagerFactory.java similarity index 77% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/CoreProtocolManagerFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreProtocolManagerFactory.java index a8f8477a0e..2f65976f6c 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/CoreProtocolManagerFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreProtocolManagerFactory.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl; +package org.apache.activemq6.core.protocol.core.impl; import java.util.List; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.protocol.ProtocolManagerFactory; /** * A CoreProtocolManagerFactory diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/CoreSessionCallback.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreSessionCallback.java similarity index 74% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/CoreSessionCallback.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreSessionCallback.java index b4d993b381..0405011163 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/CoreSessionCallback.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreSessionCallback.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl; +package org.apache.activemq6.core.protocol.core.impl; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveMessage; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.ServerConsumer; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.protocol.SessionCallback; -import org.hornetq.spi.core.remoting.ReadyListener; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveLargeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.ServerConsumer; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq6.spi.core.remoting.ReadyListener; /** * A CoreSessionCallback diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/HornetQPacketHandler.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQPacketHandler.java similarity index 85% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/HornetQPacketHandler.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQPacketHandler.java index 2d8f227a7a..f8d46706cc 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/HornetQPacketHandler.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQPacketHandler.java @@ -10,31 +10,31 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl; +package org.apache.activemq6.core.protocol.core.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.ChannelHandler; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.ServerSessionPacketHandler; -import org.hornetq.core.protocol.core.impl.wireformat.CheckFailoverMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReattachSessionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; -import org.hornetq.core.security.HornetQPrincipal; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.version.Version; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.ChannelHandler; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.ServerSessionPacketHandler; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CheckFailoverMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateQueueMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSessionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.HornetQExceptionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReattachSessionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; +import org.apache.activemq6.core.security.HornetQPrincipal; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.core.version.Version; /** * A packet handler for all packets that need to be handled at the server level diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java index fcb6fa0e3e..89edea0f7c 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * Registers a given backup-server as the replicating backup of a live server (i.e. a regular diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java index c569e458fe..c123e4cdd5 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java @@ -13,10 +13,10 @@ /** * */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; import java.util.Collections; import java.util.EnumSet; @@ -25,7 +25,7 @@ import java.util.Map; /** * Informs the Backup trying to start replicating of an error. - * @see org.hornetq.core.server.impl.ReplicationError + * @see org.apache.activemq6.core.server.impl.ReplicationError */ public final class BackupReplicationStartFailedMessage extends PacketImpl { diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/BackupRequestMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupRequestMessage.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/BackupRequestMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupRequestMessage.java index 566bb74b96..48480f3e25 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/BackupRequestMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupRequestMessage.java @@ -11,11 +11,11 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; public class BackupRequestMessage extends PacketImpl { diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/BackupResponseMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupResponseMessage.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/BackupResponseMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupResponseMessage.java index b96b074303..e1924f098c 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/BackupResponseMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupResponseMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; public class BackupResponseMessage extends PacketImpl { diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterConnectMessage.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterConnectMessage.java index f5d5297f2a..b9bf077125 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterConnectMessage.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; public class ClusterConnectMessage extends PacketImpl { diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java index f07c60ac45..83056901ef 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; public class ClusterConnectReplyMessage extends PacketImpl { diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java index f56128883b..93fe747239 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/QuorumVoteMessage.java similarity index 81% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/QuorumVoteMessage.java index c9af7ac732..de7a0ebdb7 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/QuorumVoteMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.server.cluster.qourum.QuorumVoteHandler; -import org.hornetq.core.server.cluster.qourum.Vote; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq6.core.server.cluster.qourum.Vote; public class QuorumVoteMessage extends PacketImpl { diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java similarity index 82% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java index 459bd80332..af203970de 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.server.cluster.qourum.QuorumVoteHandler; -import org.hornetq.core.server.cluster.qourum.Vote; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq6.core.server.cluster.qourum.Vote; public class QuorumVoteReplyMessage extends PacketImpl { diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationAddMessage.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationAddMessage.java index 2c8278c3e1..246f25dc66 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationAddMessage.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.replication.ReplicationManager.ADD_OPERATION_TYPE; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.replication.ReplicationManager.ADD_OPERATION_TYPE; /** * A ReplicationAddMessage diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java index 7a846ab0be..bcec74aa57 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.replication.ReplicationManager.ADD_OPERATION_TYPE; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.replication.ReplicationManager.ADD_OPERATION_TYPE; /** * A ReplicationAddMessage diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java index 8d82f2ef2c..bad53a1439 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A ReplicationAddMessage diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java index 10b92d0fc6..3458c2f140 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A ReplicationDeleteMessage diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java index b797dd1f0f..a1aed0f034 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A ReplicationAddMessage diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java index eb7fda1e43..37b26bccc3 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A ReplicationLargeMessageBeingMessage diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java index cc023a2248..815a6c88ac 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A ReplicationLargemessageEndMessage diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java index 0449e69361..b95fab6df9 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A ReplicationLargeMessageWriteMessage diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java index 4504a76066..4ce8bf3be4 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java @@ -13,10 +13,10 @@ /** * */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * Message indicating that the live is stopping (a scheduled stop). diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java index 8bde5d9f97..19bfb5a135 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A ReplicationPageWrite diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java index 00bf88d813..77a27ba3f5 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.impl.PagedMessageImpl; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.impl.PagedMessageImpl; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * A ReplicationPageWrite diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java index 27dbaef51a..82845b2a1a 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Clebert Suconic diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java index e2d0a8f739..5f36fa9033 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * @author Tim Fox diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java index 282738e7fa..a3aea5e0c8 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import java.security.InvalidParameterException; import java.util.Arrays; import java.util.List; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.impl.JournalFile; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.JournalContent; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.JournalContent; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** * This message may signal start or end of the replication synchronization. diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java index 114de68bbc..60cc5bd63a 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.EnumSet; import java.util.Set; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.JournalContent; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.JournalContent; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; /** - * Message is used to sync {@link org.hornetq.core.journal.SequentialFile}s to a backup server. The {@link FileType} controls + * Message is used to sync {@link org.apache.activemq6.core.journal.SequentialFile}s to a backup server. The {@link FileType} controls * which extra information is sent. */ public final class ReplicationSyncFileMessage extends PacketImpl @@ -34,7 +34,7 @@ public final class ReplicationSyncFileMessage extends PacketImpl */ private JournalContent journalType; /** - * This value refers to {@link org.hornetq.core.journal.impl.JournalFile#getFileID()}, or the + * This value refers to {@link org.apache.activemq6.core.journal.impl.JournalFile#getFileID()}, or the * message id if we are sync'ing a large-message. */ private long fileId; diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java index 4ef20e8136..466cccdc24 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.core.impl.wireformat; +package org.apache.activemq6.core.protocol.core.impl.wireformat; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; public class ScaleDownAnnounceMessage extends PacketImpl { diff --git a/hornetq-server/src/main/java/org/hornetq/core/protocol/stomp/WebSocketServerHandler.java b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/stomp/WebSocketServerHandler.java similarity index 99% rename from hornetq-server/src/main/java/org/hornetq/core/protocol/stomp/WebSocketServerHandler.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/protocol/stomp/WebSocketServerHandler.java index 07564d0576..760d3428a7 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/protocol/stomp/WebSocketServerHandler.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/stomp/WebSocketServerHandler.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.protocol.stomp; +package org.apache.activemq6.core.protocol.stomp; import java.nio.charset.StandardCharsets; diff --git a/hornetq-server/src/main/java/org/hornetq/core/registry/JndiBindingRegistry.java b/activemq6-server/src/main/java/org/apache/activemq6/core/registry/JndiBindingRegistry.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/registry/JndiBindingRegistry.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/registry/JndiBindingRegistry.java index 7f18916901..1298f94d4b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/registry/JndiBindingRegistry.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/registry/JndiBindingRegistry.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.registry; +package org.apache.activemq6.core.registry; -import org.hornetq.spi.core.naming.BindingRegistry; +import org.apache.activemq6.spi.core.naming.BindingRegistry; import javax.naming.Context; import javax.naming.InitialContext; @@ -140,7 +140,7 @@ public class JndiBindingRegistry implements BindingRegistry // OK } - Context c = org.hornetq.utils.JNDIUtil.createContext(context, parentContext); + Context c = org.apache.activemq6.utils.JNDIUtil.createContext(context, parentContext); c.rebind(jndiNameInContext, objectToBind); } diff --git a/hornetq-server/src/main/java/org/hornetq/core/registry/MapBindingRegistry.java b/activemq6-server/src/main/java/org/apache/activemq6/core/registry/MapBindingRegistry.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/registry/MapBindingRegistry.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/registry/MapBindingRegistry.java index 5c44de2365..0ed2d41109 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/registry/MapBindingRegistry.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/registry/MapBindingRegistry.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.registry; +package org.apache.activemq6.core.registry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.hornetq.spi.core.naming.BindingRegistry; +import org.apache.activemq6.spi.core.naming.BindingRegistry; /** * @author Bill Burke diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMAcceptor.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMAcceptor.java index ae0838eb5f..986d8e5ba4 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMAcceptor.java @@ -10,31 +10,31 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.invm; +package org.apache.activemq6.core.remoting.impl.invm; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.core.security.HornetQPrincipal; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationService; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.utils.ConfigurationHelper; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.OrderedExecutorFactory; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.core.security.HornetQPrincipal; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationService; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.utils.ConfigurationHelper; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.OrderedExecutorFactory; +import org.apache.activemq6.utils.TypedProperties; /** * A InVMAcceptor diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMAcceptorFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMAcceptorFactory.java similarity index 79% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMAcceptorFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMAcceptorFactory.java index d5289abc84..28edc71ff3 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMAcceptorFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMAcceptorFactory.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.invm; +package org.apache.activemq6.core.remoting.impl.invm; import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.AcceptorFactory; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.AcceptorFactory; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; /** * A InVMAcceptorFactory diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMConnection.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnection.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMConnection.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnection.java index 0613724045..40fc02022b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMConnection.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnection.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.invm; +package org.apache.activemq6.core.remoting.impl.invm; import java.util.HashMap; import java.util.Map; @@ -20,18 +20,18 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import io.netty.channel.ChannelFutureListener; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.security.HornetQPrincipal; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.spi.core.remoting.ReadyListener; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.security.HornetQPrincipal; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.spi.core.remoting.ReadyListener; +import org.apache.activemq6.utils.UUIDGenerator; /** * A InVMConnection @@ -283,7 +283,7 @@ public class InVMConnection implements Connection { Map params = new HashMap(); - params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, serverID); + params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, serverID); return new TransportConfiguration(InVMConnectorFactory.class.getName(), params); } diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMConnector.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnector.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMConnector.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnector.java index b47cc66147..c871c10fab 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMConnector.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnector.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.invm; +package org.apache.activemq6.core.remoting.impl.invm; import java.util.Collections; import java.util.HashMap; @@ -19,18 +19,18 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.spi.core.remoting.AbstractConnector; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.ClientProtocolManager; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.utils.ConfigurationHelper; -import org.hornetq.utils.OrderedExecutorFactory; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.spi.core.remoting.AbstractConnector; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.utils.ConfigurationHelper; +import org.apache.activemq6.utils.OrderedExecutorFactory; /** * A InVMConnector diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMConnectorFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnectorFactory.java similarity index 83% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMConnectorFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnectorFactory.java index 283ea982ee..cf4d4c26a7 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMConnectorFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnectorFactory.java @@ -11,18 +11,18 @@ * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.invm; +package org.apache.activemq6.core.remoting.impl.invm; import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.ClientProtocolManager; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.spi.core.remoting.Connector; -import org.hornetq.spi.core.remoting.ConnectorFactory; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.spi.core.remoting.Connector; +import org.apache.activemq6.spi.core.remoting.ConnectorFactory; /** * A InVMConnectorFactory diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMRegistry.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMRegistry.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMRegistry.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMRegistry.java index fbd10558c3..7f3ab5deb3 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/InVMRegistry.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMRegistry.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.invm; +package org.apache.activemq6.core.remoting.impl.invm; -import org.hornetq.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQMessageBundle; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/TransportConstants.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/TransportConstants.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/TransportConstants.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/TransportConstants.java index ea67573f1f..2fa1600dd6 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/invm/TransportConstants.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/TransportConstants.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.invm; +package org.apache.activemq6.core.remoting.impl.invm; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.hornetq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; /** * A TransportConstants @@ -39,7 +39,7 @@ public final class TransportConstants { Set allowableAcceptorKeys = new HashSet(); allowableAcceptorKeys.add(TransportConstants.SERVER_ID_PROP_NAME); - allowableAcceptorKeys.add(org.hornetq.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION); + allowableAcceptorKeys.add(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION); allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropMaskPassword()); allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropPasswordCodec()); diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/ConnectionCreator.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/ConnectionCreator.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/ConnectionCreator.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/ConnectionCreator.java index 41db4aedfd..cd479d3f83 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/ConnectionCreator.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/ConnectionCreator.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/HttpAcceptorHandler.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HttpAcceptorHandler.java similarity index 99% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/HttpAcceptorHandler.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HttpAcceptorHandler.java index 9c1019079d..d3eed0ea2b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/HttpAcceptorHandler.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HttpAcceptorHandler.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ExecutorService; diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/HttpKeepAliveRunnable.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HttpKeepAliveRunnable.java similarity index 97% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/HttpKeepAliveRunnable.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HttpKeepAliveRunnable.java index c8836f5d78..7349fa86e1 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/HttpKeepAliveRunnable.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HttpKeepAliveRunnable.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import java.util.ArrayList; import java.util.List; diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyAcceptor.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyAcceptor.java index adcf29fd23..7c4c2cbce1 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyAcceptor.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; @@ -48,29 +48,29 @@ import io.netty.util.ResourceLeakDetector; import io.netty.util.concurrent.GenericFutureListener; import io.netty.util.concurrent.GlobalEventExecutor; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.protocol.ProtocolHandler; -import org.hornetq.core.remoting.impl.ssl.SSLSupport; -import org.hornetq.core.security.HornetQPrincipal; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationService; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.utils.ConfigurationHelper; -import org.hornetq.utils.HornetQThreadFactory; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq6.core.protocol.ProtocolHandler; +import org.apache.activemq6.core.remoting.impl.ssl.SSLSupport; +import org.apache.activemq6.core.security.HornetQPrincipal; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationService; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.utils.ConfigurationHelper; +import org.apache.activemq6.utils.HornetQThreadFactory; +import org.apache.activemq6.utils.TypedProperties; /** * A Netty TCP Acceptor that supports SSL diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptorFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyAcceptorFactory.java similarity index 79% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptorFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyAcceptorFactory.java index 5e7f76bd7e..9fb3c6f3c7 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptorFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyAcceptorFactory.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.AcceptorFactory; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.AcceptorFactory; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; /** * A NettyAcceptorFactory diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/NettyServerConnection.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyServerConnection.java similarity index 83% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/NettyServerConnection.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyServerConnection.java index c89de5073a..04372634d8 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/impl/netty/NettyServerConnection.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyServerConnection.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.impl.netty; +package org.apache.activemq6.core.remoting.impl.netty; import java.util.Map; import io.netty.channel.Channel; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.buffers.impl.ChannelBufferWrapper; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; /** * @author Norman Maurer diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/server/RemotingService.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/server/RemotingService.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/server/RemotingService.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/server/RemotingService.java index 3a95e5ac87..e00baeb35b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/server/RemotingService.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/server/RemotingService.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.server; +package org.apache.activemq6.core.remoting.server; import java.util.Set; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.security.HornetQPrincipal; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.Acceptor; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.security.HornetQPrincipal; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.Acceptor; /** * @author Jeff Mesnil diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/server/impl/RemotingServiceImpl.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/remoting/server/impl/RemotingServiceImpl.java index f1b2ce9efd..4e38d8c902 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/server/impl/RemotingServiceImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.remoting.server.impl; +package org.apache.activemq6.core.remoting.server.impl; import java.security.AccessController; import java.security.PrivilegedAction; @@ -31,39 +31,39 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQInterruptedException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.impl.CoreProtocolManagerFactory; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.remoting.server.RemotingService; -import org.hornetq.core.security.HornetQPrincipal; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.ClusterManager; -import org.hornetq.core.server.impl.ServiceRegistry; -import org.hornetq.core.server.impl.ServerSessionImpl; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.spi.core.protocol.ConnectionEntry; -import org.hornetq.spi.core.protocol.ProtocolManager; -import org.hornetq.spi.core.protocol.ProtocolManagerFactory; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.AcceptorFactory; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.utils.ClassloadingUtil; -import org.hornetq.utils.ConfigurationHelper; -import org.hornetq.utils.HornetQThreadFactory; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.impl.CoreProtocolManagerFactory; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.remoting.server.RemotingService; +import org.apache.activemq6.core.security.HornetQPrincipal; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.server.cluster.ClusterManager; +import org.apache.activemq6.core.server.impl.ServiceRegistry; +import org.apache.activemq6.core.server.impl.ServerSessionImpl; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.spi.core.protocol.ConnectionEntry; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.AcceptorFactory; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.utils.ClassloadingUtil; +import org.apache.activemq6.utils.ConfigurationHelper; +import org.apache.activemq6.utils.HornetQThreadFactory; /** * @author Jeff Mesnil @@ -631,7 +631,7 @@ public class RemotingServiceImpl implements RemotingService, ConnectionLifeCycle private ClusterConnection lookupClusterConnection(TransportConfiguration acceptorConfig) { - String clusterConnectionName = (String) acceptorConfig.getParams().get(org.hornetq.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION); + String clusterConnectionName = (String) acceptorConfig.getParams().get(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION); ClusterConnection clusterConnection = null; if (clusterConnectionName != null) diff --git a/hornetq-server/src/main/java/org/hornetq/core/replication/ReplicatedJournal.java b/activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicatedJournal.java similarity index 82% rename from hornetq-server/src/main/java/org/hornetq/core/replication/ReplicatedJournal.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicatedJournal.java index 94dcc29677..cc0cca540e 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/replication/ReplicatedJournal.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicatedJournal.java @@ -10,32 +10,32 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.replication; +package org.apache.activemq6.core.replication; import java.util.List; import java.util.Map; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.IOCompletion; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.JournalLoadInformation; -import org.hornetq.core.journal.LoaderCallback; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.TransactionFailureCallback; -import org.hornetq.core.journal.impl.JournalFile; -import org.hornetq.core.journal.impl.dataformat.ByteArrayEncoding; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.replication.ReplicationManager.ADD_OPERATION_TYPE; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.IOCompletion; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.JournalLoadInformation; +import org.apache.activemq6.core.journal.LoaderCallback; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.TransactionFailureCallback; +import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq6.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.replication.ReplicationManager.ADD_OPERATION_TYPE; /** - * Used by the {@link org.hornetq.core.persistence.impl.journal.JournalStorageManager} to replicate journal calls. + * Used by the {@link org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager} to replicate journal calls. *

* This class wraps a {@link ReplicationManager} and the local {@link Journal}. Every call will be * relayed to both instances. * @author Clebert Suconic - * @see org.hornetq.core.persistence.impl.journal.JournalStorageManager + * @see org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager */ public class ReplicatedJournal implements Journal { @@ -68,7 +68,7 @@ public class ReplicatedJournal implements Journal * @param record * @param sync * @throws Exception - * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, byte[], boolean) + * @see org.apache.activemq6.core.journal.Journal#appendAddRecord(long, byte, byte[], boolean) */ public void appendAddRecord(final long id, final byte recordType, final byte[] record, final boolean sync) throws Exception { @@ -91,7 +91,7 @@ public class ReplicatedJournal implements Journal * @param record * @param sync * @throws Exception - * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean) + * @see org.apache.activemq6.core.journal.Journal#appendAddRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean) */ public void appendAddRecord(final long id, final byte recordType, @@ -113,7 +113,7 @@ public class ReplicatedJournal implements Journal * @param recordType * @param record * @throws Exception - * @see org.hornetq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, byte[]) + * @see org.apache.activemq6.core.journal.Journal#appendAddRecordTransactional(long, long, byte, byte[]) */ public void appendAddRecordTransactional(final long txID, final long id, final byte recordType, final byte[] record) throws Exception { @@ -126,7 +126,7 @@ public class ReplicatedJournal implements Journal * @param recordType * @param record * @throws Exception - * @see org.hornetq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport) + * @see org.apache.activemq6.core.journal.Journal#appendAddRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport) */ public void appendAddRecordTransactional(final long txID, final long id, @@ -145,7 +145,7 @@ public class ReplicatedJournal implements Journal * @param txID * @param sync * @throws Exception - * @see org.hornetq.core.journal.Journal#appendCommitRecord(long, boolean) + * @see org.apache.activemq6.core.journal.Journal#appendCommitRecord(long, boolean) */ public void appendCommitRecord(final long txID, final boolean sync) throws Exception { @@ -182,7 +182,7 @@ public class ReplicatedJournal implements Journal * @param id * @param sync * @throws Exception - * @see org.hornetq.core.journal.Journal#appendDeleteRecord(long, boolean) + * @see org.apache.activemq6.core.journal.Journal#appendDeleteRecord(long, boolean) */ @Override public void appendDeleteRecord(final long id, final boolean sync) throws Exception @@ -211,7 +211,7 @@ public class ReplicatedJournal implements Journal * @param id * @param record * @throws Exception - * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long, byte[]) + * @see org.apache.activemq6.core.journal.Journal#appendDeleteRecordTransactional(long, long, byte[]) */ public void appendDeleteRecordTransactional(final long txID, final long id, final byte[] record) throws Exception { @@ -223,7 +223,7 @@ public class ReplicatedJournal implements Journal * @param id * @param record * @throws Exception - * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long, org.hornetq.core.journal.EncodingSupport) + * @see org.apache.activemq6.core.journal.Journal#appendDeleteRecordTransactional(long, long, org.hornetq.core.journal.EncodingSupport) */ public void appendDeleteRecordTransactional(final long txID, final long id, final EncodingSupport record) throws Exception { @@ -239,7 +239,7 @@ public class ReplicatedJournal implements Journal * @param txID * @param id * @throws Exception - * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long) + * @see org.apache.activemq6.core.journal.Journal#appendDeleteRecordTransactional(long, long) */ public void appendDeleteRecordTransactional(final long txID, final long id) throws Exception { @@ -256,7 +256,7 @@ public class ReplicatedJournal implements Journal * @param transactionData * @param sync * @throws Exception - * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, byte[], boolean) + * @see org.apache.activemq6.core.journal.Journal#appendPrepareRecord(long, byte[], boolean) */ public void appendPrepareRecord(final long txID, final byte[] transactionData, final boolean sync) throws Exception { @@ -268,7 +268,7 @@ public class ReplicatedJournal implements Journal * @param transactionData * @param sync * @throws Exception - * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, org.hornetq.core.journal.EncodingSupport, boolean) + * @see org.apache.activemq6.core.journal.Journal#appendPrepareRecord(long, org.hornetq.core.journal.EncodingSupport, boolean) */ public void appendPrepareRecord(final long txID, final EncodingSupport transactionData, final boolean sync) throws Exception { @@ -298,7 +298,7 @@ public class ReplicatedJournal implements Journal * @param txID * @param sync * @throws Exception - * @see org.hornetq.core.journal.Journal#appendRollbackRecord(long, boolean) + * @see org.apache.activemq6.core.journal.Journal#appendRollbackRecord(long, boolean) */ public void appendRollbackRecord(final long txID, final boolean sync) throws Exception { @@ -326,7 +326,7 @@ public class ReplicatedJournal implements Journal * @param record * @param sync * @throws Exception - * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, byte[], boolean) + * @see org.apache.activemq6.core.journal.Journal#appendUpdateRecord(long, byte, byte[], boolean) */ public void appendUpdateRecord(final long id, final byte recordType, final byte[] record, final boolean sync) throws Exception { @@ -339,7 +339,7 @@ public class ReplicatedJournal implements Journal * @param record * @param sync * @throws Exception - * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean) + * @see org.apache.activemq6.core.journal.Journal#appendUpdateRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean) */ @Override public void appendUpdateRecord(final long id, final byte recordType, final EncodingSupport record, final boolean sync) throws Exception @@ -373,7 +373,7 @@ public class ReplicatedJournal implements Journal * @param recordType * @param record * @throws Exception - * @see org.hornetq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, byte[]) + * @see org.apache.activemq6.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, byte[]) */ public void appendUpdateRecordTransactional(final long txID, final long id, final byte recordType, final byte[] record) throws Exception @@ -387,7 +387,7 @@ public class ReplicatedJournal implements Journal * @param recordType * @param record * @throws Exception - * @see org.hornetq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport) + * @see org.apache.activemq6.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport) */ public void appendUpdateRecordTransactional(final long txID, final long id, final byte recordType, final EncodingSupport record) throws Exception @@ -407,7 +407,7 @@ public class ReplicatedJournal implements Journal * @param transactionFailure * * @throws Exception - * @see org.hornetq.core.journal.Journal#load(java.util.List, java.util.List, org.hornetq.core.journal.TransactionFailureCallback) + * @see org.apache.activemq6.core.journal.Journal#load(java.util.List, java.util.List, org.hornetq.core.journal.TransactionFailureCallback) */ public JournalLoadInformation load(final List committedRecords, final List preparedTransactions, @@ -420,7 +420,7 @@ public class ReplicatedJournal implements Journal * @param reloadManager * * @throws Exception - * @see org.hornetq.core.journal.Journal#load(org.hornetq.core.journal.LoaderCallback) + * @see org.apache.activemq6.core.journal.Journal#load(org.hornetq.core.journal.LoaderCallback) */ public JournalLoadInformation load(final LoaderCallback reloadManager) throws Exception { @@ -430,7 +430,7 @@ public class ReplicatedJournal implements Journal /** * @param pages * @throws Exception - * @see org.hornetq.core.journal.Journal#perfBlast(int) + * @see org.apache.activemq6.core.journal.Journal#perfBlast(int) */ public void perfBlast(final int pages) { @@ -439,7 +439,7 @@ public class ReplicatedJournal implements Journal /** * @throws Exception - * @see org.hornetq.core.server.HornetQComponent#start() + * @see org.apache.activemq6.core.server.HornetQComponent#start() */ public void start() throws Exception { @@ -448,7 +448,7 @@ public class ReplicatedJournal implements Journal /** * @throws Exception - * @see org.hornetq.core.server.HornetQComponent#stop() + * @see org.apache.activemq6.core.server.HornetQComponent#stop() */ public void stop() throws Exception { diff --git a/hornetq-server/src/main/java/org/hornetq/core/replication/ReplicatedLargeMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicatedLargeMessage.java similarity index 61% rename from hornetq-server/src/main/java/org/hornetq/core/replication/ReplicatedLargeMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicatedLargeMessage.java index 52404a857a..f87ceba6ca 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/replication/ReplicatedLargeMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicatedLargeMessage.java @@ -13,36 +13,36 @@ /** * */ -package org.hornetq.core.replication; +package org.apache.activemq6.core.replication; -import org.hornetq.api.core.Message; +import org.apache.activemq6.api.core.Message; /** - * {@link org.hornetq.core.server.LargeServerMessage} methods used by the {@link ReplicationEndpoint}. + * {@link org.apache.activemq6.core.server.LargeServerMessage} methods used by the {@link ReplicationEndpoint}. *

- * In practice a subset of the methods necessary to have a {@link org.hornetq.core.server.LargeServerMessage} + * In practice a subset of the methods necessary to have a {@link org.apache.activemq6.core.server.LargeServerMessage} * - * @see org.hornetq.core.persistence.impl.journal.LargeServerMessageInSync + * @see org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageInSync */ public interface ReplicatedLargeMessage { /** - * @see org.hornetq.core.server.LargeServerMessage#setDurable(boolean) + * @see org.apache.activemq6.core.server.LargeServerMessage#setDurable(boolean) */ Message setDurable(boolean b); /** - * @see org.hornetq.core.server.LargeServerMessage#setMessageID(long) + * @see org.apache.activemq6.core.server.LargeServerMessage#setMessageID(long) */ Message setMessageID(long id); /** - * @see org.hornetq.core.server.LargeServerMessage#releaseResources() + * @see org.apache.activemq6.core.server.LargeServerMessage#releaseResources() */ void releaseResources(); /** - * @see org.hornetq.core.server.LargeServerMessage#deleteFile() + * @see org.apache.activemq6.core.server.LargeServerMessage#deleteFile() */ void deleteFile() throws Exception; diff --git a/hornetq-server/src/main/java/org/hornetq/core/replication/ReplicationEndpoint.java b/activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicationEndpoint.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/replication/ReplicationEndpoint.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicationEndpoint.java index dd68e361a4..12954af129 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/replication/ReplicationEndpoint.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicationEndpoint.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.replication; +package org.apache.activemq6.core.replication; import java.io.File; import java.io.FileOutputStream; @@ -27,54 +27,54 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.journal.IOCriticalErrorListener; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.Journal.JournalState; -import org.hornetq.core.journal.JournalLoadInformation; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.impl.FileWrapperJournal; -import org.hornetq.core.journal.impl.JournalFile; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.paging.impl.PagingManagerImpl; -import org.hornetq.core.paging.impl.PagingStoreFactoryNIO; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.JournalContent; -import org.hornetq.core.persistence.impl.journal.LargeServerMessageInSync; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.ChannelHandler; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.hornetq.core.protocol.core.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationAddMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationCommitMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage.SyncDataType; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; -import org.hornetq.core.replication.ReplicationManager.ADD_OPERATION_TYPE; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.cluster.qourum.SharedNothingBackupQuorum; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.SharedNothingBackupActivation; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.journal.IOCriticalErrorListener; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.Journal.JournalState; +import org.apache.activemq6.core.journal.JournalLoadInformation; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.impl.FileWrapperJournal; +import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.paging.impl.PagingManagerImpl; +import org.apache.activemq6.core.paging.impl.PagingStoreFactoryNIO; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.JournalContent; +import org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageInSync; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.ChannelHandler; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.HornetQExceptionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationCommitMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage.SyncDataType; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; +import org.apache.activemq6.core.replication.ReplicationManager.ADD_OPERATION_TYPE; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.SharedNothingBackupActivation; /** * Handles all the synchronization necessary for replication on the backup side (that is the diff --git a/hornetq-server/src/main/java/org/hornetq/core/replication/ReplicationManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicationManager.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/replication/ReplicationManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicationManager.java index cd43ffa085..626b183b76 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/replication/ReplicationManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicationManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.replication; +package org.apache.activemq6.core.replication; import java.io.FileInputStream; import java.nio.ByteBuffer; @@ -22,44 +22,44 @@ import java.util.Queue; import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.impl.JournalFile; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.JournalContent; -import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.ChannelHandler; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationAddMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationCommitMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.utils.ExecutorFactory; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.JournalContent; +import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.ChannelHandler; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationCommitMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.utils.ExecutorFactory; import org.omg.CORBA.portable.ResponseHandler; /** diff --git a/hornetq-server/src/main/java/org/hornetq/core/security/CheckType.java b/activemq6-server/src/main/java/org/apache/activemq6/core/security/CheckType.java similarity index 97% rename from hornetq-server/src/main/java/org/hornetq/core/security/CheckType.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/security/CheckType.java index 0ab051decb..2d1c2ab90b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/security/CheckType.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/security/CheckType.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.security; +package org.apache.activemq6.core.security; /** * @author Jeff Mesnil diff --git a/hornetq-server/src/main/java/org/hornetq/core/security/SecurityStore.java b/activemq6-server/src/main/java/org/apache/activemq6/core/security/SecurityStore.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/security/SecurityStore.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/security/SecurityStore.java index c7325cae95..95d655bd27 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/security/SecurityStore.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/security/SecurityStore.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.security; +package org.apache.activemq6.core.security; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.ServerSession; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.ServerSession; /** * @author Ovidiu Feodorov diff --git a/hornetq-server/src/main/java/org/hornetq/core/security/impl/SecurityStoreImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/security/impl/SecurityStoreImpl.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/security/impl/SecurityStoreImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/security/impl/SecurityStoreImpl.java index d260ba3fe8..9d52656054 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/security/impl/SecurityStoreImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/security/impl/SecurityStoreImpl.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.security.impl; +package org.apache.activemq6.core.security.impl; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.core.security.SecurityStore; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationService; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.HierarchicalRepositoryChangeListener; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.security.SecurityStore; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationService; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.HierarchicalRepositoryChangeListener; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.TypedProperties; /** * The HornetQ SecurityStore implementation diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/ActivateCallback.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ActivateCallback.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/server/ActivateCallback.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/ActivateCallback.java index 361bb3a8d2..f3ba55aa50 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/ActivateCallback.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ActivateCallback.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; /** * A ActivateCallback diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/ActivationParams.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ActivationParams.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/server/ActivationParams.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/ActivationParams.java index b9b6f4bcad..17691695e6 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/ActivationParams.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ActivationParams.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; public class ActivationParams { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/Bindable.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/Bindable.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/server/Bindable.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/Bindable.java index 44d96cd049..a44c42004a 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/Bindable.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/Bindable.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; /** * A Bindable diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/BindingQueryResult.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/BindingQueryResult.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/BindingQueryResult.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/BindingQueryResult.java index 33f58cb7ec..967701a1f2 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/BindingQueryResult.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/BindingQueryResult.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; import java.util.List; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/ConnectorService.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ConnectorService.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/server/ConnectorService.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/ConnectorService.java index 47164dab77..5cefa86c91 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/ConnectorService.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ConnectorService.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; /** * @author Andy Taylor diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/ConnectorServiceFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ConnectorServiceFactory.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/server/ConnectorServiceFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/ConnectorServiceFactory.java index 61cd0ff1cd..3f14ec8781 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/ConnectorServiceFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ConnectorServiceFactory.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; import java.util.Map; import java.util.Set; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/Consumer.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/Consumer.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/server/Consumer.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/Consumer.java index a50896dcb9..82fcd5316c 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/Consumer.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/Consumer.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; import java.util.List; -import org.hornetq.core.filter.Filter; +import org.apache.activemq6.core.filter.Filter; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/Divert.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/Divert.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/server/Divert.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/Divert.java index a8eae1d379..5a07ce9b73 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/Divert.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/Divert.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; /** * A Divert diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/HandleStatus.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/HandleStatus.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/server/HandleStatus.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/HandleStatus.java index f1410f93c2..cfdc8bf973 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/HandleStatus.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/HandleStatus.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQMessageBundle.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQMessageBundle.java index 2034b6154d..52993f1739 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQMessageBundle.java @@ -11,29 +11,29 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.HornetQAddressFullException; -import org.hornetq.api.core.HornetQClusterSecurityException; -import org.hornetq.api.core.HornetQConnectionTimedOutException; -import org.hornetq.api.core.HornetQDisconnectedException; -import org.hornetq.api.core.HornetQDuplicateMetaDataException; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQIOErrorException; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.HornetQIncompatibleClientServerException; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.api.core.HornetQInvalidFilterExpressionException; -import org.hornetq.api.core.HornetQInvalidTransientQueueUseException; -import org.hornetq.api.core.HornetQNonExistentQueueException; -import org.hornetq.api.core.HornetQQueueExistsException; -import org.hornetq.api.core.HornetQSecurityException; -import org.hornetq.api.core.HornetQSessionCreationException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; -import org.hornetq.core.security.CheckType; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.HornetQAddressFullException; +import org.apache.activemq6.api.core.HornetQClusterSecurityException; +import org.apache.activemq6.api.core.HornetQConnectionTimedOutException; +import org.apache.activemq6.api.core.HornetQDisconnectedException; +import org.apache.activemq6.api.core.HornetQDuplicateMetaDataException; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQIOErrorException; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.HornetQIncompatibleClientServerException; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq6.api.core.HornetQInvalidFilterExpressionException; +import org.apache.activemq6.api.core.HornetQInvalidTransientQueueUseException; +import org.apache.activemq6.api.core.HornetQNonExistentQueueException; +import org.apache.activemq6.api.core.HornetQQueueExistsException; +import org.apache.activemq6.api.core.HornetQSecurityException; +import org.apache.activemq6.api.core.HornetQSessionCreationException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; +import org.apache.activemq6.core.security.CheckType; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; @@ -292,25 +292,25 @@ public interface HornetQMessageBundle IllegalArgumentException autoConvertError(Class aClass); /** - * Message used on on {@link org.hornetq.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)} + * Message used on on {@link org.apache.activemq6.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)} */ @Message(id = 119076, value = "Executing destroyConnection with {0}={1} through management''s request", format = Message.Format.MESSAGE_FORMAT) String destroyConnectionWithSessionMetadataHeader(String key, String value); /** - * Message used on on {@link org.hornetq.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)} + * Message used on on {@link org.apache.activemq6.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)} */ @Message(id = 119077, value = "Closing connection {0}", format = Message.Format.MESSAGE_FORMAT) String destroyConnectionWithSessionMetadataClosingConnection(String serverSessionString); /** - * Exception used on on {@link org.hornetq.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)} + * Exception used on on {@link org.apache.activemq6.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)} */ @Message(id = 119078, value = "Disconnected per admin''s request on {0}={1}", format = Message.Format.MESSAGE_FORMAT) HornetQDisconnectedException destroyConnectionWithSessionMetadataSendException(String key, String value); /** - * Message used on on {@link org.hornetq.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)} + * Message used on on {@link org.apache.activemq6.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)} */ @Message(id = 119079, value = "No session found with {0}={1}", format = Message.Format.MESSAGE_FORMAT) String destroyConnectionWithSessionMetadataNoSessionFound(String key, String value); diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQServer.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServer.java similarity index 80% rename from hornetq-server/src/main/java/org/hornetq/core/server/HornetQServer.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServer.java index 7e9ee28a0f..2fa654cda6 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQServer.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServer.java @@ -10,39 +10,39 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; import java.util.List; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.management.impl.HornetQServerControlImpl; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.remoting.server.RemotingService; -import org.hornetq.core.replication.ReplicationManager; -import org.hornetq.core.security.Role; -import org.hornetq.core.security.SecurityStore; -import org.hornetq.core.server.cluster.ClusterManager; -import org.hornetq.core.server.cluster.ha.HAPolicy; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.server.impl.Activation; -import org.hornetq.core.server.impl.ConnectorsService; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.version.Version; -import org.hornetq.spi.core.protocol.ProtocolManagerFactory; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.protocol.SessionCallback; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.utils.ExecutorFactory; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.management.impl.HornetQServerControlImpl; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.remoting.server.RemotingService; +import org.apache.activemq6.core.replication.ReplicationManager; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.security.SecurityStore; +import org.apache.activemq6.core.server.cluster.ClusterManager; +import org.apache.activemq6.core.server.cluster.ha.HAPolicy; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.server.impl.Activation; +import org.apache.activemq6.core.server.impl.ConnectorsService; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.version.Version; +import org.apache.activemq6.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.utils.ExecutorFactory; /** * This interface defines the internal interface of the HornetQ Server exposed to other components diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQServerLogger.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServerLogger.java similarity index 98% rename from hornetq-server/src/main/java/org/hornetq/core/server/HornetQServerLogger.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServerLogger.java index 3309946bb4..d7a566153d 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQServerLogger.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServerLogger.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; /** * @author Andy Taylor @@ -40,26 +40,26 @@ import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import io.netty.channel.Channel; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.impl.JournalFile; -import org.hornetq.core.paging.cursor.PagePosition; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.impl.BridgeImpl; -import org.hornetq.core.server.cluster.impl.ClusterConnectionImpl; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.ServerSessionImpl; -import org.hornetq.core.server.management.Notification; -import org.hornetq.utils.FutureLatch; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq6.core.paging.cursor.PagePosition; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq6.core.server.cluster.Bridge; +import org.apache.activemq6.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.ServerSessionImpl; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.utils.FutureLatch; import org.jboss.logging.BasicLogger; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.LogMessage; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQServers.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServers.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/server/HornetQServers.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServers.java index 6ec7ad5140..bdae34b896 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQServers.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServers.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; import java.lang.management.ManagementFactory; import javax.management.MBeanServer; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl; /** * HornetQServers is a factory class for instantiating HornetQServer instances. diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/JournalType.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/JournalType.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/server/JournalType.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/JournalType.java index 98bc5828e6..8262a45ca0 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/JournalType.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/JournalType.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/LargeServerMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/LargeServerMessage.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/server/LargeServerMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/LargeServerMessage.java index 2c18cd96e3..7a4c664f7d 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/LargeServerMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/LargeServerMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.replication.ReplicatedLargeMessage; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.replication.ReplicatedLargeMessage; /** diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/LiveNodeLocator.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/LiveNodeLocator.java similarity index 85% rename from hornetq-server/src/main/java/org/hornetq/core/server/LiveNodeLocator.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/LiveNodeLocator.java index ba7cb8a405..ab7e7ac78a 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/LiveNodeLocator.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/LiveNodeLocator.java @@ -11,14 +11,14 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum; /** * A class that will locate a particular live server running in a cluster. How this live is chosen diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/MemoryManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/MemoryManager.java similarity index 97% rename from hornetq-server/src/main/java/org/hornetq/core/server/MemoryManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/MemoryManager.java index 1ba18550a2..e5fa4ff7de 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/MemoryManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/MemoryManager.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; -import org.hornetq.utils.SizeFormatterUtil; +import org.apache.activemq6.utils.SizeFormatterUtil; /** * A memory usage watcher. diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/MessageReference.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/MessageReference.java similarity index 97% rename from hornetq-server/src/main/java/org/hornetq/core/server/MessageReference.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/MessageReference.java index 1d4ef8f685..f1a94ef5ee 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/MessageReference.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/MessageReference.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; /** diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/NodeManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/NodeManager.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/server/NodeManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/NodeManager.java index 049a3a66f8..c40c64050d 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/NodeManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/NodeManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; import java.io.File; import java.io.IOException; @@ -18,10 +18,10 @@ import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.utils.UUID; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.utils.UUID; +import org.apache.activemq6.utils.UUIDGenerator; /** * @author Andy Taylor diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/Queue.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/Queue.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/server/Queue.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/Queue.java index afa03ff82b..e973aeb0c1 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/Queue.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/Queue.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.concurrent.Executor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.utils.LinkedListIterator; -import org.hornetq.utils.ReferenceCounter; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.utils.LinkedListIterator; +import org.apache.activemq6.utils.ReferenceCounter; /** * A Queue diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/QueueFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/QueueFactory.java similarity index 83% rename from hornetq-server/src/main/java/org/hornetq/core/server/QueueFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/QueueFactory.java index 0fc639d349..1f4a74e89e 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/QueueFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/QueueFactory.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.postoffice.PostOffice; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.postoffice.PostOffice; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/RouteContextList.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/RouteContextList.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/server/RouteContextList.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/RouteContextList.java index 61eb6de592..db06ac813b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/RouteContextList.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/RouteContextList.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; import java.util.List; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/RoutingContext.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/RoutingContext.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/server/RoutingContext.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/RoutingContext.java index bdb4a03340..75207f9049 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/RoutingContext.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/RoutingContext.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; import java.util.List; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.transaction.Transaction; /** * A RoutingContext diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/ScheduledDeliveryHandler.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ScheduledDeliveryHandler.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/server/ScheduledDeliveryHandler.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/ScheduledDeliveryHandler.java index 30a9793b6b..960681fe19 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/ScheduledDeliveryHandler.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ScheduledDeliveryHandler.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; -import org.hornetq.core.filter.Filter; +import org.apache.activemq6.core.filter.Filter; import java.util.List; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/ServerConsumer.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerConsumer.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/server/ServerConsumer.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerConsumer.java index 6d94d019e0..9a56fcb1ca 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/ServerConsumer.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerConsumer.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; import java.util.List; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.Transaction; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/ServerMessage.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerMessage.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/server/ServerMessage.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerMessage.java index 6d84a3d01b..10d484a2b9 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/ServerMessage.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerMessage.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.paging.PagingStore; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.paging.PagingStore; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/ServerSession.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerSession.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/server/ServerSession.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerSession.java index e8d523ec66..21f4a70180 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/ServerSession.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerSession.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; import javax.transaction.xa.Xid; import java.util.List; import java.util.Set; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.utils.json.JSONArray; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.utils.json.JSONArray; /** * A ServerSession diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/ServerSessionFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerSessionFactory.java similarity index 65% rename from hornetq-server/src/main/java/org/hornetq/core/server/ServerSessionFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerSessionFactory.java index 8a752e811e..194237cf25 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/ServerSessionFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerSessionFactory.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.security.SecurityStore; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.ServerSessionImpl; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.protocol.SessionCallback; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.security.SecurityStore; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.ServerSessionImpl; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.protocol.SessionCallback; public interface ServerSessionFactory { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/TransientQueueManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/TransientQueueManager.java similarity index 83% rename from hornetq-server/src/main/java/org/hornetq/core/server/TransientQueueManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/TransientQueueManager.java index 9f7bec2433..14c80cb951 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/TransientQueueManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/TransientQueueManager.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server; +package org.apache.activemq6.core.server; -import org.hornetq.api.core.SimpleString; -import org.hornetq.utils.ReferenceCounter; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.utils.ReferenceCounter; /** * @author Clebert Suconic diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/BackupManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/BackupManager.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/BackupManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/BackupManager.java index 37cdea56cb..14fc942257 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/BackupManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/BackupManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster; +package org.apache.activemq6.core.server.cluster; import java.util.ArrayList; @@ -21,19 +21,19 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.NodeManager; -import org.hornetq.utils.ExecutorFactory; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.client.impl.Topology; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.utils.ExecutorFactory; /* * takes care of updating the cluster with a backups transport configuration which is based on each cluster connection. diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/Bridge.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/Bridge.java similarity index 77% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/Bridge.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/Bridge.java index 5244b0e7cd..febad927fb 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/Bridge.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/Bridge.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster; +package org.apache.activemq6.core.server.cluster; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.management.NotificationService; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.management.NotificationService; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * A Core Bridge diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/BroadcastGroup.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/BroadcastGroup.java similarity index 82% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/BroadcastGroup.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/BroadcastGroup.java index 59b21bc701..3496689807 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/BroadcastGroup.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/BroadcastGroup.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster; +package org.apache.activemq6.core.server.cluster; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.management.NotificationService; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.management.NotificationService; /** * A BroadcastGroup diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterConfigurationUtil.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterConfigurationUtil.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterConfigurationUtil.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterConfigurationUtil.java index 9db3e36a72..454f67e9fe 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterConfigurationUtil.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterConfigurationUtil.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster; +package org.apache.activemq6.core.server.cluster; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServerLogger; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServerLogger; import java.lang.reflect.Array; import java.util.List; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterConnection.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterConnection.java similarity index 82% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterConnection.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterConnection.java index f35ab62795..2f1bcdc066 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterConnection.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterConnection.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster; +package org.apache.activemq6.core.server.cluster; import java.util.Map; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServer; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.core.client.impl.Topology; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServer; /** * A ClusterConnection diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterControl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterControl.java similarity index 79% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterControl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterControl.java index 0ace46cbb8..e10f564aa1 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterControl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterControl.java @@ -11,33 +11,33 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster; +package org.apache.activemq6.core.server.cluster; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.ConfigurationUtils; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.impl.ChannelImpl; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.BackupRegistrationMessage; -import org.hornetq.core.protocol.core.impl.wireformat.BackupRequestMessage; -import org.hornetq.core.protocol.core.impl.wireformat.BackupResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterConnectMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; -import org.hornetq.core.protocol.core.impl.wireformat.NodeAnnounceMessage; -import org.hornetq.core.protocol.core.impl.wireformat.QuorumVoteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.cluster.qourum.QuorumVoteHandler; -import org.hornetq.core.server.cluster.qourum.Vote; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.ConfigurationUtils; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.impl.ChannelImpl; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupRegistrationMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupRequestMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterConnectMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.NodeAnnounceMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.QuorumVoteMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq6.core.server.cluster.qourum.Vote; /** * handles the communication between a cluster node and the cluster, either the whole cluster or a specific node in the @@ -90,7 +90,7 @@ public class ClusterControl implements AutoCloseable * @param attemptingFailBack if {@code true} then this server wants to trigger a fail-back when * up-to-date, that is it wants to take over the role of 'live' from the current 'live' * server. - * @throws org.hornetq.api.core.HornetQException + * @throws org.apache.activemq6.api.core.HornetQException */ public void announceReplicatingBackupToLive(final boolean attemptingFailBack, String replicationClusterName) throws HornetQException { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterController.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterController.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterController.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterController.java index 8c028fe161..383ca1d343 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterController.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterController.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster; +package org.apache.activemq6.core.server.cluster; import java.util.HashMap; import java.util.Map; @@ -20,38 +20,38 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.ChannelHandler; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterConnectMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; -import org.hornetq.core.protocol.core.impl.wireformat.NodeAnnounceMessage; -import org.hornetq.core.protocol.core.impl.wireformat.QuorumVoteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.cluster.qourum.QuorumManager; -import org.hornetq.core.server.cluster.qourum.QuorumVoteHandler; -import org.hornetq.core.server.cluster.qourum.Vote; -import org.hornetq.core.server.impl.Activation; -import org.hornetq.spi.core.remoting.Acceptor; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.client.impl.Topology; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.ChannelHandler; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterConnectMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.NodeAnnounceMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.QuorumVoteMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.cluster.qourum.QuorumManager; +import org.apache.activemq6.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq6.core.server.cluster.qourum.Vote; +import org.apache.activemq6.core.server.impl.Activation; +import org.apache.activemq6.spi.core.remoting.Acceptor; /** * used for creating and managing cluster control connections for each cluster connection and the replication connection diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterManager.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterManager.java index 62e8f22842..3e63de8bea 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster; +package org.apache.activemq6.core.server.cluster; import java.io.PrintWriter; import java.io.StringWriter; @@ -24,50 +24,50 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.filter.impl.FilterImpl; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.cluster.ha.HAManager; -import org.hornetq.core.server.cluster.impl.BridgeImpl; -import org.hornetq.core.server.cluster.impl.BroadcastGroupImpl; -import org.hornetq.core.server.cluster.impl.ClusterConnectionImpl; -import org.hornetq.core.server.cluster.qourum.QuorumManager; -import org.hornetq.core.server.impl.Activation; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.FutureLatch; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.filter.impl.FilterImpl; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.HornetQExceptionMessage; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.cluster.ha.HAManager; +import org.apache.activemq6.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq6.core.server.cluster.impl.BroadcastGroupImpl; +import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq6.core.server.cluster.qourum.QuorumManager; +import org.apache.activemq6.core.server.impl.Activation; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.FutureLatch; /** * A ClusterManager manages {@link ClusterConnection}s, {@link BroadcastGroup}s and {@link Bridge}s. *

- * Note that {@link org.hornetq.core.server.cluster.impl.ClusterConnectionBridge}s extend Bridges but are controlled over through - * {@link ClusterConnectionImpl}. As a node is discovered a new {@link org.hornetq.core.server.cluster.impl.ClusterConnectionBridge} is + * Note that {@link org.apache.activemq6.core.server.cluster.impl.ClusterConnectionBridge}s extend Bridges but are controlled over through + * {@link ClusterConnectionImpl}. As a node is discovered a new {@link org.apache.activemq6.core.server.cluster.impl.ClusterConnectionBridge} is * deployed. * * @author Tim Fox diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/HornetQServerSideProtocolManagerFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/HornetQServerSideProtocolManagerFactory.java similarity index 79% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/HornetQServerSideProtocolManagerFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/HornetQServerSideProtocolManagerFactory.java index b45cf944ae..b24b758239 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/HornetQServerSideProtocolManagerFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/HornetQServerSideProtocolManagerFactory.java @@ -11,13 +11,13 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster; +package org.apache.activemq6.core.server.cluster; -import org.hornetq.core.protocol.ServerPacketDecoder; -import org.hornetq.core.protocol.core.impl.HornetQClientProtocolManager; -import org.hornetq.core.protocol.core.impl.PacketDecoder; -import org.hornetq.spi.core.remoting.ClientProtocolManager; -import org.hornetq.spi.core.remoting.ClientProtocolManagerFactory; +import org.apache.activemq6.core.protocol.ServerPacketDecoder; +import org.apache.activemq6.core.protocol.core.impl.HornetQClientProtocolManager; +import org.apache.activemq6.core.protocol.core.impl.PacketDecoder; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq6.spi.core.remoting.ClientProtocolManagerFactory; /** * A protocol manager that will replace the packet manager for inter-server communications diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/MessageFlowRecord.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/MessageFlowRecord.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/MessageFlowRecord.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/MessageFlowRecord.java index 2a1a4d7c8c..83c1564659 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/MessageFlowRecord.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/MessageFlowRecord.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster; +package org.apache.activemq6.core.server.cluster; -import org.hornetq.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.MessageHandler; /** * A MessageFlowRecord diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/RemoteQueueBinding.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/RemoteQueueBinding.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/RemoteQueueBinding.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/RemoteQueueBinding.java index 955e91d750..9086021910 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/RemoteQueueBinding.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/RemoteQueueBinding.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster; +package org.apache.activemq6.core.server.cluster; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.postoffice.QueueBinding; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.postoffice.QueueBinding; /** * A RemoteQueueBinding diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/Transformer.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/Transformer.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/Transformer.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/Transformer.java index f680d01349..29a3157c8a 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/Transformer.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/Transformer.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster; +package org.apache.activemq6.core.server.cluster; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.core.server.ServerMessage; /** * A Transformer diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/BackupPolicy.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/BackupPolicy.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/BackupPolicy.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/BackupPolicy.java index f6749dfefa..cd1b8705eb 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/BackupPolicy.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/BackupPolicy.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.ha; +package org.apache.activemq6.core.server.cluster.ha; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.server.impl.Activation; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.server.impl.Activation; public abstract class BackupPolicy implements HAPolicy { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ColocatedHAManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ColocatedHAManager.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ColocatedHAManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ColocatedHAManager.java index 85e97a0f95..e383e33bf6 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ColocatedHAManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ColocatedHAManager.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.ha; +package org.apache.activemq6.core.server.cluster.ha; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.ActivationParams; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.cluster.ClusterControl; -import org.hornetq.core.server.cluster.ClusterController; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.ActivationParams; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.cluster.ClusterControl; +import org.apache.activemq6.core.server.cluster.ClusterController; import java.util.HashMap; import java.util.List; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ColocatedPolicy.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ColocatedPolicy.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ColocatedPolicy.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ColocatedPolicy.java index f951ec918f..db53553840 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ColocatedPolicy.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ColocatedPolicy.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.ha; +package org.apache.activemq6.core.server.cluster.ha; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.server.impl.ColocatedActivation; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.LiveActivation; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.server.impl.ColocatedActivation; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.LiveActivation; import java.util.ArrayList; import java.util.List; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/HAManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/HAManager.java similarity index 84% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/HAManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/HAManager.java index ff61df9ebe..3a9240f772 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/HAManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/HAManager.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.ha; +package org.apache.activemq6.core.server.cluster.ha; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServer; import java.util.Map; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/HAPolicy.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/HAPolicy.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/HAPolicy.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/HAPolicy.java index a4003a9222..b9d3f5a126 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/HAPolicy.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/HAPolicy.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.ha; +package org.apache.activemq6.core.server.cluster.ha; import java.util.Map; -import org.hornetq.core.server.impl.Activation; -import org.hornetq.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.Activation; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; /** * Every live server will have an HAPolicy that configures the type of server that it should be either live, backup or diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/LiveOnlyPolicy.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/LiveOnlyPolicy.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/LiveOnlyPolicy.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/LiveOnlyPolicy.java index 499e1b30dc..586b447bf7 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/LiveOnlyPolicy.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/LiveOnlyPolicy.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.ha; +package org.apache.activemq6.core.server.cluster.ha; -import org.hornetq.core.server.impl.Activation; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.LiveOnlyActivation; +import org.apache.activemq6.core.server.impl.Activation; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.LiveOnlyActivation; import java.util.Map; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ReplicaPolicy.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ReplicaPolicy.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ReplicaPolicy.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ReplicaPolicy.java index 64d591f4dd..ffef588c20 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ReplicaPolicy.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ReplicaPolicy.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.ha; +package org.apache.activemq6.core.server.cluster.ha; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.server.impl.Activation; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.SharedNothingBackupActivation; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.server.impl.Activation; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.SharedNothingBackupActivation; import java.util.Map; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ReplicatedPolicy.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ReplicatedPolicy.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ReplicatedPolicy.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ReplicatedPolicy.java index cfb4439ae6..342dae1923 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ReplicatedPolicy.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ReplicatedPolicy.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.ha; +package org.apache.activemq6.core.server.cluster.ha; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.LiveActivation; -import org.hornetq.core.server.impl.SharedNothingLiveActivation; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.LiveActivation; +import org.apache.activemq6.core.server.impl.SharedNothingLiveActivation; import java.util.Map; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ScaleDownPolicy.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ScaleDownPolicy.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ScaleDownPolicy.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ScaleDownPolicy.java index a5fee7795a..854ef7eedf 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/ScaleDownPolicy.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ScaleDownPolicy.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.ha; +package org.apache.activemq6.core.server.cluster.ha; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; import java.lang.reflect.Array; import java.util.ArrayList; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/SharedStoreMasterPolicy.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/SharedStoreMasterPolicy.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/SharedStoreMasterPolicy.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/SharedStoreMasterPolicy.java index 5aa848f535..70eefe4ae4 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/SharedStoreMasterPolicy.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/SharedStoreMasterPolicy.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.ha; +package org.apache.activemq6.core.server.cluster.ha; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.LiveActivation; -import org.hornetq.core.server.impl.SharedStoreLiveActivation; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.LiveActivation; +import org.apache.activemq6.core.server.impl.SharedStoreLiveActivation; import java.util.Map; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/SharedStoreSlavePolicy.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/SharedStoreSlavePolicy.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/SharedStoreSlavePolicy.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/SharedStoreSlavePolicy.java index df6890fd76..f5988f3106 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/SharedStoreSlavePolicy.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/SharedStoreSlavePolicy.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.ha; +package org.apache.activemq6.core.server.cluster.ha; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.server.impl.Activation; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.SharedStoreBackupActivation; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.server.impl.Activation; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.SharedStoreBackupActivation; import java.util.Map; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/StandaloneHAManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/StandaloneHAManager.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/StandaloneHAManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/StandaloneHAManager.java index 52934cd521..9af164423d 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/ha/StandaloneHAManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/StandaloneHAManager.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.ha; +package org.apache.activemq6.core.server.cluster.ha; -import org.hornetq.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServer; import java.util.HashMap; import java.util.Map; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/BridgeImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/BridgeImpl.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/BridgeImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/BridgeImpl.java index 4b49bbf957..e0121ba1dd 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/BridgeImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/BridgeImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.impl; +package org.apache.activemq6.core.server.cluster.impl; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -22,41 +22,41 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.Transformer; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationService; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.utils.FutureLatch; -import org.hornetq.utils.ReusableLatch; -import org.hornetq.utils.TypedProperties; -import org.hornetq.utils.UUID; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.HandleStatus; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.cluster.Bridge; +import org.apache.activemq6.core.server.cluster.Transformer; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationService; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.utils.FutureLatch; +import org.apache.activemq6.utils.ReusableLatch; +import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq6.utils.UUID; /** * A Core BridgeImpl @@ -223,7 +223,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled } /* (non-Javadoc) - * @see org.hornetq.core.server.Consumer#getDeliveringMessages() + * @see org.apache.activemq6.core.server.Consumer#getDeliveringMessages() */ @Override public List getDeliveringMessages() diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/BroadcastGroupImpl.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/BroadcastGroupImpl.java index 28ce42884a..fd44414208 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/BroadcastGroupImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.impl; +package org.apache.activemq6.core.server.cluster.impl; import java.util.ArrayList; import java.util.List; @@ -18,20 +18,20 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.BroadcastEndpoint; -import org.hornetq.api.core.BroadcastEndpointFactory; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.cluster.BroadcastGroup; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationService; -import org.hornetq.utils.TypedProperties; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.BroadcastEndpoint; +import org.apache.activemq6.api.core.BroadcastEndpointFactory; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.cluster.BroadcastGroup; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationService; +import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq6.utils.UUIDGenerator; /** *

This class will use the {@link BroadcastEndpoint} to send periodical updates on the list for connections diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/ClusterConnectionBridge.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/ClusterConnectionBridge.java index 5b5eed1649..5a856c9d18 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/ClusterConnectionBridge.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.impl; +package org.apache.activemq6.core.server.cluster.impl; import java.util.ArrayList; import java.util.HashSet; @@ -19,32 +19,32 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.ClusterManager; -import org.hornetq.core.server.cluster.HornetQServerSideProtocolManagerFactory; -import org.hornetq.core.server.cluster.MessageFlowRecord; -import org.hornetq.core.server.cluster.Transformer; -import org.hornetq.utils.UUID; -import org.hornetq.utils.UUIDGenerator; +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.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.server.cluster.ClusterManager; +import org.apache.activemq6.core.server.cluster.HornetQServerSideProtocolManagerFactory; +import org.apache.activemq6.core.server.cluster.MessageFlowRecord; +import org.apache.activemq6.core.server.cluster.Transformer; +import org.apache.activemq6.utils.UUID; +import org.apache.activemq6.utils.UUIDGenerator; /** * A bridge with extra functionality only available when the server is clustered. diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/ClusterConnectionImpl.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/ClusterConnectionImpl.java index 3cec130235..24469a81ae 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/ClusterConnectionImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.impl; +package org.apache.activemq6.core.server.cluster.impl; import java.io.PrintWriter; import java.io.StringWriter; @@ -25,47 +25,47 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.client.impl.AfterConnectInternalListener; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.client.impl.TopologyMemberImpl; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.impl.PostOfficeImpl; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.ClusterControl; -import org.hornetq.core.server.cluster.ClusterManager; -import org.hornetq.core.server.cluster.ClusterManager.IncomingInterceptorLookingForExceptionMessage; -import org.hornetq.core.server.cluster.HornetQServerSideProtocolManagerFactory; -import org.hornetq.core.server.cluster.MessageFlowRecord; -import org.hornetq.core.server.cluster.RemoteQueueBinding; -import org.hornetq.core.server.group.impl.Proposal; -import org.hornetq.core.server.group.impl.Response; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.server.management.Notification; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.FutureLatch; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.client.impl.AfterConnectInternalListener; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.client.impl.Topology; +import org.apache.activemq6.core.client.impl.TopologyMemberImpl; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.cluster.Bridge; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.server.cluster.ClusterControl; +import org.apache.activemq6.core.server.cluster.ClusterManager; +import org.apache.activemq6.core.server.cluster.ClusterManager.IncomingInterceptorLookingForExceptionMessage; +import org.apache.activemq6.core.server.cluster.HornetQServerSideProtocolManagerFactory; +import org.apache.activemq6.core.server.cluster.MessageFlowRecord; +import org.apache.activemq6.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq6.core.server.group.impl.Proposal; +import org.apache.activemq6.core.server.group.impl.Response; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.FutureLatch; +import org.apache.activemq6.utils.TypedProperties; /** * A ClusterConnectionImpl diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/Redistributor.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/Redistributor.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/Redistributor.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/Redistributor.java index 0f4fc6590e..ac3eb9b4b1 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/Redistributor.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/Redistributor.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.impl; +package org.apache.activemq6.core.server.cluster.impl; import java.util.Collections; import java.util.List; import java.util.concurrent.Executor; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.impl.TransactionImpl; -import org.hornetq.utils.ReusableLatch; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HandleStatus; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.utils.ReusableLatch; /** * A Redistributor @@ -298,7 +298,7 @@ public class Redistributor implements Consumer } /* (non-Javadoc) - * @see org.hornetq.core.server.Consumer#getDeliveringMessages() + * @see org.apache.activemq6.core.server.Consumer#getDeliveringMessages() */ @Override public List getDeliveringMessages() diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/RemoteQueueBindingImpl.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/RemoteQueueBindingImpl.java index 27f69f899c..7b2ce78879 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/RemoteQueueBindingImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.impl; +package org.apache.activemq6.core.server.cluster.impl; import java.nio.ByteBuffer; import java.util.HashMap; @@ -19,17 +19,17 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.filter.impl.FilterImpl; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.server.Bindable; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.filter.impl.FilterImpl; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.server.Bindable; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.cluster.RemoteQueueBinding; /** * A RemoteQueueBindingImpl diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/BooleanVote.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/BooleanVote.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/BooleanVote.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/BooleanVote.java index 177dc4fe81..73b58c48cb 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/BooleanVote.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/BooleanVote.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.qourum; +package org.apache.activemq6.core.server.cluster.qourum; -import org.hornetq.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffer; import java.util.Map; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/Quorum.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/Quorum.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/Quorum.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/Quorum.java index e5956bd9ce..e444354a4a 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/Quorum.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/Quorum.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.qourum; +package org.apache.activemq6.core.server.cluster.qourum; -import org.hornetq.core.client.impl.Topology; +import org.apache.activemq6.core.client.impl.Topology; /** * A quorum can be registered with the {@link QuorumManager} to receive notifications about the state of a cluster. diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/QuorumManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumManager.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/QuorumManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumManager.java index fc9cc3efa9..38cd3a867f 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/QuorumManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumManager.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.qourum; +package org.apache.activemq6.core.server.cluster.qourum; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ExecutorService; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.client.impl.TopologyMemberImpl; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.cluster.ClusterControl; -import org.hornetq.core.server.cluster.ClusterController; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.client.impl.TopologyMemberImpl; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.cluster.ClusterControl; +import org.apache.activemq6.core.server.cluster.ClusterController; /** - * A QourumManager can be used to register a {@link org.hornetq.core.server.cluster.qourum.Quorum} to receive notifications - * about changes to the cluster. A {@link org.hornetq.core.server.cluster.qourum.Quorum} can then issue a vote to the + * A QourumManager can be used to register a {@link org.apache.activemq6.core.server.cluster.qourum.Quorum} to receive notifications + * about changes to the cluster. A {@link org.apache.activemq6.core.server.cluster.qourum.Quorum} can then issue a vote to the * remaining nodes in a cluster for a specific outcome */ public final class QuorumManager implements ClusterTopologyListener, HornetQComponent @@ -39,7 +39,7 @@ public final class QuorumManager implements ClusterTopologyListener, HornetQComp private final ClusterController clusterController; /** - * all the current registered {@link org.hornetq.core.server.cluster.qourum.Quorum}'s + * all the current registered {@link org.apache.activemq6.core.server.cluster.qourum.Quorum}'s */ private Map quorums = new HashMap<>(); @@ -113,7 +113,7 @@ public final class QuorumManager implements ClusterTopologyListener, HornetQComp } /** - * registers a {@link org.hornetq.core.server.cluster.qourum.Quorum} so that it can be notified of changes in the cluster. + * registers a {@link org.apache.activemq6.core.server.cluster.qourum.Quorum} so that it can be notified of changes in the cluster. * @param quorum */ public void registerQuorum(Quorum quorum) @@ -123,7 +123,7 @@ public final class QuorumManager implements ClusterTopologyListener, HornetQComp } /** - * unregisters a {@link org.hornetq.core.server.cluster.qourum.Quorum}. + * unregisters a {@link org.apache.activemq6.core.server.cluster.qourum.Quorum}. * @param quorum */ public void unRegisterQuorum(Quorum quorum) @@ -132,8 +132,8 @@ public final class QuorumManager implements ClusterTopologyListener, HornetQComp } /** - * called by the {@link org.hornetq.core.client.impl.ServerLocatorInternal} when the topology changes. we update the - * {@code maxClusterSize} if needed and inform the {@link org.hornetq.core.server.cluster.qourum.Quorum}'s. + * called by the {@link org.apache.activemq6.core.client.impl.ServerLocatorInternal} when the topology changes. we update the + * {@code maxClusterSize} if needed and inform the {@link org.apache.activemq6.core.server.cluster.qourum.Quorum}'s. * * @param topologyMember the topolgy changed * @param last if the whole cluster topology is being transmitted (after adding the listener to @@ -151,7 +151,7 @@ public final class QuorumManager implements ClusterTopologyListener, HornetQComp } /** - * notify the {@link org.hornetq.core.server.cluster.qourum.Quorum} of a topology change. + * notify the {@link org.apache.activemq6.core.server.cluster.qourum.Quorum} of a topology change. * @param eventUID * @param nodeID the id of the node leaving the cluster */ @@ -292,7 +292,7 @@ public final class QuorumManager implements ClusterTopologyListener, HornetQComp } /** * this will connect to a node and then cast a vote. whether or not this vote is asked of the target node is dependant - * on {@link org.hornetq.core.server.cluster.qourum.Vote#isRequestServerVote()} + * on {@link org.apache.activemq6.core.server.cluster.qourum.Vote#isRequestServerVote()} */ private final class VoteRunnable implements Runnable { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/QuorumVote.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVote.java similarity index 71% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/QuorumVote.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVote.java index fe0663f164..8b616a5dec 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/QuorumVote.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVote.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.qourum; +package org.apache.activemq6.core.server.cluster.qourum; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.impl.Topology; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.client.impl.Topology; /** * the vote itself. the vote can be decided by the enquirer or sent out to each node in the quorum. @@ -28,7 +28,7 @@ public abstract class QuorumVote } /** - * called by the {@link org.hornetq.core.server.cluster.qourum.QuorumManager} when one of teh nodes in the quorum is + * called by the {@link org.apache.activemq6.core.server.cluster.qourum.QuorumManager} when one of teh nodes in the quorum is * successfully connected to. The QuorumVote can then decide whether or not a decision can be made with just that information. * * @return the vote to use @@ -36,7 +36,7 @@ public abstract class QuorumVote public abstract Vote connected(); /** - * called by the {@link org.hornetq.core.server.cluster.qourum.QuorumManager} fails to connect to a node in the quorum. + * called by the {@link org.apache.activemq6.core.server.cluster.qourum.QuorumManager} fails to connect to a node in the quorum. * The QuorumVote can then decide whether or not a decision can be made with just that information however the node * cannot cannot be asked. * @return the vote to use @@ -44,7 +44,7 @@ public abstract class QuorumVote public abstract Vote notConnected(); /** - * called by the {@link org.hornetq.core.server.cluster.qourum.QuorumManager} when a vote can be made, either from the + * called by the {@link org.apache.activemq6.core.server.cluster.qourum.QuorumManager} when a vote can be made, either from the * cluster or decided by itself. * * @param vote the vote to make. @@ -59,14 +59,14 @@ public abstract class QuorumVote public abstract T getDecision(); /** - * called by the {@link org.hornetq.core.server.cluster.qourum.QuorumManager} when all the votes have been cast and received. + * called by the {@link org.apache.activemq6.core.server.cluster.qourum.QuorumManager} when all the votes have been cast and received. * * @param voteTopology the topology of where the votes were sent. */ public abstract void allVotesCast(Topology voteTopology); /** - * the name of this quorum vote, used for identifying the correct {@link org.hornetq.core.server.cluster.qourum.QuorumVoteHandler} + * the name of this quorum vote, used for identifying the correct {@link org.apache.activemq6.core.server.cluster.qourum.QuorumVoteHandler} * * @return the name of the wuorum vote */ diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/QuorumVoteHandler.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVoteHandler.java similarity index 85% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/QuorumVoteHandler.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVoteHandler.java index b0041af795..c59da7c8d3 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/QuorumVoteHandler.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVoteHandler.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.qourum; +package org.apache.activemq6.core.server.cluster.qourum; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; /** * used to handle votes received by a quorum from a particular node diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/QuorumVoteServerConnect.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVoteServerConnect.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/QuorumVoteServerConnect.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVoteServerConnect.java index eacb42b8b3..c717d6db8f 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/QuorumVoteServerConnect.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVoteServerConnect.java @@ -11,11 +11,11 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.qourum; +package org.apache.activemq6.core.server.cluster.qourum; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.persistence.StorageManager; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.client.impl.Topology; +import org.apache.activemq6.core.persistence.StorageManager; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/SharedNothingBackupQuorum.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/SharedNothingBackupQuorum.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/SharedNothingBackupQuorum.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/SharedNothingBackupQuorum.java index 77bccbb5b5..47c58e2da1 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/SharedNothingBackupQuorum.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/SharedNothingBackupQuorum.java @@ -11,22 +11,22 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.qourum; +package org.apache.activemq6.core.server.cluster.qourum; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.NodeManager; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.Topology; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.NodeManager; /** * @author Andy Taylor @@ -56,8 +56,8 @@ public class SharedNothingBackupQuorum implements Quorum, FailureListener /** * This is a safety net in case the live sends the first {@link ReplicationLiveIsStoppingMessage} - * with code {@link org.hornetq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#STOP_CALLED} and crashes before sending the second with - * {@link org.hornetq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#FAIL_OVER}. + * with code {@link org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#STOP_CALLED} and crashes before sending the second with + * {@link org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#FAIL_OVER}. *

* If the second message does come within this dead line, we fail over anyway. */ diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/Vote.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/Vote.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/Vote.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/Vote.java index 895df826fd..a5b33ee5c8 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/cluster/qourum/Vote.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/Vote.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.cluster.qourum; +package org.apache.activemq6.core.server.cluster.qourum; -import org.hornetq.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffer; import java.util.HashMap; import java.util.Map; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/embedded/EmbeddedHornetQ.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/embedded/EmbeddedHornetQ.java similarity index 84% rename from hornetq-server/src/main/java/org/hornetq/core/server/embedded/EmbeddedHornetQ.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/embedded/EmbeddedHornetQ.java index 7797da7686..88637a63cc 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/embedded/EmbeddedHornetQ.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/embedded/EmbeddedHornetQ.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.embedded; +package org.apache.activemq6.core.server.embedded; import javax.management.MBeanServer; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.FileConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.FileConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl; /** * Helper class to simplify bootstrap of HornetQ server. Bootstraps from classpath-based config files. @@ -46,7 +46,7 @@ public class EmbeddedHornetQ } /** - * Set the hornetq security manager. This defaults to org.hornetq.spi.core.security.HornetQSecurityManagerImpl + * Set the hornetq security manager. This defaults to org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl * * @param securityManager */ diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/group/GroupingHandler.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/GroupingHandler.java similarity index 81% rename from hornetq-server/src/main/java/org/hornetq/core/server/group/GroupingHandler.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/group/GroupingHandler.java index 42961c6ea1..70105df8e1 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/group/GroupingHandler.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/GroupingHandler.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.group; +package org.apache.activemq6.core.server.group; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.group.impl.GroupBinding; -import org.hornetq.core.server.group.impl.Proposal; -import org.hornetq.core.server.group.impl.Response; -import org.hornetq.core.server.management.NotificationListener; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.group.impl.GroupBinding; +import org.apache.activemq6.core.server.group.impl.Proposal; +import org.apache.activemq6.core.server.group.impl.Response; +import org.apache.activemq6.core.server.management.NotificationListener; /** * @author Andy Taylor diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/group/UnproposalListener.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/UnproposalListener.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/server/group/UnproposalListener.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/group/UnproposalListener.java index e99160f7ba..092293443e 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/group/UnproposalListener.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/UnproposalListener.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.group; +package org.apache.activemq6.core.server.group; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; /** * @author Clebert Suconic diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/GroupBinding.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupBinding.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/server/group/impl/GroupBinding.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupBinding.java index dbf97217a2..3272405a52 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/GroupBinding.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupBinding.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.group.impl; +package org.apache.activemq6.core.server.group.impl; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; /** * A group binding diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/GroupHandlingAbstract.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupHandlingAbstract.java similarity index 83% rename from hornetq-server/src/main/java/org/hornetq/core/server/group/impl/GroupHandlingAbstract.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupHandlingAbstract.java index 83d72cb780..bd12de87af 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/GroupHandlingAbstract.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupHandlingAbstract.java @@ -11,23 +11,23 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.group.impl; +package org.apache.activemq6.core.server.group.impl; import java.util.Collections; import java.util.Set; import java.util.WeakHashMap; import java.util.concurrent.Executor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.server.group.UnproposalListener; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.server.management.Notification; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.server.group.UnproposalListener; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.utils.TypedProperties; /** * @author Clebert Suconic diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/GroupingHandlerConfiguration.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupingHandlerConfiguration.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/server/group/impl/GroupingHandlerConfiguration.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupingHandlerConfiguration.java index 88512599fb..1c0aab69f1 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/GroupingHandlerConfiguration.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupingHandlerConfiguration.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.group.impl; +package org.apache.activemq6.core.server.group.impl; import java.io.Serializable; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.SimpleString; /** * A remote Grouping handler configuration @@ -26,9 +26,9 @@ public final class GroupingHandlerConfiguration implements Serializable { public static final long serialVersionUID = -4600283023652477326L; - public static final String GROUP_TIMEOUT_PROP_NAME = "org.hornetq.GroupingHandlerConfiguration.groupTimeout"; + public static final String GROUP_TIMEOUT_PROP_NAME = "org.apache.activemq6.GroupingHandlerConfiguration.groupTimeout"; - public static final String REAPER_PERIOD_PROP_NAME = "org.hornetq.GroupingHandlerConfiguration.reaperPeriod"; + public static final String REAPER_PERIOD_PROP_NAME = "org.apache.activemq6.GroupingHandlerConfiguration.reaperPeriod"; private SimpleString name = null; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/LocalGroupingHandler.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/LocalGroupingHandler.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/server/group/impl/LocalGroupingHandler.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/LocalGroupingHandler.java index 7255c9fd9e..7c744f85fb 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/LocalGroupingHandler.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/LocalGroupingHandler.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.group.impl; +package org.apache.activemq6.core.server.group.impl; import java.util.ArrayList; import java.util.Collections; @@ -24,17 +24,17 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.server.management.Notification; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.TypedProperties; /** * A Local Grouping handler. All the Remote handlers will talk with us diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/Proposal.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/Proposal.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/group/impl/Proposal.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/Proposal.java index ad48b6a868..ef32733fbf 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/Proposal.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/Proposal.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.group.impl; +package org.apache.activemq6.core.server.group.impl; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; /** * A proposal to select a group id diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/RemoteGroupingHandler.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/RemoteGroupingHandler.java index ddbef27b9c..d5ef29905d 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/RemoteGroupingHandler.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.group.impl; +package org.apache.activemq6.core.server.group.impl; import java.util.ArrayList; import java.util.List; @@ -22,17 +22,17 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.server.management.Notification; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.TypedProperties; /** * A remote Grouping handler. diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/Response.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/Response.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/server/group/impl/Response.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/Response.java index b76e528684..5712531a40 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/group/impl/Response.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/Response.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.group.impl; +package org.apache.activemq6.core.server.group.impl; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; /** * A response to a proposal diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/AIOFileLockNodeManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AIOFileLockNodeManager.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/AIOFileLockNodeManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AIOFileLockNodeManager.java index 1c8545c030..c2e8688389 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/AIOFileLockNodeManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AIOFileLockNodeManager.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.io.File; import java.io.IOException; import java.nio.channels.FileLock; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; /** * This is using the HornetQ Libaio Native to perform calls to flock on a Linux system. At the diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/Activation.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/Activation.java similarity index 74% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/Activation.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/Activation.java index dc39d7a434..712110f2ae 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/Activation.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/Activation.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.ChannelHandler; -import org.hornetq.core.remoting.server.RemotingService; -import org.hornetq.core.replication.ReplicationManager; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.QueueFactory; -import org.hornetq.core.server.cluster.ha.HAManager; -import org.hornetq.core.server.cluster.ha.StandaloneHAManager; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.spi.core.remoting.Acceptor; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.ChannelHandler; +import org.apache.activemq6.core.remoting.server.RemotingService; +import org.apache.activemq6.core.replication.ReplicationManager; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.QueueFactory; +import org.apache.activemq6.core.server.cluster.ha.HAManager; +import org.apache.activemq6.core.server.cluster.ha.StandaloneHAManager; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.spi.core.remoting.Acceptor; /** * An activation controls the lifecycle of the server and any components specific to the Activation itself. diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/AnyLiveNodeLocatorForReplication.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AnyLiveNodeLocatorForReplication.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/AnyLiveNodeLocatorForReplication.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AnyLiveNodeLocatorForReplication.java index a6266dc9cf..5f80eeaf70 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/AnyLiveNodeLocatorForReplication.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AnyLiveNodeLocatorForReplication.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.util.HashMap; import java.util.Iterator; @@ -21,12 +21,12 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.server.LiveNodeLocator; -import org.hornetq.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.server.LiveNodeLocator; +import org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum; /** * This implementation looks for any available live node, once tried with no success it is marked as diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AnyLiveNodeLocatorForScaleDown.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AnyLiveNodeLocatorForScaleDown.java index 2b8681db89..bad0bbfa63 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AnyLiveNodeLocatorForScaleDown.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.util.Iterator; import java.util.Map; @@ -21,12 +21,12 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.LiveNodeLocator; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.LiveNodeLocator; /** * This implementation looks for any available live node, once tried with no success it is marked as diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/BackupRecoveryJournalLoader.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/BackupRecoveryJournalLoader.java similarity index 74% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/BackupRecoveryJournalLoader.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/BackupRecoveryJournalLoader.java index 021b1dcb18..0b50da2ed6 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/BackupRecoveryJournalLoader.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/BackupRecoveryJournalLoader.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.persistence.GroupingInfo; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.QueueFactory; -import org.hornetq.core.server.cluster.ClusterController; -import org.hornetq.core.server.cluster.HornetQServerSideProtocolManagerFactory; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.transaction.ResourceManager; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.persistence.GroupingInfo; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.QueueFactory; +import org.apache.activemq6.core.server.cluster.ClusterController; +import org.apache.activemq6.core.server.cluster.HornetQServerSideProtocolManagerFactory; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.transaction.ResourceManager; import java.util.List; import java.util.Map; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/BackupTopologyListener.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/BackupTopologyListener.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/BackupTopologyListener.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/BackupTopologyListener.java index af809df8a9..329f3aa772 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/BackupTopologyListener.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/BackupTopologyListener.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.api.core.client.TopologyMember; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.api.core.client.TopologyMember; final class BackupTopologyListener implements ClusterTopologyListener { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ColocatedActivation.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ColocatedActivation.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/ColocatedActivation.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ColocatedActivation.java index 92412a357b..eed70073fc 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ColocatedActivation.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ColocatedActivation.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.client.impl.TopologyMemberImpl; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.ChannelHandler; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.BackupRequestMessage; -import org.hornetq.core.protocol.core.impl.wireformat.BackupResponseMessage; -import org.hornetq.core.remoting.server.RemotingService; -import org.hornetq.core.replication.ReplicationManager; -import org.hornetq.core.server.cluster.ha.ColocatedHAManager; -import org.hornetq.core.server.cluster.ha.ColocatedPolicy; -import org.hornetq.core.server.cluster.ha.HAManager; -import org.hornetq.core.server.cluster.qourum.QuorumVote; -import org.hornetq.core.server.cluster.qourum.QuorumVoteHandler; -import org.hornetq.core.server.cluster.qourum.Vote; -import org.hornetq.spi.core.remoting.Acceptor; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.client.impl.Topology; +import org.apache.activemq6.core.client.impl.TopologyMemberImpl; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.ChannelHandler; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupRequestMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupResponseMessage; +import org.apache.activemq6.core.remoting.server.RemotingService; +import org.apache.activemq6.core.replication.ReplicationManager; +import org.apache.activemq6.core.server.cluster.ha.ColocatedHAManager; +import org.apache.activemq6.core.server.cluster.ha.ColocatedPolicy; +import org.apache.activemq6.core.server.cluster.ha.HAManager; +import org.apache.activemq6.core.server.cluster.qourum.QuorumVote; +import org.apache.activemq6.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq6.core.server.cluster.qourum.Vote; +import org.apache.activemq6.spi.core.remoting.Acceptor; import java.util.ArrayList; import java.util.Collections; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ConnectorsService.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ConnectorsService.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/ConnectorsService.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ConnectorsService.java index 2cc6f2da41..3e5e04713a 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ConnectorsService.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ConnectorsService.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.util.Collection; import java.util.HashSet; @@ -18,17 +18,17 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.Pair; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ConnectorServiceConfiguration; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.ConnectorServiceFactory; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.utils.ClassloadingUtil; -import org.hornetq.utils.ConfigurationHelper; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ConnectorServiceConfiguration; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.ConnectorServiceFactory; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.utils.ClassloadingUtil; +import org.apache.activemq6.utils.ConfigurationHelper; /** * ConnectorsService will pool some resource for updates, e.g. Twitter, then the changes are picked diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/DivertImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/DivertImpl.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/DivertImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/DivertImpl.java index 4e63d14bbc..8a7327316c 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/DivertImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/DivertImpl.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.Divert; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.cluster.Transformer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.Divert; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.cluster.Transformer; /** * A DivertImpl simply diverts a message to a different forwardAddress diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/FileLockNodeManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/FileLockNodeManager.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/FileLockNodeManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/FileLockNodeManager.java index 6935f8521a..6c8bf9db66 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/FileLockNodeManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/FileLockNodeManager.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.FileLock; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.NodeManager; -import org.hornetq.utils.UUID; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.utils.UUID; /** * @author Andy Taylor diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/HornetQServerImpl.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/HornetQServerImpl.java index ad2538e84d..51826f6ddf 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/HornetQServerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import javax.management.MBeanServer; @@ -37,102 +37,102 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ConfigurationUtils; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.deployers.Deployer; -import org.hornetq.core.deployers.DeploymentManager; -import org.hornetq.core.deployers.impl.AddressSettingsDeployer; -import org.hornetq.core.deployers.impl.BasicUserCredentialsDeployer; -import org.hornetq.core.deployers.impl.FileDeploymentManager; -import org.hornetq.core.deployers.impl.QueueDeployer; -import org.hornetq.core.deployers.impl.SecurityDeployer; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.filter.impl.FilterImpl; -import org.hornetq.core.journal.IOCriticalErrorListener; -import org.hornetq.core.journal.JournalLoadInformation; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.journal.impl.SyncSpeedTest; -import org.hornetq.core.management.impl.HornetQServerControlImpl; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.paging.impl.PagingManagerImpl; -import org.hornetq.core.paging.impl.PagingStoreFactoryNIO; -import org.hornetq.core.persistence.GroupingInfo; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.QueueBindingInfo; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.config.PersistedAddressSetting; -import org.hornetq.core.persistence.config.PersistedRoles; -import org.hornetq.core.persistence.impl.PageCountPending; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.postoffice.impl.DivertBinding; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.postoffice.impl.PostOfficeImpl; -import org.hornetq.core.remoting.server.RemotingService; -import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; -import org.hornetq.core.replication.ReplicationManager; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.core.security.SecurityStore; -import org.hornetq.core.security.impl.SecurityStoreImpl; -import org.hornetq.core.server.ActivateCallback; -import org.hornetq.core.server.Bindable; -import org.hornetq.core.server.Divert; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.MemoryManager; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.QueueFactory; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.ServerSessionFactory; -import org.hornetq.core.server.cluster.BackupManager; -import org.hornetq.core.server.cluster.ClusterManager; -import org.hornetq.core.server.cluster.Transformer; -import org.hornetq.core.server.cluster.ha.HAPolicy; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.core.server.group.impl.LocalGroupingHandler; -import org.hornetq.core.server.group.impl.RemoteGroupingHandler; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.server.management.impl.ManagementServiceImpl; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.settings.impl.HierarchicalObjectRepository; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.impl.ResourceManagerImpl; -import org.hornetq.core.version.Version; -import org.hornetq.spi.core.protocol.ProtocolManagerFactory; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.protocol.SessionCallback; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.utils.ClassloadingUtil; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.HornetQThreadFactory; -import org.hornetq.utils.OrderedExecutorFactory; -import org.hornetq.utils.ReusableLatch; -import org.hornetq.utils.SecurityFormatter; -import org.hornetq.utils.VersionLoader; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ConfigurationUtils; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.deployers.Deployer; +import org.apache.activemq6.core.deployers.DeploymentManager; +import org.apache.activemq6.core.deployers.impl.AddressSettingsDeployer; +import org.apache.activemq6.core.deployers.impl.BasicUserCredentialsDeployer; +import org.apache.activemq6.core.deployers.impl.FileDeploymentManager; +import org.apache.activemq6.core.deployers.impl.QueueDeployer; +import org.apache.activemq6.core.deployers.impl.SecurityDeployer; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.filter.impl.FilterImpl; +import org.apache.activemq6.core.journal.IOCriticalErrorListener; +import org.apache.activemq6.core.journal.JournalLoadInformation; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.impl.SyncSpeedTest; +import org.apache.activemq6.core.management.impl.HornetQServerControlImpl; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.paging.impl.PagingManagerImpl; +import org.apache.activemq6.core.paging.impl.PagingStoreFactoryNIO; +import org.apache.activemq6.core.persistence.GroupingInfo; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.QueueBindingInfo; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq6.core.persistence.config.PersistedRoles; +import org.apache.activemq6.core.persistence.impl.PageCountPending; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq6.core.persistence.impl.nullpm.NullStorageManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.QueueBinding; +import org.apache.activemq6.core.postoffice.impl.DivertBinding; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq6.core.remoting.server.RemotingService; +import org.apache.activemq6.core.remoting.server.impl.RemotingServiceImpl; +import org.apache.activemq6.core.replication.ReplicationManager; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.security.SecurityStore; +import org.apache.activemq6.core.security.impl.SecurityStoreImpl; +import org.apache.activemq6.core.server.ActivateCallback; +import org.apache.activemq6.core.server.Bindable; +import org.apache.activemq6.core.server.Divert; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.MemoryManager; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.QueueFactory; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.core.server.ServerSessionFactory; +import org.apache.activemq6.core.server.cluster.BackupManager; +import org.apache.activemq6.core.server.cluster.ClusterManager; +import org.apache.activemq6.core.server.cluster.Transformer; +import org.apache.activemq6.core.server.cluster.ha.HAPolicy; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq6.core.server.group.impl.LocalGroupingHandler; +import org.apache.activemq6.core.server.group.impl.RemoteGroupingHandler; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.server.management.impl.ManagementServiceImpl; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.impl.ResourceManagerImpl; +import org.apache.activemq6.core.version.Version; +import org.apache.activemq6.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.utils.ClassloadingUtil; +import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.HornetQThreadFactory; +import org.apache.activemq6.utils.OrderedExecutorFactory; +import org.apache.activemq6.utils.ReusableLatch; +import org.apache.activemq6.utils.SecurityFormatter; +import org.apache.activemq6.utils.VersionLoader; /** * The HornetQ server implementation diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/InVMNodeManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/InVMNodeManager.java similarity index 82% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/InVMNodeManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/InVMNodeManager.java index d07b0f857d..fa4c8f2358 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/InVMNodeManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/InVMNodeManager.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import static org.hornetq.core.server.impl.InVMNodeManager.State.LIVE; -import static org.hornetq.core.server.impl.InVMNodeManager.State.FAILING_BACK; -import static org.hornetq.core.server.impl.InVMNodeManager.State.NOT_STARTED; -import static org.hornetq.core.server.impl.InVMNodeManager.State.PAUSED; +import static org.apache.activemq6.core.server.impl.InVMNodeManager.State.LIVE; +import static org.apache.activemq6.core.server.impl.InVMNodeManager.State.FAILING_BACK; +import static org.apache.activemq6.core.server.impl.InVMNodeManager.State.NOT_STARTED; +import static org.apache.activemq6.core.server.impl.InVMNodeManager.State.PAUSED; import java.io.IOException; import java.util.concurrent.Semaphore; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.NodeManager; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.utils.UUIDGenerator; /** * NodeManager used to run multiple servers in the same VM. *

- * We use the {@link org.hornetq.core.server.impl.InVMNodeManager} instead of {@link org.hornetq.core.server.impl.FileLockNodeManager} when + * We use the {@link org.apache.activemq6.core.server.impl.InVMNodeManager} instead of {@link org.hornetq.core.server.impl.FileLockNodeManager} when * multiple servers are run inside the same VM and File Locks can not be shared in the * same VM (it would cause a shared lock violation). * diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/JournalLoader.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/JournalLoader.java similarity index 72% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/JournalLoader.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/JournalLoader.java index ad6af52709..39329b4766 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/JournalLoader.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/JournalLoader.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import javax.transaction.xa.Xid; import java.util.List; import java.util.Map; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.persistence.GroupingInfo; -import org.hornetq.core.persistence.QueueBindingInfo; -import org.hornetq.core.persistence.impl.PageCountPending; -import org.hornetq.core.persistence.impl.journal.AddMessageRecord; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.persistence.GroupingInfo; +import org.apache.activemq6.core.persistence.QueueBindingInfo; +import org.apache.activemq6.core.persistence.impl.PageCountPending; +import org.apache.activemq6.core.persistence.impl.journal.AddMessageRecord; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.Transaction; public interface JournalLoader { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/LastValueQueue.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LastValueQueue.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/LastValueQueue.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LastValueQueue.java index 028922728d..b7b9e52a5c 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/LastValueQueue.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LastValueQueue.java @@ -10,29 +10,29 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; /** * A queue that will discard messages if a newer message with the same - * {@link org.hornetq.core.message.impl.MessageImpl#HDR_LAST_VALUE_NAME} property value. In other words it only retains the last + * {@link org.apache.activemq6.core.message.impl.MessageImpl#HDR_LAST_VALUE_NAME} property value. In other words it only retains the last * value *

* This is useful for example, for stock prices, where you're only interested in the latest value @@ -275,7 +275,7 @@ public class LastValueQueue extends QueueImpl } /* (non-Javadoc) - * @see org.hornetq.core.server.MessageReference#acknowledge(org.hornetq.core.server.MessageReference) + * @see org.apache.activemq6.core.server.MessageReference#acknowledge(org.hornetq.core.server.MessageReference) */ @Override public void acknowledge() throws Exception @@ -284,7 +284,7 @@ public class LastValueQueue extends QueueImpl } /* (non-Javadoc) - * @see org.hornetq.core.server.MessageReference#getMessageMemoryEstimate() + * @see org.apache.activemq6.core.server.MessageReference#getMessageMemoryEstimate() */ public int getMessageMemoryEstimate() { @@ -292,7 +292,7 @@ public class LastValueQueue extends QueueImpl } /* (non-Javadoc) - * @see org.hornetq.core.server.MessageReference#setConsumerId(java.lang.Long) + * @see org.apache.activemq6.core.server.MessageReference#setConsumerId(java.lang.Long) */ @Override public void setConsumerId(Long consumerID) @@ -301,7 +301,7 @@ public class LastValueQueue extends QueueImpl } /* (non-Javadoc) - * @see org.hornetq.core.server.MessageReference#getConsumerId() + * @see org.apache.activemq6.core.server.MessageReference#getConsumerId() */ @Override public Long getConsumerId() diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/LiveActivation.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LiveActivation.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/LiveActivation.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LiveActivation.java index c863c6642e..ed9cfb9738 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/LiveActivation.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LiveActivation.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; public abstract class LiveActivation extends Activation { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/LiveOnlyActivation.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LiveOnlyActivation.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/LiveOnlyActivation.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LiveOnlyActivation.java index ceb60d128e..1f14b2f00d 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/LiveOnlyActivation.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LiveOnlyActivation.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.postoffice.DuplicateIDCache; -import org.hornetq.core.postoffice.impl.PostOfficeImpl; -import org.hornetq.core.remoting.server.RemotingService; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.LiveNodeLocator; -import org.hornetq.core.server.cluster.HornetQServerSideProtocolManagerFactory; -import org.hornetq.core.server.cluster.ha.LiveOnlyPolicy; -import org.hornetq.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.postoffice.DuplicateIDCache; +import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq6.core.remoting.server.RemotingService; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.LiveNodeLocator; +import org.apache.activemq6.core.server.cluster.HornetQServerSideProtocolManagerFactory; +import org.apache.activemq6.core.server.cluster.ha.LiveOnlyPolicy; +import org.apache.activemq6.core.server.cluster.ha.ScaleDownPolicy; import java.util.HashMap; import java.util.List; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/MessageReferenceImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/MessageReferenceImpl.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/MessageReferenceImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/MessageReferenceImpl.java index 2cc9b09081..41004e531a 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/MessageReferenceImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/MessageReferenceImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.utils.MemorySize; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.utils.MemorySize; /** * Implementation of a MessageReference @@ -49,7 +49,7 @@ public class MessageReferenceImpl implements MessageReference { // This is an estimate of how much memory a ServerMessageImpl takes up, exclusing body and properties // Note, it is only an estimate, it's not possible to be entirely sure with Java - // This figure is calculated using the test utilities in org.hornetq.tests.unit.util.sizeof + // This figure is calculated using the test utilities in org.apache.activemq6.tests.unit.util.sizeof // The value is somewhat higher on 64 bit architectures, probably due to different alignment if (MemorySize.is64bitArch()) diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/NamedLiveNodeLocatorForReplication.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedLiveNodeLocatorForReplication.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/NamedLiveNodeLocatorForReplication.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedLiveNodeLocatorForReplication.java index 98e84e266b..bf91603eed 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/NamedLiveNodeLocatorForReplication.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedLiveNodeLocatorForReplication.java @@ -11,25 +11,25 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.server.LiveNodeLocator; -import org.hornetq.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.server.LiveNodeLocator; +import org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum; /** * NamedLiveNodeLocatorForReplication looks for a live server in the cluster with a specific backupGroupName * * @author Andy Taylor - * @see org.hornetq.core.server.cluster.ha.HAPolicy#getGroupName() + * @see org.apache.activemq6.core.server.cluster.ha.HAPolicy#getGroupName() */ public class NamedLiveNodeLocatorForReplication extends LiveNodeLocator { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedLiveNodeLocatorForScaleDown.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedLiveNodeLocatorForScaleDown.java index 58b9d5f1dd..2f6f1fda8d 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedLiveNodeLocatorForScaleDown.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.util.HashMap; import java.util.Iterator; @@ -21,18 +21,18 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.LiveNodeLocator; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.LiveNodeLocator; /** * NamedLiveNodeLocatorForScaleDown looks for a live server in the cluster with a specific scaleDownGroupName * * @author Justin Bertram - * @see org.hornetq.core.config.Configuration#getScaleDownGroupName() + * @see org.apache.activemq6.core.config.Configuration#getScaleDownGroupName() */ public class NamedLiveNodeLocatorForScaleDown extends LiveNodeLocator { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/NamedNodeIdNodeLocator.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedNodeIdNodeLocator.java similarity index 83% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/NamedNodeIdNodeLocator.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedNodeIdNodeLocator.java index 908eb7d355..bbcbc3a2f5 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/NamedNodeIdNodeLocator.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedNodeIdNodeLocator.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.server.LiveNodeLocator; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.server.LiveNodeLocator; public class NamedNodeIdNodeLocator extends LiveNodeLocator { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/PostOfficeJournalLoader.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/PostOfficeJournalLoader.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/PostOfficeJournalLoader.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/PostOfficeJournalLoader.java index 8fba846631..683f84b107 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/PostOfficeJournalLoader.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/PostOfficeJournalLoader.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import javax.transaction.xa.Xid; import java.util.Collection; @@ -20,40 +20,40 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.filter.impl.FilterImpl; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.paging.cursor.PageSubscriptionCounter; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.persistence.GroupingInfo; -import org.hornetq.core.persistence.QueueBindingInfo; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.impl.PageCountPending; -import org.hornetq.core.persistence.impl.journal.AddMessageRecord; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.DuplicateIDCache; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.QueueFactory; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.server.group.impl.GroupBinding; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.filter.impl.FilterImpl; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.persistence.GroupingInfo; +import org.apache.activemq6.core.persistence.QueueBindingInfo; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.impl.PageCountPending; +import org.apache.activemq6.core.persistence.impl.journal.AddMessageRecord; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.DuplicateIDCache; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.QueueFactory; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.server.group.impl.GroupBinding; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; public class PostOfficeJournalLoader implements JournalLoader { @@ -278,7 +278,7 @@ public class PostOfficeJournalLoader implements JournalLoader queue.resume(); } - if (System.getProperty("org.hornetq.opt.directblast") != null) + if (System.getProperty("org.apache.activemq6.opt.directblast") != null) { messageJournal.runDirectJournalBlast(); } diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/QueueFactoryImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/QueueFactoryImpl.java similarity index 85% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/QueueFactoryImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/QueueFactoryImpl.java index e997f39733..26d816b91b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/QueueFactoryImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/QueueFactoryImpl.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.QueueFactory; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.utils.ExecutorFactory; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.QueueFactory; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.utils.ExecutorFactory; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/QueueImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/QueueImpl.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/QueueImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/QueueImpl.java index f4e8fe94e0..234be02b1e 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/QueueImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/QueueImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.io.PrintWriter; import java.io.StringWriter; @@ -36,54 +36,54 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.paging.cursor.PagedReference; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.DuplicateIDCache; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.impl.PostOfficeImpl; -import org.hornetq.core.remoting.server.RemotingService; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ScheduledDeliveryHandler; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.cluster.RemoteQueueBinding; -import org.hornetq.core.server.cluster.impl.Redistributor; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.HierarchicalRepositoryChangeListener; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.settings.impl.SlowConsumerPolicy; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionPropertyIndexes; -import org.hornetq.core.transaction.impl.BindingsTransactionImpl; -import org.hornetq.core.transaction.impl.TransactionImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.FutureLatch; -import org.hornetq.utils.LinkedListIterator; -import org.hornetq.utils.PriorityLinkedList; -import org.hornetq.utils.PriorityLinkedListImpl; -import org.hornetq.utils.ReferenceCounter; -import org.hornetq.utils.ReusableLatch; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.paging.cursor.PagedReference; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.DuplicateIDCache; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq6.core.remoting.server.RemotingService; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HandleStatus; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ScheduledDeliveryHandler; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq6.core.server.cluster.impl.Redistributor; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.HierarchicalRepositoryChangeListener; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq6.core.transaction.impl.BindingsTransactionImpl; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq6.utils.FutureLatch; +import org.apache.activemq6.utils.LinkedListIterator; +import org.apache.activemq6.utils.PriorityLinkedList; +import org.apache.activemq6.utils.PriorityLinkedListImpl; +import org.apache.activemq6.utils.ReferenceCounter; +import org.apache.activemq6.utils.ReusableLatch; +import org.apache.activemq6.utils.TypedProperties; /** * Implementation of a Queue diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/RefsOperation.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/RefsOperation.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/RefsOperation.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/RefsOperation.java index 8a7a87c465..8dfaff41d3 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/RefsOperation.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/RefsOperation.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionOperationAbstract; -import org.hornetq.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionOperationAbstract; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; import java.util.ArrayList; import java.util.HashMap; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ReplicationError.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ReplicationError.java similarity index 70% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/ReplicationError.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ReplicationError.java index 7bcb040bb5..4235b94f5b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ReplicationError.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ReplicationError.java @@ -13,24 +13,24 @@ /** * */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.LiveNodeLocator; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.LiveNodeLocator; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * Stops the backup in case of an error at the start of Replication. *

* Using an interceptor for the task to avoid a server reference inside of the 'basic' channel-0 - * handler at {@link org.hornetq.core.protocol.core.impl.HornetQClientProtocolManager.Channel0Handler}. As {@link org.hornetq.core.protocol.core.impl.HornetQClientProtocolManager} + * handler at {@link org.apache.activemq6.core.protocol.core.impl.HornetQClientProtocolManager.Channel0Handler}. As {@link org.hornetq.core.protocol.core.impl.HornetQClientProtocolManager} * is also shipped in the HQ-client JAR (which does not include {@link HornetQServer}). */ final class ReplicationError implements Interceptor diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/RoutingContextImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/RoutingContextImpl.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/RoutingContextImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/RoutingContextImpl.java index ed23725047..64c06e11d8 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/RoutingContextImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/RoutingContextImpl.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RouteContextList; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RouteContextList; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.transaction.Transaction; /** * A RoutingContextImpl diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ScaleDownHandler.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ScaleDownHandler.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/ScaleDownHandler.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ScaleDownHandler.java index c7ce890d06..940b11ba79 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ScaleDownHandler.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ScaleDownHandler.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -22,37 +22,37 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientRequestor; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.paging.cursor.PagedReference; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.postoffice.impl.PostOfficeImpl; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.cluster.ClusterControl; -import org.hornetq.core.server.cluster.ClusterController; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionOperation; -import org.hornetq.utils.LinkedListIterator; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.Pair; +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.ClientRequestor; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.paging.cursor.PagedReference; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.cluster.ClusterControl; +import org.apache.activemq6.core.server.cluster.ClusterController; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionOperation; +import org.apache.activemq6.utils.LinkedListIterator; public class ScaleDownHandler { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ScheduledDeliveryHandlerImpl.java similarity index 97% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ScheduledDeliveryHandlerImpl.java index b5b03455fb..4190386d30 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ScheduledDeliveryHandlerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.util.ArrayList; import java.util.Comparator; @@ -24,11 +24,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ScheduledDeliveryHandler; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ScheduledDeliveryHandler; /** * Handles scheduling deliveries to a queue at the correct time. diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ServerConsumerImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerConsumerImpl.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/ServerConsumerImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerConsumerImpl.java index 2d1f8a336b..e775d43879 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ServerConsumerImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerConsumerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.math.BigDecimal; import java.util.Iterator; @@ -23,37 +23,37 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.client.impl.ClientConsumerImpl; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.message.BodyEncoder; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerConsumer; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.impl.TransactionImpl; -import org.hornetq.spi.core.protocol.SessionCallback; -import org.hornetq.spi.core.remoting.ReadyListener; -import org.hornetq.utils.FutureLatch; -import org.hornetq.utils.LinkedListIterator; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.client.impl.ClientConsumerImpl; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.message.BodyEncoder; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.QueueBinding; +import org.apache.activemq6.core.server.HandleStatus; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerConsumer; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq6.spi.core.remoting.ReadyListener; +import org.apache.activemq6.utils.FutureLatch; +import org.apache.activemq6.utils.LinkedListIterator; +import org.apache.activemq6.utils.TypedProperties; /** * Concrete implementation of a ClientConsumer. diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ServerInfo.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerInfo.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/ServerInfo.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerInfo.java index 598af2f413..f46435e5b4 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ServerInfo.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerInfo.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; import java.util.Date; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.utils.SizeFormatterUtil; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.utils.SizeFormatterUtil; /** * A ServerInfo diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ServerMessageImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerMessageImpl.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/ServerMessageImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerMessageImpl.java index e780957dfd..3fe5553417 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ServerMessageImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerMessageImpl.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.io.InputStream; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.utils.DataConstants; -import org.hornetq.utils.MemorySize; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq6.utils.MemorySize; +import org.apache.activemq6.utils.TypedProperties; /** * A ServerMessageImpl @@ -51,7 +51,7 @@ public class ServerMessageImpl extends MessageImpl implements ServerMessage { // This is an estimate of how much memory a ServerMessageImpl takes up, exclusing body and properties // Note, it is only an estimate, it's not possible to be entirely sure with Java - // This figure is calculated using the test utilities in org.hornetq.tests.unit.util.sizeof + // This figure is calculated using the test utilities in org.apache.activemq6.tests.unit.util.sizeof // The value is somewhat higher on 64 bit architectures, probably due to different alignment if (MemorySize.is64bitArch()) diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ServerSessionImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerSessionImpl.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/ServerSessionImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerSessionImpl.java index 1083dfb4fb..7f8e0ceae7 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ServerSessionImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerSessionImpl.java @@ -22,7 +22,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import javax.transaction.xa.XAException; import javax.transaction.xa.Xid; @@ -38,58 +38,58 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQNonExistentQueueException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.client.impl.ClientMessageImpl; -import org.hornetq.core.exception.HornetQXAException; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.filter.impl.FilterImpl; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.SecurityStore; -import org.hornetq.core.server.BindingQueryResult; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.QueueQueryResult; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerConsumer; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.Transaction.State; -import org.hornetq.core.transaction.TransactionFactory; -import org.hornetq.core.transaction.TransactionOperationAbstract; -import org.hornetq.core.transaction.TransactionPropertyIndexes; -import org.hornetq.core.transaction.impl.TransactionImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.protocol.SessionCallback; -import org.hornetq.utils.TypedProperties; -import org.hornetq.utils.UUID; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQNonExistentQueueException; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.client.impl.ClientMessageImpl; +import org.apache.activemq6.core.exception.HornetQXAException; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.filter.impl.FilterImpl; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.QueueBinding; +import org.apache.activemq6.core.remoting.CloseListener; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.SecurityStore; +import org.apache.activemq6.core.server.BindingQueryResult; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.QueueQueryResult; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerConsumer; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.Transaction.State; +import org.apache.activemq6.core.transaction.TransactionFactory; +import org.apache.activemq6.core.transaction.TransactionOperationAbstract; +import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq6.utils.UUID; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; /** * Server side Session implementation diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ServiceRegistry.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServiceRegistry.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/ServiceRegistry.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServiceRegistry.java index 0e0e80927a..98b3b524a2 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/ServiceRegistry.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServiceRegistry.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; import java.util.Collection; import java.util.Collections; @@ -20,10 +20,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.Pair; -import org.hornetq.core.config.ConnectorServiceConfiguration; -import org.hornetq.core.server.ConnectorServiceFactory; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.config.ConnectorServiceConfiguration; +import org.apache.activemq6.core.server.ConnectorServiceFactory; /** * @author Martyn Taylor diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/SharedNothingBackupActivation.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedNothingBackupActivation.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/SharedNothingBackupActivation.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedNothingBackupActivation.java index ea2a9761e5..5acbf6aa90 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/SharedNothingBackupActivation.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedNothingBackupActivation.java @@ -10,42 +10,42 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.hornetq.core.replication.ReplicationEndpoint; -import org.hornetq.core.server.ActivationParams; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.LiveNodeLocator; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.QueueFactory; -import org.hornetq.core.server.cluster.ClusterControl; -import org.hornetq.core.server.cluster.ClusterController; -import org.hornetq.core.server.cluster.ha.ReplicaPolicy; -import org.hornetq.core.server.cluster.ha.ScaleDownPolicy; -import org.hornetq.core.server.cluster.qourum.SharedNothingBackupQuorum; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.utils.ReusableLatch; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq6.core.replication.ReplicationEndpoint; +import org.apache.activemq6.core.server.ActivationParams; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.LiveNodeLocator; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.QueueFactory; +import org.apache.activemq6.core.server.cluster.ClusterControl; +import org.apache.activemq6.core.server.cluster.ClusterController; +import org.apache.activemq6.core.server.cluster.ha.ReplicaPolicy; +import org.apache.activemq6.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.utils.ReusableLatch; import java.util.Map; import java.util.concurrent.TimeUnit; -import static org.hornetq.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAILURE_REPLICATING; -import static org.hornetq.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAIL_OVER; -import static org.hornetq.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.STOP; +import static org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAILURE_REPLICATING; +import static org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAIL_OVER; +import static org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.STOP; public final class SharedNothingBackupActivation extends Activation { @@ -425,7 +425,7 @@ public final class SharedNothingBackupActivation extends Activation } /** - * @throws org.hornetq.api.core.HornetQException + * @throws org.apache.activemq6.api.core.HornetQException */ public void remoteFailOver(ReplicationLiveIsStoppingMessage.LiveStopping finalMessage) throws HornetQException { diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/SharedNothingLiveActivation.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedNothingLiveActivation.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/SharedNothingLiveActivation.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedNothingLiveActivation.java index 27ad9d87e0..3cd33d589d 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/SharedNothingLiveActivation.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedNothingLiveActivation.java @@ -10,40 +10,40 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.HornetQAlreadyReplicatingException; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.ConfigurationUtils; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.ChannelHandler; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.BackupRegistrationMessage; -import org.hornetq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.server.RemotingService; -import org.hornetq.core.replication.ReplicationManager; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.ha.ReplicatedPolicy; -import org.hornetq.spi.core.remoting.Acceptor; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.HornetQAlreadyReplicatingException; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.ConfigurationUtils; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.ChannelHandler; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupRegistrationMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq6.core.remoting.CloseListener; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.core.remoting.server.RemotingService; +import org.apache.activemq6.core.replication.ReplicationManager; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.server.cluster.ha.ReplicatedPolicy; +import org.apache.activemq6.spi.core.remoting.Acceptor; import java.lang.reflect.Array; import java.util.List; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/SharedStoreBackupActivation.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedStoreBackupActivation.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/SharedStoreBackupActivation.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedStoreBackupActivation.java index 6c27e12a5a..072554e775 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/SharedStoreBackupActivation.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedStoreBackupActivation.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.QueueFactory; -import org.hornetq.core.server.cluster.ha.ScaleDownPolicy; -import org.hornetq.core.server.cluster.ha.SharedStoreSlavePolicy; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.server.management.ManagementService; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.QueueFactory; +import org.apache.activemq6.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq6.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.server.management.ManagementService; import java.nio.channels.ClosedChannelException; import java.util.concurrent.TimeUnit; diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/SharedStoreLiveActivation.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedStoreLiveActivation.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/SharedStoreLiveActivation.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedStoreLiveActivation.java index 4f8baf27ed..fa1cfd1e08 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/SharedStoreLiveActivation.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedStoreLiveActivation.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.cluster.ha.SharedStoreMasterPolicy; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.cluster.ha.SharedStoreMasterPolicy; /** * Created by andy on 04/09/14. diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/impl/TransientQueueManagerImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/TransientQueueManagerImpl.java similarity index 84% rename from hornetq-server/src/main/java/org/hornetq/core/server/impl/TransientQueueManagerImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/TransientQueueManagerImpl.java index f52da5af94..b8f49b4cba 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/impl/TransientQueueManagerImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/TransientQueueManagerImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.impl; +package org.apache.activemq6.core.server.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.TransientQueueManager; -import org.hornetq.utils.ReferenceCounterUtil; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.TransientQueueManager; +import org.apache.activemq6.utils.ReferenceCounterUtil; /** * @author Clebert Suconic diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/management/ManagementService.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/management/ManagementService.java similarity index 70% rename from hornetq-server/src/main/java/org/hornetq/core/server/management/ManagementService.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/management/ManagementService.java index 261d5dc5c5..e1ea0fc29b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/management/ManagementService.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/management/ManagementService.java @@ -10,41 +10,41 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.management; +package org.apache.activemq6.core.server.management; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import javax.management.ObjectName; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.management.impl.HornetQServerControlImpl; -import org.hornetq.core.messagecounter.MessageCounterManager; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.remoting.server.RemotingService; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.Divert; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.QueueFactory; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.BroadcastGroup; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.spi.core.remoting.Acceptor; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.management.impl.HornetQServerControlImpl; +import org.apache.activemq6.core.messagecounter.MessageCounterManager; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.remoting.server.RemotingService; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.Divert; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.QueueFactory; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.cluster.Bridge; +import org.apache.activemq6.core.server.cluster.BroadcastGroup; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.spi.core.remoting.Acceptor; /** * @author Jeff Mesnil diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/management/impl/ManagementServiceImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/server/management/impl/ManagementServiceImpl.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/server/management/impl/ManagementServiceImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/server/management/impl/ManagementServiceImpl.java index 59f51f9709..a41d7bedfe 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/server/management/impl/ManagementServiceImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/server/management/impl/ManagementServiceImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.server.management.impl; +package org.apache.activemq6.core.server.management.impl; import javax.management.InstanceNotFoundException; import javax.management.MBeanRegistrationException; @@ -29,56 +29,56 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.AcceptorControl; -import org.hornetq.api.core.management.BridgeControl; -import org.hornetq.api.core.management.BroadcastGroupControl; -import org.hornetq.api.core.management.ClusterConnectionControl; -import org.hornetq.api.core.management.DivertControl; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.management.impl.AcceptorControlImpl; -import org.hornetq.core.management.impl.AddressControlImpl; -import org.hornetq.core.management.impl.BridgeControlImpl; -import org.hornetq.core.management.impl.BroadcastGroupControlImpl; -import org.hornetq.core.management.impl.ClusterConnectionControlImpl; -import org.hornetq.core.management.impl.DivertControlImpl; -import org.hornetq.core.management.impl.HornetQServerControlImpl; -import org.hornetq.core.management.impl.QueueControlImpl; -import org.hornetq.core.messagecounter.MessageCounter; -import org.hornetq.core.messagecounter.MessageCounterManager; -import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.remoting.server.RemotingService; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.Divert; -import org.hornetq.core.server.HornetQMessageBundle; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.QueueFactory; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.BroadcastGroup; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationListener; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.utils.TypedProperties; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.AcceptorControl; +import org.apache.activemq6.api.core.management.BridgeControl; +import org.apache.activemq6.api.core.management.BroadcastGroupControl; +import org.apache.activemq6.api.core.management.ClusterConnectionControl; +import org.apache.activemq6.api.core.management.DivertControl; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.management.impl.AcceptorControlImpl; +import org.apache.activemq6.core.management.impl.AddressControlImpl; +import org.apache.activemq6.core.management.impl.BridgeControlImpl; +import org.apache.activemq6.core.management.impl.BroadcastGroupControlImpl; +import org.apache.activemq6.core.management.impl.ClusterConnectionControlImpl; +import org.apache.activemq6.core.management.impl.DivertControlImpl; +import org.apache.activemq6.core.management.impl.HornetQServerControlImpl; +import org.apache.activemq6.core.management.impl.QueueControlImpl; +import org.apache.activemq6.core.messagecounter.MessageCounter; +import org.apache.activemq6.core.messagecounter.MessageCounterManager; +import org.apache.activemq6.core.messagecounter.impl.MessageCounterManagerImpl; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.remoting.server.RemotingService; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.Divert; +import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.QueueFactory; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.cluster.Bridge; +import org.apache.activemq6.core.server.cluster.BroadcastGroup; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationListener; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.utils.TypedProperties; /* * @author Jeff Mesnil @@ -125,7 +125,7 @@ public class ManagementServiceImpl implements ManagementService private boolean notificationsEnabled; - private final Set listeners = new org.hornetq.utils.ConcurrentHashSet(); + private final Set listeners = new org.apache.activemq6.utils.ConcurrentHashSet(); private final ObjectNameBuilder objectNameBuilder; diff --git a/hornetq-server/src/main/java/org/hornetq/core/settings/HierarchicalRepository.java b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/HierarchicalRepository.java similarity index 98% rename from hornetq-server/src/main/java/org/hornetq/core/settings/HierarchicalRepository.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/settings/HierarchicalRepository.java index f164c32034..b00e4c5df3 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/settings/HierarchicalRepository.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/HierarchicalRepository.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.settings; +package org.apache.activemq6.core.settings; import java.util.List; diff --git a/hornetq-server/src/main/java/org/hornetq/core/settings/HierarchicalRepositoryChangeListener.java b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/HierarchicalRepositoryChangeListener.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/settings/HierarchicalRepositoryChangeListener.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/settings/HierarchicalRepositoryChangeListener.java index 92be6ff701..c3059f4422 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/settings/HierarchicalRepositoryChangeListener.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/HierarchicalRepositoryChangeListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.settings; +package org.apache.activemq6.core.settings; /** * @author Andy Taylor diff --git a/hornetq-server/src/main/java/org/hornetq/core/settings/Mergeable.java b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/Mergeable.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/core/settings/Mergeable.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/settings/Mergeable.java index 31d1026052..a22303d216 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/settings/Mergeable.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/Mergeable.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.settings; +package org.apache.activemq6.core.settings; /** * Used when merging objects together. diff --git a/hornetq-server/src/main/java/org/hornetq/core/settings/impl/AddressSettings.java b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/AddressSettings.java similarity index 98% rename from hornetq-server/src/main/java/org/hornetq/core/settings/impl/AddressSettings.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/AddressSettings.java index 88dd300479..25e1b444e2 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/settings/impl/AddressSettings.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/AddressSettings.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.settings.impl; +package org.apache.activemq6.core.settings.impl; import java.io.Serializable; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.settings.Mergeable; -import org.hornetq.utils.BufferHelper; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.settings.Mergeable; +import org.apache.activemq6.utils.BufferHelper; /** * Configuration settings that are applied on the address level diff --git a/hornetq-server/src/main/java/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/HierarchicalObjectRepository.java similarity index 97% rename from hornetq-server/src/main/java/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/HierarchicalObjectRepository.java index f7698f9917..3c7f5d32f8 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/HierarchicalObjectRepository.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.settings.impl; +package org.apache.activemq6.core.settings.impl; import java.io.Serializable; import java.util.ArrayList; @@ -26,10 +26,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.HierarchicalRepositoryChangeListener; -import org.hornetq.core.settings.Mergeable; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.HierarchicalRepositoryChangeListener; +import org.apache.activemq6.core.settings.Mergeable; /** * allows objects to be mapped against a regex pattern and held in order in a list diff --git a/hornetq-server/src/main/java/org/hornetq/core/settings/impl/Match.java b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/Match.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/settings/impl/Match.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/Match.java index f4eb5b0c4f..516c80de6b 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/settings/impl/Match.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/Match.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.settings.impl; +package org.apache.activemq6.core.settings.impl; import java.util.regex.Pattern; -import org.hornetq.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.server.HornetQMessageBundle; /** a Match is the holder for the match string and the object to hold against it. diff --git a/hornetq-server/src/main/java/org/hornetq/core/settings/impl/SlowConsumerPolicy.java b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/SlowConsumerPolicy.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/settings/impl/SlowConsumerPolicy.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/SlowConsumerPolicy.java index a16b02d2c5..ef3948b5c4 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/settings/impl/SlowConsumerPolicy.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/SlowConsumerPolicy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.settings.impl; +package org.apache.activemq6.core.settings.impl; /** * A SlowConsumerPolicy diff --git a/hornetq-server/src/main/java/org/hornetq/core/transaction/ResourceManager.java b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/ResourceManager.java similarity index 92% rename from hornetq-server/src/main/java/org/hornetq/core/transaction/ResourceManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/transaction/ResourceManager.java index d3d2c611c6..4f45a695b0 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/transaction/ResourceManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/ResourceManager.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.transaction; +package org.apache.activemq6.core.transaction; import java.util.List; import java.util.Map; import javax.transaction.xa.Xid; -import org.hornetq.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQComponent; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/transaction/Transaction.java b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/Transaction.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/core/transaction/Transaction.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/transaction/Transaction.java index 1010d35318..c2fe838351 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/transaction/Transaction.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/Transaction.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.transaction; +package org.apache.activemq6.core.transaction; import java.util.List; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.impl.RefsOperation; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.impl.RefsOperation; /** * A HornetQ internal transaction diff --git a/hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionDetail.java b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionDetail.java similarity index 87% rename from hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionDetail.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionDetail.java index 986be022bd..019f99dd69 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionDetail.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionDetail.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.transaction; +package org.apache.activemq6.core.transaction; import java.text.DateFormat; import java.util.Date; @@ -19,11 +19,11 @@ import java.util.Map; import javax.transaction.xa.Xid; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; /** * A TransactionDetail @@ -86,11 +86,11 @@ public abstract class TransactionDetail { String opClassName = op.getClass().getName(); String opType = null; - if (opClassName.equals("org.hornetq.core.postoffice.impl.PostOfficeImpl$AddOperation")) + if (opClassName.equals("org.apache.activemq6.core.postoffice.impl.PostOfficeImpl$AddOperation")) { opType = "(+) send"; } - else if (opClassName.equals("org.hornetq.core.server.impl.QueueImpl$RefsOperation")) + else if (opClassName.equals("org.apache.activemq6.core.server.impl.QueueImpl$RefsOperation")) { opType = "(-) receive"; } diff --git a/hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionFactory.java similarity index 88% rename from hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionFactory.java index bd6db6b19c..ba2fd6ebed 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionFactory.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.transaction; +package org.apache.activemq6.core.transaction; -import org.hornetq.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.StorageManager; import javax.transaction.xa.Xid; diff --git a/hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionOperation.java b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionOperation.java similarity index 93% rename from hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionOperation.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionOperation.java index b1c65454d1..a5b83d28b5 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionOperation.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionOperation.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.transaction; +package org.apache.activemq6.core.transaction; import java.util.List; -import org.hornetq.core.server.MessageReference; +import org.apache.activemq6.core.server.MessageReference; /** * diff --git a/hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionOperationAbstract.java b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionOperationAbstract.java similarity index 90% rename from hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionOperationAbstract.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionOperationAbstract.java index 1b177065a0..7b6e4a79da 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionOperationAbstract.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionOperationAbstract.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.transaction; +package org.apache.activemq6.core.transaction; import java.util.Collections; import java.util.List; -import org.hornetq.core.server.MessageReference; +import org.apache.activemq6.core.server.MessageReference; /** * Just a helper, when you don't want to implement all the methods on a transaction operation. @@ -74,7 +74,7 @@ public abstract class TransactionOperationAbstract implements TransactionOperati } /* (non-Javadoc) - * @see org.hornetq.core.transaction.TransactionOperation#getListOnConsumer(long) + * @see org.apache.activemq6.core.transaction.TransactionOperation#getListOnConsumer(long) */ @Override public List getListOnConsumer(long consumerID) diff --git a/hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionPropertyIndexes.java b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionPropertyIndexes.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionPropertyIndexes.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionPropertyIndexes.java index be04240b5c..32a6bfce42 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/transaction/TransactionPropertyIndexes.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionPropertyIndexes.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.transaction; +package org.apache.activemq6.core.transaction; /** * A TransactionPropertyIndexes diff --git a/hornetq-server/src/main/java/org/hornetq/core/transaction/impl/BindingsTransactionImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/BindingsTransactionImpl.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/transaction/impl/BindingsTransactionImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/BindingsTransactionImpl.java index bcb32a287b..b1e632a406 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/transaction/impl/BindingsTransactionImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/BindingsTransactionImpl.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.transaction.impl; +package org.apache.activemq6.core.transaction.impl; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.impl.RefsOperation; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.impl.RefsOperation; /** * A BindingsTransactionImpl diff --git a/hornetq-server/src/main/java/org/hornetq/core/transaction/impl/CoreTransactionDetail.java b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/CoreTransactionDetail.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/core/transaction/impl/CoreTransactionDetail.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/CoreTransactionDetail.java index 17c1ae91f9..749bd357ec 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/transaction/impl/CoreTransactionDetail.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/CoreTransactionDetail.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.transaction.impl; +package org.apache.activemq6.core.transaction.impl; import java.util.Map; import javax.transaction.xa.Xid; -import org.hornetq.api.core.Message; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionDetail; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionDetail; /** * A CoreTransactionDetail diff --git a/hornetq-server/src/main/java/org/hornetq/core/transaction/impl/ResourceManagerImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/ResourceManagerImpl.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/transaction/impl/ResourceManagerImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/ResourceManagerImpl.java index 95ad684c6d..f3894cf13c 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/transaction/impl/ResourceManagerImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/ResourceManagerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.transaction.impl; +package org.apache.activemq6.core.transaction.impl; import java.util.ArrayList; import java.util.HashMap; @@ -27,9 +27,9 @@ import java.util.concurrent.TimeUnit; import javax.transaction.xa.Xid; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.Transaction; /** * A ResourceManagerImpl diff --git a/hornetq-server/src/main/java/org/hornetq/core/transaction/impl/TransactionImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/TransactionImpl.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/core/transaction/impl/TransactionImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/TransactionImpl.java index fe050feeea..92eb11c1d6 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/transaction/impl/TransactionImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/TransactionImpl.java @@ -23,7 +23,7 @@ * permissions and limitations under the License. */ -package org.hornetq.core.transaction.impl; +package org.apache.activemq6.core.transaction.impl; import javax.transaction.xa.Xid; @@ -31,14 +31,14 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.impl.RefsOperation; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionOperation; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.impl.RefsOperation; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionOperation; /** * A TransactionImpl diff --git a/hornetq-server/src/main/java/org/hornetq/spi/core/naming/BindingRegistry.java b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/naming/BindingRegistry.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/spi/core/naming/BindingRegistry.java rename to activemq6-server/src/main/java/org/apache/activemq6/spi/core/naming/BindingRegistry.java index 074ef9fd20..a17274d998 100644 --- a/hornetq-server/src/main/java/org/hornetq/spi/core/naming/BindingRegistry.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/naming/BindingRegistry.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.naming; +package org.apache.activemq6.spi.core.naming; /** * Abstract interface for a registry to store endpoints like connection factories into. diff --git a/hornetq-server/src/main/java/org/hornetq/spi/core/protocol/MessageConverter.java b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/MessageConverter.java similarity index 89% rename from hornetq-server/src/main/java/org/hornetq/spi/core/protocol/MessageConverter.java rename to activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/MessageConverter.java index b031b31a37..9d3d5aa33f 100644 --- a/hornetq-server/src/main/java/org/hornetq/spi/core/protocol/MessageConverter.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/MessageConverter.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.spi.core.protocol; +package org.apache.activemq6.spi.core.protocol; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.core.server.ServerMessage; /** * @author Clebert Suconic diff --git a/hornetq-server/src/main/java/org/hornetq/spi/core/protocol/ProtocolManager.java b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/ProtocolManager.java similarity index 81% rename from hornetq-server/src/main/java/org/hornetq/spi/core/protocol/ProtocolManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/ProtocolManager.java index 125b17c242..e3489d4da9 100644 --- a/hornetq-server/src/main/java/org/hornetq/spi/core/protocol/ProtocolManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/ProtocolManager.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.protocol; +package org.apache.activemq6.spi.core.protocol; import io.netty.channel.ChannelPipeline; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.remoting.impl.netty.NettyServerConnection; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.Connection; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.Connection; /** * A ProtocolManager diff --git a/hornetq-server/src/main/java/org/hornetq/spi/core/protocol/ProtocolManagerFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/ProtocolManagerFactory.java similarity index 85% rename from hornetq-server/src/main/java/org/hornetq/spi/core/protocol/ProtocolManagerFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/ProtocolManagerFactory.java index 873dc70cca..4031aa4d01 100644 --- a/hornetq-server/src/main/java/org/hornetq/spi/core/protocol/ProtocolManagerFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/ProtocolManagerFactory.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.protocol; +package org.apache.activemq6.spi.core.protocol; import java.util.List; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.server.HornetQServer; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.server.HornetQServer; /** * A ProtocolManagerFactory diff --git a/hornetq-server/src/main/java/org/hornetq/spi/core/protocol/SessionCallback.java b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/SessionCallback.java similarity index 84% rename from hornetq-server/src/main/java/org/hornetq/spi/core/protocol/SessionCallback.java rename to activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/SessionCallback.java index d91af22feb..1c9c5aa692 100644 --- a/hornetq-server/src/main/java/org/hornetq/spi/core/protocol/SessionCallback.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/SessionCallback.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.protocol; +package org.apache.activemq6.spi.core.protocol; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.ServerConsumer; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.spi.core.remoting.ReadyListener; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.ServerConsumer; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.spi.core.remoting.ReadyListener; /** * A SessionCallback diff --git a/hornetq-server/src/main/java/org/hornetq/spi/core/remoting/Acceptor.java b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/Acceptor.java similarity index 85% rename from hornetq-server/src/main/java/org/hornetq/spi/core/remoting/Acceptor.java rename to activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/Acceptor.java index 2747ca255b..c84d2e2d8b 100644 --- a/hornetq-server/src/main/java/org/hornetq/spi/core/remoting/Acceptor.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/Acceptor.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; import java.util.Map; -import org.hornetq.core.security.HornetQPrincipal; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.management.NotificationService; +import org.apache.activemq6.core.security.HornetQPrincipal; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.server.management.NotificationService; /** * An Acceptor is used by the RemotingService to allow clients to connect. It should take care of diff --git a/hornetq-server/src/main/java/org/hornetq/spi/core/remoting/AcceptorFactory.java b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/AcceptorFactory.java similarity index 86% rename from hornetq-server/src/main/java/org/hornetq/spi/core/remoting/AcceptorFactory.java rename to activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/AcceptorFactory.java index 51721728fd..a577ae0081 100644 --- a/hornetq-server/src/main/java/org/hornetq/spi/core/remoting/AcceptorFactory.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/AcceptorFactory.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.spi.core.protocol.ProtocolManager; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.spi.core.protocol.ProtocolManager; /** * A factory for creating acceptors. *

- * An Acceptor is an endpoint that a {@link org.hornetq.spi.core.remoting.Connector} will connect to and is used by the remoting service. + * An Acceptor is an endpoint that a {@link org.apache.activemq6.spi.core.remoting.Connector} will connect to and is used by the remoting service. * * @author Andy Taylor * @author Tim Fox diff --git a/hornetq-server/src/main/java/org/hornetq/spi/core/remoting/ServerConnectionLifeCycleListener.java b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/ServerConnectionLifeCycleListener.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/spi/core/remoting/ServerConnectionLifeCycleListener.java rename to activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/ServerConnectionLifeCycleListener.java index 2c0e1ae593..62ae1b082f 100644 --- a/hornetq-server/src/main/java/org/hornetq/spi/core/remoting/ServerConnectionLifeCycleListener.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/ServerConnectionLifeCycleListener.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.spi.core.remoting; +package org.apache.activemq6.spi.core.remoting; /** * @author Andy Taylor diff --git a/hornetq-server/src/main/java/org/hornetq/spi/core/security/HornetQSecurityManager.java b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/HornetQSecurityManager.java similarity index 91% rename from hornetq-server/src/main/java/org/hornetq/spi/core/security/HornetQSecurityManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/HornetQSecurityManager.java index aa27942e28..dd1254042e 100644 --- a/hornetq-server/src/main/java/org/hornetq/spi/core/security/HornetQSecurityManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/HornetQSecurityManager.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.security; +package org.apache.activemq6.spi.core.security; import java.util.Set; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQComponent; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQComponent; /** * Use to validate whether a user has is valid to connect to the server and perform certain diff --git a/hornetq-server/src/main/java/org/hornetq/spi/core/security/HornetQSecurityManagerImpl.java b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/HornetQSecurityManagerImpl.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/spi/core/security/HornetQSecurityManagerImpl.java rename to activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/HornetQSecurityManagerImpl.java index 2c7803e004..380e694362 100644 --- a/hornetq-server/src/main/java/org/hornetq/spi/core/security/HornetQSecurityManagerImpl.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/HornetQSecurityManagerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.security; +package org.apache.activemq6.spi.core.security; import java.util.ArrayList; import java.util.HashMap; @@ -18,9 +18,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQMessageBundle; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQMessageBundle; /** * A basic implementation of the HornetQSecurityManager. This can be used within an appserver and be deployed by diff --git a/hornetq-server/src/main/java/org/hornetq/spi/core/security/JAASSecurityManager.java b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/JAASSecurityManager.java similarity index 96% rename from hornetq-server/src/main/java/org/hornetq/spi/core/security/JAASSecurityManager.java rename to activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/JAASSecurityManager.java index d3841dac25..3ce15acdf3 100644 --- a/hornetq-server/src/main/java/org/hornetq/spi/core/security/JAASSecurityManager.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/JAASSecurityManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spi.core.security; +package org.apache.activemq6.spi.core.security; import java.security.Principal; import java.security.acl.Group; @@ -24,10 +24,10 @@ import javax.security.auth.login.Configuration; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServerLogger; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServerLogger; /** * This implementation delegates to the JAAS security interfaces. diff --git a/hornetq-server/src/main/java/org/hornetq/spi/core/security/package-info.java b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/package-info.java similarity index 94% rename from hornetq-server/src/main/java/org/hornetq/spi/core/security/package-info.java rename to activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/package-info.java index 87ca945536..e58bd7c49d 100644 --- a/hornetq-server/src/main/java/org/hornetq/spi/core/security/package-info.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/package-info.java @@ -17,5 +17,5 @@ * that secuity providers can implement to plug their * implementation into HornetQ. */ -package org.hornetq.spi.core.security; +package org.apache.activemq6.spi.core.security; diff --git a/hornetq-server/src/main/java/org/hornetq/utils/XMLConfigurationUtil.java b/activemq6-server/src/main/java/org/apache/activemq6/utils/XMLConfigurationUtil.java similarity index 95% rename from hornetq-server/src/main/java/org/hornetq/utils/XMLConfigurationUtil.java rename to activemq6-server/src/main/java/org/apache/activemq6/utils/XMLConfigurationUtil.java index bece1aecde..75a6f342aa 100644 --- a/hornetq-server/src/main/java/org/hornetq/utils/XMLConfigurationUtil.java +++ b/activemq6-server/src/main/java/org/apache/activemq6/utils/XMLConfigurationUtil.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.utils; +package org.apache.activemq6.utils; -import org.hornetq.core.config.impl.Validators; +import org.apache.activemq6.core.config.impl.Validators; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -116,7 +116,7 @@ public class XMLConfigurationUtil NodeList nl = e.getElementsByTagName(name); if (nl.getLength() > 0) { - return org.hornetq.utils.XMLUtil.parseBoolean(nl.item(0)); + return org.apache.activemq6.utils.XMLUtil.parseBoolean(nl.item(0)); } else { diff --git a/hornetq-server/src/main/resources/META-INF/services/org/hornetq/security/basic-security b/activemq6-server/src/main/resources/META-INF/services/org/apache/activemq6/security/basic-security similarity index 100% rename from hornetq-server/src/main/resources/META-INF/services/org/hornetq/security/basic-security rename to activemq6-server/src/main/resources/META-INF/services/org/apache/activemq6/security/basic-security diff --git a/hornetq-server/src/main/resources/schema/hornetq-configuration.xsd b/activemq6-server/src/main/resources/schema/hornetq-configuration.xsd similarity index 100% rename from hornetq-server/src/main/resources/schema/hornetq-configuration.xsd rename to activemq6-server/src/main/resources/schema/hornetq-configuration.xsd diff --git a/hornetq-server/src/main/resources/schema/hornetq-users.xsd b/activemq6-server/src/main/resources/schema/hornetq-users.xsd similarity index 100% rename from hornetq-server/src/main/resources/schema/hornetq-users.xsd rename to activemq6-server/src/main/resources/schema/hornetq-users.xsd diff --git a/hornetq-server/src/test/java/org/hornetq/core/config/impl/ConfigurationImplTest.java b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/ConfigurationImplTest.java similarity index 97% rename from hornetq-server/src/test/java/org/hornetq/core/config/impl/ConfigurationImplTest.java rename to activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/ConfigurationImplTest.java index 1718125417..7a904e39d7 100644 --- a/hornetq-server/src/test/java/org/hornetq/core/config/impl/ConfigurationImplTest.java +++ b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/ConfigurationImplTest.java @@ -10,8 +10,8 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.impl; -import org.hornetq.core.config.ha.LiveOnlyPolicyConfiguration; +package org.apache.activemq6.core.config.impl; +import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; import org.junit.Before; import org.junit.Test; @@ -23,13 +23,13 @@ import java.io.ObjectOutputStream; import org.junit.Assert; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.journal.impl.JournalConstants; -import org.hornetq.core.server.JournalType; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.journal.impl.JournalConstants; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/hornetq-server/src/test/java/org/hornetq/core/config/impl/DefaultsFileConfigurationTest.java b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/DefaultsFileConfigurationTest.java similarity index 95% rename from hornetq-server/src/test/java/org/hornetq/core/config/impl/DefaultsFileConfigurationTest.java rename to activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/DefaultsFileConfigurationTest.java index 15e9f728f3..43afcec155 100644 --- a/hornetq-server/src/test/java/org/hornetq/core/config/impl/DefaultsFileConfigurationTest.java +++ b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/DefaultsFileConfigurationTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.impl; +package org.apache.activemq6.core.config.impl; -import org.hornetq.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; import org.junit.Test; import java.util.Collections; import org.junit.Assert; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.journal.impl.JournalConstants; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.journal.impl.JournalConstants; /** * diff --git a/hornetq-server/src/test/java/org/hornetq/core/config/impl/FileConfigurationParserTest.java b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/FileConfigurationParserTest.java similarity index 86% rename from hornetq-server/src/test/java/org/hornetq/core/config/impl/FileConfigurationParserTest.java rename to activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/FileConfigurationParserTest.java index a88a79cb4a..edccd36058 100644 --- a/hornetq-server/src/test/java/org/hornetq/core/config/impl/FileConfigurationParserTest.java +++ b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/FileConfigurationParserTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.impl; +package org.apache.activemq6.core.config.impl; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.deployers.impl.FileConfigurationParser; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.DefaultSensitiveStringCodec; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.deployers.impl.FileConfigurationParser; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.DefaultSensitiveStringCodec; import org.junit.Test; /** @@ -116,7 +116,7 @@ public class FileConfigurationParserTest extends UnitTestCase clusterPasswordPart = "" + mask + ""; - String codecPart = "" + "org.hornetq.utils.DefaultSensitiveStringCodec" + + String codecPart = "" + "org.apache.activemq6.utils.DefaultSensitiveStringCodec" + ";key=newkey"; configStr = firstPart + clusterPasswordPart + maskPasswordPart + codecPart + lastPart; @@ -133,7 +133,7 @@ public class FileConfigurationParserTest extends UnitTestCase "HornetQ.main.config" + "\n" + "abackupgroupname" + "\n" + "ascaledowngroupname" + "\n" + - "org.hornetq.integration.logging.Log4jLogDelegateFactory" + "\n" + + "org.apache.activemq6.integration.logging.Log4jLogDelegateFactory" + "\n" + "${jboss.server.data.dir}/hornetq/bindings" + "\n" + "${jboss.server.data.dir}/hornetq/journal" + "\n" + "10" + "\n" + @@ -141,36 +141,36 @@ public class FileConfigurationParserTest extends UnitTestCase "${jboss.server.data.dir}/hornetq/paging" + "\n" + "" + "\n" + "" + "\n" + - "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory" + "\n" + + "org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + - "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory" + "\n" + + "org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + - "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory" + "\n" + + "org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + - "org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory" + "\n" + + "org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + - "org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory" + "\n" + + "org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + - "org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory" + "\n" + + "org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + diff --git a/hornetq-server/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/FileConfigurationTest.java similarity index 91% rename from hornetq-server/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java rename to activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/FileConfigurationTest.java index fc60af0ffe..54c6d8693e 100644 --- a/hornetq-server/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java +++ b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/FileConfigurationTest.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.impl; +package org.apache.activemq6.core.config.impl; import java.util.Collections; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.config.HAPolicyConfiguration; -import org.hornetq.core.config.ha.LiveOnlyPolicyConfiguration; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.JournalType; -import org.hornetq.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.config.HAPolicyConfiguration; +import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.core.settings.impl.SlowConsumerPolicy; import org.junit.Assert; import org.junit.Test; @@ -93,16 +93,16 @@ public class FileConfigurationTest extends ConfigurationImplTest Assert.assertEquals(2, conf.getIncomingInterceptorClassNames().size()); Assert.assertTrue(conf.getIncomingInterceptorClassNames() - .contains("org.hornetq.tests.unit.core.config.impl.TestInterceptor1")); + .contains("org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1")); Assert.assertTrue(conf.getIncomingInterceptorClassNames() - .contains("org.hornetq.tests.unit.core.config.impl.TestInterceptor2")); + .contains("org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2")); Assert.assertEquals(2, conf.getConnectorConfigurations().size()); TransportConfiguration tc = conf.getConnectorConfigurations().get("connector1"); Assert.assertNotNull(tc); - Assert.assertEquals("org.hornetq.tests.unit.core.config.impl.TestConnectorFactory1", tc.getFactoryClassName()); + Assert.assertEquals("org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1", tc.getFactoryClassName()); Assert.assertEquals("v1", tc.getParams().get("a1")); Assert.assertEquals("123", tc.getParams().get("a2")); Assert.assertEquals("345", tc.getParams().get("a3")); @@ -110,23 +110,23 @@ public class FileConfigurationTest extends ConfigurationImplTest tc = conf.getConnectorConfigurations().get("connector2"); Assert.assertNotNull(tc); - Assert.assertEquals("org.hornetq.tests.unit.core.config.impl.TestConnectorFactory2", tc.getFactoryClassName()); + Assert.assertEquals("org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2", tc.getFactoryClassName()); Assert.assertEquals("w1", tc.getParams().get("b1")); Assert.assertEquals("234", tc.getParams().get("b2")); Assert.assertEquals(2, conf.getAcceptorConfigurations().size()); for (TransportConfiguration ac : conf.getAcceptorConfigurations()) { - if (ac.getFactoryClassName().equals("org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1")) + if (ac.getFactoryClassName().equals("org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1")) { - Assert.assertEquals("org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1", + Assert.assertEquals("org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1", ac.getFactoryClassName()); Assert.assertEquals("y1", ac.getParams().get("d1")); Assert.assertEquals("456", ac.getParams().get("d2")); } else { - Assert.assertEquals("org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory2", + Assert.assertEquals("org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2", ac.getFactoryClassName()); Assert.assertEquals("z1", ac.getParams().get("e1")); Assert.assertEquals("567", ac.getParams().get("e2")); diff --git a/hornetq-server/src/test/java/org/hornetq/core/config/impl/HAPolicyConfigurationTest.java b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/HAPolicyConfigurationTest.java similarity index 92% rename from hornetq-server/src/test/java/org/hornetq/core/config/impl/HAPolicyConfigurationTest.java rename to activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/HAPolicyConfigurationTest.java index f0dde3aba1..a66cbf8389 100644 --- a/hornetq-server/src/test/java/org/hornetq/core/config/impl/HAPolicyConfigurationTest.java +++ b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/HAPolicyConfigurationTest.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.impl; +package org.apache.activemq6.core.config.impl; -import org.hornetq.core.server.cluster.ha.ColocatedPolicy; -import org.hornetq.core.server.cluster.ha.HAPolicy; -import org.hornetq.core.server.cluster.ha.LiveOnlyPolicy; -import org.hornetq.core.server.cluster.ha.ReplicaPolicy; -import org.hornetq.core.server.cluster.ha.ReplicatedPolicy; -import org.hornetq.core.server.cluster.ha.ScaleDownPolicy; -import org.hornetq.core.server.cluster.ha.SharedStoreMasterPolicy; -import org.hornetq.core.server.cluster.ha.SharedStoreSlavePolicy; -import org.hornetq.core.server.impl.ColocatedActivation; -import org.hornetq.core.server.impl.LiveOnlyActivation; -import org.hornetq.core.server.impl.SharedNothingBackupActivation; -import org.hornetq.core.server.impl.SharedNothingLiveActivation; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.impl.Activation; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.SharedStoreBackupActivation; -import org.hornetq.core.server.impl.SharedStoreLiveActivation; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.server.cluster.ha.ColocatedPolicy; +import org.apache.activemq6.core.server.cluster.ha.HAPolicy; +import org.apache.activemq6.core.server.cluster.ha.LiveOnlyPolicy; +import org.apache.activemq6.core.server.cluster.ha.ReplicaPolicy; +import org.apache.activemq6.core.server.cluster.ha.ReplicatedPolicy; +import org.apache.activemq6.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq6.core.server.cluster.ha.SharedStoreMasterPolicy; +import org.apache.activemq6.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq6.core.server.impl.ColocatedActivation; +import org.apache.activemq6.core.server.impl.LiveOnlyActivation; +import org.apache.activemq6.core.server.impl.SharedNothingBackupActivation; +import org.apache.activemq6.core.server.impl.SharedNothingLiveActivation; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.impl.Activation; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.SharedStoreBackupActivation; +import org.apache.activemq6.core.server.impl.SharedStoreLiveActivation; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Test; import java.util.List; diff --git a/hornetq-server/src/test/java/org/hornetq/core/config/impl/ValidatorsTest.java b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/ValidatorsTest.java similarity index 96% rename from hornetq-server/src/test/java/org/hornetq/core/config/impl/ValidatorsTest.java rename to activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/ValidatorsTest.java index f461911a05..e42ac3bced 100644 --- a/hornetq-server/src/test/java/org/hornetq/core/config/impl/ValidatorsTest.java +++ b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/ValidatorsTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.impl; +package org.apache.activemq6.core.config.impl; import org.junit.Test; import org.junit.Assert; -import org.hornetq.core.server.JournalType; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.tests.util.RandomUtil; /** * @author Jeff Mesnil diff --git a/hornetq-server/src/test/java/org/hornetq/core/config/impl/WrongRoleFileConfigurationParserTest.java b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/WrongRoleFileConfigurationParserTest.java similarity index 84% rename from hornetq-server/src/test/java/org/hornetq/core/config/impl/WrongRoleFileConfigurationParserTest.java rename to activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/WrongRoleFileConfigurationParserTest.java index 19c399dd71..32ffb1cc2a 100644 --- a/hornetq-server/src/test/java/org/hornetq/core/config/impl/WrongRoleFileConfigurationParserTest.java +++ b/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/WrongRoleFileConfigurationParserTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.config.impl; +package org.apache.activemq6.core.config.impl; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; -import org.hornetq.core.deployers.impl.FileConfigurationParser; -import org.hornetq.tests.logging.AssertionLoggerHandler; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.deployers.impl.FileConfigurationParser; +import org.apache.activemq6.tests.logging.AssertionLoggerHandler; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -65,7 +65,7 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase "xsi:schemaLocation=\"urn:hornetq /schema/hornetq-configuration.xsd\">\n" + "HornetQ.main.config" + "\n" + "anodegroupname" + "\n" + - "org.hornetq.integration.logging.Log4jLogDelegateFactory" + "\n" + + "org.apache.activemq6.integration.logging.Log4jLogDelegateFactory" + "\n" + "${jboss.server.data.dir}/hornetq/bindings" + "\n" + "${jboss.server.data.dir}/hornetq/journal" + "\n" + "10" + "\n" + @@ -73,36 +73,36 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase "${jboss.server.data.dir}/hornetq/paging" + "\n" + "" + "\n" + "" + "\n" + - "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory" + "\n" + + "org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + - "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory" + "\n" + + "org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + - "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory" + "\n" + + "org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + - "org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory" + "\n" + + "org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + - "org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory" + "\n" + + "org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + - "org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory" + "\n" + + "org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + diff --git a/hornetq-server/src/test/java/org/hornetq/core/filter/impl/FilterTest.java b/activemq6-server/src/test/java/org/apache/activemq6/core/filter/impl/FilterTest.java similarity index 98% rename from hornetq-server/src/test/java/org/hornetq/core/filter/impl/FilterTest.java rename to activemq6-server/src/test/java/org/apache/activemq6/core/filter/impl/FilterTest.java index df30533f7b..c9171125fd 100644 --- a/hornetq-server/src/test/java/org/hornetq/core/filter/impl/FilterTest.java +++ b/activemq6-server/src/test/java/org/apache/activemq6/core/filter/impl/FilterTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.filter.impl; +package org.apache.activemq6.core.filter.impl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQInvalidFilterExpressionException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.SilentTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInvalidFilterExpressionException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.SilentTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/hornetq-server/src/test/java/org/hornetq/core/list/PriorityLinkedListTest.java b/activemq6-server/src/test/java/org/apache/activemq6/core/list/PriorityLinkedListTest.java similarity index 99% rename from hornetq-server/src/test/java/org/hornetq/core/list/PriorityLinkedListTest.java rename to activemq6-server/src/test/java/org/apache/activemq6/core/list/PriorityLinkedListTest.java index 4cb9e12c27..1f321f6613 100644 --- a/hornetq-server/src/test/java/org/hornetq/core/list/PriorityLinkedListTest.java +++ b/activemq6-server/src/test/java/org/apache/activemq6/core/list/PriorityLinkedListTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.list; +package org.apache.activemq6.core.list; import org.junit.Before; import org.junit.After; @@ -19,8 +19,8 @@ import org.junit.Test; import org.junit.Assert; -import org.hornetq.utils.LinkedListIterator; -import org.hornetq.utils.PriorityLinkedListImpl; +import org.apache.activemq6.utils.LinkedListIterator; +import org.apache.activemq6.utils.PriorityLinkedListImpl; /** * @author Tim Fox * @author Clebert diff --git a/hornetq-server/src/test/resources/ConfigurationTest-defaults.xml b/activemq6-server/src/test/resources/ConfigurationTest-defaults.xml similarity index 100% rename from hornetq-server/src/test/resources/ConfigurationTest-defaults.xml rename to activemq6-server/src/test/resources/ConfigurationTest-defaults.xml diff --git a/hornetq-server/src/test/resources/ConfigurationTest-full-config.xml b/activemq6-server/src/test/resources/ConfigurationTest-full-config.xml similarity index 100% rename from hornetq-server/src/test/resources/ConfigurationTest-full-config.xml rename to activemq6-server/src/test/resources/ConfigurationTest-full-config.xml diff --git a/hornetq-server/src/test/resources/InvalidConfigurationTest0.xml b/activemq6-server/src/test/resources/InvalidConfigurationTest0.xml similarity index 100% rename from hornetq-server/src/test/resources/InvalidConfigurationTest0.xml rename to activemq6-server/src/test/resources/InvalidConfigurationTest0.xml diff --git a/hornetq-server/src/test/resources/InvalidConfigurationTest1.xml b/activemq6-server/src/test/resources/InvalidConfigurationTest1.xml similarity index 100% rename from hornetq-server/src/test/resources/InvalidConfigurationTest1.xml rename to activemq6-server/src/test/resources/InvalidConfigurationTest1.xml diff --git a/hornetq-server/src/test/resources/InvalidConfigurationTest2.xml b/activemq6-server/src/test/resources/InvalidConfigurationTest2.xml similarity index 100% rename from hornetq-server/src/test/resources/InvalidConfigurationTest2.xml rename to activemq6-server/src/test/resources/InvalidConfigurationTest2.xml diff --git a/hornetq-server/src/test/resources/InvalidConfigurationTest3.xml b/activemq6-server/src/test/resources/InvalidConfigurationTest3.xml similarity index 100% rename from hornetq-server/src/test/resources/InvalidConfigurationTest3.xml rename to activemq6-server/src/test/resources/InvalidConfigurationTest3.xml diff --git a/hornetq-server/src/test/resources/InvalidConfigurationTest4.xml b/activemq6-server/src/test/resources/InvalidConfigurationTest4.xml similarity index 100% rename from hornetq-server/src/test/resources/InvalidConfigurationTest4.xml rename to activemq6-server/src/test/resources/InvalidConfigurationTest4.xml diff --git a/hornetq-server/src/test/resources/InvalidConfigurationTest5.xml b/activemq6-server/src/test/resources/InvalidConfigurationTest5.xml similarity index 100% rename from hornetq-server/src/test/resources/InvalidConfigurationTest5.xml rename to activemq6-server/src/test/resources/InvalidConfigurationTest5.xml diff --git a/hornetq-server/src/test/resources/colocated-hapolicy-config.xml b/activemq6-server/src/test/resources/colocated-hapolicy-config.xml similarity index 100% rename from hornetq-server/src/test/resources/colocated-hapolicy-config.xml rename to activemq6-server/src/test/resources/colocated-hapolicy-config.xml diff --git a/hornetq-server/src/test/resources/colocated-hapolicy-config2.xml b/activemq6-server/src/test/resources/colocated-hapolicy-config2.xml similarity index 100% rename from hornetq-server/src/test/resources/colocated-hapolicy-config2.xml rename to activemq6-server/src/test/resources/colocated-hapolicy-config2.xml diff --git a/hornetq-server/src/test/resources/divertRoutingNameNotRequired.xml b/activemq6-server/src/test/resources/divertRoutingNameNotRequired.xml similarity index 100% rename from hornetq-server/src/test/resources/divertRoutingNameNotRequired.xml rename to activemq6-server/src/test/resources/divertRoutingNameNotRequired.xml diff --git a/hornetq-server/src/test/resources/live-only-hapolicy-config.xml b/activemq6-server/src/test/resources/live-only-hapolicy-config.xml similarity index 100% rename from hornetq-server/src/test/resources/live-only-hapolicy-config.xml rename to activemq6-server/src/test/resources/live-only-hapolicy-config.xml diff --git a/hornetq-server/src/test/resources/live-only-hapolicy-config2.xml b/activemq6-server/src/test/resources/live-only-hapolicy-config2.xml similarity index 100% rename from hornetq-server/src/test/resources/live-only-hapolicy-config2.xml rename to activemq6-server/src/test/resources/live-only-hapolicy-config2.xml diff --git a/hornetq-server/src/test/resources/live-only-hapolicy-config3.xml b/activemq6-server/src/test/resources/live-only-hapolicy-config3.xml similarity index 100% rename from hornetq-server/src/test/resources/live-only-hapolicy-config3.xml rename to activemq6-server/src/test/resources/live-only-hapolicy-config3.xml diff --git a/hornetq-server/src/test/resources/live-only-hapolicy-config4.xml b/activemq6-server/src/test/resources/live-only-hapolicy-config4.xml similarity index 100% rename from hornetq-server/src/test/resources/live-only-hapolicy-config4.xml rename to activemq6-server/src/test/resources/live-only-hapolicy-config4.xml diff --git a/hornetq-server/src/test/resources/live-only-hapolicy-config5.xml b/activemq6-server/src/test/resources/live-only-hapolicy-config5.xml similarity index 100% rename from hornetq-server/src/test/resources/live-only-hapolicy-config5.xml rename to activemq6-server/src/test/resources/live-only-hapolicy-config5.xml diff --git a/hornetq-server/src/test/resources/logging.properties b/activemq6-server/src/test/resources/logging.properties similarity index 100% rename from hornetq-server/src/test/resources/logging.properties rename to activemq6-server/src/test/resources/logging.properties diff --git a/hornetq-server/src/test/resources/replica-hapolicy-config.xml b/activemq6-server/src/test/resources/replica-hapolicy-config.xml similarity index 100% rename from hornetq-server/src/test/resources/replica-hapolicy-config.xml rename to activemq6-server/src/test/resources/replica-hapolicy-config.xml diff --git a/hornetq-server/src/test/resources/replica-hapolicy-config2.xml b/activemq6-server/src/test/resources/replica-hapolicy-config2.xml similarity index 100% rename from hornetq-server/src/test/resources/replica-hapolicy-config2.xml rename to activemq6-server/src/test/resources/replica-hapolicy-config2.xml diff --git a/hornetq-server/src/test/resources/replica-hapolicy-config3.xml b/activemq6-server/src/test/resources/replica-hapolicy-config3.xml similarity index 100% rename from hornetq-server/src/test/resources/replica-hapolicy-config3.xml rename to activemq6-server/src/test/resources/replica-hapolicy-config3.xml diff --git a/hornetq-server/src/test/resources/replicated-hapolicy-config.xml b/activemq6-server/src/test/resources/replicated-hapolicy-config.xml similarity index 100% rename from hornetq-server/src/test/resources/replicated-hapolicy-config.xml rename to activemq6-server/src/test/resources/replicated-hapolicy-config.xml diff --git a/hornetq-server/src/test/resources/shared-store-master-hapolicy-config.xml b/activemq6-server/src/test/resources/shared-store-master-hapolicy-config.xml similarity index 100% rename from hornetq-server/src/test/resources/shared-store-master-hapolicy-config.xml rename to activemq6-server/src/test/resources/shared-store-master-hapolicy-config.xml diff --git a/hornetq-server/src/test/resources/shared-store-slave-hapolicy-config.xml b/activemq6-server/src/test/resources/shared-store-slave-hapolicy-config.xml similarity index 100% rename from hornetq-server/src/test/resources/shared-store-slave-hapolicy-config.xml rename to activemq6-server/src/test/resources/shared-store-slave-hapolicy-config.xml diff --git a/hornetq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml b/activemq6-server/src/test/resources/shared-store-slave-hapolicy-config2.xml similarity index 100% rename from hornetq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml rename to activemq6-server/src/test/resources/shared-store-slave-hapolicy-config2.xml diff --git a/hornetq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml b/activemq6-server/src/test/resources/shared-store-slave-hapolicy-config3.xml similarity index 100% rename from hornetq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml rename to activemq6-server/src/test/resources/shared-store-slave-hapolicy-config3.xml diff --git a/hornetq-service-sar/pom.xml b/activemq6-service-sar/pom.xml similarity index 65% rename from hornetq-service-sar/pom.xml rename to activemq6-service-sar/pom.xml index a6d0ecc71d..9a31e49b27 100644 --- a/hornetq-service-sar/pom.xml +++ b/activemq6-service-sar/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-service-sar + activemq6-service-sar jar - HornetQ JBoss AS4 Integration + ActiveMQ6 JBoss AS4 Integration ${project.basedir}/.. @@ -30,18 +30,18 @@ jboss-logging - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-jboss-as-integration + org.apache.activemq6 + activemq6-jboss-as-integration ${project.version} diff --git a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQFileConfigurationService.java b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQFileConfigurationService.java similarity index 89% rename from hornetq-service-sar/src/main/java/org/hornetq/service/HornetQFileConfigurationService.java rename to activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQFileConfigurationService.java index 83b6c6f17c..efbce8f68f 100644 --- a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQFileConfigurationService.java +++ b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQFileConfigurationService.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.service; +package org.apache.activemq6.service; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.FileConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.FileConfiguration; /** * @author Andy Taylor diff --git a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQFileConfigurationServiceMBean.java b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQFileConfigurationServiceMBean.java similarity index 91% rename from hornetq-service-sar/src/main/java/org/hornetq/service/HornetQFileConfigurationServiceMBean.java rename to activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQFileConfigurationServiceMBean.java index 5584bf3516..9527fccf6c 100644 --- a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQFileConfigurationServiceMBean.java +++ b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQFileConfigurationServiceMBean.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.service; +package org.apache.activemq6.service; -import org.hornetq.core.config.Configuration; +import org.apache.activemq6.core.config.Configuration; /** * @author Andy Taylor diff --git a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQJMSStarterService.java b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQJMSStarterService.java similarity index 92% rename from hornetq-service-sar/src/main/java/org/hornetq/service/HornetQJMSStarterService.java rename to activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQJMSStarterService.java index 5bcffcf1a6..16154f09a4 100644 --- a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQJMSStarterService.java +++ b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQJMSStarterService.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.service; +package org.apache.activemq6.service; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; /** * @author Andy Taylor diff --git a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQJMSStarterServiceMBean.java b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQJMSStarterServiceMBean.java similarity index 95% rename from hornetq-service-sar/src/main/java/org/hornetq/service/HornetQJMSStarterServiceMBean.java rename to activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQJMSStarterServiceMBean.java index 0716ed8afb..da7efd9385 100644 --- a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQJMSStarterServiceMBean.java +++ b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQJMSStarterServiceMBean.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.service; +package org.apache.activemq6.service; /** * @author Andy Taylor diff --git a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQServiceBundle.java b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQServiceBundle.java similarity index 96% rename from hornetq-service-sar/src/main/java/org/hornetq/service/HornetQServiceBundle.java rename to activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQServiceBundle.java index abacbb41f6..053615cc53 100644 --- a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQServiceBundle.java +++ b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQServiceBundle.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.service; +package org.apache.activemq6.service; import org.jboss.logging.annotations.MessageBundle; diff --git a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQServiceLogger.java b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQServiceLogger.java similarity index 96% rename from hornetq-service-sar/src/main/java/org/hornetq/service/HornetQServiceLogger.java rename to activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQServiceLogger.java index e1e5f05900..6b0f75ae04 100644 --- a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQServiceLogger.java +++ b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQServiceLogger.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.service; +package org.apache.activemq6.service; import org.jboss.logging.annotations.MessageLogger; diff --git a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQStarterService.java b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQStarterService.java similarity index 89% rename from hornetq-service-sar/src/main/java/org/hornetq/service/HornetQStarterService.java rename to activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQStarterService.java index 3685da79b1..c523153bbf 100644 --- a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQStarterService.java +++ b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQStarterService.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.service; +package org.apache.activemq6.service; import javax.management.MBeanRegistration; import javax.management.MBeanServer; import javax.management.ObjectName; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; /** * @author Lucaz Amador diff --git a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQStarterServiceMBean.java b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQStarterServiceMBean.java similarity index 92% rename from hornetq-service-sar/src/main/java/org/hornetq/service/HornetQStarterServiceMBean.java rename to activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQStarterServiceMBean.java index 8f68f36870..1aacad135e 100644 --- a/hornetq-service-sar/src/main/java/org/hornetq/service/HornetQStarterServiceMBean.java +++ b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQStarterServiceMBean.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.service; +package org.apache.activemq6.service; -import org.hornetq.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServer; /** * @author Lucaz Amador diff --git a/hornetq-service-sar/src/main/java/org/hornetq/service/JBossASSecurityManagerService.java b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/JBossASSecurityManagerService.java similarity index 90% rename from hornetq-service-sar/src/main/java/org/hornetq/service/JBossASSecurityManagerService.java rename to activemq6-service-sar/src/main/java/org/apache/activemq6/service/JBossASSecurityManagerService.java index be6e54028f..b75bd4f7b9 100644 --- a/hornetq-service-sar/src/main/java/org/hornetq/service/JBossASSecurityManagerService.java +++ b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/JBossASSecurityManagerService.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.service; +package org.apache.activemq6.service; -import org.hornetq.integration.jboss.security.JBossASSecurityManager; +import org.apache.activemq6.integration.jboss.security.JBossASSecurityManager; /** * @author Andy Taylor diff --git a/hornetq-service-sar/src/main/java/org/hornetq/service/JBossASSecurityManagerServiceMBean.java b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/JBossASSecurityManagerServiceMBean.java similarity index 87% rename from hornetq-service-sar/src/main/java/org/hornetq/service/JBossASSecurityManagerServiceMBean.java rename to activemq6-service-sar/src/main/java/org/apache/activemq6/service/JBossASSecurityManagerServiceMBean.java index e5142b3a17..d744e35a1f 100644 --- a/hornetq-service-sar/src/main/java/org/hornetq/service/JBossASSecurityManagerServiceMBean.java +++ b/activemq6-service-sar/src/main/java/org/apache/activemq6/service/JBossASSecurityManagerServiceMBean.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.service; +package org.apache.activemq6.service; -import org.hornetq.integration.jboss.security.JBossASSecurityManager; +import org.apache.activemq6.integration.jboss.security.JBossASSecurityManager; /** * @author Andy Taylor diff --git a/hornetq-tools/pom.xml b/activemq6-tools/pom.xml similarity index 81% rename from hornetq-tools/pom.xml rename to activemq6-tools/pom.xml index b0c9bea53a..b5489abb31 100644 --- a/hornetq-tools/pom.xml +++ b/activemq6-tools/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-tools + activemq6-tools jar - HornetQ Tools + ActiveMQ6 Tools @@ -22,13 +22,13 @@ jboss-logging-processor - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/hornetq-tools/src/main/java/org/hornetq/tools/DataTool.java b/activemq6-tools/src/main/java/org/apache/activemq6/tools/DataTool.java similarity index 95% rename from hornetq-tools/src/main/java/org/hornetq/tools/DataTool.java rename to activemq6-tools/src/main/java/org/apache/activemq6/tools/DataTool.java index 85663621b1..60c2814d85 100644 --- a/hornetq-tools/src/main/java/org/hornetq/tools/DataTool.java +++ b/activemq6-tools/src/main/java/org/apache/activemq6/tools/DataTool.java @@ -11,15 +11,15 @@ * permissions and limitations under the License. */ -package org.hornetq.tools; +package org.apache.activemq6.tools; import java.io.File; import java.util.ArrayList; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; /** * @author Clebert Suconic diff --git a/hornetq-tools/src/main/java/org/hornetq/tools/HornetQToolsLogger.java b/activemq6-tools/src/main/java/org/apache/activemq6/tools/HornetQToolsLogger.java similarity index 97% rename from hornetq-tools/src/main/java/org/hornetq/tools/HornetQToolsLogger.java rename to activemq6-tools/src/main/java/org/apache/activemq6/tools/HornetQToolsLogger.java index 0cb34a6a1d..5027fab3d3 100644 --- a/hornetq-tools/src/main/java/org/hornetq/tools/HornetQToolsLogger.java +++ b/activemq6-tools/src/main/java/org/apache/activemq6/tools/HornetQToolsLogger.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tools; +package org.apache.activemq6.tools; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/hornetq-tools/src/main/java/org/hornetq/tools/Main.java b/activemq6-tools/src/main/java/org/apache/activemq6/tools/Main.java similarity index 99% rename from hornetq-tools/src/main/java/org/hornetq/tools/Main.java rename to activemq6-tools/src/main/java/org/apache/activemq6/tools/Main.java index 5ff73f9079..7546d12792 100644 --- a/hornetq-tools/src/main/java/org/hornetq/tools/Main.java +++ b/activemq6-tools/src/main/java/org/apache/activemq6/tools/Main.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tools; +package org.apache.activemq6.tools; public class Main { diff --git a/hornetq-tools/src/main/java/org/hornetq/tools/PrintData.java b/activemq6-tools/src/main/java/org/apache/activemq6/tools/PrintData.java similarity index 88% rename from hornetq-tools/src/main/java/org/hornetq/tools/PrintData.java rename to activemq6-tools/src/main/java/org/apache/activemq6/tools/PrintData.java index 9e85735d53..28a34c554f 100644 --- a/hornetq-tools/src/main/java/org/hornetq/tools/PrintData.java +++ b/activemq6-tools/src/main/java/org/apache/activemq6/tools/PrintData.java @@ -11,21 +11,21 @@ * permissions and limitations under the License. */ -package org.hornetq.tools; +package org.apache.activemq6.tools; import java.io.File; -import org.hornetq.core.persistence.impl.journal.DescribeJournal; -import org.hornetq.core.server.impl.FileLockNodeManager; +import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal; +import org.apache.activemq6.core.server.impl.FileLockNodeManager; /** - * Writes a human-readable interpretation of the contents of a HornetQ {@link org.hornetq.core.journal.Journal}. + * Writes a human-readable interpretation of the contents of a HornetQ {@link org.apache.activemq6.core.journal.Journal}. *

* To run this class with Maven, use: * * 

  * cd hornetq-server
- * mvn -q exec:java -Dexec.args="/foo/hornetq/bindings /foo/hornetq/journal" -Dexec.mainClass="org.hornetq.tools.PrintData"
+ * mvn -q exec:java -Dexec.args="/foo/hornetq/bindings /foo/hornetq/journal" -Dexec.mainClass="org.apache.activemq6.tools.PrintData"
  *
* @author clebertsuconic */ diff --git a/hornetq-tools/src/main/java/org/hornetq/tools/PrintPages.java b/activemq6-tools/src/main/java/org/apache/activemq6/tools/PrintPages.java similarity index 83% rename from hornetq-tools/src/main/java/org/hornetq/tools/PrintPages.java rename to activemq6-tools/src/main/java/org/apache/activemq6/tools/PrintPages.java index d3c3e4e14d..84e20152cb 100644 --- a/hornetq-tools/src/main/java/org/hornetq/tools/PrintPages.java +++ b/activemq6-tools/src/main/java/org/apache/activemq6/tools/PrintPages.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tools; +package org.apache.activemq6.tools; import java.util.ArrayList; import java.util.HashMap; @@ -24,34 +24,34 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.PagingStoreFactory; -import org.hornetq.core.paging.cursor.PagePosition; -import org.hornetq.core.paging.cursor.impl.PagePositionImpl; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.paging.impl.PageTransactionInfoImpl; -import org.hornetq.core.paging.impl.PagingManagerImpl; -import org.hornetq.core.paging.impl.PagingStoreFactoryNIO; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.impl.journal.JournalRecordIds; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; -import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.settings.impl.HierarchicalObjectRepository; -import org.hornetq.utils.ExecutorFactory; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.PagingStoreFactory; +import org.apache.activemq6.core.paging.cursor.PagePosition; +import org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq6.core.paging.impl.PagingManagerImpl; +import org.apache.activemq6.core.paging.impl.PagingStoreFactoryNIO; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; +import org.apache.activemq6.core.persistence.impl.nullpm.NullStorageManager; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq6.utils.ExecutorFactory; /** * A PrintPage diff --git a/hornetq-tools/src/main/java/org/hornetq/tools/TransferQueue.java b/activemq6-tools/src/main/java/org/apache/activemq6/tools/TransferQueue.java similarity index 91% rename from hornetq-tools/src/main/java/org/hornetq/tools/TransferQueue.java rename to activemq6-tools/src/main/java/org/apache/activemq6/tools/TransferQueue.java index c7c1084894..e571a1cee0 100644 --- a/hornetq-tools/src/main/java/org/hornetq/tools/TransferQueue.java +++ b/activemq6-tools/src/main/java/org/apache/activemq6/tools/TransferQueue.java @@ -11,23 +11,23 @@ * permissions and limitations under the License. */ -package org.hornetq.tools; +package org.apache.activemq6.tools; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; /** * @author Clebert Suconic diff --git a/hornetq-tools/src/main/java/org/hornetq/tools/XmlDataConstants.java b/activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataConstants.java similarity index 97% rename from hornetq-tools/src/main/java/org/hornetq/tools/XmlDataConstants.java rename to activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataConstants.java index 6cea6ea964..af03b27811 100644 --- a/hornetq-tools/src/main/java/org/hornetq/tools/XmlDataConstants.java +++ b/activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataConstants.java @@ -11,11 +11,11 @@ * permissions and limitations under the License. */ -package org.hornetq.tools; +package org.apache.activemq6.tools; /** - * The constants shared by org.hornetq.tools.XmlDataImporter and - * org.hornetq.tools.XmlDataExporter. + * The constants shared by org.apache.activemq6.tools.XmlDataImporter and + * org.apache.activemq6.tools.XmlDataExporter. * * @author Justin Bertram */ diff --git a/hornetq-tools/src/main/java/org/hornetq/tools/XmlDataExporter.java b/activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataExporter.java similarity index 92% rename from hornetq-tools/src/main/java/org/hornetq/tools/XmlDataExporter.java rename to activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataExporter.java index 99b0d164ab..4a55c87707 100644 --- a/hornetq-tools/src/main/java/org/hornetq/tools/XmlDataExporter.java +++ b/activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataExporter.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tools; +package org.apache.activemq6.tools; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; @@ -33,61 +33,61 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.TransactionFailureCallback; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.message.BodyEncoder; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.PagingStoreFactory; -import org.hornetq.core.paging.cursor.PagePosition; -import org.hornetq.core.paging.cursor.impl.PagePositionImpl; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.paging.impl.PageTransactionInfoImpl; -import org.hornetq.core.paging.impl.PagingManagerImpl; -import org.hornetq.core.paging.impl.PagingStoreFactoryNIO; -import org.hornetq.core.persistence.impl.journal.DescribeJournal; -import org.hornetq.core.persistence.impl.journal.DescribeJournal.MessageDescribe; -import org.hornetq.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; -import org.hornetq.core.persistence.impl.journal.JournalRecordIds; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.AckDescribe; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.PersistentQueueBindingEncoding; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.LargeServerMessage; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.settings.impl.HierarchicalObjectRepository; -import org.hornetq.jms.persistence.config.PersistedConnectionFactory; -import org.hornetq.jms.persistence.config.PersistedDestination; -import org.hornetq.jms.persistence.config.PersistedJNDI; -import org.hornetq.jms.persistence.config.PersistedType; -import org.hornetq.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; -import org.hornetq.utils.Base64; -import org.hornetq.utils.ExecutorFactory; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.TransactionFailureCallback; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.message.BodyEncoder; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.PagingStoreFactory; +import org.apache.activemq6.core.paging.cursor.PagePosition; +import org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq6.core.paging.impl.PagingManagerImpl; +import org.apache.activemq6.core.paging.impl.PagingStoreFactoryNIO; +import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal; +import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal.MessageDescribe; +import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; +import org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.AckDescribe; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PersistentQueueBindingEncoding; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq6.jms.persistence.config.PersistedDestination; +import org.apache.activemq6.jms.persistence.config.PersistedJNDI; +import org.apache.activemq6.jms.persistence.config.PersistedType; +import org.apache.activemq6.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; +import org.apache.activemq6.utils.Base64; +import org.apache.activemq6.utils.ExecutorFactory; /** * Read the journal, page, and large-message data from a stopped instance of HornetQ and save it in an XML format to * a file. It uses the StAX javax.xml.stream.XMLStreamWriter for speed and simplicity. Output can be - * read by org.hornetq.core.persistence.impl.journal.XmlDataImporter. + * read by org.apache.activemq6.core.persistence.impl.journal.XmlDataImporter. * * @author Justin Bertram */ diff --git a/hornetq-tools/src/main/java/org/hornetq/tools/XmlDataImporter.java b/activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataImporter.java similarity index 96% rename from hornetq-tools/src/main/java/org/hornetq/tools/XmlDataImporter.java rename to activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataImporter.java index ae33615d64..d18153ec1d 100644 --- a/hornetq-tools/src/main/java/org/hornetq/tools/XmlDataImporter.java +++ b/activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataImporter.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tools; +package org.apache.activemq6.tools; import javax.xml.stream.XMLInputFactory; @@ -31,26 +31,26 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientRequestor; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.utils.Base64; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientRequestor; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.management.ManagementHelper; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.utils.Base64; /** - * Read XML output from org.hornetq.core.persistence.impl.journal.XmlDataExporter, create a core session, and + * Read XML output from org.apache.activemq6.core.persistence.impl.journal.XmlDataExporter, create a core session, and * send the messages to a running instance of HornetQ. It uses the StAX javax.xml.stream.XMLStreamReader * for speed and simplicity. * @@ -85,7 +85,7 @@ public final class XmlDataImporter /** * This is the normal constructor for programmatic access to the - * org.hornetq.core.persistence.impl.journal.XmlDataImporter if the session passed + * org.apache.activemq6.core.persistence.impl.journal.XmlDataImporter if the session passed * in uses auto-commit for sends. *

* If the session needs to be transactional then use the constructor which takes 2 sessions. @@ -101,7 +101,7 @@ public final class XmlDataImporter /** * This is the normal constructor for programmatic access to the - * org.hornetq.core.persistence.impl.journal.XmlDataImporter if the session passed + * org.apache.activemq6.core.persistence.impl.journal.XmlDataImporter if the session passed * in uses auto-commit for sends. *

* If the session needs to be transactional then use the constructor which takes 2 sessions. @@ -239,7 +239,7 @@ public final class XmlDataImporter Byte priority = 0; Long expiration = 0L; Long timestamp = 0L; - org.hornetq.utils.UUID userId = null; + org.apache.activemq6.utils.UUID userId = null; ArrayList queues = new ArrayList<>(); // get message's attributes @@ -261,7 +261,7 @@ public final class XmlDataImporter timestamp = Long.parseLong(reader.getAttributeValue(i)); break; case XmlDataConstants.MESSAGE_USER_ID: - userId = org.hornetq.utils.UUIDGenerator.getInstance().generateUUID(); + userId = org.apache.activemq6.utils.UUIDGenerator.getInstance().generateUUID(); break; } } diff --git a/distribution/hornetq/pom.xml b/distribution/activemq6/pom.xml similarity index 77% rename from distribution/hornetq/pom.xml rename to distribution/activemq6/pom.xml index c725c7e460..fdeac501b7 100644 --- a/distribution/hornetq/pom.xml +++ b/distribution/activemq6/pom.xml @@ -17,14 +17,14 @@ - org.hornetq - hornetq-distribution - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-distribution + 6.0.0-SNAPSHOT - hornetq + activemq pom - Actual HornetQ Distribution + Actual ActiveMQ Distribution ${project.build.directory}/${project.artifactId}-${project.version}-bin/${project.artifactId}-${project.version}/schema @@ -32,105 +32,105 @@ - + - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-dto + org.apache.activemq6 + activemq6-dto ${project.version} - org.hornetq - hornetq-bootstrap + org.apache.activemq6 + activemq6-bootstrap ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-tools + org.apache.activemq6 + activemq6-tools ${project.version} - org.hornetq - hornetq-jboss-as-integration + org.apache.activemq6 + activemq6-jboss-as-integration ${project.version} - org.hornetq - hornetq-ra + org.apache.activemq6 + activemq6-ra ${project.version} - org.hornetq - hornetq-service-sar + org.apache.activemq6 + activemq6-service-sar ${project.version} - org.hornetq - hornetq-spring-integration + org.apache.activemq6 + activemq6-spring-integration ${project.version} - org.hornetq - hornetq-twitter-integration + org.apache.activemq6 + activemq6-twitter-integration ${project.version} - org.hornetq - hornetq-vertx-integration + org.apache.activemq6 + activemq6-vertx-integration ${project.version} - org.hornetq.rest - hornetq-rest + org.apache.activemq6.rest + activemq6-rest ${project.version} - org.hornetq - hornetq-aerogear-integration + org.apache.activemq6 + activemq6-aerogear-integration ${project.version} - org.hornetq + org.apache.activemq6 jnp-client ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-amqp-protocol + org.apache.activemq6 + activemq6-amqp-protocol ${project.version} - org.hornetq - hornetq-stomp-protocol + org.apache.activemq6 + activemq6-stomp-protocol ${project.version} - org.hornetq - hornetq-openwire-protocol + org.apache.activemq6 + activemq6-openwire-protocol ${project.version} - org.hornetq - hornetq-native + org.apache.activemq6 + activemq6-native ${project.version} @@ -159,26 +159,26 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} javadoc - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} javadoc - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} javadoc - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} javadoc @@ -187,7 +187,7 @@ - src/main/resources + ../activemq6/src/main/resources true diff --git a/distribution/hornetq/src/main/assembly/dep.xml b/distribution/activemq6/src/main/assembly/dep.xml similarity index 86% rename from distribution/hornetq/src/main/assembly/dep.xml rename to distribution/activemq6/src/main/assembly/dep.xml index ff2b80f21f..8f3dcfd78f 100644 --- a/distribution/hornetq/src/main/assembly/dep.xml +++ b/distribution/activemq6/src/main/assembly/dep.xml @@ -25,8 +25,8 @@ - org.hornetq:* - org.hornetq.rest:hornetq-rest + org.apache.activemq6:* + org.apache.activemq6.rest:activemq6-rest org.jboss.spec.javax.jms:jboss-jms-api_2.0_spec org.jboss.naming:jnpserver @@ -51,7 +51,7 @@ - org.hornetq:hornetq-native + org.apache.activemq6:activemq6-native bin true @@ -64,10 +64,10 @@ - org.hornetq:hornetq-core-client:*:javadoc - org.hornetq:hornetq-server:*:javadoc - org.hornetq:hornetq-jms-server:*:javadoc - org.hornetq:hornetq-jms-client:*:javadoc + org.apache.activemq6:activemq6-core-client:*:javadoc + org.apache.activemq6:activemq6-server:*:javadoc + org.apache.activemq6:activemq6-jms-server:*:javadoc + org.apache.activemq6:activemq6-jms-client:*:javadoc docs/api/${artifact.artifactId} true @@ -76,12 +76,12 @@ - ../../hornetq-server/src/main/resources/schema/ + ../../activemq6-server/src/main/resources/schema/ schema keep - ../../hornetq-jms-server/src/main/resources/schema/ + ../../activemq6-jms-server/src/main/resources/schema/ schema keep diff --git a/distribution/hornetq/src/main/resources/bin/hornetq b/distribution/activemq6/src/main/resources/bin/hornetq similarity index 100% rename from distribution/hornetq/src/main/resources/bin/hornetq rename to distribution/activemq6/src/main/resources/bin/hornetq diff --git a/distribution/hornetq/src/main/resources/bin/hornetq-service b/distribution/activemq6/src/main/resources/bin/hornetq-service similarity index 100% rename from distribution/hornetq/src/main/resources/bin/hornetq-service rename to distribution/activemq6/src/main/resources/bin/hornetq-service diff --git a/distribution/hornetq/src/main/resources/bin/hornetq.cmd b/distribution/activemq6/src/main/resources/bin/hornetq.cmd similarity index 100% rename from distribution/hornetq/src/main/resources/bin/hornetq.cmd rename to distribution/activemq6/src/main/resources/bin/hornetq.cmd diff --git a/distribution/hornetq/src/main/resources/bin/run.bat b/distribution/activemq6/src/main/resources/bin/run.bat similarity index 100% rename from distribution/hornetq/src/main/resources/bin/run.bat rename to distribution/activemq6/src/main/resources/bin/run.bat diff --git a/distribution/hornetq/src/main/resources/bin/run.sh b/distribution/activemq6/src/main/resources/bin/run.sh similarity index 100% rename from distribution/hornetq/src/main/resources/bin/run.sh rename to distribution/activemq6/src/main/resources/bin/run.sh diff --git a/distribution/hornetq/src/main/resources/bin/stop.bat b/distribution/activemq6/src/main/resources/bin/stop.bat similarity index 100% rename from distribution/hornetq/src/main/resources/bin/stop.bat rename to distribution/activemq6/src/main/resources/bin/stop.bat diff --git a/distribution/hornetq/src/main/resources/bin/stop.sh b/distribution/activemq6/src/main/resources/bin/stop.sh similarity index 100% rename from distribution/hornetq/src/main/resources/bin/stop.sh rename to distribution/activemq6/src/main/resources/bin/stop.sh diff --git a/distribution/hornetq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq6/src/main/resources/config/clustered/bootstrap.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/clustered/bootstrap.xml rename to distribution/activemq6/src/main/resources/config/clustered/bootstrap.xml diff --git a/distribution/hornetq/src/main/resources/config/clustered/hornetq-configuration.xml b/distribution/activemq6/src/main/resources/config/clustered/hornetq-configuration.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/clustered/hornetq-configuration.xml rename to distribution/activemq6/src/main/resources/config/clustered/hornetq-configuration.xml diff --git a/distribution/hornetq/src/main/resources/config/clustered/hornetq-jms.xml b/distribution/activemq6/src/main/resources/config/clustered/hornetq-jms.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/clustered/hornetq-jms.xml rename to distribution/activemq6/src/main/resources/config/clustered/hornetq-jms.xml diff --git a/distribution/hornetq/src/main/resources/config/clustered/hornetq-users.xml b/distribution/activemq6/src/main/resources/config/clustered/hornetq-users.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/clustered/hornetq-users.xml rename to distribution/activemq6/src/main/resources/config/clustered/hornetq-users.xml diff --git a/distribution/hornetq/src/main/resources/config/clustered/jndi.properties b/distribution/activemq6/src/main/resources/config/clustered/jndi.properties similarity index 100% rename from distribution/hornetq/src/main/resources/config/clustered/jndi.properties rename to distribution/activemq6/src/main/resources/config/clustered/jndi.properties diff --git a/distribution/hornetq/src/main/resources/config/logging.properties b/distribution/activemq6/src/main/resources/config/logging.properties similarity index 100% rename from distribution/hornetq/src/main/resources/config/logging.properties rename to distribution/activemq6/src/main/resources/config/logging.properties diff --git a/distribution/hornetq/src/main/resources/config/non-clustered/bootstrap.xml b/distribution/activemq6/src/main/resources/config/non-clustered/bootstrap.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/non-clustered/bootstrap.xml rename to distribution/activemq6/src/main/resources/config/non-clustered/bootstrap.xml diff --git a/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-configuration.xml b/distribution/activemq6/src/main/resources/config/non-clustered/hornetq-configuration.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/non-clustered/hornetq-configuration.xml rename to distribution/activemq6/src/main/resources/config/non-clustered/hornetq-configuration.xml diff --git a/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-jms.xml b/distribution/activemq6/src/main/resources/config/non-clustered/hornetq-jms.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/non-clustered/hornetq-jms.xml rename to distribution/activemq6/src/main/resources/config/non-clustered/hornetq-jms.xml diff --git a/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-users.xml b/distribution/activemq6/src/main/resources/config/non-clustered/hornetq-users.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/non-clustered/hornetq-users.xml rename to distribution/activemq6/src/main/resources/config/non-clustered/hornetq-users.xml diff --git a/distribution/hornetq/src/main/resources/config/non-clustered/jndi.properties b/distribution/activemq6/src/main/resources/config/non-clustered/jndi.properties similarity index 100% rename from distribution/hornetq/src/main/resources/config/non-clustered/jndi.properties rename to distribution/activemq6/src/main/resources/config/non-clustered/jndi.properties diff --git a/distribution/hornetq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq6/src/main/resources/config/replicated/bootstrap.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/replicated/bootstrap.xml rename to distribution/activemq6/src/main/resources/config/replicated/bootstrap.xml diff --git a/distribution/hornetq/src/main/resources/config/replicated/hornetq-configuration.xml b/distribution/activemq6/src/main/resources/config/replicated/hornetq-configuration.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/replicated/hornetq-configuration.xml rename to distribution/activemq6/src/main/resources/config/replicated/hornetq-configuration.xml diff --git a/distribution/hornetq/src/main/resources/config/replicated/hornetq-jms.xml b/distribution/activemq6/src/main/resources/config/replicated/hornetq-jms.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/replicated/hornetq-jms.xml rename to distribution/activemq6/src/main/resources/config/replicated/hornetq-jms.xml diff --git a/distribution/hornetq/src/main/resources/config/replicated/hornetq-users.xml b/distribution/activemq6/src/main/resources/config/replicated/hornetq-users.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/replicated/hornetq-users.xml rename to distribution/activemq6/src/main/resources/config/replicated/hornetq-users.xml diff --git a/distribution/hornetq/src/main/resources/config/replicated/jndi.properties b/distribution/activemq6/src/main/resources/config/replicated/jndi.properties similarity index 100% rename from distribution/hornetq/src/main/resources/config/replicated/jndi.properties rename to distribution/activemq6/src/main/resources/config/replicated/jndi.properties diff --git a/distribution/hornetq/src/main/resources/config/shared-store/bootstrap.xml b/distribution/activemq6/src/main/resources/config/shared-store/bootstrap.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/shared-store/bootstrap.xml rename to distribution/activemq6/src/main/resources/config/shared-store/bootstrap.xml diff --git a/distribution/hornetq/src/main/resources/config/shared-store/hornetq-configuration.xml b/distribution/activemq6/src/main/resources/config/shared-store/hornetq-configuration.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/shared-store/hornetq-configuration.xml rename to distribution/activemq6/src/main/resources/config/shared-store/hornetq-configuration.xml diff --git a/distribution/hornetq/src/main/resources/config/shared-store/hornetq-jms.xml b/distribution/activemq6/src/main/resources/config/shared-store/hornetq-jms.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/shared-store/hornetq-jms.xml rename to distribution/activemq6/src/main/resources/config/shared-store/hornetq-jms.xml diff --git a/distribution/hornetq/src/main/resources/config/shared-store/hornetq-users.xml b/distribution/activemq6/src/main/resources/config/shared-store/hornetq-users.xml similarity index 100% rename from distribution/hornetq/src/main/resources/config/shared-store/hornetq-users.xml rename to distribution/activemq6/src/main/resources/config/shared-store/hornetq-users.xml diff --git a/distribution/hornetq/src/main/resources/config/shared-store/jndi.properties b/distribution/activemq6/src/main/resources/config/shared-store/jndi.properties similarity index 100% rename from distribution/hornetq/src/main/resources/config/shared-store/jndi.properties rename to distribution/activemq6/src/main/resources/config/shared-store/jndi.properties diff --git a/distribution/hornetq/src/main/resources/licenses/LGPL.txt b/distribution/activemq6/src/main/resources/licenses/LGPL.txt similarity index 100% rename from distribution/hornetq/src/main/resources/licenses/LGPL.txt rename to distribution/activemq6/src/main/resources/licenses/LGPL.txt diff --git a/distribution/hornetq/src/main/resources/licenses/LICENSE.txt b/distribution/activemq6/src/main/resources/licenses/LICENSE.txt similarity index 100% rename from distribution/hornetq/src/main/resources/licenses/LICENSE.txt rename to distribution/activemq6/src/main/resources/licenses/LICENSE.txt diff --git a/distribution/hornetq/src/main/resources/licenses/LICENSE_twitter4j.txt b/distribution/activemq6/src/main/resources/licenses/LICENSE_twitter4j.txt similarity index 100% rename from distribution/hornetq/src/main/resources/licenses/LICENSE_twitter4j.txt rename to distribution/activemq6/src/main/resources/licenses/LICENSE_twitter4j.txt diff --git a/distribution/hornetq/src/main/resources/licenses/base64.txt b/distribution/activemq6/src/main/resources/licenses/base64.txt similarity index 100% rename from distribution/hornetq/src/main/resources/licenses/base64.txt rename to distribution/activemq6/src/main/resources/licenses/base64.txt diff --git a/distribution/hornetq/src/main/resources/licenses/json.txt b/distribution/activemq6/src/main/resources/licenses/json.txt similarity index 100% rename from distribution/hornetq/src/main/resources/licenses/json.txt rename to distribution/activemq6/src/main/resources/licenses/json.txt diff --git a/distribution/jnp-client/pom.xml b/distribution/jnp-client/pom.xml index 896ec997ec..c3b01327d4 100644 --- a/distribution/jnp-client/pom.xml +++ b/distribution/jnp-client/pom.xml @@ -4,9 +4,9 @@ - org.hornetq - hornetq-distribution - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-distribution + 6.0.0-SNAPSHOT jnp-client diff --git a/distribution/pom.xml b/distribution/pom.xml index 538e685fc2..7f06e32554 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - hornetq-distribution + activemq6-distribution pom - HornetQ Distribution + ActiveMQ6 Distribution true @@ -34,7 +34,7 @@ jnp-client - hornetq + activemq6 diff --git a/docs/pom.xml b/docs/pom.xml index de0fd318e1..3dd58e0e1b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -16,15 +16,15 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - org.hornetq.docs - hornetq-docs + org.apache.activemq6.docs + activemq6-docs pom - HornetQ Documentation + ActiveMQ6 Documentation true diff --git a/docs/quickstart-guide/pom.xml b/docs/quickstart-guide/pom.xml index d2e1d02cf7..88ffa167e6 100644 --- a/docs/quickstart-guide/pom.xml +++ b/docs/quickstart-guide/pom.xml @@ -6,12 +6,12 @@ 4.0.0 - org.hornetq.docs - hornetq-docs - 2.5.0-SNAPSHOT + org.apache.activemq6.docs + activemq6-docs + 6.0.0-SNAPSHOT - org.hornetq.docs + org.apache.activemq6.docs quickstart-guide 1.0 jdocbook diff --git a/docs/user-manual/pom.xml b/docs/user-manual/pom.xml index 549f6487f3..5cba1f94c0 100644 --- a/docs/user-manual/pom.xml +++ b/docs/user-manual/pom.xml @@ -19,12 +19,12 @@ 4.0.0 - org.hornetq.docs - hornetq-docs - 2.5.0-SNAPSHOT + org.apache.activemq6.docs + activemq6-docs + 6.0.0-SNAPSHOT - org.hornetq.docs + org.apache.activemq6.docs user-manual 1.0 jdocbook @@ -275,7 +275,7 @@ net.sf.saxon.TransformerFactoryImpl -

../../hornetq-server/src/main/resources/schema + ../../activemq6-server/src/main/resources/schema ./src/main/resources/schemaToTable.xsl hornetq-configuration.xsd diff --git a/examples/core/embedded-remote/pom.xml b/examples/core/embedded-remote/pom.xml index c88da3632c..746751ad84 100644 --- a/examples/core/embedded-remote/pom.xml +++ b/examples/core/embedded-remote/pom.xml @@ -3,29 +3,29 @@ 4.0.0 - org.hornetq.examples.core + org.apache.activemq6.examples.core core-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-core-embedded-remote-example + activemq6-core-embedded-remote-example jar - HornetQ Core Embedded Remote Example + ActiveMQ6 Core Embedded Remote Example - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-commons + org.apache.activemq6 + activemq6-commons ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} @@ -53,8 +53,8 @@ server - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} @@ -83,8 +83,8 @@ client - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} diff --git a/examples/core/embedded-remote/src/main/java/org/hornetq/core/example/EmbeddedRemoteExample.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq6/core/example/EmbeddedRemoteExample.java similarity index 84% rename from examples/core/embedded-remote/src/main/java/org/hornetq/core/example/EmbeddedRemoteExample.java rename to examples/core/embedded-remote/src/main/java/org/apache/activemq6/core/example/EmbeddedRemoteExample.java index 95a5a6e36a..4d69da3fcb 100644 --- a/examples/core/embedded-remote/src/main/java/org/hornetq/core/example/EmbeddedRemoteExample.java +++ b/examples/core/embedded-remote/src/main/java/org/apache/activemq6/core/example/EmbeddedRemoteExample.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.example; +package org.apache.activemq6.core.example; import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; /** * diff --git a/examples/core/embedded-remote/src/main/java/org/hornetq/core/example/EmbeddedServer.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq6/core/example/EmbeddedServer.java similarity index 84% rename from examples/core/embedded-remote/src/main/java/org/hornetq/core/example/EmbeddedServer.java rename to examples/core/embedded-remote/src/main/java/org/apache/activemq6/core/example/EmbeddedServer.java index baaf9177a1..03222cbd1f 100644 --- a/examples/core/embedded-remote/src/main/java/org/hornetq/core/example/EmbeddedServer.java +++ b/examples/core/embedded-remote/src/main/java/org/apache/activemq6/core/example/EmbeddedServer.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.example; +package org.apache.activemq6.core.example; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; /** * An EmbeddedServer diff --git a/examples/core/embedded/pom.xml b/examples/core/embedded/pom.xml index d6b92b4cc5..0dbfd5b6de 100644 --- a/examples/core/embedded/pom.xml +++ b/examples/core/embedded/pom.xml @@ -3,29 +3,29 @@ 4.0.0 - org.hornetq.examples.core + org.apache.activemq6.examples.core core-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-core-embedded-example + activemq6-core-embedded-example jar - HornetQ Core Embedded Example + ActiveMQ6 Core Embedded Example - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-commons + org.apache.activemq6 + activemq6-commons ${project.version} diff --git a/examples/core/embedded/src/main/java/org/hornetq/core/example/EmbeddedExample.java b/examples/core/embedded/src/main/java/org/apache/activemq6/core/example/EmbeddedExample.java similarity index 79% rename from examples/core/embedded/src/main/java/org/hornetq/core/example/EmbeddedExample.java rename to examples/core/embedded/src/main/java/org/apache/activemq6/core/example/EmbeddedExample.java index 96e3b0275d..65f3392a1a 100644 --- a/examples/core/embedded/src/main/java/org/hornetq/core/example/EmbeddedExample.java +++ b/examples/core/embedded/src/main/java/org/apache/activemq6/core/example/EmbeddedExample.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.example; +package org.apache.activemq6.core.example; import java.util.Date; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; /** * diff --git a/examples/core/perf/pom.xml b/examples/core/perf/pom.xml index 759a9bcb50..01b0b01041 100644 --- a/examples/core/perf/pom.xml +++ b/examples/core/perf/pom.xml @@ -3,24 +3,24 @@ 4.0.0 - org.hornetq.examples.core + org.apache.activemq6.examples.core core-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-core-perf-example + activemq6-core-perf-example jar - HornetQ Perf Example + ActiveMQ6 Perf Example - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-commons + org.apache.activemq6 + activemq6-commons ${project.version} @@ -39,8 +39,8 @@ 5.0.5.Final - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -58,8 +58,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -84,28 +84,28 @@ - org.hornetq.examples.core - hornetq-core-perf-example + org.apache.activemq6.examples.core + activemq6-core-perf-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/core/perf/src/main/java/org/hornetq/core/example/PerfBase.java b/examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfBase.java similarity index 94% rename from examples/core/perf/src/main/java/org/hornetq/core/example/PerfBase.java rename to examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfBase.java index d837a7ead7..b9ea75d556 100644 --- a/examples/core/perf/src/main/java/org/hornetq/core/example/PerfBase.java +++ b/examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.example; +package org.apache.activemq6.core.example; import java.io.FileInputStream; import java.io.InputStream; @@ -22,21 +22,21 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Logger; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.utils.TokenBucketLimiter; -import org.hornetq.utils.TokenBucketLimiterImpl; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.utils.TokenBucketLimiter; +import org.apache.activemq6.utils.TokenBucketLimiterImpl; /** * diff --git a/examples/core/perf/src/main/java/org/hornetq/core/example/PerfListener.java b/examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfListener.java similarity index 96% rename from examples/core/perf/src/main/java/org/hornetq/core/example/PerfListener.java rename to examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfListener.java index 355aa0cb26..6e3f247131 100644 --- a/examples/core/perf/src/main/java/org/hornetq/core/example/PerfListener.java +++ b/examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.example; +package org.apache.activemq6.core.example; import java.util.logging.Logger; diff --git a/examples/core/perf/src/main/java/org/hornetq/core/example/PerfParams.java b/examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfParams.java similarity index 99% rename from examples/core/perf/src/main/java/org/hornetq/core/example/PerfParams.java rename to examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfParams.java index 738fe9a26b..87a15c6044 100644 --- a/examples/core/perf/src/main/java/org/hornetq/core/example/PerfParams.java +++ b/examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfParams.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.example; +package org.apache.activemq6.core.example; import java.io.Serializable; diff --git a/examples/core/perf/src/main/java/org/hornetq/core/example/PerfSender.java b/examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfSender.java similarity index 96% rename from examples/core/perf/src/main/java/org/hornetq/core/example/PerfSender.java rename to examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfSender.java index 9c86a4fc61..0342aa207c 100644 --- a/examples/core/perf/src/main/java/org/hornetq/core/example/PerfSender.java +++ b/examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfSender.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.example; +package org.apache.activemq6.core.example; import java.util.logging.Logger; diff --git a/examples/core/pom.xml b/examples/core/pom.xml index c70dcd160f..2ad8229adb 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -3,15 +3,15 @@ 4.0.0 - org.hornetq.examples - hornetq-examples - 2.5.0-SNAPSHOT + org.apache.activemq6.examples + activemq6-examples + 6.0.0-SNAPSHOT - org.hornetq.examples.core + org.apache.activemq6.examples.core core-examples pom - HornetQ Core Examples + ActiveMQ6 Core Examples 231.7.7.7 diff --git a/examples/core/twitter-connector/pom.xml b/examples/core/twitter-connector/pom.xml index eb4d3a3b00..a1919f09d3 100644 --- a/examples/core/twitter-connector/pom.xml +++ b/examples/core/twitter-connector/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq.examples.core + org.apache.activemq6.examples.core core-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-twitter-example + activemq6-twitter-example jar - HornetQ Twitter Example + ActiveMQ6 Twitter Example consumerKey @@ -20,18 +20,18 @@ - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-commons + org.apache.activemq6 + activemq6-commons ${project.version} @@ -64,8 +64,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -106,33 +106,33 @@ - org.hornetq.examples.core - hornetq-twitter-example + org.apache.activemq6.examples.core + activemq6-twitter-example ${project.version} - org.hornetq - hornetq-twitter-integration + org.apache.activemq6 + activemq6-twitter-integration ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/core/twitter-connector/src/main/java/org/hornetq/core/example/TwitterConnectorExample.java b/examples/core/twitter-connector/src/main/java/org/apache/activemq6/core/example/TwitterConnectorExample.java similarity index 84% rename from examples/core/twitter-connector/src/main/java/org/hornetq/core/example/TwitterConnectorExample.java rename to examples/core/twitter-connector/src/main/java/org/apache/activemq6/core/example/TwitterConnectorExample.java index 37274d1de9..d966621973 100644 --- a/examples/core/twitter-connector/src/main/java/org/hornetq/core/example/TwitterConnectorExample.java +++ b/examples/core/twitter-connector/src/main/java/org/apache/activemq6/core/example/TwitterConnectorExample.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.example; +package org.apache.activemq6.core.example; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; /** * A simple example of using twitter connector service. @@ -61,7 +61,7 @@ public class TwitterConnectorExample ClientConsumer cc = session.createConsumer(INCOMING_QUEUE); // Step 5. Create a core message. - ClientMessage cm = session.createMessage(org.hornetq.api.core.Message.TEXT_TYPE,true); + ClientMessage cm = session.createMessage(org.apache.activemq6.api.core.Message.TEXT_TYPE,true); cm.getBodyBuffer().writeString(testMessage); // Step 6. Send a message to queue.outgoingQueue. diff --git a/examples/core/vertx-connector/pom.xml b/examples/core/vertx-connector/pom.xml index 4c0fef3358..9522fb6485 100644 --- a/examples/core/vertx-connector/pom.xml +++ b/examples/core/vertx-connector/pom.xml @@ -3,32 +3,32 @@ 4.0.0 - org.hornetq.examples.core + org.apache.activemq6.examples.core core-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-vertx-example + activemq6-vertx-example jar - HornetQ Vert.x Example + ActiveMQ6 Vert.x Example 2.1.2 - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-commons + org.apache.activemq6 + activemq6-commons ${project.version} @@ -74,8 +74,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -109,33 +109,33 @@ - org.hornetq.examples.core - hornetq-vertx-example + org.apache.activemq6.examples.core + activemq6-vertx-example ${project.version} - org.hornetq - hornetq-vertx-integration + org.apache.activemq6 + activemq6-vertx-integration ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/core/vertx-connector/src/main/java/org/hornetq/core/example/ExampleVerticle.java b/examples/core/vertx-connector/src/main/java/org/apache/activemq6/core/example/ExampleVerticle.java similarity index 97% rename from examples/core/vertx-connector/src/main/java/org/hornetq/core/example/ExampleVerticle.java rename to examples/core/vertx-connector/src/main/java/org/apache/activemq6/core/example/ExampleVerticle.java index 9438434157..4693889f89 100644 --- a/examples/core/vertx-connector/src/main/java/org/hornetq/core/example/ExampleVerticle.java +++ b/examples/core/vertx-connector/src/main/java/org/apache/activemq6/core/example/ExampleVerticle.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.example; +package org.apache.activemq6.core.example; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/examples/core/vertx-connector/src/main/java/org/hornetq/core/example/VertxConnectorExample.java b/examples/core/vertx-connector/src/main/java/org/apache/activemq6/core/example/VertxConnectorExample.java similarity index 96% rename from examples/core/vertx-connector/src/main/java/org/hornetq/core/example/VertxConnectorExample.java rename to examples/core/vertx-connector/src/main/java/org/apache/activemq6/core/example/VertxConnectorExample.java index 12a1e8b458..50239b8416 100644 --- a/examples/core/vertx-connector/src/main/java/org/hornetq/core/example/VertxConnectorExample.java +++ b/examples/core/vertx-connector/src/main/java/org/apache/activemq6/core/example/VertxConnectorExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.core.example; +package org.apache.activemq6.core.example; import java.net.URL; import java.util.concurrent.CountDownLatch; @@ -55,7 +55,7 @@ public class VertxConnectorExample final CountDownLatch latch0 = new CountDownLatch(1); // Step 2 Deploy a Verticle to receive message - String verticle = "org.hornetq.core.example.ExampleVerticle"; + String verticle = "org.apache.activemq6.core.example.ExampleVerticle"; platformManager.deployVerticle(verticle, null, new URL[0], 1, null, new Handler>(){ diff --git a/examples/javaee/ejb-jms-transaction/pom.xml b/examples/javaee/ejb-jms-transaction/pom.xml index 4d09102e74..bf0aeac896 100644 --- a/examples/javaee/ejb-jms-transaction/pom.xml +++ b/examples/javaee/ejb-jms-transaction/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-ejb-jms-example + activemq6-javaee-ejb-jms-example jar - HornetQ Java EE MDB EJB Transaction Example + ActiveMQ6 Java EE MDB EJB Transaction Example \ No newline at end of file diff --git a/examples/javaee/ejb-jms-transaction/src/main/java/org/hornetq/javaee/example/EJBClientExample.java b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/EJBClientExample.java similarity index 93% rename from examples/javaee/ejb-jms-transaction/src/main/java/org/hornetq/javaee/example/EJBClientExample.java rename to examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/EJBClientExample.java index 5d9b979795..4a810bb1e7 100644 --- a/examples/javaee/ejb-jms-transaction/src/main/java/org/hornetq/javaee/example/EJBClientExample.java +++ b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/EJBClientExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,7 +22,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import java.util.Properties; -import org.hornetq.javaee.example.server.SendMessageService; +import org.apache.activemq6.javaee.example.server.SendMessageService; /** * An example showing how to invoke a EJB which sends a JMS message and update a JDBC table in the same transaction. @@ -45,7 +45,7 @@ public class EJBClientExample initialContext = new InitialContext(env); // Step 2. Lookup the EJB - SendMessageService service = (SendMessageService) initialContext.lookup("ejb:/test//SendMessageBean!org.hornetq.javaee.example.server.SendMessageService"); + SendMessageService service = (SendMessageService) initialContext.lookup("ejb:/test//SendMessageBean!org.apache.activemq6.javaee.example.server.SendMessageService"); // Step 3. Create the DB table which will be updated service.createTable(); diff --git a/examples/javaee/ejb-jms-transaction/src/main/java/org/hornetq/javaee/example/server/SendMessageBean.java b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/server/SendMessageBean.java similarity index 98% rename from examples/javaee/ejb-jms-transaction/src/main/java/org/hornetq/javaee/example/server/SendMessageBean.java rename to examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/server/SendMessageBean.java index d454447325..3a62f66d8b 100644 --- a/examples/javaee/ejb-jms-transaction/src/main/java/org/hornetq/javaee/example/server/SendMessageBean.java +++ b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/server/SendMessageBean.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; import java.sql.PreparedStatement; diff --git a/examples/javaee/ejb-jms-transaction/src/main/java/org/hornetq/javaee/example/server/SendMessageService.java b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/server/SendMessageService.java similarity index 94% rename from examples/javaee/ejb-jms-transaction/src/main/java/org/hornetq/javaee/example/server/SendMessageService.java rename to examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/server/SendMessageService.java index aecd8a91c5..60ffca5c91 100644 --- a/examples/javaee/ejb-jms-transaction/src/main/java/org/hornetq/javaee/example/server/SendMessageService.java +++ b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/server/SendMessageService.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; /** * The interface of an EJB which sends a JMS message and updates a JDBC table in the same transaction. diff --git a/examples/javaee/ejb-jms-transaction/src/test/java/org/hornetq/javaee/examples/MDBEJBTXRequiredRunnerTest.java b/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq6/javaee/examples/MDBEJBTXRequiredRunnerTest.java similarity index 86% rename from examples/javaee/ejb-jms-transaction/src/test/java/org/hornetq/javaee/examples/MDBEJBTXRequiredRunnerTest.java rename to examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq6/javaee/examples/MDBEJBTXRequiredRunnerTest.java index 8cce9bd05f..65971a937b 100644 --- a/examples/javaee/ejb-jms-transaction/src/test/java/org/hornetq/javaee/examples/MDBEJBTXRequiredRunnerTest.java +++ b/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq6/javaee/examples/MDBEJBTXRequiredRunnerTest.java @@ -11,11 +11,11 @@ * permissions and limitations under the License. */ -package org.hornetq.javaee.examples; +package org.apache.activemq6.javaee.examples; -import org.hornetq.javaee.example.EJBClientExample; -import org.hornetq.javaee.example.server.SendMessageBean; -import org.hornetq.javaee.example.server.SendMessageService; +import org.apache.activemq6.javaee.example.EJBClientExample; +import org.apache.activemq6.javaee.example.server.SendMessageBean; +import org.apache.activemq6.javaee.example.server.SendMessageService; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; diff --git a/examples/javaee/jca-config/pom.xml b/examples/javaee/jca-config/pom.xml index dca8852095..490f1476b4 100644 --- a/examples/javaee/jca-config/pom.xml +++ b/examples/javaee/jca-config/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-jca-config-example + activemq6-javaee-jca-config-example jar - HornetQ Java EE JCA Config Example + ActiveMQ6 Java EE JCA Config Example diff --git a/examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/MDBRemoteClientExample.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteClientExample.java similarity index 88% rename from examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/MDBRemoteClientExample.java rename to examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteClientExample.java index 67b77ca312..9e8cbdfac0 100644 --- a/examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/MDBRemoteClientExample.java +++ b/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteClientExample.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; -import org.hornetq.javaee.example.server2.StatelessSenderService; +import org.apache.activemq6.javaee.example.server2.StatelessSenderService; import javax.jms.Connection; import javax.naming.Context; @@ -39,7 +39,7 @@ public class MDBRemoteClientExample initialContext = new InitialContext(env); // Step 2. Lookup the EJB - StatelessSenderService sender = (StatelessSenderService)initialContext.lookup("ejb:/test//StatelessSender!org.hornetq.javaee.example.server2.StatelessSenderService"); + StatelessSenderService sender = (StatelessSenderService)initialContext.lookup("ejb:/test//StatelessSender!org.apache.activemq6.javaee.example.server2.StatelessSenderService"); //Step 3. Calling a Stateless Session Bean. You will have more steps on the SessionBean sender.sendHello("Hello there MDB!"); diff --git a/examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/server/MDBQueueA.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server/MDBQueueA.java similarity index 97% rename from examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/server/MDBQueueA.java rename to examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server/MDBQueueA.java index 1ea3e74c72..9318acb171 100644 --- a/examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/server/MDBQueueA.java +++ b/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server/MDBQueueA.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; import javax.ejb.ActivationConfigProperty; import javax.ejb.MessageDriven; diff --git a/examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/server2/MDBQueueB.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/MDBQueueB.java similarity index 97% rename from examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/server2/MDBQueueB.java rename to examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/MDBQueueB.java index 763541947f..fe8885958e 100644 --- a/examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/server2/MDBQueueB.java +++ b/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/MDBQueueB.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server2; +package org.apache.activemq6.javaee.example.server2; import org.jboss.ejb3.annotation.ResourceAdapter; diff --git a/examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/server2/StatelessSender.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/StatelessSender.java similarity index 92% rename from examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/server2/StatelessSender.java rename to examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/StatelessSender.java index f2409c06fc..6161bfc24a 100644 --- a/examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/server2/StatelessSender.java +++ b/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/StatelessSender.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server2; +package org.apache.activemq6.javaee.example.server2; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.ra.HornetQRAConnectionFactoryImpl; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.ra.HornetQRAConnectionFactoryImpl; import javax.annotation.Resource; import javax.ejb.Remote; diff --git a/examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/server2/StatelessSenderService.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/StatelessSenderService.java similarity index 94% rename from examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/server2/StatelessSenderService.java rename to examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/StatelessSenderService.java index 6222474b2e..e6bf2a5a33 100644 --- a/examples/javaee/jca-config/src/main/java/org/hornetq/javaee/example/server2/StatelessSenderService.java +++ b/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/StatelessSenderService.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server2; +package org.apache.activemq6.javaee.example.server2; /** * A StatelessSenderService diff --git a/examples/javaee/jca-config/src/test/java/org/hornetq/javaee/example/server/ExampleRunner2Test.java b/examples/javaee/jca-config/src/test/java/org/apache/activemq6/javaee/example/server/ExampleRunner2Test.java similarity index 92% rename from examples/javaee/jca-config/src/test/java/org/hornetq/javaee/example/server/ExampleRunner2Test.java rename to examples/javaee/jca-config/src/test/java/org/apache/activemq6/javaee/example/server/ExampleRunner2Test.java index 72fd4aa79a..e3f47558f6 100644 --- a/examples/javaee/jca-config/src/test/java/org/hornetq/javaee/example/server/ExampleRunner2Test.java +++ b/examples/javaee/jca-config/src/test/java/org/apache/activemq6/javaee/example/server/ExampleRunner2Test.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; -import org.hornetq.javaee.example.MDBRemoteClientExample; -import org.hornetq.javaee.example.server2.MDBQueueB; -import org.hornetq.javaee.example.server2.StatelessSender; -import org.hornetq.javaee.example.server2.StatelessSenderService; +import org.apache.activemq6.javaee.example.MDBRemoteClientExample; +import org.apache.activemq6.javaee.example.server2.MDBQueueB; +import org.apache.activemq6.javaee.example.server2.StatelessSender; +import org.apache.activemq6.javaee.example.server2.StatelessSenderService; import org.jboss.arquillian.container.test.api.ContainerController; import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/examples/javaee/jca-remote/pom.xml b/examples/javaee/jca-remote/pom.xml index 95d079acb3..bf2ec91a1b 100644 --- a/examples/javaee/jca-remote/pom.xml +++ b/examples/javaee/jca-remote/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-jca-remote-example + activemq6-javaee-jca-remote-example jar - HornetQ Java EE JCA Remote Example + ActiveMQ6 Java EE JCA Remote Example diff --git a/examples/javaee/jca-remote/src/main/java/org/hornetq/javaee/example/MDBRemoteServerClientExample.java b/examples/javaee/jca-remote/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteServerClientExample.java similarity index 98% rename from examples/javaee/jca-remote/src/main/java/org/hornetq/javaee/example/MDBRemoteServerClientExample.java rename to examples/javaee/jca-remote/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteServerClientExample.java index 1aad6ced48..41a9fdec2f 100644 --- a/examples/javaee/jca-remote/src/main/java/org/hornetq/javaee/example/MDBRemoteServerClientExample.java +++ b/examples/javaee/jca-remote/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteServerClientExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; diff --git a/examples/javaee/jca-remote/src/main/java/org/hornetq/javaee/example/server/MDBQueue.java b/examples/javaee/jca-remote/src/main/java/org/apache/activemq6/javaee/example/server/MDBQueue.java similarity index 96% rename from examples/javaee/jca-remote/src/main/java/org/hornetq/javaee/example/server/MDBQueue.java rename to examples/javaee/jca-remote/src/main/java/org/apache/activemq6/javaee/example/server/MDBQueue.java index b6e9aa604f..c06521364d 100644 --- a/examples/javaee/jca-remote/src/main/java/org/hornetq/javaee/example/server/MDBQueue.java +++ b/examples/javaee/jca-remote/src/main/java/org/apache/activemq6/javaee/example/server/MDBQueue.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; -import org.hornetq.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.HornetQJMSClient; import org.jboss.ejb3.annotation.ResourceAdapter; import javax.annotation.Resource; diff --git a/examples/javaee/jca-remote/src/test/java/org/hornetq/javaee/examples/JCARemoteRunnerTest.java b/examples/javaee/jca-remote/src/test/java/org/apache/activemq6/javaee/examples/JCARemoteRunnerTest.java similarity index 94% rename from examples/javaee/jca-remote/src/test/java/org/hornetq/javaee/examples/JCARemoteRunnerTest.java rename to examples/javaee/jca-remote/src/test/java/org/apache/activemq6/javaee/examples/JCARemoteRunnerTest.java index c610f03083..8692945f61 100644 --- a/examples/javaee/jca-remote/src/test/java/org/hornetq/javaee/examples/JCARemoteRunnerTest.java +++ b/examples/javaee/jca-remote/src/test/java/org/apache/activemq6/javaee/examples/JCARemoteRunnerTest.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.hornetq.javaee.examples; +package org.apache.activemq6.javaee.examples; -import org.hornetq.javaee.example.MDBRemoteServerClientExample; -import org.hornetq.javaee.example.server.MDBQueue; +import org.apache.activemq6.javaee.example.MDBRemoteServerClientExample; +import org.apache.activemq6.javaee.example.server.MDBQueue; import org.jboss.arquillian.container.test.api.ContainerController; import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/examples/javaee/jms-bridge/pom.xml b/examples/javaee/jms-bridge/pom.xml index cf319be1d0..37c594e0a8 100644 --- a/examples/javaee/jms-bridge/pom.xml +++ b/examples/javaee/jms-bridge/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-bridge-example + activemq6-jms-bridge-example jar - HornetQ JMS Bridge Example + ActiveMQ6 JMS Bridge Example \ No newline at end of file diff --git a/examples/javaee/jms-bridge/src/main/java/org/hornetq/javaee/example/JMSBridgeExample.java b/examples/javaee/jms-bridge/src/main/java/org/apache/activemq6/javaee/example/JMSBridgeExample.java similarity index 99% rename from examples/javaee/jms-bridge/src/main/java/org/hornetq/javaee/example/JMSBridgeExample.java rename to examples/javaee/jms-bridge/src/main/java/org/apache/activemq6/javaee/example/JMSBridgeExample.java index 89542350b5..ed2528ba94 100644 --- a/examples/javaee/jms-bridge/src/main/java/org/hornetq/javaee/example/JMSBridgeExample.java +++ b/examples/javaee/jms-bridge/src/main/java/org/apache/activemq6/javaee/example/JMSBridgeExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/javaee/jms-bridge/src/test/java/org/hornetq/javaee/examples/JMSBridgeRunnerTest.java b/examples/javaee/jms-bridge/src/test/java/org/apache/activemq6/javaee/examples/JMSBridgeRunnerTest.java similarity index 90% rename from examples/javaee/jms-bridge/src/test/java/org/hornetq/javaee/examples/JMSBridgeRunnerTest.java rename to examples/javaee/jms-bridge/src/test/java/org/apache/activemq6/javaee/examples/JMSBridgeRunnerTest.java index 3e1b077df3..8cab2aa447 100644 --- a/examples/javaee/jms-bridge/src/test/java/org/hornetq/javaee/examples/JMSBridgeRunnerTest.java +++ b/examples/javaee/jms-bridge/src/test/java/org/apache/activemq6/javaee/examples/JMSBridgeRunnerTest.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.javaee.examples; +package org.apache.activemq6.javaee.examples; -import org.hornetq.javaee.example.JMSBridgeExample; +import org.apache.activemq6.javaee.example.JMSBridgeExample; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.junit.Test; diff --git a/examples/javaee/jms-context-injection/pom.xml b/examples/javaee/jms-context-injection/pom.xml index 89b6c77aa3..7218b1cbc3 100644 --- a/examples/javaee/jms-context-injection/pom.xml +++ b/examples/javaee/jms-context-injection/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-mdb-jms-context-example + activemq6-javaee-mdb-jms-context-example jar - HornetQ Java EE MDB JMS Context Example + ActiveMQ6 Java EE MDB JMS Context Example \ No newline at end of file diff --git a/examples/javaee/jms-context-injection/src/main/java/org/hornetq/javaee/example/JmsContextInjectionClientExample.java b/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq6/javaee/example/JmsContextInjectionClientExample.java similarity index 98% rename from examples/javaee/jms-context-injection/src/main/java/org/hornetq/javaee/example/JmsContextInjectionClientExample.java rename to examples/javaee/jms-context-injection/src/main/java/org/apache/activemq6/javaee/example/JmsContextInjectionClientExample.java index ae720b0499..89f0559b61 100644 --- a/examples/javaee/jms-context-injection/src/main/java/org/hornetq/javaee/example/JmsContextInjectionClientExample.java +++ b/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq6/javaee/example/JmsContextInjectionClientExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/javaee/jms-context-injection/src/main/java/org/hornetq/javaee/example/server/JmsContextInjectionExample.java b/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq6/javaee/example/server/JmsContextInjectionExample.java similarity index 98% rename from examples/javaee/jms-context-injection/src/main/java/org/hornetq/javaee/example/server/JmsContextInjectionExample.java rename to examples/javaee/jms-context-injection/src/main/java/org/apache/activemq6/javaee/example/server/JmsContextInjectionExample.java index 83c1a63552..06c24e95c4 100644 --- a/examples/javaee/jms-context-injection/src/main/java/org/hornetq/javaee/example/server/JmsContextInjectionExample.java +++ b/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq6/javaee/example/server/JmsContextInjectionExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; import javax.annotation.Resource; import javax.ejb.ActivationConfigProperty; diff --git a/examples/javaee/jms-context-injection/src/test/java/org/hornetq/javaee/examples/JmsContextInjectionRunnerTest.java b/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq6/javaee/examples/JmsContextInjectionRunnerTest.java similarity index 90% rename from examples/javaee/jms-context-injection/src/test/java/org/hornetq/javaee/examples/JmsContextInjectionRunnerTest.java rename to examples/javaee/jms-context-injection/src/test/java/org/apache/activemq6/javaee/examples/JmsContextInjectionRunnerTest.java index fef539a672..63b3920a03 100644 --- a/examples/javaee/jms-context-injection/src/test/java/org/hornetq/javaee/examples/JmsContextInjectionRunnerTest.java +++ b/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq6/javaee/examples/JmsContextInjectionRunnerTest.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.hornetq.javaee.examples; +package org.apache.activemq6.javaee.examples; -import org.hornetq.javaee.example.JmsContextInjectionClientExample; -import org.hornetq.javaee.example.server.JmsContextInjectionExample; +import org.apache.activemq6.javaee.example.JmsContextInjectionClientExample; +import org.apache.activemq6.javaee.example.server.JmsContextInjectionExample; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; diff --git a/examples/javaee/mdb-bmt/pom.xml b/examples/javaee/mdb-bmt/pom.xml index 713744b9a6..c57f7e8bc9 100644 --- a/examples/javaee/mdb-bmt/pom.xml +++ b/examples/javaee/mdb-bmt/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-mdb-bmt-example + activemq6-javaee-mdb-bmt-example jar - HornetQ Java EE MDB Example + ActiveMQ6 Java EE MDB Example \ No newline at end of file diff --git a/examples/javaee/mdb-bmt/src/main/java/org/hornetq/javaee/example/MDB_BMTClientExample.java b/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq6/javaee/example/MDB_BMTClientExample.java similarity index 98% rename from examples/javaee/mdb-bmt/src/main/java/org/hornetq/javaee/example/MDB_BMTClientExample.java rename to examples/javaee/mdb-bmt/src/main/java/org/apache/activemq6/javaee/example/MDB_BMTClientExample.java index bf59eea48a..cd6c0310f8 100644 --- a/examples/javaee/mdb-bmt/src/main/java/org/hornetq/javaee/example/MDB_BMTClientExample.java +++ b/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq6/javaee/example/MDB_BMTClientExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/javaee/mdb-bmt/src/main/java/org/hornetq/javaee/example/server/MDB_BMTExample.java b/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq6/javaee/example/server/MDB_BMTExample.java similarity index 98% rename from examples/javaee/mdb-bmt/src/main/java/org/hornetq/javaee/example/server/MDB_BMTExample.java rename to examples/javaee/mdb-bmt/src/main/java/org/apache/activemq6/javaee/example/server/MDB_BMTExample.java index d5661e2c55..188da63890 100644 --- a/examples/javaee/mdb-bmt/src/main/java/org/hornetq/javaee/example/server/MDB_BMTExample.java +++ b/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq6/javaee/example/server/MDB_BMTExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; import javax.annotation.Resource; import javax.ejb.ActivationConfigProperty; diff --git a/examples/javaee/mdb-bmt/src/test/java/org/hornetq/javaee/example/server/ExampleRunnerTest.java b/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq6/javaee/example/server/ExampleRunnerTest.java similarity index 93% rename from examples/javaee/mdb-bmt/src/test/java/org/hornetq/javaee/example/server/ExampleRunnerTest.java rename to examples/javaee/mdb-bmt/src/test/java/org/apache/activemq6/javaee/example/server/ExampleRunnerTest.java index 19217978a6..89486666c7 100644 --- a/examples/javaee/mdb-bmt/src/test/java/org/hornetq/javaee/example/server/ExampleRunnerTest.java +++ b/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq6/javaee/example/server/ExampleRunnerTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; -import org.hornetq.javaee.example.MDB_BMTClientExample; +import org.apache.activemq6.javaee.example.MDB_BMTClientExample; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml index afdfcc61bf..682227f27a 100644 --- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml +++ b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-mdb-cmt-setrollbackonly-with-dlq-example + activemq6-javaee-mdb-cmt-setrollbackonly-with-dlq-example jar - HornetQ Java EE MDB CMT set rollback only with DLQ Example + ActiveMQ6 Java EE MDB CMT set rollback only with DLQ Example \ No newline at end of file diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/hornetq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java similarity index 98% rename from examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/hornetq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java rename to examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java index 7b9951bce0..f34cfdbbbd 100644 --- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/hornetq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java +++ b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java similarity index 97% rename from examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java rename to examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java index 5b604f47a5..dfacdb902e 100644 --- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java +++ b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; import javax.annotation.Resource; import javax.ejb.ActivationConfigProperty; diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/hornetq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java similarity index 92% rename from examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/hornetq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java rename to examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java index 3e45bc4950..dbc10fe584 100644 --- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/hornetq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java +++ b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; -import org.hornetq.javaee.example.server.MDB_CMT_SetRollbackOnlyWithDLQExample; +import org.apache.activemq6.javaee.example.server.MDB_CMT_SetRollbackOnlyWithDLQExample; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; diff --git a/examples/javaee/mdb-cmt-setrollbackonly/pom.xml b/examples/javaee/mdb-cmt-setrollbackonly/pom.xml index edfd7f1cb6..9afb60c2a3 100644 --- a/examples/javaee/mdb-cmt-setrollbackonly/pom.xml +++ b/examples/javaee/mdb-cmt-setrollbackonly/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-mdb-cmt-setrollbackonly-example + activemq6-javaee-mdb-cmt-setrollbackonly-example jar - HornetQ Java EE MDB CMT set rollback only Example + ActiveMQ6 Java EE MDB CMT set rollback only Example \ No newline at end of file diff --git a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/hornetq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java b/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java similarity index 98% rename from examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/hornetq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java rename to examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java index 8f7fe71a6a..d53e2a191d 100644 --- a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/hornetq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java +++ b/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java b/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java similarity index 97% rename from examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java rename to examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java index 235a514e30..bf2ea5cc8e 100644 --- a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java +++ b/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; import javax.annotation.Resource; import javax.ejb.ActivationConfigProperty; diff --git a/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/hornetq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java b/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java similarity index 92% rename from examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/hornetq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java rename to examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java index 58d693d716..4ca348cae3 100644 --- a/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/hornetq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java +++ b/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; -import org.hornetq.javaee.example.server.MDB_CMT_SetRollbackOnlyExample; +import org.apache.activemq6.javaee.example.server.MDB_CMT_SetRollbackOnlyExample; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; diff --git a/examples/javaee/mdb-cmt-tx-local/pom.xml b/examples/javaee/mdb-cmt-tx-local/pom.xml index 9dcfb0ac30..13dfc43c7c 100644 --- a/examples/javaee/mdb-cmt-tx-local/pom.xml +++ b/examples/javaee/mdb-cmt-tx-local/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-mdb-cmt-tx-local-example + activemq6-javaee-mdb-cmt-tx-local-example jar - HornetQ Java EE MDB CMT Local Transaction Example + ActiveMQ6 Java EE MDB CMT Local Transaction Example \ No newline at end of file diff --git a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/hornetq/javaee/example/MDB_CMT_TxLocalClientExample.java b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxLocalClientExample.java similarity index 98% rename from examples/javaee/mdb-cmt-tx-local/src/main/java/org/hornetq/javaee/example/MDB_CMT_TxLocalClientExample.java rename to examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxLocalClientExample.java index 68162e6d1d..8859f5d958 100644 --- a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/hornetq/javaee/example/MDB_CMT_TxLocalClientExample.java +++ b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxLocalClientExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxLocalExample.java b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxLocalExample.java similarity index 98% rename from examples/javaee/mdb-cmt-tx-local/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxLocalExample.java rename to examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxLocalExample.java index d0786a6b71..8170c66d95 100644 --- a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxLocalExample.java +++ b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxLocalExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; import javax.annotation.Resource; import javax.ejb.ActivationConfigProperty; diff --git a/examples/javaee/mdb-cmt-tx-local/src/test/java/org/hornetq/javaee/example/MDBCMTSetLocalTXRunnerTest.java b/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetLocalTXRunnerTest.java similarity index 93% rename from examples/javaee/mdb-cmt-tx-local/src/test/java/org/hornetq/javaee/example/MDBCMTSetLocalTXRunnerTest.java rename to examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetLocalTXRunnerTest.java index 18fee164a3..5d918a0bc4 100644 --- a/examples/javaee/mdb-cmt-tx-local/src/test/java/org/hornetq/javaee/example/MDBCMTSetLocalTXRunnerTest.java +++ b/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetLocalTXRunnerTest.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; -import org.hornetq.javaee.example.server.MDB_CMT_TxLocalExample; +import org.apache.activemq6.javaee.example.server.MDB_CMT_TxLocalExample; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; diff --git a/examples/javaee/mdb-cmt-tx-not-supported/pom.xml b/examples/javaee/mdb-cmt-tx-not-supported/pom.xml index ead5118878..758977e397 100644 --- a/examples/javaee/mdb-cmt-tx-not-supported/pom.xml +++ b/examples/javaee/mdb-cmt-tx-not-supported/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-mdb-cmt-no-tx-example + activemq6-javaee-mdb-cmt-no-tx-example jar - HornetQ Java EE MDB CMT Transaction Not Supported Example + ActiveMQ6 Java EE MDB CMT Transaction Not Supported Example \ No newline at end of file diff --git a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/hornetq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxNotSupportedClientExample.java similarity index 98% rename from examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/hornetq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java rename to examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxNotSupportedClientExample.java index 1c39ac887f..229dd6908d 100644 --- a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/hornetq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java +++ b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxNotSupportedClientExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxNotSupported.java b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxNotSupported.java similarity index 98% rename from examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxNotSupported.java rename to examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxNotSupported.java index 3763a75467..91a1786c56 100644 --- a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxNotSupported.java +++ b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxNotSupported.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; import javax.annotation.Resource; import javax.ejb.ActivationConfigProperty; diff --git a/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/hornetq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java b/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java similarity index 93% rename from examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/hornetq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java rename to examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java index 4e5328614f..0a9646525d 100644 --- a/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/hornetq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java +++ b/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; -import org.hornetq.javaee.example.server.MDB_CMT_TxNotSupported; +import org.apache.activemq6.javaee.example.server.MDB_CMT_TxNotSupported; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; diff --git a/examples/javaee/mdb-cmt-tx-required/pom.xml b/examples/javaee/mdb-cmt-tx-required/pom.xml index 739e4d0aa4..e1f5739c1d 100644 --- a/examples/javaee/mdb-cmt-tx-required/pom.xml +++ b/examples/javaee/mdb-cmt-tx-required/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-mdb-cmt-tx-example + activemq6-javaee-mdb-cmt-tx-example jar - HornetQ Java EE MDB CMT Transaction Example + ActiveMQ6 Java EE MDB CMT Transaction Example \ No newline at end of file diff --git a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/hornetq/javaee/example/MDB_CMT_TxRequiredClientExample.java b/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxRequiredClientExample.java similarity index 98% rename from examples/javaee/mdb-cmt-tx-required/src/main/java/org/hornetq/javaee/example/MDB_CMT_TxRequiredClientExample.java rename to examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxRequiredClientExample.java index 1e9dc44fc3..fe2c8a3c51 100644 --- a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/hornetq/javaee/example/MDB_CMT_TxRequiredClientExample.java +++ b/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxRequiredClientExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxRequiredExample.java b/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxRequiredExample.java similarity index 97% rename from examples/javaee/mdb-cmt-tx-required/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxRequiredExample.java rename to examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxRequiredExample.java index 0520bd5b6a..14f20ebf0d 100644 --- a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/hornetq/javaee/example/server/MDB_CMT_TxRequiredExample.java +++ b/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxRequiredExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; import javax.ejb.ActivationConfigProperty; import javax.ejb.MessageDriven; diff --git a/examples/javaee/mdb-cmt-tx-required/src/test/java/org/hornetq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java b/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java similarity index 89% rename from examples/javaee/mdb-cmt-tx-required/src/test/java/org/hornetq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java rename to examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java index e2696182fb..7791e944a6 100644 --- a/examples/javaee/mdb-cmt-tx-required/src/test/java/org/hornetq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java +++ b/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.hornetq.javaee.examples; +package org.apache.activemq6.javaee.examples; -import org.hornetq.javaee.example.MDB_CMT_TxRequiredClientExample; -import org.hornetq.javaee.example.server.MDB_CMT_TxRequiredExample; +import org.apache.activemq6.javaee.example.MDB_CMT_TxRequiredClientExample; +import org.apache.activemq6.javaee.example.server.MDB_CMT_TxRequiredExample; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; diff --git a/examples/javaee/mdb-message-selector/pom.xml b/examples/javaee/mdb-message-selector/pom.xml index 64363c4fbb..b731e8a559 100644 --- a/examples/javaee/mdb-message-selector/pom.xml +++ b/examples/javaee/mdb-message-selector/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-mdb-message-selector-example + activemq6-javaee-mdb-message-selector-example jar - HornetQ Java EE MDB Message Selector Example + ActiveMQ6 Java EE MDB Message Selector Example \ No newline at end of file diff --git a/examples/javaee/mdb-message-selector/src/main/java/org/hornetq/javaee/example/MDBMessageSelectorClientExample.java b/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq6/javaee/example/MDBMessageSelectorClientExample.java similarity index 98% rename from examples/javaee/mdb-message-selector/src/main/java/org/hornetq/javaee/example/MDBMessageSelectorClientExample.java rename to examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq6/javaee/example/MDBMessageSelectorClientExample.java index 45da301aed..afe480b307 100644 --- a/examples/javaee/mdb-message-selector/src/main/java/org/hornetq/javaee/example/MDBMessageSelectorClientExample.java +++ b/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq6/javaee/example/MDBMessageSelectorClientExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/javaee/mdb-message-selector/src/main/java/org/hornetq/javaee/example/server/MDBMessageSelectorExample.java b/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq6/javaee/example/server/MDBMessageSelectorExample.java similarity index 97% rename from examples/javaee/mdb-message-selector/src/main/java/org/hornetq/javaee/example/server/MDBMessageSelectorExample.java rename to examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq6/javaee/example/server/MDBMessageSelectorExample.java index 92d8c2942c..fe6bf14ee2 100644 --- a/examples/javaee/mdb-message-selector/src/main/java/org/hornetq/javaee/example/server/MDBMessageSelectorExample.java +++ b/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq6/javaee/example/server/MDBMessageSelectorExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; import org.jboss.ejb3.annotation.ResourceAdapter; diff --git a/examples/javaee/mdb-message-selector/src/test/java/org/hornetq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java b/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java similarity index 89% rename from examples/javaee/mdb-message-selector/src/test/java/org/hornetq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java rename to examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java index 2f821cfdfc..d64706e1c5 100644 --- a/examples/javaee/mdb-message-selector/src/test/java/org/hornetq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java +++ b/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.examples; +package org.apache.activemq6.javaee.examples; -import org.hornetq.javaee.example.MDBMessageSelectorClientExample; -import org.hornetq.javaee.example.server.MDBMessageSelectorExample; +import org.apache.activemq6.javaee.example.MDBMessageSelectorClientExample; +import org.apache.activemq6.javaee.example.server.MDBMessageSelectorExample; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; diff --git a/examples/javaee/mdb-remote-failover-static/pom.xml b/examples/javaee/mdb-remote-failover-static/pom.xml index b2f0d49406..2ee3fa1646 100644 --- a/examples/javaee/mdb-remote-failover-static/pom.xml +++ b/examples/javaee/mdb-remote-failover-static/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-mdb-remote-failover-static-example + activemq6-javaee-mdb-remote-failover-static-example jar - HornetQ Java EE MDB Remote Failover Static Example + ActiveMQ6 Java EE MDB Remote Failover Static Example diff --git a/examples/javaee/mdb-remote-failover-static/src/main/java/org/hornetq/javaee/example/MDBRemoteFailoverStaticClientExample.java b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteFailoverStaticClientExample.java similarity index 97% rename from examples/javaee/mdb-remote-failover-static/src/main/java/org/hornetq/javaee/example/MDBRemoteFailoverStaticClientExample.java rename to examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteFailoverStaticClientExample.java index 5106dd7ffc..02614d6681 100644 --- a/examples/javaee/mdb-remote-failover-static/src/main/java/org/hornetq/javaee/example/MDBRemoteFailoverStaticClientExample.java +++ b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteFailoverStaticClientExample.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; -import org.hornetq.javaee.example.server.ServerKiller; +import org.apache.activemq6.javaee.example.server.ServerKiller; import javax.jms.*; import javax.naming.Context; diff --git a/examples/javaee/mdb-remote-failover-static/src/main/java/org/hornetq/javaee/example/server/MDBRemoteFailoverStaticExample.java b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/server/MDBRemoteFailoverStaticExample.java similarity index 96% rename from examples/javaee/mdb-remote-failover-static/src/main/java/org/hornetq/javaee/example/server/MDBRemoteFailoverStaticExample.java rename to examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/server/MDBRemoteFailoverStaticExample.java index f5cacee031..005317bead 100644 --- a/examples/javaee/mdb-remote-failover-static/src/main/java/org/hornetq/javaee/example/server/MDBRemoteFailoverStaticExample.java +++ b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/server/MDBRemoteFailoverStaticExample.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; -import org.hornetq.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.HornetQJMSClient; import org.jboss.ejb3.annotation.ResourceAdapter; import javax.annotation.Resource; diff --git a/examples/javaee/mdb-remote-failover-static/src/main/java/org/hornetq/javaee/example/server/ServerKiller.java b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/server/ServerKiller.java similarity index 93% rename from examples/javaee/mdb-remote-failover-static/src/main/java/org/hornetq/javaee/example/server/ServerKiller.java rename to examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/server/ServerKiller.java index f9d568f4a3..16bdeb39f7 100644 --- a/examples/javaee/mdb-remote-failover-static/src/main/java/org/hornetq/javaee/example/server/ServerKiller.java +++ b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/server/ServerKiller.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; /** * @author Andy Taylor * Date: 12/06/12 diff --git a/examples/javaee/mdb-remote-failover-static/src/test/java/org/hornetq/javaee/examples/FailoverStaticRunnerTest.java b/examples/javaee/mdb-remote-failover-static/src/test/java/org/apache/activemq6/javaee/examples/FailoverStaticRunnerTest.java similarity index 92% rename from examples/javaee/mdb-remote-failover-static/src/test/java/org/hornetq/javaee/examples/FailoverStaticRunnerTest.java rename to examples/javaee/mdb-remote-failover-static/src/test/java/org/apache/activemq6/javaee/examples/FailoverStaticRunnerTest.java index 496bc04db4..a0fe20fea4 100644 --- a/examples/javaee/mdb-remote-failover-static/src/test/java/org/hornetq/javaee/examples/FailoverStaticRunnerTest.java +++ b/examples/javaee/mdb-remote-failover-static/src/test/java/org/apache/activemq6/javaee/examples/FailoverStaticRunnerTest.java @@ -11,11 +11,11 @@ * permissions and limitations under the License. */ -package org.hornetq.javaee.examples; +package org.apache.activemq6.javaee.examples; -import org.hornetq.javaee.example.MDBRemoteFailoverStaticClientExample; -import org.hornetq.javaee.example.server.MDBRemoteFailoverStaticExample; -import org.hornetq.javaee.example.server.ServerKiller; +import org.apache.activemq6.javaee.example.MDBRemoteFailoverStaticClientExample; +import org.apache.activemq6.javaee.example.server.MDBRemoteFailoverStaticExample; +import org.apache.activemq6.javaee.example.server.ServerKiller; import org.jboss.arquillian.container.test.api.ContainerController; import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/examples/javaee/mdb-remote-failover/pom.xml b/examples/javaee/mdb-remote-failover/pom.xml index 2187ee287f..7062d94e51 100644 --- a/examples/javaee/mdb-remote-failover/pom.xml +++ b/examples/javaee/mdb-remote-failover/pom.xml @@ -3,14 +3,14 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-mdb-remote-failover-example + activemq6-javaee-mdb-remote-failover-example jar - HornetQ Java EE MDB Remote Failover Example + ActiveMQ6 Java EE MDB Remote Failover Example diff --git a/examples/javaee/mdb-remote-failover/src/main/java/org/hornetq/javaee/example/MDBRemoteFailoverClientExample.java b/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteFailoverClientExample.java similarity index 97% rename from examples/javaee/mdb-remote-failover/src/main/java/org/hornetq/javaee/example/MDBRemoteFailoverClientExample.java rename to examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteFailoverClientExample.java index 1fb5683784..cbc7aa8e8a 100644 --- a/examples/javaee/mdb-remote-failover/src/main/java/org/hornetq/javaee/example/MDBRemoteFailoverClientExample.java +++ b/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteFailoverClientExample.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; -import org.hornetq.javaee.example.server.ServerKiller; +import org.apache.activemq6.javaee.example.server.ServerKiller; import javax.jms.*; import javax.naming.Context; diff --git a/examples/javaee/mdb-remote-failover/src/main/java/org/hornetq/javaee/example/server/MDBRemoteFailoverExample.java b/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/server/MDBRemoteFailoverExample.java similarity index 96% rename from examples/javaee/mdb-remote-failover/src/main/java/org/hornetq/javaee/example/server/MDBRemoteFailoverExample.java rename to examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/server/MDBRemoteFailoverExample.java index e6c15e0692..38a3b91d4a 100644 --- a/examples/javaee/mdb-remote-failover/src/main/java/org/hornetq/javaee/example/server/MDBRemoteFailoverExample.java +++ b/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/server/MDBRemoteFailoverExample.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; -import org.hornetq.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.HornetQJMSClient; import org.jboss.ejb3.annotation.ResourceAdapter; import javax.annotation.Resource; diff --git a/examples/javaee/mdb-remote-failover/src/main/java/org/hornetq/javaee/example/server/ServerKiller.java b/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/server/ServerKiller.java similarity index 93% rename from examples/javaee/mdb-remote-failover/src/main/java/org/hornetq/javaee/example/server/ServerKiller.java rename to examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/server/ServerKiller.java index f5494f7114..8726921834 100644 --- a/examples/javaee/mdb-remote-failover/src/main/java/org/hornetq/javaee/example/server/ServerKiller.java +++ b/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/server/ServerKiller.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; /** * @author Andy Taylor * Date: 12/06/12 diff --git a/examples/javaee/mdb-remote-failover/src/test/java/org/hornetq/javaee/examples/FailoverRunnerTest.java b/examples/javaee/mdb-remote-failover/src/test/java/org/apache/activemq6/javaee/examples/FailoverRunnerTest.java similarity index 92% rename from examples/javaee/mdb-remote-failover/src/test/java/org/hornetq/javaee/examples/FailoverRunnerTest.java rename to examples/javaee/mdb-remote-failover/src/test/java/org/apache/activemq6/javaee/examples/FailoverRunnerTest.java index 0838fd0df0..d98bfd0487 100644 --- a/examples/javaee/mdb-remote-failover/src/test/java/org/hornetq/javaee/examples/FailoverRunnerTest.java +++ b/examples/javaee/mdb-remote-failover/src/test/java/org/apache/activemq6/javaee/examples/FailoverRunnerTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.examples; +package org.apache.activemq6.javaee.examples; -import org.hornetq.javaee.example.MDBRemoteFailoverClientExample; -import org.hornetq.javaee.example.server.MDBRemoteFailoverExample; -import org.hornetq.javaee.example.server.ServerKiller; +import org.apache.activemq6.javaee.example.MDBRemoteFailoverClientExample; +import org.apache.activemq6.javaee.example.server.MDBRemoteFailoverExample; +import org.apache.activemq6.javaee.example.server.ServerKiller; import org.jboss.arquillian.container.test.api.*; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.junit.InSequence; diff --git a/examples/javaee/mdb-tx-send/pom.xml b/examples/javaee/mdb-tx-send/pom.xml index 11ed2e4e9e..d180999c14 100644 --- a/examples/javaee/mdb-tx-send/pom.xml +++ b/examples/javaee/mdb-tx-send/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-javaee-mdb-tx-send-example + activemq6-javaee-mdb-tx-send-example jar - HornetQ Java EE MDB Transactional Send Example + ActiveMQ6 Java EE MDB Transactional Send Example \ No newline at end of file diff --git a/examples/javaee/mdb-tx-send/src/main/java/org/hornetq/javaee/example/MDBMessageSendTxClientExample.java b/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq6/javaee/example/MDBMessageSendTxClientExample.java similarity index 98% rename from examples/javaee/mdb-tx-send/src/main/java/org/hornetq/javaee/example/MDBMessageSendTxClientExample.java rename to examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq6/javaee/example/MDBMessageSendTxClientExample.java index 4d4d938db8..4fe212f5db 100644 --- a/examples/javaee/mdb-tx-send/src/main/java/org/hornetq/javaee/example/MDBMessageSendTxClientExample.java +++ b/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq6/javaee/example/MDBMessageSendTxClientExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example; +package org.apache.activemq6.javaee.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/javaee/mdb-tx-send/src/main/java/org/hornetq/javaee/example/server/MDBMessageSendTxExample.java b/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq6/javaee/example/server/MDBMessageSendTxExample.java similarity index 98% rename from examples/javaee/mdb-tx-send/src/main/java/org/hornetq/javaee/example/server/MDBMessageSendTxExample.java rename to examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq6/javaee/example/server/MDBMessageSendTxExample.java index 0e2cedcfd5..e50e7f0401 100644 --- a/examples/javaee/mdb-tx-send/src/main/java/org/hornetq/javaee/example/server/MDBMessageSendTxExample.java +++ b/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq6/javaee/example/server/MDBMessageSendTxExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.javaee.example.server; +package org.apache.activemq6.javaee.example.server; import org.jboss.ejb3.annotation.ResourceAdapter; diff --git a/examples/javaee/mdb-tx-send/src/test/java/org/hornetq/javaee/examples/MDBCMTTxSendRunnerTest.java b/examples/javaee/mdb-tx-send/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTTxSendRunnerTest.java similarity index 90% rename from examples/javaee/mdb-tx-send/src/test/java/org/hornetq/javaee/examples/MDBCMTTxSendRunnerTest.java rename to examples/javaee/mdb-tx-send/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTTxSendRunnerTest.java index 9397f52e2a..440c96bd05 100644 --- a/examples/javaee/mdb-tx-send/src/test/java/org/hornetq/javaee/examples/MDBCMTTxSendRunnerTest.java +++ b/examples/javaee/mdb-tx-send/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTTxSendRunnerTest.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.hornetq.javaee.examples; +package org.apache.activemq6.javaee.examples; -import org.hornetq.javaee.example.MDBMessageSendTxClientExample; -import org.hornetq.javaee.example.server.MDBMessageSendTxExample; +import org.apache.activemq6.javaee.example.MDBMessageSendTxClientExample; +import org.apache.activemq6.javaee.example.server.MDBMessageSendTxExample; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; diff --git a/examples/javaee/pom.xml b/examples/javaee/pom.xml index e1a63b7865..af11e90fc0 100644 --- a/examples/javaee/pom.xml +++ b/examples/javaee/pom.xml @@ -3,15 +3,15 @@ 4.0.0 - org.hornetq.examples - hornetq-examples - 2.5.0-SNAPSHOT + org.apache.activemq6.examples + activemq6-examples + 6.0.0-SNAPSHOT - org.hornetq.example.javaee + org.apache.activemq6.example.javaee javaee-examples pom - HornetQ Java EE Examples + ActiveMQ6 Java EE Examples application-layer-failover @@ -113,7 +113,7 @@ release - hornetq-jms-examples-common + activemq6-jms-examples-common diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml index 4ba6d60f01..5611b45268 100644 --- a/examples/jms/pre-acknowledge/pom.xml +++ b/examples/jms/pre-acknowledge/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-pre-acknowledge-example + activemq6-jms-pre-acknowledge-example jar - HornetQ JMS Pre Acknowledge Example + ActiveMQ6 JMS Pre Acknowledge Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-pre-acknowledge-example + org.apache.activemq6.examples.jms + activemq6-jms-pre-acknowledge-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/pre-acknowledge/src/main/java/org/hornetq/jms/example/PreacknowledgeExample.java b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq6/jms/example/PreacknowledgeExample.java similarity index 94% rename from examples/jms/pre-acknowledge/src/main/java/org/hornetq/jms/example/PreacknowledgeExample.java rename to examples/jms/pre-acknowledge/src/main/java/org/apache/activemq6/jms/example/PreacknowledgeExample.java index 898c3719b8..5644dc43f7 100644 --- a/examples/jms/pre-acknowledge/src/main/java/org/hornetq/jms/example/PreacknowledgeExample.java +++ b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq6/jms/example/PreacknowledgeExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -25,10 +25,10 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.HornetQJMSConstants; -import org.hornetq.api.jms.management.JMSManagementHelper; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.HornetQJMSConstants; +import org.apache.activemq6.api.jms.management.JMSManagementHelper; +import org.apache.activemq6.common.example.HornetQExample; /** * diff --git a/examples/jms/producer-rate-limit/pom.xml b/examples/jms/producer-rate-limit/pom.xml index baf835cf78..1291cc3d6a 100644 --- a/examples/jms/producer-rate-limit/pom.xml +++ b/examples/jms/producer-rate-limit/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-producer-rate-limit-example + activemq6-jms-producer-rate-limit-example jar - HornetQ JMS Producer Rate Limit Example + ActiveMQ6 JMS Producer Rate Limit Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-producer-rate-limit-example + org.apache.activemq6.examples.jms + activemq6-jms-producer-rate-limit-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/producer-rate-limit/src/main/java/org/hornetq/jms/example/ProducerRateLimitExample.java b/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq6/jms/example/ProducerRateLimitExample.java similarity index 97% rename from examples/jms/producer-rate-limit/src/main/java/org/hornetq/jms/example/ProducerRateLimitExample.java rename to examples/jms/producer-rate-limit/src/main/java/org/apache/activemq6/jms/example/ProducerRateLimitExample.java index 4fde1cff7b..639eb1c321 100644 --- a/examples/jms/producer-rate-limit/src/main/java/org/hornetq/jms/example/ProducerRateLimitExample.java +++ b/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq6/jms/example/ProducerRateLimitExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -21,7 +21,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * This example demonstrates how a message producer can be limited to produce messages at a maximum rate diff --git a/examples/jms/proton-cpp/pom.xml b/examples/jms/proton-cpp/pom.xml index b7fde8459d..f118d42374 100644 --- a/examples/jms/proton-cpp/pom.xml +++ b/examples/jms/proton-cpp/pom.xml @@ -3,24 +3,24 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-protoncpp + activemq6-jms-protoncpp jar - HornetQ AMQP CPP Example + ActiveMQ6 AMQP CPP Example - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-commons + org.apache.activemq6 + activemq6-commons ${project.version} @@ -43,8 +43,8 @@ jboss-jms-api_2.0_spec - org.hornetq - hornetq-amqp-protocol + org.apache.activemq6 + activemq6-amqp-protocol ${project.version} @@ -59,8 +59,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -85,28 +85,28 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-amqp-protocol + org.apache.activemq6 + activemq6-amqp-protocol ${project.version} diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml index eb33fc8b2f..c92a7e132a 100644 --- a/examples/jms/proton-j/pom.xml +++ b/examples/jms/proton-j/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-proton-j-example + activemq6-proton-j-example jar - HornetQ Proton-J Example + ActiveMQ6 Proton-J Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -28,8 +28,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -66,33 +66,33 @@ - org.hornetq.examples.jms - hornetq-proton-j-example + org.apache.activemq6.examples.jms + activemq6-proton-j-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-amqp-protocol + org.apache.activemq6 + activemq6-amqp-protocol ${project.version} diff --git a/examples/jms/proton-j/src/main/java/org/hornetq/jms/example/ProtonJExample.java b/examples/jms/proton-j/src/main/java/org/apache/activemq6/jms/example/ProtonJExample.java similarity index 95% rename from examples/jms/proton-j/src/main/java/org/hornetq/jms/example/ProtonJExample.java rename to examples/jms/proton-j/src/main/java/org/apache/activemq6/jms/example/ProtonJExample.java index 7f848fc893..a0724b0887 100644 --- a/examples/jms/proton-j/src/main/java/org/hornetq/jms/example/ProtonJExample.java +++ b/examples/jms/proton-j/src/main/java/org/apache/activemq6/jms/example/ProtonJExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import org.apache.qpid.amqp_1_0.client.Connection; @@ -19,7 +19,7 @@ import org.apache.qpid.amqp_1_0.client.Receiver; import org.apache.qpid.amqp_1_0.client.Sender; import org.apache.qpid.amqp_1_0.client.Session; import org.apache.qpid.amqp_1_0.type.UnsignedInteger; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; public class ProtonJExample extends HornetQExample { diff --git a/examples/jms/proton-ruby/pom.xml b/examples/jms/proton-ruby/pom.xml index d751d457f8..58e11f5b43 100644 --- a/examples/jms/proton-ruby/pom.xml +++ b/examples/jms/proton-ruby/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-proton-ruby-example + activemq6-jms-proton-ruby-example jar - HornetQ Proton Ruby Examplee + ActiveMQ6 Proton Ruby Examplee - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -23,8 +23,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -44,33 +44,33 @@ - org.hornetq.examples.jms - hornetq-jms-proton-ruby-example + org.apache.activemq6.examples.jms + activemq6-jms-proton-ruby-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-amqp-protocol + org.apache.activemq6 + activemq6-amqp-protocol ${project.version} diff --git a/examples/jms/queue-message-redistribution/pom.xml b/examples/jms/queue-message-redistribution/pom.xml index e3436503ba..6b4f0a61fa 100644 --- a/examples/jms/queue-message-redistribution/pom.xml +++ b/examples/jms/queue-message-redistribution/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-queue-message-redistribution-example + activemq6-jms-queue-message-redistribution-example jar - HornetQ JMS Queue Message Redistribution Example + ActiveMQ6 JMS Queue Message Redistribution Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start0 @@ -111,28 +111,28 @@ - org.hornetq.examples.jms - hornetq-jms-queue-message-redistribution-example + org.apache.activemq6.examples.jms + activemq6-jms-queue-message-redistribution-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/queue-message-redistribution/src/main/java/org/hornetq/jms/example/QueueMessageRedistributionExample.java b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq6/jms/example/QueueMessageRedistributionExample.java similarity index 98% rename from examples/jms/queue-message-redistribution/src/main/java/org/hornetq/jms/example/QueueMessageRedistributionExample.java rename to examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq6/jms/example/QueueMessageRedistributionExample.java index df8731c2a7..7b3ac8cf2b 100644 --- a/examples/jms/queue-message-redistribution/src/main/java/org/hornetq/jms/example/QueueMessageRedistributionExample.java +++ b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq6/jms/example/QueueMessageRedistributionExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -21,7 +21,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * This example demonstrates a queue with the same name deployed on two nodes of a cluster. diff --git a/examples/jms/queue-requestor/pom.xml b/examples/jms/queue-requestor/pom.xml index 764e4e7de9..4d32af00c1 100644 --- a/examples/jms/queue-requestor/pom.xml +++ b/examples/jms/queue-requestor/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-queue-requestor-example + activemq6-jms-queue-requestor-example jar - HornetQ JMS Queue Requestor Example + ActiveMQ6 JMS Queue Requestor Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-queue-requestor-example + org.apache.activemq6.examples.jms + activemq6-jms-queue-requestor-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/queue-requestor/src/main/java/org/hornetq/jms/example/QueueRequestorExample.java b/examples/jms/queue-requestor/src/main/java/org/apache/activemq6/jms/example/QueueRequestorExample.java similarity index 97% rename from examples/jms/queue-requestor/src/main/java/org/hornetq/jms/example/QueueRequestorExample.java rename to examples/jms/queue-requestor/src/main/java/org/apache/activemq6/jms/example/QueueRequestorExample.java index 618a6e6a88..9e02ea379f 100644 --- a/examples/jms/queue-requestor/src/main/java/org/hornetq/jms/example/QueueRequestorExample.java +++ b/examples/jms/queue-requestor/src/main/java/org/apache/activemq6/jms/example/QueueRequestorExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.JMSException; import javax.jms.Queue; @@ -22,7 +22,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS example that shows how to use queues requestors. diff --git a/examples/jms/queue-requestor/src/main/java/org/hornetq/jms/example/TextReverserService.java b/examples/jms/queue-requestor/src/main/java/org/apache/activemq6/jms/example/TextReverserService.java similarity index 98% rename from examples/jms/queue-requestor/src/main/java/org/hornetq/jms/example/TextReverserService.java rename to examples/jms/queue-requestor/src/main/java/org/apache/activemq6/jms/example/TextReverserService.java index 8b19e925ba..a3be585f83 100644 --- a/examples/jms/queue-requestor/src/main/java/org/hornetq/jms/example/TextReverserService.java +++ b/examples/jms/queue-requestor/src/main/java/org/apache/activemq6/jms/example/TextReverserService.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/jms/queue-selector/pom.xml b/examples/jms/queue-selector/pom.xml index 327aa82d42..7858e62528 100644 --- a/examples/jms/queue-selector/pom.xml +++ b/examples/jms/queue-selector/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-queue-selector-example + activemq6-jms-queue-selector-example jar - HornetQ JMS Queue Selector Example + ActiveMQ6 JMS Queue Selector Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-queue-selector-example + org.apache.activemq6.examples.jms + activemq6-jms-queue-selector-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/queue-selector/src/main/java/org/hornetq/jms/example/QueueSelectorExample.java b/examples/jms/queue-selector/src/main/java/org/apache/activemq6/jms/example/QueueSelectorExample.java similarity index 98% rename from examples/jms/queue-selector/src/main/java/org/hornetq/jms/example/QueueSelectorExample.java rename to examples/jms/queue-selector/src/main/java/org/apache/activemq6/jms/example/QueueSelectorExample.java index cd05eb2fd2..7253ce9822 100644 --- a/examples/jms/queue-selector/src/main/java/org/hornetq/jms/example/QueueSelectorExample.java +++ b/examples/jms/queue-selector/src/main/java/org/apache/activemq6/jms/example/QueueSelectorExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -24,7 +24,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS example that uses selectors with queue consumers. diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml index 3bd155e5f4..0d2367e344 100644 --- a/examples/jms/queue/pom.xml +++ b/examples/jms/queue/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-queue-example + activemq6-jms-queue-example jar - HornetQ JMS Queue Example + ActiveMQ6 JMS Queue Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-queue-example + org.apache.activemq6.examples.jms + activemq6-jms-queue-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/queue/src/main/java/org/hornetq/jms/example/QueueExample.java b/examples/jms/queue/src/main/java/org/apache/activemq6/jms/example/QueueExample.java similarity index 96% rename from examples/jms/queue/src/main/java/org/hornetq/jms/example/QueueExample.java rename to examples/jms/queue/src/main/java/org/apache/activemq6/jms/example/QueueExample.java index 969858d5d4..2d62c562e8 100644 --- a/examples/jms/queue/src/main/java/org/hornetq/jms/example/QueueExample.java +++ b/examples/jms/queue/src/main/java/org/apache/activemq6/jms/example/QueueExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -21,7 +21,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message. diff --git a/examples/jms/reattach-node/pom.xml b/examples/jms/reattach-node/pom.xml index f97371d786..97ffad8e27 100644 --- a/examples/jms/reattach-node/pom.xml +++ b/examples/jms/reattach-node/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-reattach-node-example + activemq6-jms-reattach-node-example jar - HornetQ JMS Reattach Node Example + ActiveMQ6 JMS Reattach Node Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start0 @@ -69,28 +69,28 @@ - org.hornetq.examples.jms - hornetq-jms-reattach-node-example + org.apache.activemq6.examples.jms + activemq6-jms-reattach-node-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/reattach-node/src/main/java/org/hornetq/jms/example/ReattachExample.java b/examples/jms/reattach-node/src/main/java/org/apache/activemq6/jms/example/ReattachExample.java similarity index 95% rename from examples/jms/reattach-node/src/main/java/org/hornetq/jms/example/ReattachExample.java rename to examples/jms/reattach-node/src/main/java/org/apache/activemq6/jms/example/ReattachExample.java index 864d0f339c..9f97d2c186 100644 --- a/examples/jms/reattach-node/src/main/java/org/hornetq/jms/example/ReattachExample.java +++ b/examples/jms/reattach-node/src/main/java/org/apache/activemq6/jms/example/ReattachExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,9 +22,9 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.management.JMSManagementHelper; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.management.JMSManagementHelper; +import org.apache.activemq6.common.example.HornetQExample; /** * This examples demonstrates a connection created to a server. Failure of the network connection is then simulated diff --git a/examples/jms/replicated-failback-static/pom.xml b/examples/jms/replicated-failback-static/pom.xml index fd1f832770..8e71126522 100644 --- a/examples/jms/replicated-failback-static/pom.xml +++ b/examples/jms/replicated-failback-static/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-replicated-failback-static-example + activemq6-jms-replicated-failback-static-example jar - HornetQ JMS Replicated Failback Static Example + ActiveMQ6 JMS Replicated Failback Static Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start0 @@ -111,28 +111,28 @@ - org.hornetq.examples.jms - hornetq-jms-replicated-failback-static-example + org.apache.activemq6.examples.jms + activemq6-jms-replicated-failback-static-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/replicated-failback-static/src/main/java/org/hornetq/jms/example/ReplicatedFailbackStaticExample.java b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq6/jms/example/ReplicatedFailbackStaticExample.java similarity index 98% rename from examples/jms/replicated-failback-static/src/main/java/org/hornetq/jms/example/ReplicatedFailbackStaticExample.java rename to examples/jms/replicated-failback-static/src/main/java/org/apache/activemq6/jms/example/ReplicatedFailbackStaticExample.java index af53034912..307435234c 100644 --- a/examples/jms/replicated-failback-static/src/main/java/org/hornetq/jms/example/ReplicatedFailbackStaticExample.java +++ b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq6/jms/example/ReplicatedFailbackStaticExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,7 +22,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * Example of live and replicating backup pair. diff --git a/examples/jms/replicated-failback/pom.xml b/examples/jms/replicated-failback/pom.xml index 179b3ebd1d..ca799d1877 100644 --- a/examples/jms/replicated-failback/pom.xml +++ b/examples/jms/replicated-failback/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-replicated-failback-example + activemq6-jms-replicated-failback-example jar - HornetQ JMS Replicated Failback Example + ActiveMQ6 JMS Replicated Failback Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start0 @@ -111,28 +111,28 @@ - org.hornetq.examples.jms - hornetq-jms-replicated-failback-example + org.apache.activemq6.examples.jms + activemq6-jms-replicated-failback-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/replicated-failback/src/main/java/org/hornetq/jms/example/ReplicatedFailbackExample.java b/examples/jms/replicated-failback/src/main/java/org/apache/activemq6/jms/example/ReplicatedFailbackExample.java similarity index 98% rename from examples/jms/replicated-failback/src/main/java/org/hornetq/jms/example/ReplicatedFailbackExample.java rename to examples/jms/replicated-failback/src/main/java/org/apache/activemq6/jms/example/ReplicatedFailbackExample.java index d63cb9a7bc..c88e88e222 100644 --- a/examples/jms/replicated-failback/src/main/java/org/hornetq/jms/example/ReplicatedFailbackExample.java +++ b/examples/jms/replicated-failback/src/main/java/org/apache/activemq6/jms/example/ReplicatedFailbackExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,7 +22,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * Example of live and replicating backup pair. diff --git a/examples/jms/replicated-multiple-failover/pom.xml b/examples/jms/replicated-multiple-failover/pom.xml index 2337e9c268..2735e22f45 100644 --- a/examples/jms/replicated-multiple-failover/pom.xml +++ b/examples/jms/replicated-multiple-failover/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-replicated-multiple-failover-example + activemq6-jms-replicated-multiple-failover-example jar - HornetQ JMS Replicated Multiple Failover Example + ActiveMQ6 JMS Replicated Multiple Failover Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start0 @@ -143,28 +143,28 @@ - org.hornetq.examples.jms - hornetq-jms-replicated-multiple-failover-example + org.apache.activemq6.examples.jms + activemq6-jms-replicated-multiple-failover-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/replicated-multiple-failover/src/main/java/org/hornetq/jms/example/ReplicatedMultipleFailoverExample.java b/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq6/jms/example/ReplicatedMultipleFailoverExample.java similarity index 98% rename from examples/jms/replicated-multiple-failover/src/main/java/org/hornetq/jms/example/ReplicatedMultipleFailoverExample.java rename to examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq6/jms/example/ReplicatedMultipleFailoverExample.java index 6f7bf03ff7..02085379e1 100644 --- a/examples/jms/replicated-multiple-failover/src/main/java/org/hornetq/jms/example/ReplicatedMultipleFailoverExample.java +++ b/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq6/jms/example/ReplicatedMultipleFailoverExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,7 +22,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * @author Andy Taylor diff --git a/examples/jms/replicated-transaction-failover/pom.xml b/examples/jms/replicated-transaction-failover/pom.xml index f710ffa2f2..cf8b3b4786 100644 --- a/examples/jms/replicated-transaction-failover/pom.xml +++ b/examples/jms/replicated-transaction-failover/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-replicated-transaction-failover-example + activemq6-jms-replicated-transaction-failover-example jar - HornetQ JMS Replicated Transaction Failover Example + ActiveMQ6 JMS Replicated Transaction Failover Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start0 @@ -111,28 +111,28 @@ - org.hornetq.examples.jms - hornetq-jms-replicated-transaction-failover-example + org.apache.activemq6.examples.jms + activemq6-jms-replicated-transaction-failover-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/replicated-transaction-failover/src/main/java/org/hornetq/jms/example/ReplicatedTransactionFailoverExample.java b/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq6/jms/example/ReplicatedTransactionFailoverExample.java similarity index 97% rename from examples/jms/replicated-transaction-failover/src/main/java/org/hornetq/jms/example/ReplicatedTransactionFailoverExample.java rename to examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq6/jms/example/ReplicatedTransactionFailoverExample.java index d18bc543da..e47d4b5469 100644 --- a/examples/jms/replicated-transaction-failover/src/main/java/org/hornetq/jms/example/ReplicatedTransactionFailoverExample.java +++ b/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq6/jms/example/ReplicatedTransactionFailoverExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,8 +22,8 @@ import javax.jms.TextMessage; import javax.jms.TransactionRolledBackException; import javax.naming.InitialContext; -import org.hornetq.api.core.Message; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple example that demonstrates failover of the JMS connection from one node to another diff --git a/examples/jms/request-reply/pom.xml b/examples/jms/request-reply/pom.xml index 7b0eb92a38..06eac3a7ae 100644 --- a/examples/jms/request-reply/pom.xml +++ b/examples/jms/request-reply/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-request-reply-example + activemq6-jms-request-reply-example jar - HornetQ JMS Request Reply Example + ActiveMQ6 JMS Request Reply Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-request-reply-example + org.apache.activemq6.examples.jms + activemq6-jms-request-reply-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/request-reply/src/main/java/org/hornetq/jms/example/RequestReplyExample.java b/examples/jms/request-reply/src/main/java/org/apache/activemq6/jms/example/RequestReplyExample.java similarity index 98% rename from examples/jms/request-reply/src/main/java/org/hornetq/jms/example/RequestReplyExample.java rename to examples/jms/request-reply/src/main/java/org/apache/activemq6/jms/example/RequestReplyExample.java index 2ae0f7c230..ad6f54a79a 100644 --- a/examples/jms/request-reply/src/main/java/org/hornetq/jms/example/RequestReplyExample.java +++ b/examples/jms/request-reply/src/main/java/org/apache/activemq6/jms/example/RequestReplyExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import java.util.HashMap; import java.util.Map; @@ -29,7 +29,7 @@ import javax.jms.TemporaryQueue; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS example that shows how to use Request/Replay style messaging. diff --git a/examples/jms/rest/dup-send/pom.xml b/examples/jms/rest/dup-send/pom.xml index 79e9e1a7bc..8a6f42b8a0 100644 --- a/examples/jms/rest/dup-send/pom.xml +++ b/examples/jms/rest/dup-send/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.rest.examples - hornetq-rest-examples-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.rest.examples + activemq6-rest-examples-pom + 6.0.0-SNAPSHOT dup-send war @@ -92,23 +92,23 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} @@ -120,8 +120,8 @@ jboss-jms-api_2.0_spec - org.hornetq.rest - hornetq-rest + org.apache.activemq6.rest + activemq6-rest ${project.version} diff --git a/examples/jms/rest/dup-send/src/main/java/PostOrder.java b/examples/jms/rest/dup-send/src/main/java/PostOrder.java index 1d8da269da..1043e92c02 100644 --- a/examples/jms/rest/dup-send/src/main/java/PostOrder.java +++ b/examples/jms/rest/dup-send/src/main/java/PostOrder.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -import org.hornetq.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQDestination; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/examples/jms/rest/javascript-chat/pom.xml b/examples/jms/rest/javascript-chat/pom.xml index 73df11ffb9..c71c6ec680 100644 --- a/examples/jms/rest/javascript-chat/pom.xml +++ b/examples/jms/rest/javascript-chat/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.rest.examples - hornetq-rest-examples-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.rest.examples + activemq6-rest-examples-pom + 6.0.0-SNAPSHOT javascript-chat war @@ -106,23 +106,23 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} @@ -134,8 +134,8 @@ jboss-jms-api_2.0_spec - org.hornetq.rest - hornetq-rest + org.apache.activemq6.rest + activemq6-rest ${project.version} diff --git a/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java b/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java index 278ae4e341..eabf90a3ab 100644 --- a/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java +++ b/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java @@ -15,7 +15,7 @@ package org.jboss.resteasy.messaging.test; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; -import org.hornetq.rest.util.LinkStrategy; +import org.apache.activemq6.rest.util.LinkStrategy; import org.junit.Assert; import org.junit.Test; diff --git a/examples/jms/rest/jms-to-rest/pom.xml b/examples/jms/rest/jms-to-rest/pom.xml index 7400b041db..7eaf5142e6 100644 --- a/examples/jms/rest/jms-to-rest/pom.xml +++ b/examples/jms/rest/jms-to-rest/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.rest.examples - hornetq-rest-examples-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.rest.examples + activemq6-rest-examples-pom + 6.0.0-SNAPSHOT mixed-jms-rest war @@ -92,23 +92,23 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} @@ -120,8 +120,8 @@ jboss-jms-api_2.0_spec - org.hornetq.rest - hornetq-rest + org.apache.activemq6.rest + activemq6-rest ${project.version} diff --git a/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java b/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java index f9253a6616..211e79135c 100644 --- a/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java +++ b/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.config.impl.FileConfiguration; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq6.core.config.impl.FileConfiguration; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; import javax.jms.ConnectionFactory; import javax.jms.Destination; diff --git a/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java b/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java index 3f69a03753..17ee8e87d6 100644 --- a/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java +++ b/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java @@ -10,8 +10,8 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.rest.Jms; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.rest.Jms; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java b/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java index eb8b0f7fff..b348a539d7 100644 --- a/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java +++ b/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -import org.hornetq.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQDestination; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/jms/rest/pom.xml b/examples/jms/rest/pom.xml index 5b2d8471fe..5d73141065 100644 --- a/examples/jms/rest/pom.xml +++ b/examples/jms/rest/pom.xml @@ -3,15 +3,15 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - org.hornetq.rest.examples - hornetq-rest-examples-pom + org.apache.activemq6.rest.examples + activemq6-rest-examples-pom pom - HornetQ REST Examples + ActiveMQ6 REST Examples javascript-chat diff --git a/examples/jms/rest/push/pom.xml b/examples/jms/rest/push/pom.xml index 9e511315a9..17ce8343c2 100644 --- a/examples/jms/rest/push/pom.xml +++ b/examples/jms/rest/push/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.rest.examples - hornetq-rest-examples-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.rest.examples + activemq6-rest-examples-pom + 6.0.0-SNAPSHOT push war @@ -98,23 +98,23 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} @@ -126,8 +126,8 @@ jboss-jms-api_2.0_spec - org.hornetq.rest - hornetq-rest + org.apache.activemq6.rest + activemq6-rest ${project.version} diff --git a/examples/jms/rest/push/src/main/java/JmsHelper.java b/examples/jms/rest/push/src/main/java/JmsHelper.java index cc7edd24f7..12ab96e36f 100644 --- a/examples/jms/rest/push/src/main/java/JmsHelper.java +++ b/examples/jms/rest/push/src/main/java/JmsHelper.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.config.impl.FileConfiguration; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.config.impl.FileConfiguration; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; import javax.jms.ConnectionFactory; import javax.jms.Destination; diff --git a/examples/jms/rest/push/src/main/java/PostOrder.java b/examples/jms/rest/push/src/main/java/PostOrder.java index 2f4b51049f..1fafc6f250 100644 --- a/examples/jms/rest/push/src/main/java/PostOrder.java +++ b/examples/jms/rest/push/src/main/java/PostOrder.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -import org.hornetq.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQDestination; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/jms/rest/push/src/main/java/PushReg.java b/examples/jms/rest/push/src/main/java/PushReg.java index a8a0ab993d..b11d695bf1 100644 --- a/examples/jms/rest/push/src/main/java/PushReg.java +++ b/examples/jms/rest/push/src/main/java/PushReg.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -import org.hornetq.rest.queue.push.xml.Authentication; -import org.hornetq.rest.queue.push.xml.BasicAuth; -import org.hornetq.rest.queue.push.xml.PushRegistration; -import org.hornetq.rest.queue.push.xml.XmlLink; +import org.apache.activemq6.rest.queue.push.xml.Authentication; +import org.apache.activemq6.rest.queue.push.xml.BasicAuth; +import org.apache.activemq6.rest.queue.push.xml.PushRegistration; +import org.apache.activemq6.rest.queue.push.xml.XmlLink; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/examples/jms/rest/push/src/main/java/ReceiveShipping.java b/examples/jms/rest/push/src/main/java/ReceiveShipping.java index 9383b7cecd..d29a190911 100644 --- a/examples/jms/rest/push/src/main/java/ReceiveShipping.java +++ b/examples/jms/rest/push/src/main/java/ReceiveShipping.java @@ -10,8 +10,8 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.rest.Jms; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.rest.Jms; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/jms/scale-down/pom.xml b/examples/jms/scale-down/pom.xml index 6f9dd3ea41..a686cee586 100644 --- a/examples/jms/scale-down/pom.xml +++ b/examples/jms/scale-down/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT scale-down jar - HornetQ JMS Scale Down Example + ActiveMQ6 JMS Scale Down Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start0 @@ -103,28 +103,28 @@ - org.hornetq.examples.jms + org.apache.activemq6.examples.jms scale-down ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/scale-down/src/main/java/org/hornetq/jms/example/ScaleDownExample.java b/examples/jms/scale-down/src/main/java/org/apache/activemq6/jms/example/ScaleDownExample.java similarity index 97% rename from examples/jms/scale-down/src/main/java/org/hornetq/jms/example/ScaleDownExample.java rename to examples/jms/scale-down/src/main/java/org/apache/activemq6/jms/example/ScaleDownExample.java index a8ccba8371..dba235fd02 100644 --- a/examples/jms/scale-down/src/main/java/org/hornetq/jms/example/ScaleDownExample.java +++ b/examples/jms/scale-down/src/main/java/org/apache/activemq6/jms/example/ScaleDownExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -21,7 +21,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple example that demonstrates a colocated server diff --git a/examples/jms/scheduled-message/pom.xml b/examples/jms/scheduled-message/pom.xml index 9efe195169..e52ef29d7d 100644 --- a/examples/jms/scheduled-message/pom.xml +++ b/examples/jms/scheduled-message/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-scheduled-message-example + activemq6-jms-scheduled-message-example jar - HornetQ JMS Scheduled Message Example + ActiveMQ6 JMS Scheduled Message Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-scheduled-message-example + org.apache.activemq6.examples.jms + activemq6-jms-scheduled-message-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/scheduled-message/src/main/java/org/hornetq/jms/example/ScheduledMessageExample.java b/examples/jms/scheduled-message/src/main/java/org/apache/activemq6/jms/example/ScheduledMessageExample.java similarity index 96% rename from examples/jms/scheduled-message/src/main/java/org/hornetq/jms/example/ScheduledMessageExample.java rename to examples/jms/scheduled-message/src/main/java/org/apache/activemq6/jms/example/ScheduledMessageExample.java index 265e3331a3..7403ab7f89 100644 --- a/examples/jms/scheduled-message/src/main/java/org/hornetq/jms/example/ScheduledMessageExample.java +++ b/examples/jms/scheduled-message/src/main/java/org/apache/activemq6/jms/example/ScheduledMessageExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import java.text.SimpleDateFormat; import java.util.Date; @@ -24,8 +24,8 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.api.core.Message; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS scheduled delivery example that delivers a message in 5 seconds. diff --git a/examples/jms/security/pom.xml b/examples/jms/security/pom.xml index a3e8dd8a4e..ba68b08a0c 100644 --- a/examples/jms/security/pom.xml +++ b/examples/jms/security/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-security-example + activemq6-jms-security-example jar - HornetQ JMS Security Example + ActiveMQ6 JMS Security Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-security-example + org.apache.activemq6.examples.jms + activemq6-jms-security-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/security/src/main/java/org/hornetq/jms/example/SecurityExample.java b/examples/jms/security/src/main/java/org/apache/activemq6/jms/example/SecurityExample.java similarity index 99% rename from examples/jms/security/src/main/java/org/hornetq/jms/example/SecurityExample.java rename to examples/jms/security/src/main/java/org/apache/activemq6/jms/example/SecurityExample.java index ce20683c37..9215a16a1c 100644 --- a/examples/jms/security/src/main/java/org/hornetq/jms/example/SecurityExample.java +++ b/examples/jms/security/src/main/java/org/apache/activemq6/jms/example/SecurityExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -23,7 +23,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS example that shows how to access messaging with security configured. diff --git a/examples/jms/send-acknowledgements/pom.xml b/examples/jms/send-acknowledgements/pom.xml index 7d572d84e7..c9fa483b0b 100644 --- a/examples/jms/send-acknowledgements/pom.xml +++ b/examples/jms/send-acknowledgements/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-send-acknowledgements-example + activemq6-jms-send-acknowledgements-example jar - HornetQ JMS Send Acknowledgements Example + ActiveMQ6 JMS Send Acknowledgements Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-send-acknowledgements-example + org.apache.activemq6.examples.jms + activemq6-jms-send-acknowledgements-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/send-acknowledgements/src/main/java/org/hornetq/jms/example/SendAcknowledgementsExample.java b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq6/jms/example/SendAcknowledgementsExample.java similarity index 91% rename from examples/jms/send-acknowledgements/src/main/java/org/hornetq/jms/example/SendAcknowledgementsExample.java rename to examples/jms/send-acknowledgements/src/main/java/org/apache/activemq6/jms/example/SendAcknowledgementsExample.java index e9229a94c4..516a969959 100644 --- a/examples/jms/send-acknowledgements/src/main/java/org/hornetq/jms/example/SendAcknowledgementsExample.java +++ b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq6/jms/example/SendAcknowledgementsExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -20,11 +20,11 @@ import javax.jms.Queue; import javax.jms.Session; import javax.naming.InitialContext; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.common.example.HornetQExample; -import org.hornetq.jms.client.HornetQSession; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq6.jms.client.HornetQSession; /** * diff --git a/examples/jms/spring-integration/pom.xml b/examples/jms/spring-integration/pom.xml index 4d81cc13aa..36465c0555 100644 --- a/examples/jms/spring-integration/pom.xml +++ b/examples/jms/spring-integration/pom.xml @@ -3,24 +3,24 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-spring-integration-example + activemq6-jms-spring-integration-example jar - HornetQ JMS Spring Integration Example + ActiveMQ6 JMS Spring Integration Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} - org.hornetq - hornetq-spring-integration + org.apache.activemq6 + activemq6-spring-integration ${project.version} @@ -36,8 +36,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin runClient @@ -54,28 +54,28 @@ - org.hornetq.examples.jms - hornetq-jms-spring-integration-example + org.apache.activemq6.examples.jms + activemq6-jms-spring-integration-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/spring-integration/src/main/java/org/hornetq/jms/example/ExampleListener.java b/examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/ExampleListener.java similarity index 96% rename from examples/jms/spring-integration/src/main/java/org/hornetq/jms/example/ExampleListener.java rename to examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/ExampleListener.java index 7804e89505..4f523a573e 100644 --- a/examples/jms/spring-integration/src/main/java/org/hornetq/jms/example/ExampleListener.java +++ b/examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/ExampleListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.JMSException; import javax.jms.Message; diff --git a/examples/jms/spring-integration/src/main/java/org/hornetq/jms/example/MessageSender.java b/examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/MessageSender.java similarity index 97% rename from examples/jms/spring-integration/src/main/java/org/hornetq/jms/example/MessageSender.java rename to examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/MessageSender.java index 0aee97e985..e00bd7568f 100644 --- a/examples/jms/spring-integration/src/main/java/org/hornetq/jms/example/MessageSender.java +++ b/examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/MessageSender.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/jms/spring-integration/src/main/java/org/hornetq/jms/example/SpringExample.java b/examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/SpringExample.java similarity index 96% rename from examples/jms/spring-integration/src/main/java/org/hornetq/jms/example/SpringExample.java rename to examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/SpringExample.java index 33299786cb..07870e5704 100644 --- a/examples/jms/spring-integration/src/main/java/org/hornetq/jms/example/SpringExample.java +++ b/examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/SpringExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/examples/jms/ssl-enabled/pom.xml b/examples/jms/ssl-enabled/pom.xml index c846a98b64..7a5e707d16 100644 --- a/examples/jms/ssl-enabled/pom.xml +++ b/examples/jms/ssl-enabled/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-ssl-enabled-example + activemq6-jms-ssl-enabled-example jar - HornetQ JMS SSL Enabled Example + ActiveMQ6 JMS SSL Enabled Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-ssl-enabled-example + org.apache.activemq6.examples.jms + activemq6-jms-ssl-enabled-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/ssl-enabled/src/main/java/org/hornetq/jms/example/SSLExample.java b/examples/jms/ssl-enabled/src/main/java/org/apache/activemq6/jms/example/SSLExample.java similarity index 96% rename from examples/jms/ssl-enabled/src/main/java/org/hornetq/jms/example/SSLExample.java rename to examples/jms/ssl-enabled/src/main/java/org/apache/activemq6/jms/example/SSLExample.java index 010853d5f2..0949f46acc 100644 --- a/examples/jms/ssl-enabled/src/main/java/org/hornetq/jms/example/SSLExample.java +++ b/examples/jms/ssl-enabled/src/main/java/org/apache/activemq6/jms/example/SSLExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -21,7 +21,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS Queue example that uses SSL secure transport. diff --git a/examples/jms/static-selector-jms/pom.xml b/examples/jms/static-selector-jms/pom.xml index abba1ee24d..f18e320d52 100644 --- a/examples/jms/static-selector-jms/pom.xml +++ b/examples/jms/static-selector-jms/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-static-selector-jms-example + activemq6-jms-static-selector-jms-example jar - HornetQ JMS Static Selector Example + ActiveMQ6 JMS Static Selector Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-static-selector-jms-example + org.apache.activemq6.examples.jms + activemq6-jms-static-selector-jms-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/static-selector-jms/src/main/java/org/hornetq/jms/example/StaticSelectorJMSExample.java b/examples/jms/static-selector-jms/src/main/java/org/apache/activemq6/jms/example/StaticSelectorJMSExample.java similarity index 98% rename from examples/jms/static-selector-jms/src/main/java/org/hornetq/jms/example/StaticSelectorJMSExample.java rename to examples/jms/static-selector-jms/src/main/java/org/apache/activemq6/jms/example/StaticSelectorJMSExample.java index d749b22d2a..67750959f7 100644 --- a/examples/jms/static-selector-jms/src/main/java/org/hornetq/jms/example/StaticSelectorJMSExample.java +++ b/examples/jms/static-selector-jms/src/main/java/org/apache/activemq6/jms/example/StaticSelectorJMSExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -24,7 +24,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS example that shows how static message selectors work when using JMS config. diff --git a/examples/jms/static-selector/pom.xml b/examples/jms/static-selector/pom.xml index 163b57e9f2..73152141b3 100644 --- a/examples/jms/static-selector/pom.xml +++ b/examples/jms/static-selector/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-static-selector-example + activemq6-static-selector-example jar - HornetQ Static Selector Example + ActiveMQ6 Static Selector Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-static-selector-example + org.apache.activemq6.examples.jms + activemq6-static-selector-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/static-selector/src/main/java/org/hornetq/jms/example/StaticSelectorExample.java b/examples/jms/static-selector/src/main/java/org/apache/activemq6/jms/example/StaticSelectorExample.java similarity index 98% rename from examples/jms/static-selector/src/main/java/org/hornetq/jms/example/StaticSelectorExample.java rename to examples/jms/static-selector/src/main/java/org/apache/activemq6/jms/example/StaticSelectorExample.java index 1122bd313d..b62afcbeb1 100644 --- a/examples/jms/static-selector/src/main/java/org/hornetq/jms/example/StaticSelectorExample.java +++ b/examples/jms/static-selector/src/main/java/org/apache/activemq6/jms/example/StaticSelectorExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -24,7 +24,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS example that shows how static message selectors work. diff --git a/examples/jms/stomp-websockets/pom.xml b/examples/jms/stomp-websockets/pom.xml index 6023eff6b0..8112fab9fe 100644 --- a/examples/jms/stomp-websockets/pom.xml +++ b/examples/jms/stomp-websockets/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-stomp-websockets-example + activemq6-jms-stomp-websockets-example jar - HornetQ JMS StompWebSocketExample Example + ActiveMQ6 JMS StompWebSocketExample Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start0 @@ -69,33 +69,33 @@ - org.hornetq.examples.jms - hornetq-jms-stomp-websockets-example + org.apache.activemq6.examples.jms + activemq6-jms-stomp-websockets-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-stomp-protocol + org.apache.activemq6 + activemq6-stomp-protocol ${project.version} diff --git a/examples/jms/stomp-websockets/src/main/java/org/hornetq/jms/example/StompWebSocketExample.java b/examples/jms/stomp-websockets/src/main/java/org/apache/activemq6/jms/example/StompWebSocketExample.java similarity index 96% rename from examples/jms/stomp-websockets/src/main/java/org/hornetq/jms/example/StompWebSocketExample.java rename to examples/jms/stomp-websockets/src/main/java/org/apache/activemq6/jms/example/StompWebSocketExample.java index e7c7473069..08bdbbe1ae 100644 --- a/examples/jms/stomp-websockets/src/main/java/org/hornetq/jms/example/StompWebSocketExample.java +++ b/examples/jms/stomp-websockets/src/main/java/org/apache/activemq6/jms/example/StompWebSocketExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import java.util.Date; @@ -23,7 +23,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * An example where a client will send a JMS message to a Topic. diff --git a/examples/jms/stomp/pom.xml b/examples/jms/stomp/pom.xml index aea39564d9..9f0b6227b0 100644 --- a/examples/jms/stomp/pom.xml +++ b/examples/jms/stomp/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-stomp-example + activemq6-jms-stomp-example jar - HornetQ JMS Stomp Example + ActiveMQ6 JMS Stomp Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,33 +65,33 @@ - org.hornetq.examples.jms - hornetq-jms-stomp-example + org.apache.activemq6.examples.jms + activemq6-jms-stomp-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-stomp-protocol + org.apache.activemq6 + activemq6-stomp-protocol ${project.version} diff --git a/examples/jms/stomp/src/main/java/org/hornetq/jms/example/StompExample.java b/examples/jms/stomp/src/main/java/org/apache/activemq6/jms/example/StompExample.java similarity index 97% rename from examples/jms/stomp/src/main/java/org/hornetq/jms/example/StompExample.java rename to examples/jms/stomp/src/main/java/org/apache/activemq6/jms/example/StompExample.java index 219190043c..db8c3019f1 100644 --- a/examples/jms/stomp/src/main/java/org/hornetq/jms/example/StompExample.java +++ b/examples/jms/stomp/src/main/java/org/apache/activemq6/jms/example/StompExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import java.io.OutputStream; import java.net.Socket; @@ -24,7 +24,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * An example where a client will send a Stomp message on a TCP socket diff --git a/examples/jms/stomp1.1/pom.xml b/examples/jms/stomp1.1/pom.xml index fe74dd9e44..483e6de046 100644 --- a/examples/jms/stomp1.1/pom.xml +++ b/examples/jms/stomp1.1/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-stomp1.1-example + activemq6-jms-stomp1.1-example jar - HornetQ JMS Stomp 1.1 Example + ActiveMQ6 JMS Stomp 1.1 Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,33 +65,33 @@ - org.hornetq.examples.jms - hornetq-jms-stomp1.1-example + org.apache.activemq6.examples.jms + activemq6-jms-stomp1.1-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-stomp-protocol + org.apache.activemq6 + activemq6-stomp-protocol ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/stomp1.1/src/main/java/org/hornetq/jms/example/StompExample.java b/examples/jms/stomp1.1/src/main/java/org/apache/activemq6/jms/example/StompExample.java similarity index 97% rename from examples/jms/stomp1.1/src/main/java/org/hornetq/jms/example/StompExample.java rename to examples/jms/stomp1.1/src/main/java/org/apache/activemq6/jms/example/StompExample.java index 476f80d854..afe6de9630 100644 --- a/examples/jms/stomp1.1/src/main/java/org/hornetq/jms/example/StompExample.java +++ b/examples/jms/stomp1.1/src/main/java/org/apache/activemq6/jms/example/StompExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import java.io.InputStream; import java.io.OutputStream; @@ -25,7 +25,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * An example where a Stomp 1.1 client sends a message on a TCP socket diff --git a/examples/jms/stomp1.2/pom.xml b/examples/jms/stomp1.2/pom.xml index e215d40491..c7b20f74fd 100644 --- a/examples/jms/stomp1.2/pom.xml +++ b/examples/jms/stomp1.2/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-stomp1.2-example + activemq6-jms-stomp1.2-example jar - HornetQ JMS Stomp 1.2 Example + ActiveMQ6 JMS Stomp 1.2 Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,33 +65,33 @@ - org.hornetq.examples.jms - hornetq-jms-stomp1.2-example + org.apache.activemq6.examples.jms + activemq6-jms-stomp1.2-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-stomp-protocol + org.apache.activemq6 + activemq6-stomp-protocol ${project.version} diff --git a/examples/jms/stomp1.2/src/main/java/org/hornetq/jms/example/StompExample.java b/examples/jms/stomp1.2/src/main/java/org/apache/activemq6/jms/example/StompExample.java similarity index 97% rename from examples/jms/stomp1.2/src/main/java/org/hornetq/jms/example/StompExample.java rename to examples/jms/stomp1.2/src/main/java/org/apache/activemq6/jms/example/StompExample.java index a58e66aa34..ce5459b172 100644 --- a/examples/jms/stomp1.2/src/main/java/org/hornetq/jms/example/StompExample.java +++ b/examples/jms/stomp1.2/src/main/java/org/apache/activemq6/jms/example/StompExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import java.io.InputStream; import java.io.OutputStream; @@ -24,7 +24,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * An example where a Stomp 1.2 client sends a message on a TCP socket diff --git a/examples/jms/stop-server-failover/pom.xml b/examples/jms/stop-server-failover/pom.xml index acf30bc4e9..38f0a92574 100644 --- a/examples/jms/stop-server-failover/pom.xml +++ b/examples/jms/stop-server-failover/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-stop-server-failover-example + activemq6-jms-stop-server-failover-example jar - HornetQ JMS Stop Server Failover Example + ActiveMQ6 JMS Stop Server Failover Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start0 @@ -111,28 +111,28 @@ - org.hornetq.examples.jms - hornetq-jms-stop-server-failover-example + org.apache.activemq6.examples.jms + activemq6-jms-stop-server-failover-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/stop-server-failover/src/main/java/org/hornetq/jms/example/StopServerFailoverExample.java b/examples/jms/stop-server-failover/src/main/java/org/apache/activemq6/jms/example/StopServerFailoverExample.java similarity index 97% rename from examples/jms/stop-server-failover/src/main/java/org/hornetq/jms/example/StopServerFailoverExample.java rename to examples/jms/stop-server-failover/src/main/java/org/apache/activemq6/jms/example/StopServerFailoverExample.java index 11be1e9c49..0be24ef0d4 100644 --- a/examples/jms/stop-server-failover/src/main/java/org/hornetq/jms/example/StopServerFailoverExample.java +++ b/examples/jms/stop-server-failover/src/main/java/org/apache/activemq6/jms/example/StopServerFailoverExample.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/examples/jms/symmetric-cluster/pom.xml b/examples/jms/symmetric-cluster/pom.xml index 85585ddcf9..2ea49bb4f2 100644 --- a/examples/jms/symmetric-cluster/pom.xml +++ b/examples/jms/symmetric-cluster/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-symmetric-cluster-example + activemq6-jms-symmetric-cluster-example jar - HornetQ JMS Symmetric Cluster Example + ActiveMQ6 JMS Symmetric Cluster Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start0 @@ -239,28 +239,28 @@ - org.hornetq.examples.jms - hornetq-jms-symmetric-cluster-example + org.apache.activemq6.examples.jms + activemq6-jms-symmetric-cluster-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/symmetric-cluster/src/main/java/org/hornetq/jms/example/SymmetricClusterExample.java b/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq6/jms/example/SymmetricClusterExample.java similarity index 95% rename from examples/jms/symmetric-cluster/src/main/java/org/hornetq/jms/example/SymmetricClusterExample.java rename to examples/jms/symmetric-cluster/src/main/java/org/apache/activemq6/jms/example/SymmetricClusterExample.java index 4f9dc7e666..d9fdc923f2 100644 --- a/examples/jms/symmetric-cluster/src/main/java/org/hornetq/jms/example/SymmetricClusterExample.java +++ b/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq6/jms/example/SymmetricClusterExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -21,12 +21,12 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.common.example.HornetQExample; /** * This example demonstrates a cluster of three nodes set up in a symmetric topology - i.e. each diff --git a/examples/jms/temp-queue/pom.xml b/examples/jms/temp-queue/pom.xml index 0a3b395194..7fddccb955 100644 --- a/examples/jms/temp-queue/pom.xml +++ b/examples/jms/temp-queue/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-temp-queue-example + activemq6-jms-temp-queue-example jar - HornetQ JMS Temporary Queue Example + ActiveMQ6 JMS Temporary Queue Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-temp-queue-example + org.apache.activemq6.examples.jms + activemq6-jms-temp-queue-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/temp-queue/src/main/java/org/hornetq/jms/example/TemporaryQueueExample.java b/examples/jms/temp-queue/src/main/java/org/apache/activemq6/jms/example/TemporaryQueueExample.java similarity index 97% rename from examples/jms/temp-queue/src/main/java/org/hornetq/jms/example/TemporaryQueueExample.java rename to examples/jms/temp-queue/src/main/java/org/apache/activemq6/jms/example/TemporaryQueueExample.java index d70ad1c430..dd0b778543 100644 --- a/examples/jms/temp-queue/src/main/java/org/hornetq/jms/example/TemporaryQueueExample.java +++ b/examples/jms/temp-queue/src/main/java/org/apache/activemq6/jms/example/TemporaryQueueExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,7 +22,7 @@ import javax.jms.TemporaryQueue; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS example that shows how to use temporary queues. diff --git a/examples/jms/topic-hierarchies/pom.xml b/examples/jms/topic-hierarchies/pom.xml index f2281d65da..220cfb0a20 100644 --- a/examples/jms/topic-hierarchies/pom.xml +++ b/examples/jms/topic-hierarchies/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-topic-hierarchies-example + activemq6-jms-topic-hierarchies-example jar - HornetQ JMS Topic Hierarchies Example + ActiveMQ6 JMS Topic Hierarchies Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-topic-hierarchies-example + org.apache.activemq6.examples.jms + activemq6-jms-topic-hierarchies-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/topic-hierarchies/src/main/java/org/hornetq/jms/example/TopicHierarchyExample.java b/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq6/jms/example/TopicHierarchyExample.java similarity index 96% rename from examples/jms/topic-hierarchies/src/main/java/org/hornetq/jms/example/TopicHierarchyExample.java rename to examples/jms/topic-hierarchies/src/main/java/org/apache/activemq6/jms/example/TopicHierarchyExample.java index c3e42713ba..fdbf8a5660 100644 --- a/examples/jms/topic-hierarchies/src/main/java/org/hornetq/jms/example/TopicHierarchyExample.java +++ b/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq6/jms/example/TopicHierarchyExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,8 +22,8 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.common.example.HornetQExample; /** * This example demonstrates how a JMS TopicSubscriber can be created to subscribe to a wild-card Topic. diff --git a/examples/jms/topic-selector-example1/pom.xml b/examples/jms/topic-selector-example1/pom.xml index 8e99cdb9f0..a7c1637e20 100644 --- a/examples/jms/topic-selector-example1/pom.xml +++ b/examples/jms/topic-selector-example1/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-topic-selector-example1-example + activemq6-jms-topic-selector-example1-example jar - HornetQ JMS Topic Selector Example 1 + ActiveMQ6 JMS Topic Selector Example 1 - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-topic-selector-example1-example + org.apache.activemq6.examples.jms + activemq6-jms-topic-selector-example1-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/topic-selector-example1/src/main/java/org/hornetq/jms/example/TopicSelectorExample1.java b/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq6/jms/example/TopicSelectorExample1.java similarity index 98% rename from examples/jms/topic-selector-example1/src/main/java/org/hornetq/jms/example/TopicSelectorExample1.java rename to examples/jms/topic-selector-example1/src/main/java/org/apache/activemq6/jms/example/TopicSelectorExample1.java index de8d1c5da4..518bb3d7e8 100644 --- a/examples/jms/topic-selector-example1/src/main/java/org/hornetq/jms/example/TopicSelectorExample1.java +++ b/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq6/jms/example/TopicSelectorExample1.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -21,7 +21,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS Topic example that creates a producer and consumer on a queue and sends and receives a message. diff --git a/examples/jms/topic-selector-example2/pom.xml b/examples/jms/topic-selector-example2/pom.xml index 9ed706600a..29925cac06 100644 --- a/examples/jms/topic-selector-example2/pom.xml +++ b/examples/jms/topic-selector-example2/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-topic-selector-example2-example + activemq6-jms-topic-selector-example2-example jar - HornetQ JMS Topic Selector Example 2 + ActiveMQ6 JMS Topic Selector Example 2 - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-topic-selector-example2-example + org.apache.activemq6.examples.jms + activemq6-jms-topic-selector-example2-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/topic-selector-example2/src/main/java/org/hornetq/jms/example/TopicSelectorExample2.java b/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq6/jms/example/TopicSelectorExample2.java similarity index 98% rename from examples/jms/topic-selector-example2/src/main/java/org/hornetq/jms/example/TopicSelectorExample2.java rename to examples/jms/topic-selector-example2/src/main/java/org/apache/activemq6/jms/example/TopicSelectorExample2.java index b761f425e7..7818c8a555 100644 --- a/examples/jms/topic-selector-example2/src/main/java/org/hornetq/jms/example/TopicSelectorExample2.java +++ b/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq6/jms/example/TopicSelectorExample2.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -24,7 +24,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS example that consumes messages using selectors. diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml index 07d9f8d0ac..42954c420a 100644 --- a/examples/jms/topic/pom.xml +++ b/examples/jms/topic/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-topic-example + activemq6-jms-topic-example jar - HornetQ JMS Topic Example + ActiveMQ6 JMS Topic Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-topic-example + org.apache.activemq6.examples.jms + activemq6-jms-topic-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/topic/src/main/java/org/hornetq/jms/example/TopicExample.java b/examples/jms/topic/src/main/java/org/apache/activemq6/jms/example/TopicExample.java similarity index 97% rename from examples/jms/topic/src/main/java/org/hornetq/jms/example/TopicExample.java rename to examples/jms/topic/src/main/java/org/apache/activemq6/jms/example/TopicExample.java index da0be54eae..017d6caa86 100644 --- a/examples/jms/topic/src/main/java/org/hornetq/jms/example/TopicExample.java +++ b/examples/jms/topic/src/main/java/org/apache/activemq6/jms/example/TopicExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -21,7 +21,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS Topic example that creates a producer and consumer on a queue and sends and receives a message. diff --git a/examples/jms/transaction-failover/pom.xml b/examples/jms/transaction-failover/pom.xml index 2529ecb3f6..acfbff4639 100644 --- a/examples/jms/transaction-failover/pom.xml +++ b/examples/jms/transaction-failover/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-transaction-failover-example + activemq6-jms-transaction-failover-example jar - HornetQ JMS Transaction Failover Example + ActiveMQ6 JMS Transaction Failover Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start0 @@ -111,28 +111,28 @@ - org.hornetq.examples.jms - hornetq-jms-transaction-failover-example + org.apache.activemq6.examples.jms + activemq6-jms-transaction-failover-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/transaction-failover/src/main/java/org/hornetq/jms/example/TransactionFailoverExample.java b/examples/jms/transaction-failover/src/main/java/org/apache/activemq6/jms/example/TransactionFailoverExample.java similarity index 97% rename from examples/jms/transaction-failover/src/main/java/org/hornetq/jms/example/TransactionFailoverExample.java rename to examples/jms/transaction-failover/src/main/java/org/apache/activemq6/jms/example/TransactionFailoverExample.java index c5543c5669..436e687780 100644 --- a/examples/jms/transaction-failover/src/main/java/org/hornetq/jms/example/TransactionFailoverExample.java +++ b/examples/jms/transaction-failover/src/main/java/org/apache/activemq6/jms/example/TransactionFailoverExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -22,8 +22,8 @@ import javax.jms.TextMessage; import javax.jms.TransactionRolledBackException; import javax.naming.InitialContext; -import org.hornetq.api.core.Message; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple example that demonstrates failover of the JMS connection from one node to another diff --git a/examples/jms/transactional/pom.xml b/examples/jms/transactional/pom.xml index 24c2f437c4..73dbd4dc10 100644 --- a/examples/jms/transactional/pom.xml +++ b/examples/jms/transactional/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-transactional-example + activemq6-jms-transactional-example jar - HornetQ JMS Transactional Example + ActiveMQ6 JMS Transactional Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-transactional-example + org.apache.activemq6.examples.jms + activemq6-jms-transactional-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/transactional/src/main/java/org/hornetq/jms/example/TransactionalExample.java b/examples/jms/transactional/src/main/java/org/apache/activemq6/jms/example/TransactionalExample.java similarity index 97% rename from examples/jms/transactional/src/main/java/org/hornetq/jms/example/TransactionalExample.java rename to examples/jms/transactional/src/main/java/org/apache/activemq6/jms/example/TransactionalExample.java index 8a15acdce1..4fadcbdd44 100644 --- a/examples/jms/transactional/src/main/java/org/hornetq/jms/example/TransactionalExample.java +++ b/examples/jms/transactional/src/main/java/org/apache/activemq6/jms/example/TransactionalExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -21,7 +21,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS example that sends and consume message transactionally. diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml index 8598efab92..5c9f200538 100644 --- a/examples/jms/xa-heuristic/pom.xml +++ b/examples/jms/xa-heuristic/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-xa-heuristic-example + activemq6-jms-xa-heuristic-example jar - HornetQ JMS XAHeuristicExample Example + ActiveMQ6 JMS XAHeuristicExample Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -32,8 +32,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -88,28 +88,28 @@ - org.hornetq.examples.jms - hornetq-jms-xa-heuristic-example + org.apache.activemq6.examples.jms + activemq6-jms-xa-heuristic-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/xa-heuristic/src/main/java/org/hornetq/jms/example/XAHeuristicExample.java b/examples/jms/xa-heuristic/src/main/java/org/apache/activemq6/jms/example/XAHeuristicExample.java similarity index 96% rename from examples/jms/xa-heuristic/src/main/java/org/hornetq/jms/example/XAHeuristicExample.java rename to examples/jms/xa-heuristic/src/main/java/org/apache/activemq6/jms/example/XAHeuristicExample.java index f22a648fb9..dd7ca2a8c1 100644 --- a/examples/jms/xa-heuristic/src/main/java/org/hornetq/jms/example/XAHeuristicExample.java +++ b/examples/jms/xa-heuristic/src/main/java/org/apache/activemq6/jms/example/XAHeuristicExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -36,10 +36,10 @@ import javax.naming.InitialContext; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.common.example.DummyXid; -import org.hornetq.common.example.HornetQExample; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.common.example.DummyXid; +import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq6.utils.UUIDGenerator; /** * A simple JMS example showing how to administer un-finished transactions. diff --git a/examples/jms/xa-receive/pom.xml b/examples/jms/xa-receive/pom.xml index bef5871171..a30b5cc976 100644 --- a/examples/jms/xa-receive/pom.xml +++ b/examples/jms/xa-receive/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-xa-receive-example + activemq6-jms-xa-receive-example jar - HornetQ JMS XA Receive Example + ActiveMQ6 JMS XA Receive Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-xa-receive-example + org.apache.activemq6.examples.jms + activemq6-jms-xa-receive-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/xa-receive/src/main/java/org/hornetq/jms/example/XAReceiveExample.java b/examples/jms/xa-receive/src/main/java/org/apache/activemq6/jms/example/XAReceiveExample.java similarity index 96% rename from examples/jms/xa-receive/src/main/java/org/hornetq/jms/example/XAReceiveExample.java rename to examples/jms/xa-receive/src/main/java/org/apache/activemq6/jms/example/XAReceiveExample.java index dd341d87a3..b1c552109d 100644 --- a/examples/jms/xa-receive/src/main/java/org/hornetq/jms/example/XAReceiveExample.java +++ b/examples/jms/xa-receive/src/main/java/org/apache/activemq6/jms/example/XAReceiveExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import java.nio.charset.StandardCharsets; @@ -26,9 +26,9 @@ import javax.naming.InitialContext; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.common.example.DummyXid; -import org.hornetq.common.example.HornetQExample; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.common.example.DummyXid; +import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq6.utils.UUIDGenerator; /** * A simple JMS example showing the usage of XA support in JMS. diff --git a/examples/jms/xa-send/pom.xml b/examples/jms/xa-send/pom.xml index e94306ad72..1da996efe9 100644 --- a/examples/jms/xa-send/pom.xml +++ b/examples/jms/xa-send/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-xa-send-example + activemq6-jms-xa-send-example jar - HornetQ JMS XA Send Example + ActiveMQ6 JMS XA Send Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -27,8 +27,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -65,28 +65,28 @@ - org.hornetq.examples.jms - hornetq-jms-xa-send-example + org.apache.activemq6.examples.jms + activemq6-jms-xa-send-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/xa-send/src/main/java/org/hornetq/jms/example/XASendExample.java b/examples/jms/xa-send/src/main/java/org/apache/activemq6/jms/example/XASendExample.java similarity index 96% rename from examples/jms/xa-send/src/main/java/org/hornetq/jms/example/XASendExample.java rename to examples/jms/xa-send/src/main/java/org/apache/activemq6/jms/example/XASendExample.java index edf230ad28..094fbb54d0 100644 --- a/examples/jms/xa-send/src/main/java/org/hornetq/jms/example/XASendExample.java +++ b/examples/jms/xa-send/src/main/java/org/apache/activemq6/jms/example/XASendExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -30,9 +30,9 @@ import javax.naming.InitialContext; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.common.example.DummyXid; -import org.hornetq.common.example.HornetQExample; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.common.example.DummyXid; +import org.apache.activemq6.common.example.HornetQExample; +import org.apache.activemq6.utils.UUIDGenerator; /** * A simple JMS example showing the usage of XA support in JMS. diff --git a/examples/jms/xa-with-jta/pom.xml b/examples/jms/xa-with-jta/pom.xml index e0c915df0e..3f0d78007e 100644 --- a/examples/jms/xa-with-jta/pom.xml +++ b/examples/jms/xa-with-jta/pom.xml @@ -3,19 +3,19 @@ 4.0.0 - org.hornetq.examples.jms + org.apache.activemq6.examples.jms jms-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-jms-xa-with-jta-example + activemq6-jms-xa-with-jta-example jar - HornetQ JMS XA with JTA Example + ActiveMQ6 JMS XA with JTA Example - org.hornetq.examples.jms - hornetq-jms-examples-common + org.apache.activemq6.examples.jms + activemq6-jms-examples-common ${project.version} @@ -36,8 +36,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -74,28 +74,28 @@ - org.hornetq.examples.jms - hornetq-jms-xa-with-jta-example + org.apache.activemq6.examples.jms + activemq6-jms-xa-with-jta-example ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/examples/jms/xa-with-jta/src/main/java/org/hornetq/jms/example/XAwithJTAExample.java b/examples/jms/xa-with-jta/src/main/java/org/apache/activemq6/jms/example/XAwithJTAExample.java similarity index 98% rename from examples/jms/xa-with-jta/src/main/java/org/hornetq/jms/example/XAwithJTAExample.java rename to examples/jms/xa-with-jta/src/main/java/org/apache/activemq6/jms/example/XAwithJTAExample.java index 14c130921e..1d3602d089 100644 --- a/examples/jms/xa-with-jta/src/main/java/org/hornetq/jms/example/XAwithJTAExample.java +++ b/examples/jms/xa-with-jta/src/main/java/org/apache/activemq6/jms/example/XAwithJTAExample.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.example; +package org.apache.activemq6.jms.example; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; @@ -28,7 +28,7 @@ import javax.transaction.xa.Xid; import com.arjuna.ats.jta.TransactionManager; -import org.hornetq.common.example.HornetQExample; +import org.apache.activemq6.common.example.HornetQExample; /** * A simple JMS example showing the HornetQ XA support with JTA. diff --git a/examples/pom.xml b/examples/pom.xml index 09a7d41a14..89904ee0c6 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,15 +3,15 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - org.hornetq.examples - hornetq-examples + org.apache.activemq6.examples + activemq6-examples pom - HornetQ Examples + ActiveMQ6 Examples true diff --git a/examples/soak/normal/pom.xml b/examples/soak/normal/pom.xml index 37cec414f2..48e128340f 100644 --- a/examples/soak/normal/pom.xml +++ b/examples/soak/normal/pom.xml @@ -2,20 +2,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - hornetq-jms-soak-example + activemq6-jms-soak-example jar - HornetQ Soak Normal Example + ActiveMQ6 Soak Normal Example - org.hornetq.example.soak + org.apache.activemq6.example.soak soak-examples - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} @@ -27,22 +27,22 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin - org.hornetq.example.soak - hornetq-jms-soak-example + org.apache.activemq6.example.soak + activemq6-jms-soak-example ${project.version} - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} @@ -78,8 +78,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start @@ -134,8 +134,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin runConsumer @@ -171,8 +171,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin start diff --git a/examples/soak/normal/src/main/java/org/hornetq/jms/soak/example/SoakBase.java b/examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakBase.java similarity index 99% rename from examples/soak/normal/src/main/java/org/hornetq/jms/soak/example/SoakBase.java rename to examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakBase.java index dd654ac716..22db2943a1 100644 --- a/examples/soak/normal/src/main/java/org/hornetq/jms/soak/example/SoakBase.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.soak.example; +package org.apache.activemq6.jms.soak.example; import java.io.FileInputStream; import java.io.InputStream; diff --git a/examples/soak/normal/src/main/java/org/hornetq/jms/soak/example/SoakParams.java b/examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakParams.java similarity index 98% rename from examples/soak/normal/src/main/java/org/hornetq/jms/soak/example/SoakParams.java rename to examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakParams.java index 9b94d2b3a7..5fb3170cc8 100644 --- a/examples/soak/normal/src/main/java/org/hornetq/jms/soak/example/SoakParams.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakParams.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.soak.example; +package org.apache.activemq6.jms.soak.example; import java.io.Serializable; diff --git a/examples/soak/normal/src/main/java/org/hornetq/jms/soak/example/SoakReceiver.java b/examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakReceiver.java similarity index 99% rename from examples/soak/normal/src/main/java/org/hornetq/jms/soak/example/SoakReceiver.java rename to examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakReceiver.java index 913a2f7cb6..ed9fcd13f2 100644 --- a/examples/soak/normal/src/main/java/org/hornetq/jms/soak/example/SoakReceiver.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakReceiver.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.soak.example; +package org.apache.activemq6.jms.soak.example; import java.lang.Override; import java.lang.Runnable; diff --git a/examples/soak/normal/src/main/java/org/hornetq/jms/soak/example/SoakSender.java b/examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakSender.java similarity index 97% rename from examples/soak/normal/src/main/java/org/hornetq/jms/soak/example/SoakSender.java rename to examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakSender.java index 3bc0705c46..a3e5dee201 100644 --- a/examples/soak/normal/src/main/java/org/hornetq/jms/soak/example/SoakSender.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakSender.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.soak.example; +package org.apache.activemq6.jms.soak.example; import java.util.Hashtable; import java.util.concurrent.atomic.AtomicLong; @@ -28,8 +28,8 @@ import javax.jms.Session; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.hornetq.utils.TokenBucketLimiter; -import org.hornetq.utils.TokenBucketLimiterImpl; +import org.apache.activemq6.utils.TokenBucketLimiter; +import org.apache.activemq6.utils.TokenBucketLimiterImpl; public class SoakSender { diff --git a/examples/soak/pom.xml b/examples/soak/pom.xml index 82d1bd756c..75e36610e3 100644 --- a/examples/soak/pom.xml +++ b/examples/soak/pom.xml @@ -3,15 +3,15 @@ 4.0.0 - org.hornetq.examples - hornetq-examples - 2.5.0-SNAPSHOT + org.apache.activemq6.examples + activemq6-examples + 6.0.0-SNAPSHOT - org.hornetq.example.soak + org.apache.activemq6.example.soak soak-examples pom - HornetQ Soak Examples + ActiveMQ6 Soak Examples diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/PacketDecoder.java b/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/PacketDecoder.java deleted file mode 100644 index c2e1758137..0000000000 --- a/hornetq-core-client/src/main/java/org/hornetq/core/protocol/core/impl/PacketDecoder.java +++ /dev/null @@ -1,474 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.hornetq.core.protocol.core.impl; - -import static org.hornetq.core.protocol.core.impl.PacketImpl.CLUSTER_TOPOLOGY; -import static org.hornetq.core.protocol.core.impl.PacketImpl.CLUSTER_TOPOLOGY_V2; -import static org.hornetq.core.protocol.core.impl.PacketImpl.CLUSTER_TOPOLOGY_V3; -import static org.hornetq.core.protocol.core.impl.PacketImpl.CREATESESSION; -import static org.hornetq.core.protocol.core.impl.PacketImpl.CREATESESSION_RESP; -import static org.hornetq.core.protocol.core.impl.PacketImpl.CREATE_QUEUE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.CREATE_SHARED_QUEUE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.DELETE_QUEUE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.DISCONNECT; -import static org.hornetq.core.protocol.core.impl.PacketImpl.DISCONNECT_V2; -import static org.hornetq.core.protocol.core.impl.PacketImpl.DISCONNECT_CONSUMER; -import static org.hornetq.core.protocol.core.impl.PacketImpl.EXCEPTION; -import static org.hornetq.core.protocol.core.impl.PacketImpl.NULL_RESPONSE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.PACKETS_CONFIRMED; -import static org.hornetq.core.protocol.core.impl.PacketImpl.PING; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REATTACH_SESSION; -import static org.hornetq.core.protocol.core.impl.PacketImpl.REATTACH_SESSION_RESP; -import static org.hornetq.core.protocol.core.impl.PacketImpl.CHECK_FOR_FAILOVER; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_ACKNOWLEDGE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_ADD_METADATA; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_ADD_METADATA2; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY_RESP; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_CLOSE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_COMMIT; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_CONSUMER_CLOSE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_CREATECONSUMER; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_EXPIRED; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_FLOWTOKEN; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_INDIVIDUAL_ACKNOWLEDGE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_PRODUCER_CREDITS; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_PRODUCER_FAIL_CREDITS; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_PRODUCER_REQUEST_CREDITS; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY_RESP; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_CONTINUATION; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_ROLLBACK; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_START; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_STOP; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_UNIQUE_ADD_METADATA; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_COMMIT; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_END; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_FAILED; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_FORGET; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT_RESP; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS_RESP; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_JOIN; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_PREPARE; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_RESP; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_RESUME; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_ROLLBACK; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT_RESP; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_START; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_SUSPEND; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SUBSCRIBE_TOPOLOGY; -import static org.hornetq.core.protocol.core.impl.PacketImpl.SUBSCRIBE_TOPOLOGY_V2; - -import java.io.Serializable; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.CheckFailoverMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; -import org.hornetq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; -import org.hornetq.core.protocol.core.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; -import org.hornetq.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; -import org.hornetq.core.protocol.core.impl.wireformat.DisconnectMessage; -import org.hornetq.core.protocol.core.impl.wireformat.DisconnectMessage_V2; -import org.hornetq.core.protocol.core.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.NullResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.PacketsConfirmedMessage; -import org.hornetq.core.protocol.core.impl.wireformat.Ping; -import org.hornetq.core.protocol.core.impl.wireformat.ReattachSessionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.RollbackMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; -import org.hornetq.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionCloseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionCommitMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionExpireMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXACommitMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAEndMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAForgetMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAJoinMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAResumeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXARollbackMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAStartMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; - -/** - * A PacketDecoder - * - * @author Tim Fox - */ -public abstract class PacketDecoder implements Serializable -{ - public abstract Packet decode(final HornetQBuffer in); - - public Packet decode(byte packetType) - { - Packet packet; - - switch (packetType) - { - case PING: - { - packet = new Ping(); - break; - } - case DISCONNECT: - { - packet = new DisconnectMessage(); - break; - } - case DISCONNECT_V2: - { - packet = new DisconnectMessage_V2(); - break; - } - case DISCONNECT_CONSUMER: - { - packet = new DisconnectConsumerMessage(); - break; - } - case EXCEPTION: - { - packet = new HornetQExceptionMessage(); - break; - } - case PACKETS_CONFIRMED: - { - packet = new PacketsConfirmedMessage(); - break; - } - case CREATESESSION: - { - packet = new CreateSessionMessage(); - break; - } - case CHECK_FOR_FAILOVER: - { - packet = new CheckFailoverMessage(); - break; - } - case CREATESESSION_RESP: - { - packet = new CreateSessionResponseMessage(); - break; - } - case REATTACH_SESSION: - { - packet = new ReattachSessionMessage(); - break; - } - case REATTACH_SESSION_RESP: - { - packet = new ReattachSessionResponseMessage(); - break; - } - case SESS_CLOSE: - { - packet = new SessionCloseMessage(); - break; - } - case SESS_CREATECONSUMER: - { - packet = new SessionCreateConsumerMessage(); - break; - } - case SESS_ACKNOWLEDGE: - { - packet = new SessionAcknowledgeMessage(); - break; - } - case SESS_EXPIRED: - { - packet = new SessionExpireMessage(); - break; - } - case SESS_COMMIT: - { - packet = new SessionCommitMessage(); - break; - } - case SESS_ROLLBACK: - { - packet = new RollbackMessage(); - break; - } - case SESS_QUEUEQUERY: - { - packet = new SessionQueueQueryMessage(); - break; - } - case SESS_QUEUEQUERY_RESP: - { - packet = new SessionQueueQueryResponseMessage(); - break; - } - case CREATE_QUEUE: - { - packet = new CreateQueueMessage(); - break; - } - case CREATE_SHARED_QUEUE: - { - packet = new CreateSharedQueueMessage(); - break; - } - case DELETE_QUEUE: - { - packet = new SessionDeleteQueueMessage(); - break; - } - case SESS_BINDINGQUERY: - { - packet = new SessionBindingQueryMessage(); - break; - } - case SESS_BINDINGQUERY_RESP: - { - packet = new SessionBindingQueryResponseMessage(); - break; - } - case SESS_XA_START: - { - packet = new SessionXAStartMessage(); - break; - } - case SESS_XA_FAILED: - { - packet = new SessionXAAfterFailedMessage(); - break; - } - case SESS_XA_END: - { - packet = new SessionXAEndMessage(); - break; - } - case SESS_XA_COMMIT: - { - packet = new SessionXACommitMessage(); - break; - } - case SESS_XA_PREPARE: - { - packet = new SessionXAPrepareMessage(); - break; - } - case SESS_XA_RESP: - { - packet = new SessionXAResponseMessage(); - break; - } - case SESS_XA_ROLLBACK: - { - packet = new SessionXARollbackMessage(); - break; - } - case SESS_XA_JOIN: - { - packet = new SessionXAJoinMessage(); - break; - } - case SESS_XA_SUSPEND: - { - packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND); - break; - } - case SESS_XA_RESUME: - { - packet = new SessionXAResumeMessage(); - break; - } - case SESS_XA_FORGET: - { - packet = new SessionXAForgetMessage(); - break; - } - case SESS_XA_INDOUBT_XIDS: - { - packet = new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS); - break; - } - case SESS_XA_INDOUBT_XIDS_RESP: - { - packet = new SessionXAGetInDoubtXidsResponseMessage(); - break; - } - case SESS_XA_SET_TIMEOUT: - { - packet = new SessionXASetTimeoutMessage(); - break; - } - case SESS_XA_SET_TIMEOUT_RESP: - { - packet = new SessionXASetTimeoutResponseMessage(); - break; - } - case SESS_XA_GET_TIMEOUT: - { - packet = new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT); - break; - } - case SESS_XA_GET_TIMEOUT_RESP: - { - packet = new SessionXAGetTimeoutResponseMessage(); - break; - } - case SESS_START: - { - packet = new PacketImpl(PacketImpl.SESS_START); - break; - } - case SESS_STOP: - { - packet = new PacketImpl(PacketImpl.SESS_STOP); - break; - } - case SESS_FLOWTOKEN: - { - packet = new SessionConsumerFlowCreditMessage(); - break; - } - case SESS_CONSUMER_CLOSE: - { - packet = new SessionConsumerCloseMessage(); - break; - } - case SESS_INDIVIDUAL_ACKNOWLEDGE: - { - packet = new SessionIndividualAcknowledgeMessage(); - break; - } - case NULL_RESPONSE: - { - packet = new NullResponseMessage(); - break; - } - case SESS_RECEIVE_CONTINUATION: - { - packet = new SessionReceiveContinuationMessage(); - break; - } - case SESS_SEND_CONTINUATION: - { - packet = new SessionSendContinuationMessage(); - break; - } - case SESS_PRODUCER_REQUEST_CREDITS: - { - packet = new SessionRequestProducerCreditsMessage(); - break; - } - case SESS_PRODUCER_CREDITS: - { - packet = new SessionProducerCreditsMessage(); - break; - } - case SESS_PRODUCER_FAIL_CREDITS: - { - packet = new SessionProducerCreditsFailMessage(); - break; - } - case SESS_FORCE_CONSUMER_DELIVERY: - { - packet = new SessionForceConsumerDelivery(); - break; - } - case CLUSTER_TOPOLOGY: - { - packet = new ClusterTopologyChangeMessage(); - break; - } - case CLUSTER_TOPOLOGY_V2: - { - packet = new ClusterTopologyChangeMessage_V2(); - break; - } - case CLUSTER_TOPOLOGY_V3: - { - packet = new ClusterTopologyChangeMessage_V3(); - break; - } - case SUBSCRIBE_TOPOLOGY: - { - packet = new SubscribeClusterTopologyUpdatesMessage(); - break; - } - case SUBSCRIBE_TOPOLOGY_V2: - { - packet = new SubscribeClusterTopologyUpdatesMessageV2(); - break; - } - case SESS_ADD_METADATA: - { - packet = new SessionAddMetaDataMessage(); - break; - } - case SESS_ADD_METADATA2: - { - packet = new SessionAddMetaDataMessageV2(); - break; - } - case SESS_UNIQUE_ADD_METADATA: - { - packet = new SessionUniqueAddMetaDataMessage(); - break; - } - case PacketImpl.CHECK_FOR_FAILOVER_REPLY: - { - packet = new CheckFailoverReplyMessage(); - break; - } - default: - { - throw HornetQClientMessageBundle.BUNDLE.invalidType(packetType); - } - } - - return packet; - } - -} diff --git a/integration/hornetq-aerogear-integration/pom.xml b/integration/activemq6-aerogear-integration/pom.xml similarity index 79% rename from integration/hornetq-aerogear-integration/pom.xml rename to integration/activemq6-aerogear-integration/pom.xml index 3375f4dc0e..eda5f3ef90 100644 --- a/integration/hornetq-aerogear-integration/pom.xml +++ b/integration/activemq6-aerogear-integration/pom.xml @@ -3,15 +3,15 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT ../../pom.xml - hornetq-aerogear-integration + activemq6-aerogear-integration jar - HornetQ Aerogear Integration + ActiveMQ6 Aerogear Integration ${project.basedir}/../.. @@ -31,8 +31,8 @@ jboss-logging - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} diff --git a/integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/AeroGearConnectorService.java b/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConnectorService.java similarity index 94% rename from integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/AeroGearConnectorService.java rename to integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConnectorService.java index ed5cea7b3f..e69ee4cd4e 100644 --- a/integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/AeroGearConnectorService.java +++ b/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConnectorService.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.aerogear; +package org.apache.activemq6.integration.aerogear; import java.net.HttpURLConnection; import java.net.URL; @@ -22,19 +22,19 @@ import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.filter.impl.FilterImpl; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.utils.ConfigurationHelper; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.filter.impl.FilterImpl; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HandleStatus; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.utils.ConfigurationHelper; import org.jboss.aerogear.unifiedpush.JavaSender; import org.jboss.aerogear.unifiedpush.SenderClient; import org.jboss.aerogear.unifiedpush.message.MessageResponseCallback; diff --git a/integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/AeroGearConnectorServiceFactory.java b/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConnectorServiceFactory.java similarity index 82% rename from integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/AeroGearConnectorServiceFactory.java rename to integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConnectorServiceFactory.java index ccee9e0f7b..cb9fdaea0e 100644 --- a/integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/AeroGearConnectorServiceFactory.java +++ b/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConnectorServiceFactory.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.aerogear; +package org.apache.activemq6.integration.aerogear; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.ConnectorServiceFactory; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.ConnectorServiceFactory; import java.util.Map; import java.util.Set; diff --git a/integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/AeroGearConstants.java b/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConstants.java similarity index 97% rename from integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/AeroGearConstants.java rename to integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConstants.java index a0349c8573..cead0840b7 100644 --- a/integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/AeroGearConstants.java +++ b/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConstants.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.aerogear; +package org.apache.activemq6.integration.aerogear; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; import java.util.HashSet; import java.util.Set; diff --git a/integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/HornetQAeroGearBundle.java b/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/HornetQAeroGearBundle.java similarity index 94% rename from integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/HornetQAeroGearBundle.java rename to integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/HornetQAeroGearBundle.java index 13a94b964a..cf6649c022 100644 --- a/integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/HornetQAeroGearBundle.java +++ b/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/HornetQAeroGearBundle.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.aerogear; +package org.apache.activemq6.integration.aerogear; -import org.hornetq.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.HornetQIllegalStateException; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; import org.jboss.logging.Messages; diff --git a/integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/HornetQAeroGearLogger.java b/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/HornetQAeroGearLogger.java similarity index 98% rename from integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/HornetQAeroGearLogger.java rename to integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/HornetQAeroGearLogger.java index ee8420c06f..d7e0c7024f 100644 --- a/integration/hornetq-aerogear-integration/src/main/java/org/hornetq/integration/aerogear/HornetQAeroGearLogger.java +++ b/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/HornetQAeroGearLogger.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.aerogear; +package org.apache.activemq6.integration.aerogear; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/integration/hornetq-jboss-as-integration/pom.xml b/integration/activemq6-jboss-as-integration/pom.xml similarity index 83% rename from integration/hornetq-jboss-as-integration/pom.xml rename to integration/activemq6-jboss-as-integration/pom.xml index e159478823..acd545e1e8 100644 --- a/integration/hornetq-jboss-as-integration/pom.xml +++ b/integration/activemq6-jboss-as-integration/pom.xml @@ -3,15 +3,15 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT ../../pom.xml - hornetq-jboss-as-integration + activemq6-jboss-as-integration jar - HornetQ JBoss AS Integration + ActiveMQ6 JBoss AS Integration ${project.basedir}/../.. @@ -31,8 +31,8 @@ jboss-logging - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} diff --git a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/HornetQJBossBundle.java b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/HornetQJBossBundle.java similarity index 95% rename from integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/HornetQJBossBundle.java rename to integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/HornetQJBossBundle.java index f44f6fd250..0df6e1c582 100644 --- a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/HornetQJBossBundle.java +++ b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/HornetQJBossBundle.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.jboss; +package org.apache.activemq6.integration.jboss; import org.jboss.logging.annotations.MessageBundle; diff --git a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/HornetQJBossLogger.java b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/HornetQJBossLogger.java similarity index 97% rename from integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/HornetQJBossLogger.java rename to integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/HornetQJBossLogger.java index 5b866ef893..40beb1cc82 100644 --- a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/HornetQJBossLogger.java +++ b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/HornetQJBossLogger.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.jboss; +package org.apache.activemq6.integration.jboss; import javax.security.auth.Subject; diff --git a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/security/AS4SecurityActions.java b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/AS4SecurityActions.java similarity index 98% rename from integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/security/AS4SecurityActions.java rename to integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/AS4SecurityActions.java index bb15ee2098..f1303e8835 100644 --- a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/security/AS4SecurityActions.java +++ b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/AS4SecurityActions.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.jboss.security; +package org.apache.activemq6.integration.jboss.security; import java.security.AccessController; import java.security.Principal; diff --git a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/security/JBossASSecurityManager.java b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/JBossASSecurityManager.java similarity index 96% rename from integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/security/JBossASSecurityManager.java rename to integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/JBossASSecurityManager.java index dbc27d2c9f..c98579a99a 100644 --- a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/security/JBossASSecurityManager.java +++ b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/JBossASSecurityManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.jboss.security; +package org.apache.activemq6.integration.jboss.security; import java.security.AccessController; import java.security.Principal; @@ -21,11 +21,11 @@ import java.util.Set; import javax.naming.InitialContext; import javax.security.auth.Subject; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.integration.jboss.HornetQJBossLogger; -import org.hornetq.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.integration.jboss.HornetQJBossLogger; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; import org.jboss.security.AuthenticationManager; import org.jboss.security.RealmMapping; import org.jboss.security.SecurityContext; diff --git a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/security/SecurityActions.java b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/SecurityActions.java similarity index 97% rename from integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/security/SecurityActions.java rename to integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/SecurityActions.java index ab09787c73..7c0fc3a3a3 100644 --- a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/security/SecurityActions.java +++ b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/SecurityActions.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.jboss.security; +package org.apache.activemq6.integration.jboss.security; import java.security.AccessController; import java.security.Principal; @@ -18,7 +18,7 @@ import java.security.PrivilegedAction; import javax.security.auth.Subject; -import org.hornetq.integration.jboss.HornetQJBossLogger; +import org.apache.activemq6.integration.jboss.HornetQJBossLogger; import org.jboss.security.SecurityContext; import org.jboss.security.SecurityContextAssociation; import org.jboss.security.SecurityContextFactory; diff --git a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/tm/JBoss4TransactionManagerLocator.java b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/tm/JBoss4TransactionManagerLocator.java similarity index 94% rename from integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/tm/JBoss4TransactionManagerLocator.java rename to integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/tm/JBoss4TransactionManagerLocator.java index 11c19157bb..99ba90ed8a 100644 --- a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/tm/JBoss4TransactionManagerLocator.java +++ b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/tm/JBoss4TransactionManagerLocator.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.jboss.tm; +package org.apache.activemq6.integration.jboss.tm; import javax.transaction.TransactionManager; diff --git a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/tm/JBoss5TransactionManagerLocator.java b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/tm/JBoss5TransactionManagerLocator.java similarity index 94% rename from integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/tm/JBoss5TransactionManagerLocator.java rename to integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/tm/JBoss5TransactionManagerLocator.java index 06142a0d42..44074c5408 100644 --- a/integration/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/tm/JBoss5TransactionManagerLocator.java +++ b/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/tm/JBoss5TransactionManagerLocator.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.jboss.tm; +package org.apache.activemq6.integration.jboss.tm; import javax.transaction.TransactionManager; diff --git a/integration/hornetq-spring-integration/pom.xml b/integration/activemq6-spring-integration/pom.xml similarity index 83% rename from integration/hornetq-spring-integration/pom.xml rename to integration/activemq6-spring-integration/pom.xml index 98ae482bfe..6cb918e479 100644 --- a/integration/hornetq-spring-integration/pom.xml +++ b/integration/activemq6-spring-integration/pom.xml @@ -16,15 +16,15 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT ../../pom.xml - hornetq-spring-integration + activemq6-spring-integration jar - HornetQ Spring Integration + ActiveMQ6 Spring Integration ${project.basedir}/../.. @@ -44,13 +44,13 @@ jboss-logging - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} diff --git a/integration/hornetq-spring-integration/src/main/java/org/hornetq/integration/spring/SpringBindingRegistry.java b/integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/integration/spring/SpringBindingRegistry.java similarity index 93% rename from integration/hornetq-spring-integration/src/main/java/org/hornetq/integration/spring/SpringBindingRegistry.java rename to integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/integration/spring/SpringBindingRegistry.java index 2bcb8525ca..6e1de847a1 100644 --- a/integration/hornetq-spring-integration/src/main/java/org/hornetq/integration/spring/SpringBindingRegistry.java +++ b/integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/integration/spring/SpringBindingRegistry.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.spring; +package org.apache.activemq6.integration.spring; -import org.hornetq.spi.core.naming.BindingRegistry; +import org.apache.activemq6.spi.core.naming.BindingRegistry; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/integration/hornetq-spring-integration/src/main/java/org/hornetq/integration/spring/SpringJmsBootstrap.java b/integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/integration/spring/SpringJmsBootstrap.java similarity index 91% rename from integration/hornetq-spring-integration/src/main/java/org/hornetq/integration/spring/SpringJmsBootstrap.java rename to integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/integration/spring/SpringJmsBootstrap.java index 1457c694d5..ced7d28a0d 100644 --- a/integration/hornetq-spring-integration/src/main/java/org/hornetq/integration/spring/SpringJmsBootstrap.java +++ b/integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/integration/spring/SpringJmsBootstrap.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.spring; +package org.apache.activemq6.integration.spring; -import org.hornetq.jms.server.embedded.EmbeddedJMS; +import org.apache.activemq6.jms.server.embedded.EmbeddedJMS; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; diff --git a/integration/hornetq-spring-integration/src/main/java/org/hornetq/spring/HornetQSpringBundle.java b/integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/spring/HornetQSpringBundle.java similarity index 96% rename from integration/hornetq-spring-integration/src/main/java/org/hornetq/spring/HornetQSpringBundle.java rename to integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/spring/HornetQSpringBundle.java index 697a7e6490..eba1e74780 100644 --- a/integration/hornetq-spring-integration/src/main/java/org/hornetq/spring/HornetQSpringBundle.java +++ b/integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/spring/HornetQSpringBundle.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spring; +package org.apache.activemq6.spring; import org.jboss.logging.annotations.MessageBundle; diff --git a/integration/hornetq-spring-integration/src/main/java/org/hornetq/spring/HornetQSpringLogger.java b/integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/spring/HornetQSpringLogger.java similarity index 96% rename from integration/hornetq-spring-integration/src/main/java/org/hornetq/spring/HornetQSpringLogger.java rename to integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/spring/HornetQSpringLogger.java index 11365d3432..404963a025 100644 --- a/integration/hornetq-spring-integration/src/main/java/org/hornetq/spring/HornetQSpringLogger.java +++ b/integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/spring/HornetQSpringLogger.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.spring; +package org.apache.activemq6.spring; import org.jboss.logging.annotations.MessageLogger; diff --git a/integration/hornetq-twitter-integration/pom.xml b/integration/activemq6-twitter-integration/pom.xml similarity index 75% rename from integration/hornetq-twitter-integration/pom.xml rename to integration/activemq6-twitter-integration/pom.xml index 7bc252e251..e76eb33860 100644 --- a/integration/hornetq-twitter-integration/pom.xml +++ b/integration/activemq6-twitter-integration/pom.xml @@ -3,15 +3,15 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT ../../pom.xml - hornetq-twitter-integration + activemq6-twitter-integration jar - HornetQ Twitter Integration + ActiveMQ6 Twitter Integration ${project.basedir}/../.. @@ -31,8 +31,8 @@ jboss-logging - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} diff --git a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/TwitterConstants.java b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterConstants.java similarity index 98% rename from integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/TwitterConstants.java rename to integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterConstants.java index d70a40958f..a0d22f1ce8 100644 --- a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/TwitterConstants.java +++ b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterConstants.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.twitter; +package org.apache.activemq6.integration.twitter; import java.util.HashSet; import java.util.Set; diff --git a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/TwitterIncomingConnectorServiceFactory.java b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterIncomingConnectorServiceFactory.java similarity index 82% rename from integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/TwitterIncomingConnectorServiceFactory.java rename to integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterIncomingConnectorServiceFactory.java index b843ea260e..fbb72c0796 100644 --- a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/TwitterIncomingConnectorServiceFactory.java +++ b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterIncomingConnectorServiceFactory.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.twitter; +package org.apache.activemq6.integration.twitter; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.ConnectorServiceFactory; -import org.hornetq.integration.twitter.impl.IncomingTweetsHandler; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.ConnectorServiceFactory; +import org.apache.activemq6.integration.twitter.impl.IncomingTweetsHandler; import java.util.Map; import java.util.Set; diff --git a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/TwitterOutgoingConnectorServiceFactory.java b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterOutgoingConnectorServiceFactory.java similarity index 79% rename from integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/TwitterOutgoingConnectorServiceFactory.java rename to integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterOutgoingConnectorServiceFactory.java index 626e8aa9b1..c8557eecd6 100644 --- a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/TwitterOutgoingConnectorServiceFactory.java +++ b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterOutgoingConnectorServiceFactory.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.twitter; +package org.apache.activemq6.integration.twitter; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.ConnectorServiceFactory; -import org.hornetq.integration.twitter.impl.OutgoingTweetsHandler; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.ConnectorServiceFactory; +import org.apache.activemq6.integration.twitter.impl.OutgoingTweetsHandler; import java.util.Map; import java.util.Set; diff --git a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/impl/IncomingTweetsHandler.java b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/impl/IncomingTweetsHandler.java similarity index 92% rename from integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/impl/IncomingTweetsHandler.java rename to integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/impl/IncomingTweetsHandler.java index d9f1650ed4..eca75aea6a 100644 --- a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/impl/IncomingTweetsHandler.java +++ b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/impl/IncomingTweetsHandler.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.twitter.impl; +package org.apache.activemq6.integration.twitter.impl; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.integration.twitter.TwitterConstants; -import org.hornetq.twitter.HornetQTwitterLogger; -import org.hornetq.utils.ConfigurationHelper; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.integration.twitter.TwitterConstants; +import org.apache.activemq6.twitter.HornetQTwitterLogger; +import org.apache.activemq6.utils.ConfigurationHelper; import twitter4j.GeoLocation; import twitter4j.Paging; import twitter4j.Place; diff --git a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/impl/OutgoingTweetsHandler.java b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/impl/OutgoingTweetsHandler.java similarity index 88% rename from integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/impl/OutgoingTweetsHandler.java rename to integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/impl/OutgoingTweetsHandler.java index 2e2c175af7..3bdd2550fc 100644 --- a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/impl/OutgoingTweetsHandler.java +++ b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/impl/OutgoingTweetsHandler.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.twitter.impl; +package org.apache.activemq6.integration.twitter.impl; import java.util.Collections; import java.util.List; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.integration.twitter.TwitterConstants; -import org.hornetq.twitter.HornetQTwitterLogger; -import org.hornetq.utils.ConfigurationHelper; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HandleStatus; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.integration.twitter.TwitterConstants; +import org.apache.activemq6.twitter.HornetQTwitterLogger; +import org.apache.activemq6.utils.ConfigurationHelper; import twitter4j.GeoLocation; import twitter4j.StatusUpdate; import twitter4j.Twitter; @@ -162,7 +162,7 @@ public class OutgoingTweetsHandler implements Consumer, ConnectorService } /* (non-Javadoc) - * @see org.hornetq.core.server.Consumer#getDeliveringMessages() + * @see org.apache.activemq6.core.server.Consumer#getDeliveringMessages() */ @Override public List getDeliveringMessages() diff --git a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/twitter/HornetQTwitterBundle.java b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/twitter/HornetQTwitterBundle.java similarity index 96% rename from integration/hornetq-twitter-integration/src/main/java/org/hornetq/twitter/HornetQTwitterBundle.java rename to integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/twitter/HornetQTwitterBundle.java index 3e16dda5c9..bbfc2e4f73 100644 --- a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/twitter/HornetQTwitterBundle.java +++ b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/twitter/HornetQTwitterBundle.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.twitter; +package org.apache.activemq6.twitter; import org.jboss.logging.annotations.MessageBundle; diff --git a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/twitter/HornetQTwitterLogger.java b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/twitter/HornetQTwitterLogger.java similarity index 98% rename from integration/hornetq-twitter-integration/src/main/java/org/hornetq/twitter/HornetQTwitterLogger.java rename to integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/twitter/HornetQTwitterLogger.java index a70b0d83c3..f77cfe80c5 100644 --- a/integration/hornetq-twitter-integration/src/main/java/org/hornetq/twitter/HornetQTwitterLogger.java +++ b/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/twitter/HornetQTwitterLogger.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.twitter; +package org.apache.activemq6.twitter; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/integration/hornetq-vertx-integration/pom.xml b/integration/activemq6-vertx-integration/pom.xml similarity index 92% rename from integration/hornetq-vertx-integration/pom.xml rename to integration/activemq6-vertx-integration/pom.xml index 3521603ed7..8483e78e7e 100644 --- a/integration/hornetq-vertx-integration/pom.xml +++ b/integration/activemq6-vertx-integration/pom.xml @@ -4,15 +4,15 @@ 4.0.0 - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT ../../pom.xml - hornetq-vertx-integration + activemq6-vertx-integration jar - HornetQ Vert.x Integration + ActiveMQ6 Vert.x Integration @@ -74,8 +74,8 @@ jboss-logging - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} diff --git a/integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/HornetQVertxLogger.java b/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/HornetQVertxLogger.java similarity index 94% rename from integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/HornetQVertxLogger.java rename to integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/HornetQVertxLogger.java index 76d7ba0e38..51725508f0 100644 --- a/integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/HornetQVertxLogger.java +++ b/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/HornetQVertxLogger.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.vertx; +package org.apache.activemq6.integration.vertx; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.core.server.ServerMessage; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.LogMessage; diff --git a/integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/IncomingVertxEventHandler.java b/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/IncomingVertxEventHandler.java similarity index 94% rename from integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/IncomingVertxEventHandler.java rename to integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/IncomingVertxEventHandler.java index 7cb3d14bcd..e2d7598fc2 100644 --- a/integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/IncomingVertxEventHandler.java +++ b/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/IncomingVertxEventHandler.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.vertx; +package org.apache.activemq6.integration.vertx; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.utils.ConfigurationHelper; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.utils.ConfigurationHelper; import org.vertx.java.core.Handler; import org.vertx.java.core.buffer.Buffer; import org.vertx.java.core.eventbus.EventBus; @@ -80,7 +80,7 @@ public class IncomingVertxEventHandler implements ConnectorService this.haGroup = ConfigurationHelper.getStringProperty(VertxConstants.VERTX_HA_GROUP, "hornetq", configuration); this.vertxAddress = ConfigurationHelper.getStringProperty(VertxConstants.VERTX_ADDRESS, - "org.hornetq", configuration); + "org.apache.activemq6", configuration); this.storageManager = storageManager; this.postOffice = postOffice; diff --git a/integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/OutgoingVertxEventHandler.java b/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/OutgoingVertxEventHandler.java similarity index 92% rename from integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/OutgoingVertxEventHandler.java rename to integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/OutgoingVertxEventHandler.java index f74d1cccec..af96f30460 100644 --- a/integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/OutgoingVertxEventHandler.java +++ b/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/OutgoingVertxEventHandler.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.vertx; +package org.apache.activemq6.integration.vertx; import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.utils.ConfigurationHelper; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HandleStatus; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.utils.ConfigurationHelper; import org.vertx.java.core.buffer.Buffer; import org.vertx.java.core.eventbus.EventBus; import org.vertx.java.core.eventbus.ReplyException; @@ -86,7 +86,7 @@ public class OutgoingVertxEventHandler implements Consumer, ConnectorService this.haGroup = ConfigurationHelper.getStringProperty(VertxConstants.VERTX_HA_GROUP, "hornetq", configuration); this.vertxAddress = ConfigurationHelper.getStringProperty(VertxConstants.VERTX_ADDRESS, - "org.hornetq", configuration); + "org.apache.activemq6", configuration); this.publish = ConfigurationHelper.getBooleanProperty(VertxConstants.VERTX_PUBLISH, false, configuration); } diff --git a/integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/VertxConstants.java b/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxConstants.java similarity index 98% rename from integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/VertxConstants.java rename to integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxConstants.java index 5d3d51a6c8..7f5f022854 100644 --- a/integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/VertxConstants.java +++ b/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxConstants.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.vertx; +package org.apache.activemq6.integration.vertx; import java.util.HashSet; import java.util.Set; diff --git a/integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/VertxIncomingConnectorServiceFactory.java b/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxIncomingConnectorServiceFactory.java similarity index 83% rename from integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/VertxIncomingConnectorServiceFactory.java rename to integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxIncomingConnectorServiceFactory.java index 4ecef7a79e..3440de1709 100644 --- a/integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/VertxIncomingConnectorServiceFactory.java +++ b/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxIncomingConnectorServiceFactory.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.vertx; +package org.apache.activemq6.integration.vertx; import java.util.Map; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.ConnectorServiceFactory; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.ConnectorServiceFactory; public class VertxIncomingConnectorServiceFactory implements ConnectorServiceFactory { diff --git a/integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/VertxOutgoingConnectorServiceFactory.java b/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxOutgoingConnectorServiceFactory.java similarity index 83% rename from integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/VertxOutgoingConnectorServiceFactory.java rename to integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxOutgoingConnectorServiceFactory.java index 9922a4a462..5265667cc4 100644 --- a/integration/hornetq-vertx-integration/src/main/java/org/hornetq/integration/vertx/VertxOutgoingConnectorServiceFactory.java +++ b/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxOutgoingConnectorServiceFactory.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.vertx; +package org.apache.activemq6.integration.vertx; import java.util.Map; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.ConnectorServiceFactory; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.ConnectorServiceFactory; public class VertxOutgoingConnectorServiceFactory implements ConnectorServiceFactory { diff --git a/pom.xml b/pom.xml index 5576fc4ccb..b548c99a22 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,16 @@ 4.0.0 - org.hornetq - hornetq-pom + org.apache.activemq6 + activemq6-pom pom - 2.5.0-SNAPSHOT + 6.0.0-SNAPSHOT - hornetq-protocols - hornetq-dto + activemq6-protocols + activemq6-dto - HornetQ Parent + ActiveMQ6 Parent http://hornetq.org Putting the buzz in messaging @@ -476,75 +476,75 @@ true - hornetq-dto - hornetq-bootstrap - hornetq-commons - hornetq-selector - hornetq-core-client - hornetq-server - hornetq-jms-client - hornetq-jms-server - hornetq-journal - hornetq-native - hornetq-ra - hornetq-rest - hornetq-service-sar - hornetq-tools - integration/hornetq-jboss-as-integration - integration/hornetq-spring-integration - integration/hornetq-twitter-integration - integration/hornetq-aerogear-integration - integration/hornetq-vertx-integration + activemq6-dto + activemq6-bootstrap + activemq6-commons + activemq6-selector + activemq6-core-client + activemq6-server + activemq6-jms-client + activemq6-jms-server + activemq6-journal + activemq6-native + activemq6-ra + activemq6-rest + activemq6-service-sar + activemq6-tools + integration/activemq6-jboss-as-integration + integration/activemq6-spring-integration + integration/activemq6-twitter-integration + integration/activemq6-aerogear-integration + integration/activemq6-vertx-integration tests maven-release - hornetq-dto - hornetq-bootstrap - hornetq-commons - hornetq-selector - hornetq-core-client - hornetq-server - hornetq-jms-client - hornetq-jms-server - hornetq-journal - hornetq-native - hornetq-ra - hornetq-rest - hornetq-service-sar - hornetq-tools - integration/hornetq-jboss-as-integration - integration/hornetq-spring-integration - integration/hornetq-twitter-integration - integration/hornetq-aerogear-integration - integration/hornetq-vertx-integration + activemq6-dto + activemq6-bootstrap + activemq6-commons + activemq6-selector + activemq6-core-client + activemq6-server + activemq6-jms-client + activemq6-jms-server + activemq6-journal + activemq6-native + activemq6-ra + activemq6-rest + activemq6-service-sar + activemq6-tools + integration/activemq6-jboss-as-integration + integration/activemq6-spring-integration + integration/activemq6-twitter-integration + integration/activemq6-aerogear-integration + integration/activemq6-vertx-integration examples release - hornetq-dto - hornetq-bootstrap - hornetq-commons - hornetq-selector - hornetq-core-client - hornetq-server - hornetq-jms-client - hornetq-jms-server - hornetq-native - hornetq-journal - hornetq-ra - hornetq-rest - hornetq-service-sar - hornetq-tools - integration/hornetq-jboss-as-integration - integration/hornetq-spring-integration - integration/hornetq-twitter-integration - integration/hornetq-aerogear-integration - integration/hornetq-vertx-integration + activemq6-dto + activemq6-bootstrap + activemq6-commons + activemq6-selector + activemq6-core-client + activemq6-server + activemq6-jms-client + activemq6-jms-server + activemq6-native + activemq6-journal + activemq6-ra + activemq6-rest + activemq6-service-sar + activemq6-tools + integration/activemq6-jboss-as-integration + integration/activemq6-spring-integration + integration/activemq6-twitter-integration + integration/activemq6-aerogear-integration + integration/activemq6-vertx-integration examples docs distribution @@ -553,25 +553,25 @@ hudson-tests - hornetq-dto - hornetq-bootstrap - hornetq-commons - hornetq-selector - hornetq-core-client - hornetq-server - hornetq-jms-client - hornetq-jms-server - hornetq-native - hornetq-journal - hornetq-ra - hornetq-rest - hornetq-service-sar - hornetq-tools - integration/hornetq-jboss-as-integration - integration/hornetq-spring-integration - integration/hornetq-twitter-integration - integration/hornetq-aerogear-integration - integration/hornetq-vertx-integration + activemq6-dto + activemq6-bootstrap + activemq6-commons + activemq6-selector + activemq6-core-client + activemq6-server + activemq6-jms-client + activemq6-jms-server + activemq6-native + activemq6-journal + activemq6-ra + activemq6-rest + activemq6-service-sar + activemq6-tools + integration/activemq6-jboss-as-integration + integration/activemq6-spring-integration + integration/activemq6-twitter-integration + integration/activemq6-aerogear-integration + integration/activemq6-vertx-integration tests @@ -591,25 +591,25 @@ jenkins-fast-tests - hornetq-dto - hornetq-bootstrap - hornetq-commons - hornetq-selector - hornetq-core-client - hornetq-server - hornetq-jms-client - hornetq-jms-server - hornetq-native - hornetq-journal - hornetq-ra - hornetq-rest - hornetq-service-sar - hornetq-tools - integration/hornetq-jboss-as-integration - integration/hornetq-spring-integration - integration/hornetq-twitter-integration - integration/hornetq-aerogear-integration - integration/hornetq-vertx-integration + activemq6-dto + activemq6-bootstrap + activemq6-commons + activemq6-selector + activemq6-core-client + activemq6-server + activemq6-jms-client + activemq6-jms-server + activemq6-native + activemq6-journal + activemq6-ra + activemq6-rest + activemq6-service-sar + activemq6-tools + integration/activemq6-jboss-as-integration + integration/activemq6-spring-integration + integration/activemq6-twitter-integration + integration/activemq6-aerogear-integration + integration/activemq6-vertx-integration tests @@ -625,25 +625,25 @@ examples - hornetq-dto - hornetq-bootstrap - hornetq-commons - hornetq-selector - hornetq-core-client - hornetq-server - hornetq-jms-client - hornetq-jms-server - hornetq-native - hornetq-journal - hornetq-ra - hornetq-rest - hornetq-service-sar - hornetq-tools - integration/hornetq-jboss-as-integration - integration/hornetq-spring-integration - integration/hornetq-twitter-integration - integration/hornetq-aerogear-integration - integration/hornetq-vertx-integration + activemq6-dto + activemq6-bootstrap + activemq6-commons + activemq6-selector + activemq6-core-client + activemq6-server + activemq6-jms-client + activemq6-jms-server + activemq6-native + activemq6-journal + activemq6-ra + activemq6-rest + activemq6-service-sar + activemq6-tools + integration/activemq6-jboss-as-integration + integration/activemq6-spring-integration + integration/activemq6-twitter-integration + integration/activemq6-aerogear-integration + integration/activemq6-vertx-integration tests examples @@ -799,8 +799,8 @@ - org.hornetq - hornetq-maven-plugin + org.apache.activemq6 + activemq6-maven-plugin 1.2.0 @@ -907,7 +907,7 @@ **/filter/impl/Operator.java **/filter/impl/RegExp.java **/utils/UUID*.java - **/org/hornetq/selector/** + **/org/apache/activemq6/selector/** true true diff --git a/tests/byteman-tests/pom.xml b/tests/byteman-tests/pom.xml index cd3bffaf5f..7832f99aa2 100644 --- a/tests/byteman-tests/pom.xml +++ b/tests/byteman-tests/pom.xml @@ -2,14 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.tests - hornetq-tests-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.tests + activemq6-tests-pom + 6.0.0-SNAPSHOT byteman-tests jar - HornetQ ByteMan Tests + ActiveMQ6 ByteMan Tests ${java.home}/../lib/tools.jar @@ -59,51 +59,51 @@ ${tools.jar} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} test test-jar - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests integration-tests ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests unit-tests ${project.version} test test-jar - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-ra + org.apache.activemq6 + activemq6-ra ${project.version} - org.hornetq - hornetq-bootstrap + org.apache.activemq6 + activemq6-bootstrap ${project.version} diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/BMFailoverTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/BMFailoverTest.java similarity index 84% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/BMFailoverTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/BMFailoverTest.java index 4724891e00..c97d9faa50 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/BMFailoverTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/BMFailoverTest.java @@ -11,34 +11,34 @@ * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQTransactionOutcomeUnknownException; -import org.hornetq.api.core.HornetQTransactionRolledBackException; -import org.hornetq.api.core.HornetQUnBlockedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.HornetQClientMessageBundle; -import org.hornetq.core.client.impl.ClientMessageImpl; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.server.Queue; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.tests.integration.cluster.failover.FailoverTestBase; -import org.hornetq.tests.integration.cluster.util.TestableServer; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.HornetQTransactionOutcomeUnknownException; +import org.apache.activemq6.api.core.HornetQTransactionRolledBackException; +import org.apache.activemq6.api.core.HornetQUnBlockedException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.HornetQClientMessageBundle; +import org.apache.activemq6.core.client.impl.ClientMessageImpl; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.tests.integration.cluster.failover.FailoverTestBase; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.utils.UUIDGenerator; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -109,10 +109,10 @@ public class BMFailoverTest extends FailoverTestBase @BMRule ( name = "trace HornetQSessionContext xaEnd", - targetClass = "org.hornetq.core.protocol.core.impl.HornetQSessionContext", + targetClass = "org.apache.activemq6.core.protocol.core.impl.HornetQSessionContext", targetMethod = "xaEnd", targetLocation = "AT EXIT", - action = "org.hornetq.byteman.tests.BMFailoverTest.stopAndThrow()" + action = "org.apache.activemq6.byteman.tests.BMFailoverTest.stopAndThrow()" ) } ) @@ -200,10 +200,10 @@ public class BMFailoverTest extends FailoverTestBase @BMRule ( name = "trace clientsessionimpl commit", - targetClass = "org.hornetq.core.client.impl.ClientSessionImpl", + targetClass = "org.apache.activemq6.core.client.impl.ClientSessionImpl", targetMethod = "start(javax.transaction.xa.Xid, int)", targetLocation = "AT EXIT", - action = "org.hornetq.byteman.tests.BMFailoverTest.serverToStop.getServer().stop(true)" + action = "org.apache.activemq6.byteman.tests.BMFailoverTest.serverToStop.getServer().stop(true)" ) } ) @@ -303,10 +303,10 @@ public class BMFailoverTest extends FailoverTestBase @BMRule ( name = "trace clientsessionimpl commit", - targetClass = "org.hornetq.core.client.impl.ClientSessionImpl", + targetClass = "org.apache.activemq6.core.client.impl.ClientSessionImpl", targetMethod = "commit", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.BMFailoverTest.serverToStop.getServer().stop(true)" + action = "org.apache.activemq6.byteman.tests.BMFailoverTest.serverToStop.getServer().stop(true)" ) } ) @@ -344,10 +344,10 @@ public class BMFailoverTest extends FailoverTestBase @BMRule ( name = "trace clientsessionimpl commit", - targetClass = "org.hornetq.core.client.impl.ClientSessionImpl", + targetClass = "org.apache.activemq6.core.client.impl.ClientSessionImpl", targetMethod = "commit", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.BMFailoverTest.serverToStop.getServer().stop(true)" + action = "org.apache.activemq6.byteman.tests.BMFailoverTest.serverToStop.getServer().stop(true)" ) } ) diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/BridgeServerLocatorConfigurationTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/BridgeServerLocatorConfigurationTest.java similarity index 88% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/BridgeServerLocatorConfigurationTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/BridgeServerLocatorConfigurationTest.java index c30b7b989a..a1ac3aeaeb 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/BridgeServerLocatorConfigurationTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/BridgeServerLocatorConfigurationTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.cluster.impl.BridgeImpl; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Test; @@ -53,7 +53,7 @@ public class BridgeServerLocatorConfigurationTest extends ServiceTestBase @Test @BMRule(name = "check connection ttl", - targetClass = "org.hornetq.byteman.tests.BridgeServerLocatorConfigurationTest", + targetClass = "org.apache.activemq6.byteman.tests.BridgeServerLocatorConfigurationTest", targetMethod = "getBridgeTTL(HornetQServer, String)", targetLocation = "EXIT", action = "$! = $0.getConfiguredBridge($1).serverLocator.getConnectionTTL();") /** @@ -72,7 +72,7 @@ public class BridgeServerLocatorConfigurationTest extends ServiceTestBase Map server1Params = new HashMap(); if (isNetty()) { - server1Params.put("port", org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ClusteredGroupingTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ClusteredGroupingTest.java similarity index 85% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ClusteredGroupingTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ClusteredGroupingTest.java index cd27a49b1e..8974d54119 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ClusteredGroupingTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ClusteredGroupingTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQNonExistentQueueException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.core.server.group.impl.Response; -import org.hornetq.core.server.management.Notification; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.api.core.HornetQNonExistentQueueException; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq6.core.server.group.impl.Response; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -47,18 +47,18 @@ public class ClusteredGroupingTest extends ClusterTestBase @BMRule ( name = "blow-up", - targetClass = "org.hornetq.core.server.group.impl.LocalGroupingHandler", + targetClass = "org.apache.activemq6.core.server.group.impl.LocalGroupingHandler", targetMethod = "removeGrouping", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.ClusteredGroupingTest.pause($1);" + action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.pause($1);" ), @BMRule ( name = "blow-up2", - targetClass = "org.hornetq.core.server.group.impl.GroupHandlingAbstract", + targetClass = "org.apache.activemq6.core.server.group.impl.GroupHandlingAbstract", targetMethod = "forceRemove", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.ClusteredGroupingTest.restart2();" + action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.restart2();" ) } ) @@ -124,16 +124,16 @@ public class ClusteredGroupingTest extends ClusterTestBase @BMRule ( name = "blow-up", - targetClass = "org.hornetq.core.server.group.impl.RemoteGroupingHandler", + targetClass = "org.apache.activemq6.core.server.group.impl.RemoteGroupingHandler", targetMethod = "onNotification", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.ClusteredGroupingTest.pause2($1);" + action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.pause2($1);" ), @BMRule(name = "blow-up2", - targetClass = "org.hornetq.core.server.group.impl.RemoteGroupingHandler", + targetClass = "org.apache.activemq6.core.server.group.impl.RemoteGroupingHandler", targetMethod = "remove", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.ClusteredGroupingTest.restart2();") + action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.restart2();") } ) public void test3serversLocalGoesDown() throws Exception @@ -209,16 +209,16 @@ public class ClusteredGroupingTest extends ClusterTestBase @BMRule ( name = "blow-up", - targetClass = "org.hornetq.core.server.group.impl.LocalGroupingHandler", + targetClass = "org.apache.activemq6.core.server.group.impl.LocalGroupingHandler", targetMethod = "onNotification", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.ClusteredGroupingTest.pause2($1);" + action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.pause2($1);" ), @BMRule(name = "blow-up2", - targetClass = "org.hornetq.core.server.group.impl.LocalGroupingHandler", + targetClass = "org.apache.activemq6.core.server.group.impl.LocalGroupingHandler", targetMethod = "remove", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.ClusteredGroupingTest.restart2();") + action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.restart2();") } ) public void testLocal3serversLocalGoesDown() throws Exception @@ -294,16 +294,16 @@ public class ClusteredGroupingTest extends ClusterTestBase @BMRule ( name = "blow-up", - targetClass = "org.hornetq.core.server.group.impl.LocalGroupingHandler", + targetClass = "org.apache.activemq6.core.server.group.impl.LocalGroupingHandler", targetMethod = "onNotification", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.ClusteredGroupingTest.pause2($1);" + action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.pause2($1);" ), @BMRule(name = "blow-up2", - targetClass = "org.hornetq.core.server.group.impl.LocalGroupingHandler", + targetClass = "org.apache.activemq6.core.server.group.impl.LocalGroupingHandler", targetMethod = "remove", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.ClusteredGroupingTest.restart2();") + action = "org.apache.activemq6.byteman.tests.ClusteredGroupingTest.restart2();") } ) public void testLocal4serversLocalGoesDown() throws Exception diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/GroupingTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/GroupingTest.java similarity index 91% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/GroupingTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/GroupingTest.java index 61e1fce104..bc00810a17 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/GroupingTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/GroupingTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -21,10 +21,10 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.JMSTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -74,10 +74,10 @@ public class GroupingTest extends JMSTestBase @BMRule ( name = "trace clientsessionimpl commit", - targetClass = "org.hornetq.core.server.impl.ServerSessionImpl", + targetClass = "org.apache.activemq6.core.server.impl.ServerSessionImpl", targetMethod = "rollback", targetLocation = "EXIT", - action = "org.hornetq.byteman.tests.GroupingTest.pause();" + action = "org.apache.activemq6.byteman.tests.GroupingTest.pause();" ) } ) diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/HornetQMessageHandlerTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/HornetQMessageHandlerTest.java similarity index 90% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/HornetQMessageHandlerTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/HornetQMessageHandlerTest.java index e800d79408..2b8a8c772e 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/HornetQMessageHandlerTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/HornetQMessageHandlerTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; import com.arjuna.ats.arjuna.coordinator.TransactionReaper; import com.arjuna.ats.arjuna.coordinator.TxControl; import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.server.Queue; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.ra.inflow.HornetQActivationSpec; -import org.hornetq.tests.integration.ra.HornetQRATestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.ra.inflow.HornetQActivationSpec; +import org.apache.activemq6.tests.integration.ra.HornetQRATestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -74,10 +74,10 @@ public class HornetQMessageHandlerTest extends HornetQRATestBase @BMRule ( name = "interrupt", - targetClass = "org.hornetq.core.protocol.core.impl.HornetQSessionContext", + targetClass = "org.apache.activemq6.core.protocol.core.impl.HornetQSessionContext", targetMethod = "xaEnd", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.HornetQMessageHandlerTest.interrupt();" + action = "org.apache.activemq6.byteman.tests.HornetQMessageHandlerTest.interrupt();" ) } ) @@ -154,10 +154,10 @@ public class HornetQMessageHandlerTest extends HornetQRATestBase @BMRule ( name = "interrupt", - targetClass = "org.hornetq.core.protocol.core.impl.HornetQSessionContext", + targetClass = "org.apache.activemq6.core.protocol.core.impl.HornetQSessionContext", targetMethod = "xaEnd", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.HornetQMessageHandlerTest.interrupt();" + action = "org.apache.activemq6.byteman.tests.HornetQMessageHandlerTest.interrupt();" ) } ) diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/JMSBridgeReconnectionTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/JMSBridgeReconnectionTest.java similarity index 79% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/JMSBridgeReconnectionTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/JMSBridgeReconnectionTest.java index e0db2e3375..ccea7107d0 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/JMSBridgeReconnectionTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/JMSBridgeReconnectionTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; -import org.hornetq.core.client.impl.ClientProducerCredits; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.hornetq.jms.bridge.ConnectionFactoryFactory; -import org.hornetq.jms.bridge.QualityOfServiceMode; -import org.hornetq.jms.bridge.impl.JMSBridgeImpl; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.tests.integration.jms.bridge.BridgeTestBase; +import org.apache.activemq6.core.client.impl.ClientProducerCredits; +import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq6.jms.bridge.QualityOfServiceMode; +import org.apache.activemq6.jms.bridge.impl.JMSBridgeImpl; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.tests.integration.jms.bridge.BridgeTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -42,18 +42,18 @@ public class JMSBridgeReconnectionTest extends BridgeTestBase @BMRule ( name = "trace clientsessionimpl send", - targetClass = "org.hornetq.core.protocol.core.impl.ChannelImpl", + targetClass = "org.apache.activemq6.core.protocol.core.impl.ChannelImpl", targetMethod = "send", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.JMSBridgeReconnectionTest.pause($1);" + action = "org.apache.activemq6.byteman.tests.JMSBridgeReconnectionTest.pause($1);" ), @BMRule ( name = "trace sendRegularMessage", - targetClass = "org.hornetq.core.client.impl.ClientProducerImpl", + targetClass = "org.apache.activemq6.core.client.impl.ClientProducerImpl", targetMethod = "sendRegularMessage", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.JMSBridgeReconnectionTest.pause2($1,$2,$3);" + action = "org.apache.activemq6.byteman.tests.JMSBridgeReconnectionTest.pause2($1,$2,$3);" ) } ) diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/LatencyTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/LatencyTest.java similarity index 86% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/LatencyTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/LatencyTest.java index 494d9b38c6..1994248b08 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/LatencyTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/LatencyTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/MessageCopyTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/MessageCopyTest.java similarity index 86% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/MessageCopyTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/MessageCopyTest.java index be4f10371f..b89b35927d 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/MessageCopyTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/MessageCopyTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; import java.util.ArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.tests.util.RandomUtil; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -43,7 +43,7 @@ public class MessageCopyTest @BMRule ( name = "message-copy0", - targetClass = "org.hornetq.core.server.impl.ServerMessageImpl", + targetClass = "org.apache.activemq6.core.server.impl.ServerMessageImpl", targetMethod = "copy()", targetLocation = "ENTRY", action = "System.out.println(\"copy\"), waitFor(\"encode-done\")" @@ -51,15 +51,15 @@ public class MessageCopyTest @BMRule ( name = "message-copy-done", - targetClass = "org.hornetq.core.protocol.core.impl.wireformat.SessionSendMessage", - targetMethod = "encode(org.hornetq.spi.core.protocol.RemotingConnection)", + targetClass = "org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage", + targetMethod = "encode(org.apache.activemq6.spi.core.protocol.RemotingConnection)", targetLocation = "EXIT", action = "System.out.println(\"encodeDone\"), signalWake(\"encode-done\", true)" ), @BMRule ( name = "message-copy1", - targetClass = "org.hornetq.core.buffers.impl.ChannelBufferWrapper", + targetClass = "org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper", targetMethod = "copy(int, int)", condition = "Thread.currentThread().getName().equals(\"T1\")", targetLocation = "EXIT", @@ -67,7 +67,7 @@ public class MessageCopyTest ), @BMRule( name = "JMSServer.stop wait-init", - targetClass = "org.hornetq.byteman.tests.MessageCopyTest", + targetClass = "org.apache.activemq6.byteman.tests.MessageCopyTest", targetMethod = "simulateRead", targetLocation = "EXIT", action = "signalWake(\"finish-read\", true)" diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/OrphanedConsumerTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/OrphanedConsumerTest.java similarity index 82% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/OrphanedConsumerTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/OrphanedConsumerTest.java index 6a278fe1ac..68101bce5e 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/OrphanedConsumerTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/OrphanedConsumerTest.java @@ -11,19 +11,19 @@ * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -126,20 +126,20 @@ public class OrphanedConsumerTest extends ServiceTestBase @BMRule ( name = "closeExit", - targetClass = "org.hornetq.core.server.impl.ServerConsumerImpl", + targetClass = "org.apache.activemq6.core.server.impl.ServerConsumerImpl", targetMethod = "close", targetLocation = "AT EXIT", - condition = "org.hornetq.byteman.tests.OrphanedConsumerTest.isConditionActive()", + condition = "org.apache.activemq6.byteman.tests.OrphanedConsumerTest.isConditionActive()", action = "System.out.println(\"throwing stuff\");throw new InterruptedException()" ), @BMRule ( name = "closeEnter", - targetClass = "org.hornetq.core.server.impl.ServerConsumerImpl", + targetClass = "org.apache.activemq6.core.server.impl.ServerConsumerImpl", targetMethod = "close", targetLocation = "ENTRY", - condition = "org.hornetq.byteman.tests.OrphanedConsumerTest.isConditionActive()", - action = "org.hornetq.byteman.tests.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()" + condition = "org.apache.activemq6.byteman.tests.OrphanedConsumerTest.isConditionActive()", + action = "org.apache.activemq6.byteman.tests.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()" ) } @@ -165,20 +165,20 @@ public class OrphanedConsumerTest extends ServiceTestBase @BMRule ( name = "closeExit", - targetClass = "org.hornetq.core.server.impl.ServerConsumerImpl", + targetClass = "org.apache.activemq6.core.server.impl.ServerConsumerImpl", targetMethod = "close", targetLocation = "AT EXIT", - condition = "org.hornetq.byteman.tests.OrphanedConsumerTest.isConditionActive()", + condition = "org.apache.activemq6.byteman.tests.OrphanedConsumerTest.isConditionActive()", action = "System.out.println(\"throwing stuff\");throw new InterruptedException()" ), @BMRule ( name = "closeEnter", - targetClass = "org.hornetq.core.server.impl.ServerConsumerImpl", + targetClass = "org.apache.activemq6.core.server.impl.ServerConsumerImpl", targetMethod = "close", targetLocation = "ENTRY", - condition = "org.hornetq.byteman.tests.OrphanedConsumerTest.isConditionActive()", - action = "org.hornetq.byteman.tests.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()" + condition = "org.apache.activemq6.byteman.tests.OrphanedConsumerTest.isConditionActive()", + action = "org.apache.activemq6.byteman.tests.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()" ) } diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/PagingLeakTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/PagingLeakTest.java similarity index 83% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/PagingLeakTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/PagingLeakTest.java index 654de4c5c1..9bba2e4c8d 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/PagingLeakTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/PagingLeakTest.java @@ -11,27 +11,27 @@ * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.paging.cursor.impl.PagePositionImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -70,18 +70,18 @@ public class PagingLeakTest extends ServiceTestBase @BMRule ( name = "newPosition", - targetClass = "org.hornetq.core.paging.cursor.impl.PagePositionImpl", + targetClass = "org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl", targetMethod = "()", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.PagingLeakTest.newPosition()" + action = "org.apache.activemq6.byteman.tests.PagingLeakTest.newPosition()" ), @BMRule ( name = "finalPosition", - targetClass = "org.hornetq.core.paging.cursor.impl.PagePositionImpl", + targetClass = "org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl", targetMethod = "finalize", targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.PagingLeakTest.deletePosition()" + action = "org.apache.activemq6.byteman.tests.PagingLeakTest.deletePosition()" ) } ) diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ScaleDownFailoverTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownFailoverTest.java similarity index 89% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ScaleDownFailoverTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownFailoverTest.java index 05c7245448..74969f95b6 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ScaleDownFailoverTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownFailoverTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.core.config.ScaleDownConfiguration; -import org.hornetq.core.config.ha.LiveOnlyPolicyConfiguration; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.core.config.ScaleDownConfiguration; +import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.After; @@ -96,11 +96,11 @@ public class ScaleDownFailoverTest extends ClusterTestBase @BMRule ( name = "blow-up", - targetClass = "org.hornetq.api.core.client.ServerLocator", - targetMethod = "createSessionFactory(org.hornetq.api.core.TransportConfiguration, int, boolean)", + targetClass = "org.apache.activemq6.api.core.client.ServerLocator", + targetMethod = "createSessionFactory(org.apache.activemq6.api.core.TransportConfiguration, int, boolean)", isInterface = true, targetLocation = "ENTRY", - action = "org.hornetq.byteman.tests.ScaleDownFailoverTest.fail($1);" + action = "org.apache.activemq6.byteman.tests.ScaleDownFailoverTest.fail($1);" ) public void testScaleDownWhenFirstServerFails() throws Exception { diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ScaleDownFailureTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownFailureTest.java similarity index 87% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ScaleDownFailureTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownFailureTest.java index 44cd4df196..f109933f8a 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ScaleDownFailureTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownFailureTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.core.config.ScaleDownConfiguration; -import org.hornetq.core.config.ha.LiveOnlyPolicyConfiguration; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.core.config.ScaleDownConfiguration; +import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.After; @@ -74,8 +74,8 @@ public class ScaleDownFailureTest extends ClusterTestBase @BMRule ( name = "blow-up", - targetClass = "org.hornetq.api.core.client.ServerLocator", - targetMethod = "createSessionFactory(org.hornetq.api.core.TransportConfiguration, int, boolean)", + targetClass = "org.apache.activemq6.api.core.client.ServerLocator", + targetMethod = "createSessionFactory(org.apache.activemq6.api.core.TransportConfiguration, int, boolean)", isInterface = true, targetLocation = "ENTRY", action = "throw new Exception()" diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ScaleDownGroupedFailoverTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownGroupedFailoverTest.java similarity index 94% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ScaleDownGroupedFailoverTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownGroupedFailoverTest.java index 4134ddc83d..83c0b2ea79 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ScaleDownGroupedFailoverTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownGroupedFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; public class ScaleDownGroupedFailoverTest extends ScaleDownFailoverTest { diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ScaleDownGroupedFailureTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownGroupedFailureTest.java similarity index 94% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ScaleDownGroupedFailureTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownGroupedFailureTest.java index cab98bcb2b..7e51c6ac95 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/ScaleDownGroupedFailureTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownGroupedFailureTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; public class ScaleDownGroupedFailureTest extends ScaleDownFailureTest { diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/StartStopDeadlockTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/StartStopDeadlockTest.java similarity index 84% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/StartStopDeadlockTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/StartStopDeadlockTest.java index a813bfb8c6..58ce3fda39 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/StartStopDeadlockTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/StartStopDeadlockTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -51,7 +51,7 @@ public class StartStopDeadlockTest extends ServiceTestBase @BMRule ( name = "Server.start wait-init", - targetClass = "org.hornetq.core.server.impl.HornetQServerImpl", + targetClass = "org.apache.activemq6.core.server.impl.HornetQServerImpl", targetMethod = "initialisePart2", targetLocation = "ENTRY", condition = "incrementCounter(\"server-Init\") == 2", @@ -59,14 +59,14 @@ public class StartStopDeadlockTest extends ServiceTestBase ), @BMRule( name = "JMSServer.stop wait-init", - targetClass = "org.hornetq.jms.server.impl.JMSServerManagerImpl", + targetClass = "org.apache.activemq6.jms.server.impl.JMSServerManagerImpl", targetMethod = "stop", targetLocation = "ENTRY", action = "signalWake(\"start-init\", true)" ), @BMRule( name = "StartStopDeadlockTest tearDown", - targetClass = "org.hornetq.byteman.tests.StartStopDeadlockTest", + targetClass = "org.apache.activemq6.byteman.tests.StartStopDeadlockTest", targetMethod = "tearDown", targetLocation = "ENTRY", action = "deleteCounter(\"server-Init\")" diff --git a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/StompInternalStateTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/StompInternalStateTest.java similarity index 77% rename from tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/StompInternalStateTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/StompInternalStateTest.java index 7bde640821..aad3ccb0e9 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/byteman/tests/StompInternalStateTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/StompInternalStateTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.byteman.tests; +package org.apache.activemq6.byteman.tests; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.protocol.stomp.StompProtocolManagerFactory; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.management.Notification; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.protocol.stomp.StompProtocolManagerFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -54,10 +54,10 @@ public class StompInternalStateTest extends ServiceTestBase @BMRule ( name = "StompProtocolManager Leak Server Rule", - targetClass = "org.hornetq.core.protocol.stomp.StompProtocolManager", - targetMethod = "onNotification(org.hornetq.core.server.management.Notification)", + targetClass = "org.apache.activemq6.core.protocol.stomp.StompProtocolManager", + targetMethod = "onNotification(org.apache.activemq6.core.server.management.Notification)", targetLocation = "EXIT", - helper = "org.hornetq.byteman.tests.StompInternalStateTest", + helper = "org.apache.activemq6.byteman.tests.StompInternalStateTest", action = "verifyBindingAddRemove($1, $0.destinations)" ) } diff --git a/tests/byteman-tests/src/test/java/org/hornetq/core/settings/impl/HierarchicalObjectRepositoryTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq6/core/settings/impl/HierarchicalObjectRepositoryTest.java similarity index 94% rename from tests/byteman-tests/src/test/java/org/hornetq/core/settings/impl/HierarchicalObjectRepositoryTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq6/core/settings/impl/HierarchicalObjectRepositoryTest.java index f32102c1d7..378cf3fa77 100644 --- a/tests/byteman-tests/src/test/java/org/hornetq/core/settings/impl/HierarchicalObjectRepositoryTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq6/core/settings/impl/HierarchicalObjectRepositoryTest.java @@ -13,7 +13,7 @@ /** * */ -package org.hornetq.core.settings.impl; +package org.apache.activemq6.core.settings.impl; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -31,9 +31,9 @@ import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) @BMRules(rules = { @BMRule(name = "modify map during iteration", - targetClass = "org.hornetq.core.settings.impl.HierarchicalObjectRepository", + targetClass = "org.apache.activemq6.core.settings.impl.HierarchicalObjectRepository", targetMethod = "getPossibleMatches(String)", targetLocation = "AT INVOKE java.util.HashMap.put", - action = "org.hornetq.core.settings.impl.HierarchicalObjectRepositoryTest.bum()"), }) + action = "org.apache.activemq6.core.settings.impl.HierarchicalObjectRepositoryTest.bum()"), }) public class HierarchicalObjectRepositoryTest { private static final String A = "a."; diff --git a/tests/concurrent-tests/pom.xml b/tests/concurrent-tests/pom.xml index a3f478c249..add388b748 100644 --- a/tests/concurrent-tests/pom.xml +++ b/tests/concurrent-tests/pom.xml @@ -15,14 +15,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.tests - hornetq-tests-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.tests + activemq6-tests-pom + 6.0.0-SNAPSHOT concurrent-tests jar - HornetQ concurrent Tests + ActiveMQ6 concurrent Tests ${project.basedir}/../.. @@ -30,46 +30,46 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} test test-jar - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests unit-tests ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests integration-tests ${project.version} test test-jar - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-ra + org.apache.activemq6 + activemq6-ra ${project.version} - org.hornetq - hornetq-bootstrap + org.apache.activemq6 + activemq6-bootstrap ${project.version} diff --git a/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/server/impl/QueueTest.java b/tests/concurrent-tests/src/test/java/org/apache/activemq6/tests/concurrent/server/impl/QueueTest.java similarity index 88% rename from tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/server/impl/QueueTest.java rename to tests/concurrent-tests/src/test/java/org/apache/activemq6/tests/concurrent/server/impl/QueueTest.java index 7dbeba3e59..1e1c448df3 100644 --- a/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/server/impl/QueueTest.java +++ b/tests/concurrent-tests/src/test/java/org/apache/activemq6/tests/concurrent/server/impl/QueueTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.concurrent.server.impl; +package org.apache.activemq6.tests.concurrent.server.impl; import org.junit.Before; import org.junit.After; @@ -19,16 +19,16 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.unit.core.server.impl.fakes.FakeConsumer; -import org.hornetq.tests.unit.core.server.impl.fakes.FakeQueueFactory; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.HandleStatus; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakeConsumer; +import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakeQueueFactory; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java b/tests/concurrent-tests/src/test/java/org/apache/activemq6/tests/concurrent/stomp/ConcurrentStompTest.java similarity index 96% rename from tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java rename to tests/concurrent-tests/src/test/java/org/apache/activemq6/tests/concurrent/stomp/ConcurrentStompTest.java index f36d9e9856..097be68baf 100644 --- a/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java +++ b/tests/concurrent-tests/src/test/java/org/apache/activemq6/tests/concurrent/stomp/ConcurrentStompTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.concurrent.stomp; +package org.apache.activemq6.tests.concurrent.stomp; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -21,8 +21,8 @@ import java.nio.charset.StandardCharsets; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.core.protocol.stomp.Stomp; -import org.hornetq.tests.integration.stomp.StompTestBase; +import org.apache.activemq6.core.protocol.stomp.Stomp; +import org.apache.activemq6.tests.integration.stomp.StompTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml index f25fddc620..66917ca1cf 100644 --- a/tests/integration-tests/pom.xml +++ b/tests/integration-tests/pom.xml @@ -2,14 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.tests - hornetq-tests-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.tests + activemq6-tests-pom + 6.0.0-SNAPSHOT integration-tests jar - HornetQ Integration Tests + ActiveMQ6 Integration Tests ${project.basedir}/../.. @@ -19,94 +19,94 @@ - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests unit-tests ${project.version} test test-jar - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} test test-jar - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-ra + org.apache.activemq6 + activemq6-ra ${project.version} - org.hornetq - hornetq-bootstrap + org.apache.activemq6 + activemq6-bootstrap ${project.version} - org.hornetq - hornetq-commons + org.apache.activemq6 + activemq6-commons ${project.version} - org.hornetq - hornetq-tools + org.apache.activemq6 + activemq6-tools ${project.version} - org.hornetq - hornetq-twitter-integration + org.apache.activemq6 + activemq6-twitter-integration ${project.version} - org.hornetq - hornetq-spring-integration + org.apache.activemq6 + activemq6-spring-integration ${project.version} - org.hornetq - hornetq-vertx-integration + org.apache.activemq6 + activemq6-vertx-integration ${project.version} - org.hornetq - hornetq-journal + org.apache.activemq6 + activemq6-journal ${project.version} - org.hornetq - hornetq-amqp-protocol + org.apache.activemq6 + activemq6-amqp-protocol ${project.version} - org.hornetq - hornetq-stomp-protocol + org.apache.activemq6 + activemq6-stomp-protocol ${project.version} - org.hornetq - hornetq-openwire-protocol + org.apache.activemq6 + activemq6-openwire-protocol ${project.version} - org.hornetq - hornetq-aerogear-integration + org.apache.activemq6 + activemq6-aerogear-integration ${project.version} diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/DuplicateDetectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/DuplicateDetectionTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/DuplicateDetectionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/DuplicateDetectionTest.java index e1a859e054..83e9be97b8 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/DuplicateDetectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/DuplicateDetectionTest.java @@ -10,32 +10,32 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration; +package org.apache.activemq6.tests.integration; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQDuplicateIdException; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.postoffice.impl.PostOfficeImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.HornetQDuplicateIdException; +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.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.UUIDGenerator; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/IntegrationTestLogger.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/IntegrationTestLogger.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/IntegrationTestLogger.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/IntegrationTestLogger.java index 0e5e6b5b57..7a1a81621f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/IntegrationTestLogger.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/IntegrationTestLogger.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration; +package org.apache.activemq6.tests.integration; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/InterceptorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/InterceptorTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/InterceptorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/InterceptorTest.java index cf18ea7b45..db7d8595b1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/InterceptorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/InterceptorTest.java @@ -10,34 +10,34 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration; +package org.apache.activemq6.tests.integration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientConsumerImpl; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.ServerSessionPacketHandler; -import org.hornetq.core.protocol.core.impl.ChannelImpl; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.RemotingConnectionImpl; -import org.hornetq.core.protocol.core.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.protocol.core.impl.wireformat.MessagePacket; -import org.hornetq.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientConsumerImpl; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.ServerSessionPacketHandler; +import org.apache.activemq6.core.protocol.core.impl.ChannelImpl; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.RemotingConnectionImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateQueueMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.MessagePacket; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/SimpleNotificationService.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/SimpleNotificationService.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/SimpleNotificationService.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/SimpleNotificationService.java index d5855228c0..5f2c518dd3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/SimpleNotificationService.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/SimpleNotificationService.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration; +package org.apache.activemq6.tests.integration; import java.util.ArrayList; import java.util.List; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationListener; -import org.hornetq.core.server.management.NotificationService; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationListener; +import org.apache.activemq6.core.server.management.NotificationService; /** * A SimpleNotificationService diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/String64KLimitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/String64KLimitTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/String64KLimitTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/String64KLimitTest.java index 5ef7f8551a..cfae5a66a2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/String64KLimitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/String64KLimitTest.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration; +package org.apache.activemq6.tests.integration; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/aerogear/AeroGearBasicServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/aerogear/AeroGearBasicServerTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/aerogear/AeroGearBasicServerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/aerogear/AeroGearBasicServerTest.java index 41819bbad7..33da2aecc9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/aerogear/AeroGearBasicServerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/aerogear/AeroGearBasicServerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.aerogear; +package org.apache.activemq6.tests.integration.aerogear; import javax.servlet.ServletException; @@ -21,27 +21,27 @@ import java.util.HashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ConnectorServiceConfiguration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.integration.aerogear.AeroGearConnectorServiceFactory; -import org.hornetq.integration.aerogear.AeroGearConstants; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONException; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ConnectorServiceConfiguration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.integration.aerogear.AeroGearConnectorServiceFactory; +import org.apache.activemq6.integration.aerogear.AeroGearConstants; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONException; +import org.apache.activemq6.utils.json.JSONObject; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AckBatchSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AckBatchSizeTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AckBatchSizeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AckBatchSizeTest.java index b7ec2ae7f6..6525823ac7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AckBatchSizeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AckBatchSizeTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AcknowledgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AcknowledgeTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AcknowledgeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AcknowledgeTest.java index 5d0362c8be..ad5c8bbd6a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AcknowledgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AcknowledgeTest.java @@ -10,33 +10,33 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQPropertyConversionException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.protocol.core.impl.HornetQConsumerContext; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.spi.core.remoting.ConsumerContext; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.utils.UUID; +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.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.protocol.core.impl.HornetQConsumerContext; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.spi.core.remoting.ConsumerContext; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.utils.UUID; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AddressSettingsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AddressSettingsTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AddressSettingsTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AddressSettingsTest.java index d5e5414dc2..17604feb40 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AddressSettingsTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AddressSettingsTest.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AutoCloseCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AutoCloseCoreTest.java similarity index 81% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AutoCloseCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AutoCloseCoreTest.java index 6c126c1297..c2ecd06b5a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AutoCloseCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AutoCloseCoreTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.tests.util.SingleServerTestBase; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.tests.util.SingleServerTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AutogroupIdTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AutogroupIdTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AutogroupIdTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AutogroupIdTest.java index 6f017e1fc2..3523186b81 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AutogroupIdTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AutogroupIdTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.concurrent.CountDownLatch; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/BlockingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/BlockingSendTest.java similarity index 81% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/BlockingSendTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/BlockingSendTest.java index a739f9fcac..93cbae3b72 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/BlockingSendTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/BlockingSendTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CommitRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CommitRollbackTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CommitRollbackTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CommitRollbackTest.java index ce687ace38..6dc6e63d35 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CommitRollbackTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CommitRollbackTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConcurrentCreateDeleteProduceTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConcurrentCreateDeleteProduceTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConcurrentCreateDeleteProduceTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConcurrentCreateDeleteProduceTest.java index 5923fc5a95..cd7b7c9232 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConcurrentCreateDeleteProduceTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConcurrentCreateDeleteProduceTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.HashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerCloseTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerCloseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerCloseTest.java index f3d10db90d..153998a8bb 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerCloseTest.java @@ -10,32 +10,32 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientConsumerImpl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +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.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientConsumerImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerFilterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerFilterTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerFilterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerFilterTest.java index ae82adcace..45980dcc12 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerFilterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerFilterTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerRoundRobinTest.java similarity index 80% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerRoundRobinTest.java index fd303e7afe..c32435524e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerRoundRobinTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerStuckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerStuckTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerStuckTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerStuckTest.java index e9b1a38381..52aac844a8 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerStuckTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerStuckTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.protocol.core.impl.RemotingConnectionImpl; -import org.hornetq.core.remoting.impl.netty.NettyConnection; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq6.core.protocol.core.impl.RemotingConnectionImpl; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnection; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerTest.java index 96fca27a6d..e13c2b9651 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.Arrays; import java.util.Collection; @@ -19,24 +19,24 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.utils.ConcurrentHashSet; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.Interceptor; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.utils.ConcurrentHashSet; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerWindowSizeTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerWindowSizeTest.java index 60324cf6ce..10dcaebb73 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerWindowSizeTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.io.IOException; import java.io.OutputStream; @@ -20,24 +20,24 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientConsumerInternal; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.ServerConsumerImpl; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientConsumerInternal; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.QueueBinding; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.ServerConsumerImpl; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -1171,7 +1171,7 @@ public class ConsumerWindowSizeTest extends ServiceTestBase int count = 0; /* (non-Javadoc) - * @see org.hornetq.api.core.client.MessageHandler#onMessage(org.hornetq.api.core.client.ClientMessage) + * @see org.apache.activemq6.api.core.client.MessageHandler#onMessage(org.hornetq.api.core.client.ClientMessage) */ public synchronized void onMessage(final ClientMessage message) { @@ -1331,7 +1331,7 @@ public class ConsumerWindowSizeTest extends ServiceTestBase int count = 0; /* (non-Javadoc) - * @see org.hornetq.api.core.client.MessageHandler#onMessage(org.hornetq.api.core.client.ClientMessage) + * @see org.apache.activemq6.api.core.client.MessageHandler#onMessage(org.hornetq.api.core.client.ClientMessage) */ public synchronized void onMessage(final ClientMessage message) { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CoreClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CoreClientTest.java similarity index 79% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CoreClientTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CoreClientTest.java index a87f180479..e0754a05ba 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CoreClientTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CoreClientTest.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; public class CoreClientTest extends ServiceTestBase { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CreateQueueIdempotentTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CreateQueueIdempotentTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CreateQueueIdempotentTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CreateQueueIdempotentTest.java index ca11aa42a7..36bfc24e8d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CreateQueueIdempotentTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CreateQueueIdempotentTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQQueueExistsException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.ServiceTestBase; +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.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DeadLetterAddressTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeadLetterAddressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DeadLetterAddressTest.java index e88ca83879..9c98e859a9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeadLetterAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DeadLetterAddressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.Test; @@ -22,27 +22,27 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +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.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeliveryOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DeliveryOrderTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeliveryOrderTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DeliveryOrderTest.java index ed539439dc..0b1ac3dfae 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeliveryOrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DeliveryOrderTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DurableQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DurableQueueTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DurableQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DurableQueueTest.java index c905755a91..35f5a667bb 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DurableQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DurableQueueTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * A TemporaryQueueTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpireTestOnRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpireTestOnRestartTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpireTestOnRestartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpireTestOnRestartTest.java index 1c28243572..fc79c87eb8 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpireTestOnRestartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpireTestOnRestartTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpiryAddressTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryAddressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpiryAddressTest.java index edddb8e7d1..5ede7960e6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpiryAddressTest.java @@ -10,32 +10,32 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; -import org.hornetq.core.message.impl.MessageImpl; +package org.apache.activemq6.tests.integration.client; +import org.apache.activemq6.core.message.impl.MessageImpl; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpiryLargeMessageTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryLargeMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpiryLargeMessageTest.java index 0044d9d0e5..2721caad2a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpiryLargeMessageTest.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.io.File; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/FailureDeadlockTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/FailureDeadlockTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/FailureDeadlockTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/FailureDeadlockTest.java index 8435a5e508..2add1778da 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/FailureDeadlockTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/FailureDeadlockTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.After; @@ -21,20 +21,20 @@ import javax.jms.ExceptionListener; import javax.jms.JMSException; import javax.jms.Session; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.jms.server.management.NullInitialContext; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQSession; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.jms.server.management.NullInitialContext; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java index 7892bf1e8d..1ff77c8564 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.Test; @@ -29,8 +29,8 @@ import javax.jms.TopicSubscriber; import javax.naming.Context; import javax.naming.NamingException; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.JMSTestBase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/HangConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HangConsumerTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/HangConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HangConsumerTest.java index cfe619f552..45278aa24b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/HangConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HangConsumerTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.ServerConsumer; +package org.apache.activemq6.tests.integration.client; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.ServerConsumer; import org.junit.Before; import org.junit.After; import org.junit.Test; @@ -29,47 +29,47 @@ import java.util.concurrent.TimeUnit; import javax.management.MBeanServer; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.impl.journal.JournalRecordIds; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveMessage; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.ServerSessionFactory; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.QueueFactoryImpl; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.core.server.impl.ServerSessionImpl; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.spi.core.protocol.SessionCallback; -import org.hornetq.spi.core.remoting.ReadyListener; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.ReusableLatch; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.ServerSessionFactory; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.QueueFactoryImpl; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.core.server.impl.ServerSessionImpl; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq6.spi.core.remoting.ReadyListener; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.ReusableLatch; /** * This test will simulate a consumer hanging on the delivery packet due to unbehaved clients @@ -536,7 +536,7 @@ public class HangConsumerTest extends ServiceTestBase } /* (non-Javadoc) - * @see org.hornetq.spi.core.protocol.SessionCallback#sendProducerCreditsMessage(int, org.hornetq.api.core.SimpleString) + * @see org.apache.activemq6.spi.core.protocol.SessionCallback#sendProducerCreditsMessage(int, org.hornetq.api.core.SimpleString) */ @Override public void sendProducerCreditsMessage(int credits, SimpleString address) @@ -550,7 +550,7 @@ public class HangConsumerTest extends ServiceTestBase } /* (non-Javadoc) - * @see org.hornetq.spi.core.protocol.SessionCallback#sendMessage(org.hornetq.core.server.ServerMessage, long, int) + * @see org.apache.activemq6.spi.core.protocol.SessionCallback#sendMessage(org.hornetq.core.server.ServerMessage, long, int) */ @Override public int sendMessage(ServerMessage message, ServerConsumer consumer, int deliveryCount) @@ -578,7 +578,7 @@ public class HangConsumerTest extends ServiceTestBase } /* (non-Javadoc) - * @see org.hornetq.spi.core.protocol.SessionCallback#sendLargeMessage(org.hornetq.core.server.ServerMessage, long, long, int) + * @see org.apache.activemq6.spi.core.protocol.SessionCallback#sendLargeMessage(org.hornetq.core.server.ServerMessage, long, long, int) */ @Override public int sendLargeMessage(ServerMessage message, ServerConsumer consumer, long bodySize, int deliveryCount) @@ -587,7 +587,7 @@ public class HangConsumerTest extends ServiceTestBase } /* (non-Javadoc) - * @see org.hornetq.spi.core.protocol.SessionCallback#sendLargeMessageContinuation(long, byte[], boolean, boolean) + * @see org.apache.activemq6.spi.core.protocol.SessionCallback#sendLargeMessageContinuation(long, byte[], boolean, boolean) */ @Override public int sendLargeMessageContinuation(ServerConsumer consumer, byte[] body, boolean continues, boolean requiresResponse) @@ -596,7 +596,7 @@ public class HangConsumerTest extends ServiceTestBase } /* (non-Javadoc) - * @see org.hornetq.spi.core.protocol.SessionCallback#closed() + * @see org.apache.activemq6.spi.core.protocol.SessionCallback#closed() */ @Override public void closed() @@ -605,7 +605,7 @@ public class HangConsumerTest extends ServiceTestBase } /* (non-Javadoc) - * @see org.hornetq.spi.core.protocol.SessionCallback#addReadyListener(org.hornetq.spi.core.remoting.ReadyListener) + * @see org.apache.activemq6.spi.core.protocol.SessionCallback#addReadyListener(org.hornetq.spi.core.remoting.ReadyListener) */ @Override public void addReadyListener(ReadyListener listener) @@ -614,7 +614,7 @@ public class HangConsumerTest extends ServiceTestBase } /* (non-Javadoc) - * @see org.hornetq.spi.core.protocol.SessionCallback#removeReadyListener(org.hornetq.spi.core.remoting.ReadyListener) + * @see org.apache.activemq6.spi.core.protocol.SessionCallback#removeReadyListener(org.hornetq.spi.core.remoting.ReadyListener) */ @Override public void removeReadyListener(ReadyListener listener) diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/HeuristicXATest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HeuristicXATest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/HeuristicXATest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HeuristicXATest.java index b737f83ad3..153c9e24b7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/HeuristicXATest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HeuristicXATest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.After; @@ -25,21 +25,21 @@ import javax.transaction.xa.Xid; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.HornetQServerControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.tests.integration.management.ManagementControlHelper; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.HornetQServerControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.tests.integration.management.ManagementControlHelper; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * A HeuristicXATest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/HornetQCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HornetQCrashTest.java similarity index 73% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/HornetQCrashTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HornetQCrashTest.java index 55dc38e320..855de2dbee 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/HornetQCrashTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HornetQCrashTest.java @@ -10,34 +10,34 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.TransportConfiguration; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InVMNonPersistentMessageBufferTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InVMNonPersistentMessageBufferTest.java index 59fbe3e2c2..73a2367224 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InVMNonPersistentMessageBufferTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.After; @@ -18,17 +18,17 @@ import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.utils.DataConstants; public class InVMNonPersistentMessageBufferTest extends ServiceTestBase { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/InVMPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InVMPersistentMessageBufferTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/InVMPersistentMessageBufferTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InVMPersistentMessageBufferTest.java index 909addca3d..dd8bf5c3d9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/InVMPersistentMessageBufferTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InVMPersistentMessageBufferTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; /** * A InVMPersistentMessageBufferTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/IncompatibleVersionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/IncompatibleVersionTest.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/IncompatibleVersionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/IncompatibleVersionTest.java index ec7f135211..672cb9a36f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/IncompatibleVersionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/IncompatibleVersionTest.java @@ -10,40 +10,40 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.io.FileOutputStream; import java.io.InputStream; import java.util.Properties; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQIncompatibleClientServerException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.version.impl.VersionImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.SpawnedVMSupport; -import org.hornetq.utils.VersionLoader; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQIncompatibleClientServerException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSessionMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; +import org.apache.activemq6.core.remoting.server.impl.RemotingServiceImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.version.impl.VersionImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.SpawnedVMSupport; +import org.apache.activemq6.utils.VersionLoader; import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.hornetq.tests.util.RandomUtil.randomString; +import static org.apache.activemq6.tests.util.RandomUtil.randomString; /** * A IncompatibleVersionTest @@ -215,13 +215,13 @@ public class IncompatibleVersionTest extends ServiceTestBase boolean result = false; try { - serverProcess = SpawnedVMSupport.spawnVM("org.hornetq.tests.integration.client.IncompatibleVersionTest", + serverProcess = SpawnedVMSupport.spawnVM("org.apache.activemq6.tests.integration.client.IncompatibleVersionTest", new String[]{"-D" + VersionLoader.VERSION_PROP_FILE_KEY + "=" + propFileName}, "server", serverStartedString); Thread.sleep(2000); - Process client = SpawnedVMSupport.spawnVM("org.hornetq.tests.integration.client.IncompatibleVersionTest", + Process client = SpawnedVMSupport.spawnVM("org.apache.activemq6.tests.integration.client.IncompatibleVersionTest", new String[]{"-D" + VersionLoader.VERSION_PROP_FILE_KEY + "=" + propFileName}, "client"); @@ -254,7 +254,7 @@ public class IncompatibleVersionTest extends ServiceTestBase { Configuration conf = new ConfigurationImpl() .setSecurityEnabled(false) - .addAcceptorConfiguration(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory")); + .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory")); HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/InterruptedLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InterruptedLargeMessageTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/InterruptedLargeMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InterruptedLargeMessageTest.java index 536501219c..1d90b7301a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/InterruptedLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InterruptedLargeMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -22,37 +22,37 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.SessionContinuationMessage; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.QueueFactory; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.core.server.impl.ServerSessionImpl; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.largemessage.LargeMessageTestBase; -import org.hornetq.utils.ExecutorFactory; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.filter.Filter; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionContinuationMessage; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.QueueFactory; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.core.server.impl.ServerSessionImpl; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.largemessage.LargeMessageTestBase; +import org.apache.activemq6.utils.ExecutorFactory; import org.junit.Before; import org.junit.Test; @@ -586,7 +586,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase } /* (non-Javadoc) - * @see org.hornetq.core.server.QueueFactory#setPostOffice(org.hornetq.core.postoffice.PostOffice) + * @see org.apache.activemq6.core.server.QueueFactory#setPostOffice(org.hornetq.core.postoffice.PostOffice) */ public void setPostOffice(PostOffice postOffice) { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JMSMessageCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JMSMessageCounterTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JMSMessageCounterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JMSMessageCounterTest.java index 511e18bedf..742a310525 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JMSMessageCounterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JMSMessageCounterTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -19,9 +19,9 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.api.jms.management.JMSQueueControl; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JMSPagingFileDeleteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JMSPagingFileDeleteTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JMSPagingFileDeleteTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JMSPagingFileDeleteTest.java index 4d77bab757..4edbcd7d69 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JMSPagingFileDeleteTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JMSPagingFileDeleteTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -20,11 +20,11 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.Topic; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JmsNettyNioStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JmsNettyNioStressTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JmsNettyNioStressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JmsNettyNioStressTest.java index 2c8c53e685..f47506b912 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JmsNettyNioStressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JmsNettyNioStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -22,19 +22,19 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JournalCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JournalCrashTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JournalCrashTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JournalCrashTest.java index 4ad3f26301..5a67c302f7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JournalCrashTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JournalCrashTest.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.ArrayList; import java.util.Arrays; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.SpawnedVMSupport; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.SpawnedVMSupport; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java index 789873368a..ce0e9b473d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageCompressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageCompressTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageCompressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageCompressTest.java index 9f2bcdb8fb..26f8a24f15 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageCompressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageCompressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.io.File; import java.io.FileInputStream; @@ -20,16 +20,16 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.RandomUtil; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageTest.java index d3be7b87ab..5bc369b78e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -22,30 +22,30 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientConsumerInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.persistence.impl.journal.LargeServerMessageImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.largemessage.LargeMessageTestBase; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientConsumerInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.largemessage.LargeMessageTestBase; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LibaioDependencyCheckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LibaioDependencyCheckTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LibaioDependencyCheckTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LibaioDependencyCheckTest.java index 5fe98f8628..bd3df92b05 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LibaioDependencyCheckTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LibaioDependencyCheckTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Test; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.tests.util.UnitTestCase; /** * This tests is placed in duplication here to validate that the libaio module is properly loaded on this diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageConcurrencyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageConcurrencyTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageConcurrencyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageConcurrencyTest.java index 53c9d1f6c8..c17c3a5ef9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageConcurrencyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageConcurrencyTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.HashSet; import java.util.Set; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageConsumerRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageConsumerRollbackTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageConsumerRollbackTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageConsumerRollbackTest.java index 219caef1c2..cb3186ca61 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageConsumerRollbackTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageConsumerRollbackTest.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.HashSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageCounterTest.java similarity index 81% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageCounterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageCounterTest.java index 92fe2adfea..2a7461b896 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageCounterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageCounterTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageDurabilityTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageDurabilityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageDurabilityTest.java index a8d73460a8..397cda8ae2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageDurabilityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageDurabilityTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQNonExistentQueueException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQNonExistentQueueException; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageExpirationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageExpirationTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageExpirationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageExpirationTest.java index 2a0ea06526..6ee5ffc14c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageExpirationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageExpirationTest.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * A MessageExpirationTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageGroupingConnectionFactoryTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageGroupingConnectionFactoryTest.java index 93ee1b9f0c..d0fb393aad 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageGroupingConnectionFactoryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.Test; @@ -21,22 +21,22 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageGroupingTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageGroupingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageGroupingTest.java index eff418ad0d..6d94bb2a7d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageGroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageGroupingTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Assume; import org.junit.Before; @@ -25,24 +25,24 @@ import javax.transaction.xa.Xid; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.UnitTestCase; +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.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageHandlerTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageHandlerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageHandlerTest.java index af9a9b3367..12cbfe2dc7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageHandlerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageHandlerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.Test; @@ -20,17 +20,17 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessagePriorityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessagePriorityTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessagePriorityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessagePriorityTest.java index 14fb37914a..6ce162a44e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessagePriorityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessagePriorityTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageRateTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageRateTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageRateTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageRateTest.java index f2176993d3..d057fa1b78 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageRateTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageRateTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MultipleThreadFilterOneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MultipleThreadFilterOneTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MultipleThreadFilterOneTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MultipleThreadFilterOneTest.java index e13876df8b..11751da4a4 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MultipleThreadFilterOneTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MultipleThreadFilterOneTest.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Test; import java.util.HashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * Multiple Threads producing Messages, with Multiple Consumers with different queues, each queue with a different filter diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NIOvsOIOTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NIOvsOIOTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NIOvsOIOTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NIOvsOIOTest.java index dd752a8751..c1c9ca8a4e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NIOvsOIOTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NIOvsOIOTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Test; @@ -20,25 +20,25 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.UUIDGenerator; public class NIOvsOIOTest extends UnitTestCase { @@ -151,7 +151,7 @@ public class NIOvsOIOTest extends UnitTestCase private void testPerf(boolean nio) throws Exception { - String acceptorFactoryClassName = "org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory"; + String acceptorFactoryClassName = "org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory"; Configuration conf = createDefaultConfig() .setSecurityEnabled(false); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyConnectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyConnectorTest.java similarity index 76% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyConnectorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyConnectorTest.java index 0129035539..912b2a76e8 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyConnectorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyConnectorTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import io.netty.bootstrap.Bootstrap; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.netty.NettyConnector; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnector; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyConsumerWindowSizeTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyConsumerWindowSizeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyConsumerWindowSizeTest.java index 0188c518f2..db44b83bf2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyConsumerWindowSizeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyConsumerWindowSizeTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; /** * A NettyConsumerWindowSizeTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyNonPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyNonPersistentMessageBufferTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyNonPersistentMessageBufferTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyNonPersistentMessageBufferTest.java index 589d80791c..7b9b7d955e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyNonPersistentMessageBufferTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyNonPersistentMessageBufferTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; /** * A NettyNonPersistentMessageBufferTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyPersistentMessageBufferTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyPersistentMessageBufferTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyPersistentMessageBufferTest.java index 9f72ea04fa..c9eeb3833b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyPersistentMessageBufferTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyPersistentMessageBufferTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; /** * A NettyPersistentMessageBufferTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyProducerFlowControlTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyProducerFlowControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyProducerFlowControlTest.java index 1a8878cf5f..cf0fcc9910 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NettyProducerFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyProducerFlowControlTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; /** * A NettyProducerFlowControlTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NewDeadLetterAddressTest.java similarity index 77% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NewDeadLetterAddressTest.java index 99ea6ba03b..ec5eaa86d3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NewDeadLetterAddressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.After; @@ -18,21 +18,21 @@ import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/OrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/OrderTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/OrderTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/OrderTest.java index 621073bb2c..1f827253c9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/OrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/OrderTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.Arrays; import java.util.Collection; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingOrderTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingOrderTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingOrderTest.java index 6da8ca371b..fd423cb65c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingOrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingOrderTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -23,31 +23,31 @@ import java.nio.ByteBuffer; import java.util.HashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingSyncTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingSyncTest.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingSyncTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingSyncTest.java index 28fb1807f4..910551eedf 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingSyncTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingSyncTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.nio.ByteBuffer; import java.util.HashMap; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQBuffer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingTest.java index c47d79d2f2..da7b6116ab 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -29,49 +29,49 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientConsumerInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.cursor.PageCursorProvider; -import org.hornetq.core.paging.cursor.impl.PagePositionImpl; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.impl.journal.DescribeJournal; -import org.hornetq.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; -import org.hornetq.core.persistence.impl.journal.JournalRecordIds; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager.AckDescribe; -import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.logging.AssertionLoggerHandler; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.Pair; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientConsumerInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.cursor.PageCursorProvider; +import org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal; +import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; +import org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.AckDescribe; +import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.logging.AssertionLoggerHandler; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerCloseTest.java similarity index 72% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerCloseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerCloseTest.java index df3132cda7..afad754235 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerCloseTest.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerFlowControlTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerFlowControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerFlowControlTest.java index 02095e3ad1..61d82b5e97 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerFlowControlTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.ArrayList; import java.util.Iterator; @@ -19,27 +19,27 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.hornetq.api.core.HornetQObjectClosedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientProducerCreditManagerImpl; -import org.hornetq.core.client.impl.ClientProducerCredits; -import org.hornetq.core.client.impl.ClientProducerInternal; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQObjectClosedException; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientProducerCreditManagerImpl; +import org.apache.activemq6.core.client.impl.ClientProducerCredits; +import org.apache.activemq6.core.client.impl.ClientProducerInternal; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerTest.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerTest.java index dde8d906bb..a3ac4bee90 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerTest.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/QueueBrowserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/QueueBrowserTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/QueueBrowserTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/QueueBrowserTest.java index 0bb524806b..b04e1b4967 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/QueueBrowserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/QueueBrowserTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ReceiveImmediateTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ReceiveImmediateTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ReceiveImmediateTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ReceiveImmediateTest.java index c2eaabefbf..86d3392897 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ReceiveImmediateTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ReceiveImmediateTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.Test; @@ -19,18 +19,18 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ReceiveTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ReceiveTest.java index ac8fbb4c83..7fd4786c2d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ReceiveTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.HornetQObjectClosedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.HornetQObjectClosedException; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RedeliveryConsumerTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RedeliveryConsumerTest.java index e528151938..b495a641c1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RedeliveryConsumerTest.java @@ -10,29 +10,29 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.journal.LoaderCallback; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.persistence.impl.journal.JournalRecordIds; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.journal.LoaderCallback; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RequestorTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RequestorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RequestorTest.java index 7b3e7e00cb..b0b465489f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RequestorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RequestorTest.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientRequestor; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientMessageImpl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.TransportConfigurationUtils; -import org.hornetq.tests.util.UnitTestCase; +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.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientRequestor; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientMessageImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RoutingTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RoutingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RoutingTest.java index e3e72d7640..97b9476b71 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RoutingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RoutingTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SelfExpandingBufferTest.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SelfExpandingBufferTest.java index bc3c2f256b..92b3afc790 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SelfExpandingBufferTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ServerLocatorConnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ServerLocatorConnectTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ServerLocatorConnectTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ServerLocatorConnectTest.java index fe1f4bc554..ec6b6a3582 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ServerLocatorConnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ServerLocatorConnectTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +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.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ServerLocatorSerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ServerLocatorSerializationTest.java similarity index 80% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ServerLocatorSerializationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ServerLocatorSerializationTest.java index 2d4f6d064d..baf8cf0d7a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ServerLocatorSerializationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ServerLocatorSerializationTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.After; import org.junit.Test; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; import javax.jms.Connection; import javax.jms.Session; @@ -95,7 +95,7 @@ public class ServerLocatorSerializationTest extends ServiceTestBase public void testConnectionFactorySerialization() throws Exception { log.info("Starting connection factory"); - HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory")); + HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory")); Connection connection = cf.createConnection(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCloseOnGCTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseOnGCTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCloseOnGCTest.java index 3513de314c..1339c2774b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseOnGCTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCloseOnGCTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.lang.ref.WeakReference; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCloseTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCloseTest.java index 9dadd774f4..b7ef6997be 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCloseTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.After; @@ -21,22 +21,22 @@ import javax.transaction.xa.XAResource; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +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.TransportConfiguration; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A SessionCloseTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java similarity index 75% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java index fb636e0589..9021e0fa13 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.HornetQObjectClosedException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.HornetQObjectClosedException; +import org.apache.activemq6.api.core.TransportConfiguration; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateAndDeleteQueueTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateAndDeleteQueueTest.java index 4ecdb37fd9..eaeef3659b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateAndDeleteQueueTest.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQNonExistentQueueException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.impl.LastValueQueue; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQNonExistentQueueException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.impl.LastValueQueue; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateConsumerTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateConsumerTest.java index 9bda0b0ffb..712ea181c7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateConsumerTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQInvalidFilterExpressionException; -import org.hornetq.api.core.HornetQNonExistentQueueException; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInvalidFilterExpressionException; +import org.apache.activemq6.api.core.HornetQNonExistentQueueException; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateProducerTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateProducerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateProducerTest.java index 5ac1beba12..1b6b12bcdb 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateProducerTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQObjectClosedException; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQObjectClosedException; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionFactoryTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionFactoryTest.java index 244037c02a..0a5e88bc17 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionFactoryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -20,21 +20,21 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.config.Configuration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionSendAcknowledgementHandlerTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionSendAcknowledgementHandlerTest.java index e1863179d0..db8ae37ed1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionSendAcknowledgementHandlerTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionStopStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionStopStartTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionStopStartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionStopStartTest.java index 4519e2b082..75803b9216 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionStopStartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionStopStartTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.Test; @@ -20,17 +20,17 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionTest.java index 698d631ee8..1683521675 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionTest.java @@ -10,29 +10,29 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.List; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSession.QueueQuery; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.CountDownSessionFailureListener; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSession.QueueQuery; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.CountDownSessionFailureListener; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SimpleSendMultipleQueuesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SimpleSendMultipleQueuesTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SimpleSendMultipleQueuesTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SimpleSendMultipleQueuesTest.java index 899dd619c6..525cc5eb43 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SimpleSendMultipleQueuesTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SimpleSendMultipleQueuesTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.After; @@ -18,15 +18,15 @@ import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * @author Tim Fox diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SlowConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SlowConsumerTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SlowConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SlowConsumerTest.java index ce6504c9de..0d037e3463 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SlowConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SlowConsumerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.Arrays; import java.util.Collection; @@ -18,25 +18,25 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQObjectClosedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.settings.impl.SlowConsumerPolicy; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQObjectClosedException; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TemporaryQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TemporaryQueueTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TemporaryQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TemporaryQueueTest.java index ebb64916ae..022a971eb4 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TemporaryQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TemporaryQueueTest.java @@ -10,44 +10,44 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import java.util.Arrays; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQDisconnectedException; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQIOErrorException; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.api.core.HornetQNonExistentQueueException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientProducerImpl; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.RemotingConnectionImpl; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.impl.ServerSessionImpl; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.SingleServerTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQDisconnectedException; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQIOErrorException; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq6.api.core.HornetQNonExistentQueueException; +import org.apache.activemq6.api.core.Interceptor; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientProducerImpl; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.RemotingConnectionImpl; +import org.apache.activemq6.core.remoting.CloseListener; +import org.apache.activemq6.core.remoting.server.impl.RemotingServiceImpl; +import org.apache.activemq6.core.server.ServerSession; +import org.apache.activemq6.core.server.impl.ServerSessionImpl; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.SingleServerTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransactionDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransactionDurabilityTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransactionDurabilityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransactionDurabilityTest.java index fce4d0d74f..a920f33c17 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransactionDurabilityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransactionDurabilityTest.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransactionalSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransactionalSendTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransactionalSendTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransactionalSendTest.java index 8ccb2336b8..7c2f9818d1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransactionalSendTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransactionalSendTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransientQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransientQueueTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransientQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransientQueueTest.java index 9f969abc99..6425152428 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransientQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransientQueueTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; -import org.hornetq.api.core.HornetQInvalidTransientQueueUseException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.SingleServerTestBase; +import org.apache.activemq6.api.core.HornetQInvalidTransientQueueUseException; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.SingleServerTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/WildCardRoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/WildCardRoutingTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/WildCardRoutingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/WildCardRoutingTest.java index 726f78ae46..a6ecac88a9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/WildCardRoutingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/WildCardRoutingTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.client; +package org.apache.activemq6.tests.integration.client; import org.junit.Before; import org.junit.After; @@ -18,20 +18,20 @@ import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientCrashTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientCrashTest.java index aa9ee52f82..63bf74f558 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientCrashTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.clientcrash; +package org.apache.activemq6.tests.integration.clientcrash; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.SpawnedVMSupport; +import org.apache.activemq6.api.core.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.SpawnedVMSupport; /** * A test that makes sure that a HornetQ server cleans up the associated diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/ClientExitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientExitTest.java similarity index 83% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/ClientExitTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientExitTest.java index d4e3c99e77..b90cb0d11e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/ClientExitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientExitTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.clientcrash; +package org.apache.activemq6.tests.integration.clientcrash; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.SpawnedVMSupport; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.SpawnedVMSupport; /** * A test that makes sure that a HornetQ client gracefully exists after the last session is diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/ClientTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientTestBase.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/ClientTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientTestBase.java index 700adcf20d..5b120d547d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/ClientTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientTestBase.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.clientcrash; +package org.apache.activemq6.tests.integration.clientcrash; import org.junit.Before; import org.junit.Assert; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * A ClientTestBase diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/CrashClient.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/CrashClient.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/CrashClient.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/CrashClient.java index 753fc07d6d..d10a4cbb50 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/CrashClient.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/CrashClient.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.clientcrash; +package org.apache.activemq6.tests.integration.clientcrash; import java.util.Arrays; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.api.core.TransportConfiguration; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; /** * Code to be run in an external VM, via main() diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/CrashClient2.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/CrashClient2.java similarity index 83% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/CrashClient2.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/CrashClient2.java index 23715c7382..c6b61c76ef 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/CrashClient2.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/CrashClient2.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.clientcrash; +package org.apache.activemq6.tests.integration.clientcrash; import java.util.Arrays; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; /** * Code to be run in an external VM, via main() diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/DummyInterceptor.java similarity index 76% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/DummyInterceptor.java index e76951878a..3104d59fa5 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/DummyInterceptor.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.clientcrash; +package org.apache.activemq6.tests.integration.clientcrash; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveMessage; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; /** * @author Clebert Suconic diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/DummyInterceptorB.java similarity index 79% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/DummyInterceptorB.java index 8141d3f345..8d663d52dc 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/DummyInterceptorB.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.clientcrash; +package org.apache.activemq6.tests.integration.clientcrash; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/GracefulClient.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/GracefulClient.java similarity index 80% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/GracefulClient.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/GracefulClient.java index 24101875c3..338eb727bc 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/clientcrash/GracefulClient.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/GracefulClient.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.clientcrash; +package org.apache.activemq6.tests.integration.clientcrash; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; /** * Code to be run in an external VM, via main() diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/ClusterControllerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/ClusterControllerTest.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/ClusterControllerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/ClusterControllerTest.java index 9f8fad7776..bdcc552e6b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/ClusterControllerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/ClusterControllerTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster; +package org.apache.activemq6.tests.integration.cluster; -import org.hornetq.api.core.HornetQClusterSecurityException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.server.cluster.ClusterControl; -import org.hornetq.core.server.cluster.ClusterController; -import org.hornetq.core.server.cluster.HornetQServerSideProtocolManagerFactory; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.api.core.HornetQClusterSecurityException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq6.core.server.cluster.ClusterControl; +import org.apache.activemq6.core.server.cluster.ClusterController; +import org.apache.activemq6.core.server.cluster.HornetQServerSideProtocolManagerFactory; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/NodeManagerAction.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/NodeManagerAction.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/NodeManagerAction.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/NodeManagerAction.java index b38710520e..092b044cfb 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/NodeManagerAction.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/NodeManagerAction.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster; +package org.apache.activemq6.tests.integration.cluster; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.impl.FileLockNodeManager; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.impl.FileLockNodeManager; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/NodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/NodeManagerTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/NodeManagerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/NodeManagerTest.java index 42583aeadc..cbfecc4f59 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/NodeManagerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/NodeManagerTest.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster; +package org.apache.activemq6.tests.integration.cluster; import java.util.ArrayList; import java.util.List; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Test; -import static org.hornetq.tests.integration.cluster.NodeManagerAction.AWAIT_LIVE; -import static org.hornetq.tests.integration.cluster.NodeManagerAction.CRASH_LIVE; -import static org.hornetq.tests.integration.cluster.NodeManagerAction.DOESNT_HAVE_BACKUP; -import static org.hornetq.tests.integration.cluster.NodeManagerAction.DOESNT_HAVE_LIVE; -import static org.hornetq.tests.integration.cluster.NodeManagerAction.HAS_BACKUP; -import static org.hornetq.tests.integration.cluster.NodeManagerAction.HAS_LIVE; -import static org.hornetq.tests.integration.cluster.NodeManagerAction.PAUSE_LIVE; -import static org.hornetq.tests.integration.cluster.NodeManagerAction.RELEASE_BACKUP; -import static org.hornetq.tests.integration.cluster.NodeManagerAction.START_BACKUP; -import static org.hornetq.tests.integration.cluster.NodeManagerAction.START_LIVE; -import static org.hornetq.tests.integration.cluster.NodeManagerAction.STOP_BACKUP; +import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.AWAIT_LIVE; +import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.CRASH_LIVE; +import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.DOESNT_HAVE_BACKUP; +import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.DOESNT_HAVE_LIVE; +import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.HAS_BACKUP; +import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.HAS_LIVE; +import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.PAUSE_LIVE; +import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.RELEASE_BACKUP; +import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.START_BACKUP; +import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.START_LIVE; +import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.STOP_BACKUP; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/RealNodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/RealNodeManagerTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/RealNodeManagerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/RealNodeManagerTest.java index a1c1944f85..4a2cefd535 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/RealNodeManagerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/RealNodeManagerTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster; +package org.apache.activemq6.tests.integration.cluster; import java.util.ArrayList; import java.util.List; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.impl.FileLockNodeManager; -import org.hornetq.tests.util.SpawnedVMSupport; -import org.hornetq.utils.UUID; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.impl.FileLockNodeManager; +import org.apache.activemq6.tests.util.SpawnedVMSupport; +import org.apache.activemq6.utils.UUID; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeFailoverTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeFailoverTest.java index 019f8b22d2..ef18fd35dc 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeFailoverTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.bridge; +package org.apache.activemq6.tests.integration.cluster.bridge; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.cluster.impl.BridgeImpl; -import org.hornetq.tests.integration.cluster.util.MultiServerTestBase; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq6.tests.integration.cluster.util.MultiServerTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeReconnectTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeReconnectTest.java index ccb1708eb7..535f525972 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeReconnectTest.java @@ -10,39 +10,39 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.bridge; +package org.apache.activemq6.tests.integration.cluster.bridge; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.remoting.impl.invm.InVMConnector; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.impl.BridgeImpl; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnector; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.cluster.Bridge; +import org.apache.activemq6.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeStartTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeStartTest.java index edccaf931c..8c34f214ef 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeStartTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.bridge; +package org.apache.activemq6.tests.integration.cluster.bridge; import java.util.ArrayList; import java.util.Arrays; @@ -19,22 +19,22 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.cluster.Bridge; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -92,7 +92,7 @@ public class BridgeStartTest extends ServiceTestBase Map server1Params = new HashMap(); if (isNetty()) { - server1Params.put("port", org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { @@ -261,7 +261,7 @@ public class BridgeStartTest extends ServiceTestBase Map server1Params = new HashMap(); if (isNetty()) { - server1Params.put("port", org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { @@ -472,7 +472,7 @@ public class BridgeStartTest extends ServiceTestBase Map server1Params = new HashMap(); if (isNetty()) { - server1Params.put("port", org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { @@ -626,7 +626,7 @@ public class BridgeStartTest extends ServiceTestBase Map server1Params = new HashMap(); if (isNetty()) { - server1Params.put("port", org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeTest.java index f2f09662c0..114e475a34 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.bridge; +package org.apache.activemq6.tests.integration.cluster.bridge; import java.util.ArrayList; import java.util.Arrays; @@ -23,38 +23,38 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.postoffice.DuplicateIDCache; -import org.hornetq.core.postoffice.impl.PostOfficeImpl; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendLargeMessage; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.cluster.impl.BridgeImpl; -import org.hornetq.core.transaction.impl.TransactionImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.LinkedListIterator; -import org.hornetq.utils.ReusableLatch; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.postoffice.DuplicateIDCache; +import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendLargeMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.LinkedListIterator; +import org.apache.activemq6.utils.ReusableLatch; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -456,7 +456,7 @@ public class BridgeTest extends ServiceTestBase { if (isNetty()) { - server1Params.put("port", org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeTestBase.java similarity index 78% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeTestBase.java index 316e98e2ad..c994f2ed6e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeTestBase.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.bridge; +package org.apache.activemq6.tests.integration.cluster.bridge; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.remoting.impl.invm.InVMConnector; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.NodeManager; -import org.hornetq.tests.util.InVMNodeManagerServer; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnector; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.tests.util.InVMNodeManagerServer; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; /** @@ -65,14 +65,14 @@ public abstract class BridgeTestBase extends UnitTestCase if (netty) { - params.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, - org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id); + params.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id); tc = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params); } else { - params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id); + params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id); tc = new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params); } Configuration serviceConf = createBasicConfig() @@ -110,14 +110,14 @@ public abstract class BridgeTestBase extends UnitTestCase if (netty) { - params.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, - org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id); + params.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id); tc = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params); } else { - params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id); + params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id); tc = new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params); } diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java index c904484a2e..38dee7d4eb 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.bridge; +package org.apache.activemq6.tests.integration.cluster.bridge; import java.util.ArrayList; import java.util.Arrays; @@ -19,26 +19,26 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.cluster.Bridge; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -92,7 +92,7 @@ public class BridgeWithDiscoveryGroupStartTest extends ServiceTestBase } else { - server1Params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, 1); + server1Params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, 1); } HornetQServer server1 = createClusteredServerWithParams(isNetty(), 1, true, server1Params); ServerLocator locator = null; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/SimpleTransformer.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/SimpleTransformer.java index 4d8b248a49..5eb51fc1f9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/SimpleTransformer.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.bridge; +package org.apache.activemq6.tests.integration.cluster.bridge; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.cluster.Transformer; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.cluster.Transformer; /** * A SimpleTransformer diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java index 2a2bf948a7..d951d80472 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.Test; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.core.message.impl.MessageImpl; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.core.message.impl.MessageImpl; public class ClusterHeadersRemovedTest extends ClusterTestBase { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterTestBase.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterTestBase.java index 97d45f64b5..7b23dabe9b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; import java.io.PrintWriter; import java.io.StringWriter; @@ -27,53 +27,53 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.client.impl.TopologyMemberImpl; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.HAPolicyConfiguration; -import org.hornetq.core.config.ha.LiveOnlyPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.ClusterManager; -import org.hornetq.core.server.cluster.HornetQServerSideProtocolManagerFactory; -import org.hornetq.core.server.cluster.RemoteQueueBinding; -import org.hornetq.core.server.cluster.impl.ClusterConnectionImpl; -import org.hornetq.core.server.cluster.qourum.SharedNothingBackupQuorum; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +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.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.client.impl.Topology; +import org.apache.activemq6.core.client.impl.TopologyMemberImpl; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.HAPolicyConfiguration; +import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.QueueBinding; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.server.cluster.ClusterManager; +import org.apache.activemq6.core.server.cluster.HornetQServerSideProtocolManagerFactory; +import org.apache.activemq6.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterWithBackupTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterWithBackupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterWithBackupTest.java index f6099c4642..a71896809c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterWithBackupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterWithBackupTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.Test; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusteredGroupingTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusteredGroupingTest.java index 895595e35a..a0d23f0f12 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusteredGroupingTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; import java.util.ArrayList; import java.util.List; @@ -21,28 +21,28 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.core.postoffice.impl.BindingsImpl; -import org.hornetq.core.server.group.GroupingHandler; -import org.hornetq.core.server.group.UnproposalListener; -import org.hornetq.core.server.group.impl.GroupBinding; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.core.server.group.impl.Proposal; -import org.hornetq.core.server.group.impl.Response; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationListener; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.IntegrationTestLogger; +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.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.core.postoffice.impl.BindingsImpl; +import org.apache.activemq6.core.server.group.GroupingHandler; +import org.apache.activemq6.core.server.group.UnproposalListener; +import org.apache.activemq6.core.server.group.impl.GroupBinding; +import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq6.core.server.group.impl.Proposal; +import org.apache.activemq6.core.server.group.impl.Response; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationListener; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; import org.junit.After; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java index b0929feedf..69852e18d9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java index af832085d7..ad21b39577 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; /** * A LargeMessageRedistributionTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/MessageRedistributionTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/MessageRedistributionTest.java index bff10b512a..b2499c15b3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/MessageRedistributionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -18,20 +18,20 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.server.Bindable; -import org.hornetq.core.server.cluster.impl.Redistributor; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.api.core.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.server.Bindable; +import org.apache.activemq6.core.server.cluster.impl.Redistributor; +import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java index 4276645c58..1894f462d7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.Test; @@ -20,11 +20,11 @@ import java.util.ArrayList; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.settings.impl.AddressSettings; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.core.settings.impl.AddressSettings; /** * A MessageRedistributionWithDiscoveryTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java index 5b6445e232..15d62081b1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; /** * A NettyFileStorageSymmetricClusterTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java index ff011d22dd..c2c546bc86 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; /** * A NettyFileStorageSymmetricClusterWithBackupTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java index 1ccf68ca93..78c5f3459c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; /** * A NettyFileStorageSymmetricClusterWithDiscoveryTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java index 115096af42..f67e4cf2ab 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java index 6971083508..0ff0549d5e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterTest.java index b8a876c854..61b046abde 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; /** * A NettySymmetricClusterTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java index 895c9f3a5c..c3a932b791 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java index c049e72992..07f320e29b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; /** * A NettySymmetricClusterWithDiscoveryTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/OneWayChainClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/OneWayChainClusterTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/OneWayChainClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/OneWayChainClusterTest.java index fbef1791dc..bfbe888e14 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/OneWayChainClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/OneWayChainClusterTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.Test; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.MessageFlowRecord; -import org.hornetq.core.server.cluster.impl.ClusterConnectionImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.server.cluster.MessageFlowRecord; +import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; import java.util.Map; import java.util.Set; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java index d982b7e2c0..fc2fde3a94 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; -import org.hornetq.core.server.HornetQServer; +package org.apache.activemq6.tests.integration.cluster.distribution; +import org.apache.activemq6.core.server.HornetQServer; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java index 7578fb3479..9d3aa14a9e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterTest.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterTest.java index 58ed3e8b33..fa1ca67cc8 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.After; import org.junit.Test; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A SymmetricClusterTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java index 4dc5af7f60..cab0775cc8 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java index 2ef1942033..97ddee5cea 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; /** * A SymmetricClusterWithDiscoveryTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java index 7f4bfcc77f..50baedb99e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientSession; /** * A TemporaryQueueClusterTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java index d256a8c071..62d11bf2f9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java index 5f9d37d27a..3337d4965a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.distribution; +package org.apache.activemq6.tests.integration.cluster.distribution; /** * A TwoWayTwoNodeClusterWithDiscoveryTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java index c5a71420e4..ac94be739e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; /** * Validating failover when the size of the message Size > flow Control && message Size < minLargeMessageSize diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AsynchronousFailoverTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AsynchronousFailoverTest.java index 8dc8848c3f..79092d60c9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AsynchronousFailoverTest.java @@ -10,31 +10,31 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.HornetQDuplicateIdException; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQTransactionOutcomeUnknownException; -import org.hornetq.api.core.HornetQTransactionRolledBackException; -import org.hornetq.api.core.HornetQUnBlockedException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.client.impl.DelegatingSession; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.CountDownSessionFailureListener; -import org.hornetq.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.api.core.HornetQDuplicateIdException; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQTransactionOutcomeUnknownException; +import org.apache.activemq6.api.core.HornetQTransactionRolledBackException; +import org.apache.activemq6.api.core.HornetQUnBlockedException; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.client.impl.DelegatingSession; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.CountDownSessionFailureListener; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java index 52ca1fb586..1b43b9e242 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.ArrayList; import java.util.Arrays; @@ -21,24 +21,24 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.client.impl.TopologyMemberImpl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.config.ScaleDownConfiguration; -import org.hornetq.core.config.ha.ColocatedPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +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.core.client.impl.Topology; +import org.apache.activemq6.core.client.impl.TopologyMemberImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.config.ScaleDownConfiguration; +import org.apache.activemq6.core.config.ha.ColocatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupAuthenticationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupAuthenticationTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupAuthenticationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupAuthenticationTest.java index cf7fc2b307..8a8a5d7041 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupAuthenticationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupAuthenticationTest.java @@ -13,7 +13,7 @@ /** * */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import org.junit.Before; import org.junit.Test; @@ -22,13 +22,13 @@ import java.util.Arrays; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; public class BackupAuthenticationTest extends FailoverTestBase { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncJournalTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncJournalTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncJournalTest.java index 891be381d6..358dc27dbf 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncJournalTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncJournalTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.io.File; import java.io.RandomAccessFile; @@ -20,27 +20,27 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.journal.impl.JournalFile; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.persistence.impl.journal.DescribeJournal; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.integration.cluster.util.BackupSyncDelay; -import org.hornetq.tests.integration.cluster.util.TestableServer; -import org.hornetq.tests.util.TransportConfigurationUtils; -import org.hornetq.utils.UUID; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.integration.cluster.util.BackupSyncDelay; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.utils.UUID; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java index ecde2ec547..cc32cc7268 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import org.junit.Test; @@ -24,15 +24,15 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Assert; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.tests.util.UnitTestCase; public class BackupSyncLargeMessageTest extends BackupSyncJournalTest { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncPagingTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncPagingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncPagingTest.java index 03db405c2e..21d9490979 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncPagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncPagingTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import org.junit.Before; import org.junit.Test; @@ -18,11 +18,11 @@ import org.junit.Test; import java.util.HashMap; import java.util.Map; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; public class BackupSyncPagingTest extends BackupSyncJournalTest { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java index c3ebc48b3e..b0b7a95183 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.HashSet; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; -import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; -import org.hornetq.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.tests.integration.cluster.util.SameProcessHornetQServer; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor.java similarity index 74% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor.java index 6a8a17349e..3a949654e0 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * A DelayInterceptor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor2.java similarity index 80% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor2.java index 87155781d4..96617a74ae 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor2.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * A DelayInterceptor2 diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor3.java similarity index 75% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor3.java index e5553d9685..30c8a75699 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor3.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * A DelayInterceptor3 diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java index c84094db5e..141a40cbc0 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackAutoTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailBackAutoTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackAutoTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailBackAutoTest.java index 22caa1a583..cef3334919 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackAutoTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailBackAutoTest.java @@ -10,29 +10,29 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.server.cluster.ha.SharedStoreSlavePolicy; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.CountDownSessionFailureListener; -import org.hornetq.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.CountDownSessionFailureListener; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailBackManualTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailBackManualTest.java index 366c2ad23f..98ab109da7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailBackManualTest.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.cluster.util.TestableServer; -import org.hornetq.tests.util.CountDownSessionFailureListener; -import org.hornetq.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.tests.util.CountDownSessionFailureListener; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverListenerTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverListenerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverListenerTest.java index ccc3592162..d612cd5b4d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverListenerTest.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.ArrayList; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.FailoverEventListener; -import org.hornetq.api.core.client.FailoverEventType; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.FailoverEventListener; +import org.apache.activemq6.api.core.client.FailoverEventType; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverOnFlowControlTest.java similarity index 80% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverOnFlowControlTest.java index eb04baef8e..302d881a40 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverOnFlowControlTest.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import org.junit.Test; import java.util.ArrayList; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.remoting.impl.invm.InVMConnection; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.TransportConfiguration; +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.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnection; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; /** * A FailoverOnFlowControlTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverTest.java index c1f262d595..221336cff3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -23,38 +23,38 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQDuplicateIdException; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQObjectClosedException; -import org.hornetq.api.core.HornetQTransactionOutcomeUnknownException; -import org.hornetq.api.core.HornetQTransactionRolledBackException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.server.cluster.ha.BackupPolicy; -import org.hornetq.core.server.cluster.ha.HAPolicy; -import org.hornetq.core.server.cluster.ha.ReplicaPolicy; -import org.hornetq.core.server.cluster.ha.ReplicatedPolicy; -import org.hornetq.core.server.cluster.ha.SharedStoreMasterPolicy; -import org.hornetq.core.server.cluster.ha.SharedStoreSlavePolicy; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.cluster.util.TestableServer; -import org.hornetq.tests.util.CountDownSessionFailureListener; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.api.core.HornetQDuplicateIdException; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQObjectClosedException; +import org.apache.activemq6.api.core.HornetQTransactionOutcomeUnknownException; +import org.apache.activemq6.api.core.HornetQTransactionRolledBackException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.server.cluster.ha.BackupPolicy; +import org.apache.activemq6.core.server.cluster.ha.HAPolicy; +import org.apache.activemq6.core.server.cluster.ha.ReplicaPolicy; +import org.apache.activemq6.core.server.cluster.ha.ReplicatedPolicy; +import org.apache.activemq6.core.server.cluster.ha.SharedStoreMasterPolicy; +import org.apache.activemq6.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.tests.util.CountDownSessionFailureListener; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverTestBase.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverTestBase.java index b73d2e00bc..5d7d3d7d6b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.io.IOException; import java.net.ServerSocket; @@ -19,33 +19,33 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.remoting.impl.invm.InVMConnector; -import org.hornetq.core.remoting.impl.invm.InVMRegistry; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.cluster.ha.ReplicatedPolicy; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; -import org.hornetq.tests.integration.cluster.util.TestableServer; -import org.hornetq.tests.util.ReplicatedBackupUtils; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnector; +import org.apache.activemq6.core.remoting.impl.invm.InVMRegistry; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.cluster.ha.ReplicatedPolicy; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.tests.integration.cluster.util.SameProcessHornetQServer; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.tests.util.ReplicatedBackupUtils; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java index 72118dbbff..2e48a0c240 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java index 8c98e19279..b9cc382c8a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverTestBase.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverTestBase.java index f9f2ed023b..35d2e8a3ad 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverTestBase.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.Collection; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.TopologyMemberImpl; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.core.server.impl.SharedNothingBackupActivation; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.TopologyMemberImpl; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq6.core.server.impl.SharedNothingBackupActivation; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/LargeMessageFailoverTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/LargeMessageFailoverTest.java index cc787c9e0c..a43de8e022 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/LargeMessageFailoverTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/LiveToLiveFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/LiveToLiveFailoverTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/LiveToLiveFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/LiveToLiveFailoverTest.java index 5d49d45e02..02195137ba 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/LiveToLiveFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/LiveToLiveFailoverTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.config.ScaleDownConfiguration; -import org.hornetq.core.config.ha.ColocatedPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.api.core.TransportConfiguration; +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.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.config.ScaleDownConfiguration; +import org.apache.activemq6.core.config.ha.ColocatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java similarity index 83% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java index b892323d30..99af3592a4 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.cluster.failover.FailoverTestBase.LatchClusterTopologyListener; -import org.hornetq.tests.integration.cluster.util.TestableServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.cluster.failover.FailoverTestBase.LatchClusterTopologyListener; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java index a6da777673..63f92ee834 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; -import org.hornetq.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.tests.integration.cluster.util.SameProcessHornetQServer; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; import org.junit.After; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java index 05f593e62f..70c38e772b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java @@ -11,32 +11,32 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.HAPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServerLogger; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; -import org.hornetq.tests.integration.cluster.util.TestableServer; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.HAPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.integration.cluster.util.SameProcessHornetQServer; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; import org.junit.After; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java index cbc6c98ed4..454deb2046 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; /** * A NettyAsynchronousFailoverTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java similarity index 79% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java index 2f7815fc45..5fe3f98e2c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; /** * A NettyAsynchronousReattachTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java index 1cc0da0587..4d5c389f50 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** * A NettyDiscoveryClusterWithBackupFailoverTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFailoverTest.java similarity index 81% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFailoverTest.java index a298420953..3a4a57f4c4 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import org.junit.Test; @@ -19,14 +19,14 @@ import java.util.Map; import org.junit.Assert; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.api.core.TransportConfiguration; +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.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; /** * A NettyFailoverTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java index f2184e08b5..d342ed7915 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** * A NettyFileStorageDiscoveryClusterWithBackupFailoverTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java index 4c83f7f537..15bc5d0217 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** * A NettyFileStorageClusterWithBackupFailoverTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java similarity index 83% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java index 6e587beb95..67f51eaee3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java @@ -11,12 +11,12 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.config.Configuration; -import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; -import org.hornetq.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.tests.integration.cluster.util.SameProcessHornetQServer; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; /** * A NettyReplicatedFailoverTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java index 34ed9141de..760395a605 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** * A NettyClusterWithBackupFailoverTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/PagingFailoverTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/PagingFailoverTest.java index a7d6941642..d6bb48a265 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/PagingFailoverTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.HashMap; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; -import org.hornetq.tests.integration.cluster.util.TestableServer; -import org.hornetq.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.cluster.util.SameProcessHornetQServer; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/QuorumFailOverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/QuorumFailOverTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/QuorumFailOverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/QuorumFailOverTest.java index d9c1f6bc11..3f5ade175d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/QuorumFailOverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/QuorumFailOverTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.tests.integration.cluster.util.BackupSyncDelay; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.tests.integration.cluster.util.BackupSyncDelay; import org.junit.Test; public class QuorumFailOverTest extends StaticClusterWithBackupFailoverTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java index f75ce792a1..8ef23b957f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.core.server.cluster.qourum.BooleanVote; -import org.hornetq.core.server.cluster.qourum.QuorumVoteServerConnect; -import org.hornetq.tests.integration.server.FakeStorageManager; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.server.cluster.qourum.BooleanVote; +import org.apache.activemq6.core.server.cluster.qourum.QuorumVoteServerConnect; +import org.apache.activemq6.tests.integration.server.FakeStorageManager; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java index 0ff1e750b8..97336fe690 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedDistributionTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedDistributionTest.java index f1b394d8e0..b00cf4bd0e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedDistributionTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; -import org.hornetq.tests.util.CountDownSessionFailureListener; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.tests.util.CountDownSessionFailureListener; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedFailoverTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedFailoverTest.java index 88c087d105..7dd25a7d23 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedFailoverTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.server.cluster.ha.ReplicatedPolicy; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.server.cluster.ha.ReplicatedPolicy; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java index 11a6577ec1..5e18e07c41 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; public class ReplicatedFailoverUsingNodeGroupNameTest extends ReplicatedFailoverTest { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java index 4de14b9a83..ae327a8431 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; /** * A ReplicatedLargeMessageFailoverTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java index 858f70c856..c8be9f2f57 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.tests.integration.cluster.util.BackupSyncDelay; +package org.apache.activemq6.tests.integration.cluster.failover; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.tests.integration.cluster.util.BackupSyncDelay; import org.junit.After; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java index 967dede0d3..1e2b9f7838 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java index 46741b1193..3563f49e15 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java index edb40e87c0..5e08e23e1c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java @@ -11,19 +11,19 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java index 1ba7945531..9628c49720 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java index dcecced3c4..c8c27ef7a0 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java @@ -11,15 +11,15 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java index 3d0a3e5235..e1737e5938 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** * A ReplicatedNettyAsynchronousFailoverTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java similarity index 81% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java index ae08ba9931..df4abee12e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import org.junit.Test; import java.util.HashMap; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.settings.impl.AddressSettings; public class ReplicatedPagedFailoverTest extends ReplicatedFailoverTest { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java index cea11b6ca1..f9c4a8a1c2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java index 2096fb9779..62f14f3e74 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import org.junit.Before; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.tests.integration.cluster.util.BackupSyncDelay; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.tests.integration.cluster.util.BackupSyncDelay; /** * See {@link BackupSyncDelay} for the rationale about these 'WithDelay' tests. diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SecurityFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SecurityFailoverTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SecurityFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SecurityFailoverTest.java index b9374f6eea..930e8012be 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SecurityFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SecurityFailoverTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.HashSet; import java.util.Set; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; /** * A SecurityFailoverTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SharedStoreDistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SharedStoreDistributionTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SharedStoreDistributionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SharedStoreDistributionTest.java index 58662e95c7..dc80c4376a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SharedStoreDistributionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SharedStoreDistributionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** * A SharedStoreReplicatedDistributionTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java index 8bedccacd9..65fc714027 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; -import org.hornetq.tests.integration.cluster.util.TestableServer; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq6.core.client.impl.Topology; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.cluster.util.SameProcessHornetQServer; +import org.apache.activemq6.tests.integration.cluster.util.TestableServer; import org.junit.After; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java index 3b9a0b4fa6..f674d68b2c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover; +package org.apache.activemq6.tests.integration.cluster.failover; /** * A StaticClusterWithBackupFailoverTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java similarity index 69% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java index 0789c4e2b8..5e6f0e5982 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.failover.remote; +package org.apache.activemq6.tests.integration.cluster.failover.remote; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java index bb805a800c..85ff4ba692 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.ha; +package org.apache.activemq6.tests.integration.cluster.ha; -import org.hornetq.core.config.HAPolicyConfiguration; -import org.hornetq.core.config.ha.ColocatedPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.core.config.HAPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ColocatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java index de7006f5de..88e915eb31 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.reattach; +package org.apache.activemq6.tests.integration.cluster.reattach; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.core.config.Configuration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.core.config.Configuration; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java index acf9409771..5ddc7a8fac 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.reattach; +package org.apache.activemq6.tests.integration.cluster.reattach; import org.junit.Before; import org.junit.After; @@ -25,21 +25,21 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.remoting.impl.invm.InVMRegistry; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.client.HornetQBytesMessage; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.RandomUtil; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.remoting.impl.invm.InVMRegistry; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.client.HornetQBytesMessage; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; /** * A MultiThreadRandomReattachTestBase diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java index 5d776b60e8..1ca925fd1b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.reattach; +package org.apache.activemq6.tests.integration.cluster.reattach; import org.junit.Before; import org.junit.After; @@ -21,17 +21,17 @@ import java.util.TimerTask; import org.junit.Assert; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.protocol.core.impl.RemotingConnectionImpl; -import org.hornetq.core.remoting.impl.invm.InVMConnector; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.protocol.core.impl.RemotingConnectionImpl; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnector; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A MultiThreadFailoverSupport diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java index c83743f9e9..15a918fbbe 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.reattach; +package org.apache.activemq6.tests.integration.cluster.reattach; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; /** * A NettyMultiThreadRandomReattachTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/OrderReattachTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/OrderReattachTest.java index 5660237f58..51f3886b5a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/OrderReattachTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.reattach; +package org.apache.activemq6.tests.integration.cluster.reattach; import org.junit.Test; @@ -22,21 +22,21 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.protocol.core.impl.RemotingConnectionImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.protocol.core.impl.RemotingConnectionImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * A OrderReattachTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/RandomReattachTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/RandomReattachTest.java index 099b04cf60..8cbcf9cb90 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/RandomReattachTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.reattach; +package org.apache.activemq6.tests.integration.cluster.reattach; import java.util.ArrayList; import java.util.HashSet; @@ -20,28 +20,28 @@ import java.util.TimerTask; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMRegistry; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMRegistry; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -1497,7 +1497,7 @@ public class RandomReattachTest extends UnitTestCase { Configuration liveConf = createDefaultConfig() .setSecurityEnabled(false) - .addAcceptorConfiguration(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); + .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory")); liveService = HornetQServers.newHornetQServer(liveConf, false); liveService.start(); } @@ -1565,7 +1565,7 @@ public class RandomReattachTest extends UnitTestCase private final ArrayList errors = new ArrayList(); /* (non-Javadoc) - * @see org.hornetq.api.core.client.MessageHandler#onMessage(org.hornetq.api.core.client.ClientMessage) + * @see org.apache.activemq6.api.core.client.MessageHandler#onMessage(org.hornetq.api.core.client.ClientMessage) */ public void onMessage(ClientMessage message) { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/ReattachTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/ReattachTest.java index 90f477d4d3..0dc876ad39 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/ReattachTest.java @@ -10,36 +10,36 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.reattach; +package org.apache.activemq6.tests.integration.cluster.reattach; import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.HornetQObjectClosedException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.remoting.impl.invm.InVMConnector; -import org.hornetq.core.remoting.impl.invm.InVMRegistry; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.HornetQObjectClosedException; +import org.apache.activemq6.api.core.Interceptor; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnector; +import org.apache.activemq6.core.remoting.impl.invm.InVMRegistry; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/restart/ClusterRestartTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/restart/ClusterRestartTest.java index c27efb363a..9980ac263a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/restart/ClusterRestartTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.restart; +package org.apache.activemq6.tests.integration.cluster.restart; import org.junit.Test; import java.util.Collection; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/HAClientTopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/HAClientTopologyTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/HAClientTopologyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/HAClientTopologyTest.java index fbfb2092c8..9f133efcd4 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/HAClientTopologyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/HAClientTopologyTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.topology; +package org.apache.activemq6.tests.integration.cluster.topology; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; /** * @author Jeff Mesnil diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java index 36dd7d66bf..5c9eb4f1aa 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.topology; +package org.apache.activemq6.tests.integration.cluster.topology; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; /** * @author Jeff Mesnil diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/IsolatedTopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/IsolatedTopologyTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/IsolatedTopologyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/IsolatedTopologyTest.java index ebbe331d91..259cf87097 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/IsolatedTopologyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/IsolatedTopologyTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.topology; +package org.apache.activemq6.tests.integration.cluster.topology; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.client.impl.TopologyMemberImpl; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.client.impl.Topology; +import org.apache.activemq6.core.client.impl.TopologyMemberImpl; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; @@ -108,7 +108,7 @@ public class IsolatedTopologyTest extends ServiceTestBase { Map params = new HashMap(); params.put(TransportConstants.CLUSTER_CONNECTION, "cc1"); - params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "1"); + params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "1"); TransportConfiguration acceptor1VM1 = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY, params, @@ -116,7 +116,7 @@ public class IsolatedTopologyTest extends ServiceTestBase params = new HashMap(); params.put(TransportConstants.CLUSTER_CONNECTION, "cc2"); - params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "2"); + params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "2"); TransportConfiguration acceptor2VM1 = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY, params, @@ -165,7 +165,7 @@ public class IsolatedTopologyTest extends ServiceTestBase Map params = new HashMap(); params.put(TransportConstants.CLUSTER_CONNECTION, "cc1"); - params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "3"); + params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "3"); TransportConfiguration acceptor1VM1 = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY, params, @@ -173,7 +173,7 @@ public class IsolatedTopologyTest extends ServiceTestBase params = new HashMap(); params.put(TransportConstants.CLUSTER_CONNECTION, "cc2"); - params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "4"); + params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "4"); TransportConfiguration acceptor2VM1 = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY, params, diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/NettyHAClientTopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NettyHAClientTopologyTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/NettyHAClientTopologyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NettyHAClientTopologyTest.java index 0fab33c430..de1ceec8be 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/NettyHAClientTopologyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NettyHAClientTopologyTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.topology; +package org.apache.activemq6.tests.integration.cluster.topology; /** * A NettyHAClientTopologyTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java index 1be782f51c..d3f53f9599 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.topology; +package org.apache.activemq6.tests.integration.cluster.topology; /** * A NettyHAClientTopologyWithDiscoveryTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/NonHATopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NonHATopologyTest.java similarity index 81% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/NonHATopologyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NonHATopologyTest.java index 57acb403c8..dc7cba7fa6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/NonHATopologyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NonHATopologyTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.topology; +package org.apache.activemq6.tests.integration.cluster.topology; import org.junit.Test; import java.util.ArrayList; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.core.client.impl.ServerLocatorInternal; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.client.impl.TopologyMemberImpl; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq6.core.client.impl.Topology; +import org.apache.activemq6.core.client.impl.TopologyMemberImpl; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * I have added this test to help validate if the connectors from Recovery will be diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/TopologyClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/TopologyClusterTestBase.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/TopologyClusterTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/TopologyClusterTestBase.java index 73e7ff6d45..7046798e59 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/topology/TopologyClusterTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/TopologyClusterTestBase.java @@ -10,32 +10,32 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.topology; +package org.apache.activemq6.tests.integration.cluster.topology; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQObjectClosedException; -import org.hornetq.api.core.HornetQUnBlockedException; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClusterTopologyListener; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.client.TopologyMember; -import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.ClusterManager; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQObjectClosedException; +import org.apache.activemq6.api.core.HornetQUnBlockedException; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ClusterTopologyListener; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.client.TopologyMember; +import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.server.cluster.ClusterManager; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.tests.util.RandomUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/BackupSyncDelay.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/BackupSyncDelay.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/BackupSyncDelay.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/BackupSyncDelay.java index d3f51f9a4b..a262333c60 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/BackupSyncDelay.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/BackupSyncDelay.java @@ -13,24 +13,24 @@ /** * */ -package org.hornetq.tests.integration.cluster.util; +package org.apache.activemq6.tests.integration.cluster.util; import java.util.concurrent.locks.Lock; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.ChannelHandler; -import org.hornetq.core.protocol.core.CommandConfirmationHandler; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationResponseMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; -import org.hornetq.core.replication.ReplicationEndpoint; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.SharedNothingBackupActivation; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.protocol.core.Channel; +import org.apache.activemq6.core.protocol.core.ChannelHandler; +import org.apache.activemq6.core.protocol.core.CommandConfirmationHandler; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationResponseMessage; +import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; +import org.apache.activemq6.core.replication.ReplicationEndpoint; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.SharedNothingBackupActivation; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * An interceptor to keep a replicated backup server from reaching "up-to-date" status. diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/MultiServerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/MultiServerTestBase.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/MultiServerTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/MultiServerTestBase.java index 8b2ee1dfaf..21391bab48 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/MultiServerTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/MultiServerTestBase.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.util; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; +package org.apache.activemq6.tests.integration.cluster.util; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; import org.junit.Before; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * @author Clebert Suconic diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/RemoteServerConfiguration.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/RemoteServerConfiguration.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/RemoteServerConfiguration.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/RemoteServerConfiguration.java index 599df5178a..cd299e697f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/RemoteServerConfiguration.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/RemoteServerConfiguration.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.util; +package org.apache.activemq6.tests.integration.cluster.util; -import org.hornetq.core.config.Configuration; +import org.apache.activemq6.core.config.Configuration; /** * A RemoteServerConfiguration. diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/SameProcessHornetQServer.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/SameProcessHornetQServer.java index 7a289a69ba..0ef3a02ef1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/SameProcessHornetQServer.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.util; +package org.apache.activemq6.tests.integration.cluster.util; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.cluster.ClusterManager; -import org.hornetq.tests.util.CountDownSessionFailureListener; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.cluster.ClusterManager; +import org.apache.activemq6.tests.util.CountDownSessionFailureListener; import org.junit.Assert; import java.util.concurrent.CountDownLatch; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/TestableServer.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/TestableServer.java similarity index 80% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/TestableServer.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/TestableServer.java index e789a79fb2..69307ab18a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/TestableServer.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/TestableServer.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.cluster.util; +package org.apache.activemq6.tests.integration.cluster.util; import java.util.concurrent.CountDownLatch; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServer; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServer; /** * A TestServer diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/core/deployers/impl/QueueDeployerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/core/deployers/impl/QueueDeployerTest.java similarity index 80% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/core/deployers/impl/QueueDeployerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/core/deployers/impl/QueueDeployerTest.java index 03cf67935b..0499f85af2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/core/deployers/impl/QueueDeployerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/core/deployers/impl/QueueDeployerTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.core.deployers.impl; +package org.apache.activemq6.tests.integration.core.deployers.impl; import org.junit.Before; import org.junit.Test; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.deployers.DeploymentManager; -import org.hornetq.core.deployers.impl.FileDeploymentManager; -import org.hornetq.core.deployers.impl.QueueDeployer; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.deployers.DeploymentManager; +import org.apache.activemq6.core.deployers.impl.FileDeploymentManager; +import org.apache.activemq6.core.deployers.impl.QueueDeployer; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -57,7 +57,7 @@ public class QueueDeployerTest extends ServiceTestBase + " " + ""; - Element rootNode = org.hornetq.utils.XMLUtil.stringToElement(xml); + Element rootNode = org.apache.activemq6.utils.XMLUtil.stringToElement(xml); deployer.validate(rootNode); NodeList queueNodes = rootNode.getElementsByTagName("queue"); assertEquals(1, queueNodes.getLength()); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/discovery/DiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/discovery/DiscoveryTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/discovery/DiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/discovery/DiscoveryTest.java index 2b10d2c8f6..fb50538f8b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/discovery/DiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/discovery/DiscoveryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.discovery; +package org.apache.activemq6.tests.integration.discovery; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -30,28 +30,28 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.BroadcastEndpoint; -import org.hornetq.api.core.BroadcastEndpointFactory; -import org.hornetq.api.core.HornetQIllegalStateException; -import org.hornetq.api.core.JGroupsBroadcastGroupConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.core.cluster.DiscoveryEntry; -import org.hornetq.core.cluster.DiscoveryGroup; -import org.hornetq.core.cluster.DiscoveryListener; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.cluster.BroadcastGroup; -import org.hornetq.core.server.cluster.impl.BroadcastGroupImpl; -import org.hornetq.core.server.management.Notification; -import org.hornetq.core.server.management.NotificationService; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.SimpleNotificationService; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.BroadcastEndpoint; +import org.apache.activemq6.api.core.BroadcastEndpointFactory; +import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq6.api.core.JGroupsBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.core.cluster.DiscoveryEntry; +import org.apache.activemq6.core.cluster.DiscoveryGroup; +import org.apache.activemq6.core.cluster.DiscoveryListener; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.cluster.BroadcastGroup; +import org.apache.activemq6.core.server.cluster.impl.BroadcastGroupImpl; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.core.server.management.NotificationService; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.SimpleNotificationService; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.UUIDGenerator; import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/divert/DivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/divert/DivertTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/divert/DivertTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/divert/DivertTest.java index 6bae7f1443..c5c18a34d4 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/divert/DivertTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/divert/DivertTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.divert; +package org.apache.activemq6.tests.integration.divert; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/divert/PersistentDivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/divert/PersistentDivertTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/divert/PersistentDivertTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/divert/PersistentDivertTest.java index 95264f79cd..a63af61026 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/divert/PersistentDivertTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/divert/PersistentDivertTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.divert; +package org.apache.activemq6.tests.integration.divert; import org.junit.Test; @@ -19,20 +19,20 @@ import java.util.List; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.config.Configuration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A PersistentDivertTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/embedded/ValidateAIOTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/embedded/ValidateAIOTest.java similarity index 78% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/embedded/ValidateAIOTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/embedded/ValidateAIOTest.java index 3f9b5d5231..5d10d8d105 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/embedded/ValidateAIOTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/embedded/ValidateAIOTest.java @@ -11,13 +11,13 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.embedded; +package org.apache.activemq6.tests.integration.embedded; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.JournalType; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/http/CoreClientOverHttpTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/http/CoreClientOverHttpTest.java index 7c08c77919..69ee812db2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/http/CoreClientOverHttpTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.http; +package org.apache.activemq6.tests.integration.http; import org.junit.Before; import org.junit.Test; @@ -20,21 +20,21 @@ import java.util.Random; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/FloodServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/FloodServerTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/FloodServerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/FloodServerTest.java index 1550d0b82b..6c2f934418 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/FloodServerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/FloodServerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms; +package org.apache.activemq6.tests.integration.jms; import org.junit.Before; import org.junit.After; @@ -28,19 +28,19 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/HornetQConnectionFactoryTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/HornetQConnectionFactoryTest.java index 1e2def95cf..0397510883 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/HornetQConnectionFactoryTest.java @@ -10,8 +10,8 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; +package org.apache.activemq6.tests.integration.jms; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; import org.junit.Before; import org.junit.Test; @@ -27,20 +27,20 @@ import javax.jms.Session; import org.junit.Assert; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/JMSSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/JMSSecurityTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/JMSSecurityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/JMSSecurityTest.java index be1f4ceffe..24c6837575 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/JMSSecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/JMSSecurityTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms; +package org.apache.activemq6.tests.integration.jms; import javax.jms.JMSContext; import javax.jms.JMSSecurityException; @@ -18,7 +18,7 @@ import javax.jms.JMSSecurityRuntimeException; import javax.jms.QueueConnection; import javax.jms.QueueConnectionFactory; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/JmsProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/JmsProducerTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/JmsProducerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/JmsProducerTest.java index 142734f94e..4b70fffba6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/JmsProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/JmsProducerTest.java @@ -13,7 +13,7 @@ /** * */ -package org.hornetq.tests.integration.jms; +package org.apache.activemq6.tests.integration.jms; import javax.jms.DeliveryMode; import javax.jms.JMSConsumer; @@ -25,13 +25,13 @@ import javax.jms.TextMessage; import java.util.ArrayList; import java.util.Random; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.impl.ClientSessionImpl; -import org.hornetq.core.client.impl.DelegatingSession; -import org.hornetq.jms.client.HornetQJMSContext; -import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.client.impl.ClientSessionImpl; +import org.apache.activemq6.core.client.impl.DelegatingSession; +import org.apache.activemq6.jms.client.HornetQJMSContext; +import org.apache.activemq6.jms.client.HornetQSession; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/ManualReconnectionToSingleServerTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/ManualReconnectionToSingleServerTest.java index 1f35454596..912b40ca6e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/ManualReconnectionToSingleServerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms; +package org.apache.activemq6.tests.integration.jms; import org.junit.Before; import org.junit.After; @@ -37,19 +37,19 @@ import javax.naming.Context; import org.junit.Assert; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.config.impl.JMSQueueConfigurationImpl; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.JMSQueueConfigurationImpl; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * @author Jeff Mesnil diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/BridgeTestBase.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/BridgeTestBase.java index 11811e6016..ecb1f73387 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/BridgeTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.bridge; +package org.apache.activemq6.tests.integration.jms.bridge; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -33,29 +33,29 @@ import java.util.Set; import com.arjuna.ats.arjuna.coordinator.TransactionReaper; import com.arjuna.ats.arjuna.coordinator.TxControl; import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.management.ManagementService; -import org.hornetq.jms.bridge.ConnectionFactoryFactory; -import org.hornetq.jms.bridge.DestinationFactory; -import org.hornetq.jms.bridge.QualityOfServiceMode; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.jms.client.HornetQXAConnectionFactory; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.api.jms.management.JMSQueueControl; +import org.apache.activemq6.api.jms.management.TopicControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq6.jms.bridge.DestinationFactory; +import org.apache.activemq6.jms.bridge.QualityOfServiceMode; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.jms.client.HornetQXAConnectionFactory; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/ClusteredBridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/ClusteredBridgeTestBase.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/ClusteredBridgeTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/ClusteredBridgeTestBase.java index cc75b206b2..5c140211ca 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/ClusteredBridgeTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/ClusteredBridgeTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.bridge; +package org.apache.activemq6.tests.integration.jms.bridge; import javax.jms.ConnectionFactory; import javax.jms.Destination; @@ -23,32 +23,32 @@ import java.util.concurrent.TimeUnit; import com.arjuna.ats.arjuna.coordinator.TransactionReaper; import com.arjuna.ats.arjuna.coordinator.TxControl; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.FailoverEventListener; -import org.hornetq.api.core.client.FailoverEventType; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.bridge.ConnectionFactoryFactory; -import org.hornetq.jms.bridge.DestinationFactory; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.unit.util.InVMContext; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.FailoverEventListener; +import org.apache.activemq6.api.core.client.FailoverEventType; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq6.jms.bridge.DestinationFactory; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.unit.util.InVMContext; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeClusteredTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeClusteredTest.java index 58bfa4101e..e3a204429d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeClusteredTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.bridge; +package org.apache.activemq6.tests.integration.jms.bridge; import javax.transaction.TransactionManager; import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -import org.hornetq.api.core.HornetQException; -import org.hornetq.jms.bridge.ConnectionFactoryFactory; -import org.hornetq.jms.bridge.DestinationFactory; -import org.hornetq.jms.bridge.QualityOfServiceMode; -import org.hornetq.jms.bridge.impl.JMSBridgeImpl; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq6.jms.bridge.DestinationFactory; +import org.apache.activemq6.jms.bridge.QualityOfServiceMode; +import org.apache.activemq6.jms.bridge.impl.JMSBridgeImpl; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java index c20c48d253..7c1f36b7fa 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.bridge; +package org.apache.activemq6.tests.integration.jms.bridge; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.jms.bridge.ConnectionFactoryFactory; -import org.hornetq.jms.bridge.QualityOfServiceMode; -import org.hornetq.jms.bridge.impl.JMSBridgeImpl; -import org.hornetq.jms.client.HornetQXAConnectionFactory; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.ra.DummyTransactionManager; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq6.jms.bridge.QualityOfServiceMode; +import org.apache.activemq6.jms.bridge.impl.JMSBridgeImpl; +import org.apache.activemq6.jms.client.HornetQXAConnectionFactory; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.ra.DummyTransactionManager; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeTest.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeTest.java index c10b07d766..bae45e92ec 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.bridge; +package org.apache.activemq6.tests.integration.jms.bridge; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -30,13 +30,13 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.hornetq.api.jms.HornetQJMSConstants; -import org.hornetq.jms.bridge.ConnectionFactoryFactory; -import org.hornetq.jms.bridge.QualityOfServiceMode; -import org.hornetq.jms.bridge.impl.JMSBridgeImpl; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.utils.DefaultSensitiveStringCodec; +import org.apache.activemq6.api.jms.HornetQJMSConstants; +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq6.jms.bridge.QualityOfServiceMode; +import org.apache.activemq6.jms.bridge.impl.JMSBridgeImpl; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.utils.DefaultSensitiveStringCodec; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/AutoGroupingTest.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/AutoGroupingTest.java index 897e5df91d..11b80f8728 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/AutoGroupingTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.ConnectionFactory; import javax.jms.Message; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; /** * A AutoGroupingTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ConnectionTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ConnectionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ConnectionTest.java index 77921d5c37..c424836152 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ConnectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ConnectionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -27,7 +27,7 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/CreateQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/CreateQueueTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/CreateQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/CreateQueueTest.java index 8743f31ddc..8e4127cc9f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/CreateQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/CreateQueueTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; @@ -18,9 +18,9 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.Topic; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ExpiryMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ExpiryMessageTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ExpiryMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ExpiryMessageTest.java index bb9cc94d8b..b7b5ad05ca 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ExpiryMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ExpiryMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.MessageProducer; @@ -18,10 +18,10 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.tests.integration.management.ManagementControlHelper; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.jms.management.TopicControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.tests.integration.management.ManagementControlHelper; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/GroupIDTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/GroupIDTest.java similarity index 81% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/GroupIDTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/GroupIDTest.java index 0135552966..f3dbee04d0 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/GroupIDTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/GroupIDTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import org.junit.Test; import javax.jms.ConnectionFactory; import javax.jms.Message; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; /** * A GroupIDTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/GroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/GroupingTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/GroupingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/GroupingTest.java index 4346ed6fde..eb7278d559 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/GroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/GroupingTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.JMSException; @@ -21,13 +21,13 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.After; import org.junit.Assume; import org.junit.Before; @@ -63,7 +63,7 @@ public class GroupingTest extends JMSTestBase protected void setProperty(Message message) { - ((HornetQMessage)message).getCoreMessage().putStringProperty(org.hornetq.api.core.Message.HDR_GROUP_ID, new SimpleString("foo")); + ((HornetQMessage)message).getCoreMessage().putStringProperty(org.apache.activemq6.api.core.Message.HDR_GROUP_ID, new SimpleString("foo")); } protected ConnectionFactory getCF() throws Exception diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/MessageProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/MessageProducerTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/MessageProducerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/MessageProducerTest.java index 6c59cb8e37..d081b7ff27 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/MessageProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/MessageProducerTest.java @@ -13,7 +13,7 @@ /** * */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.JMSException; import javax.jms.Message; @@ -21,7 +21,7 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/MessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/MessageTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/MessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/MessageTest.java index 4276bbbda9..66913f6e5d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/MessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/MessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.Message; @@ -21,9 +21,9 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.StreamMessage; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/NewQueueRequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/NewQueueRequestorTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/NewQueueRequestorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/NewQueueRequestorTest.java index 4d395ad42b..72054fbd80 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/NewQueueRequestorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/NewQueueRequestorTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.Destination; import javax.jms.JMSException; @@ -25,8 +25,8 @@ import javax.jms.QueueSession; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/NoLocalSubscriberTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/NoLocalSubscriberTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/NoLocalSubscriberTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/NoLocalSubscriberTest.java index 3e0ae4f82f..3a72fd3790 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/NoLocalSubscriberTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/NoLocalSubscriberTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import org.junit.Test; @@ -24,9 +24,9 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.jms.TopicSubscriber; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.JMSTestBase; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq6.tests.util.RandomUtil; /** * @author Jeff Mesnil diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/PreACKJMSTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/PreACKJMSTest.java index 4446d09d6a..cb29ba26c2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/PreACKJMSTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; @@ -20,10 +20,10 @@ import javax.jms.TextMessage; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ReSendMessageTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ReSendMessageTest.java index 29f66e4284..cd441380c1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ReSendMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.BytesMessage; import javax.jms.MapMessage; @@ -25,12 +25,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.HornetQJMSConstants; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.tests.util.JMSTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.HornetQJMSConstants; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ReceiveNoWaitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ReceiveNoWaitTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ReceiveNoWaitTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ReceiveNoWaitTest.java index d0c057e485..8656c0d113 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ReceiveNoWaitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ReceiveNoWaitTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import org.junit.Before; import org.junit.After; @@ -24,7 +24,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.tests.util.JMSTestBase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/RemoteConnectionStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/RemoteConnectionStressTest.java similarity index 79% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/RemoteConnectionStressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/RemoteConnectionStressTest.java index 4a08174b14..990c438438 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/RemoteConnectionStressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/RemoteConnectionStressTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.MessageProducer; @@ -21,16 +21,16 @@ import javax.jms.TextMessage; import javax.management.MBeanServer; import javax.management.MBeanServerFactory; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -53,7 +53,7 @@ public class RemoteConnectionStressTest extends ServiceTestBase super.setUp(); Configuration conf = ServiceTestBase.createBasicConfigNoDataFolder(); - conf.getAcceptorConfigurations().add(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory")); + conf.getAcceptorConfigurations().add(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory")); mbeanServer = MBeanServerFactory.createMBeanServer(); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java index bbe8f5540d..dc875dcc2d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import org.junit.Test; @@ -27,15 +27,15 @@ import javax.jms.Session; import org.junit.Assert; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.jms.client.HornetQSession; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.jms.client.HornetQSession; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.JMSTestBase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/SessionTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/SessionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/SessionTest.java index 7c1d50a520..5fcae6f22b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/SessionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/SessionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.QueueConnection; @@ -18,8 +18,8 @@ import javax.jms.QueueSession; import javax.jms.Session; import javax.jms.Topic; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/StoreConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/StoreConfigTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/StoreConfigTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/StoreConfigTest.java index 1cfb83e484..312241915e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/StoreConfigTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/StoreConfigTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import org.junit.Test; @@ -26,9 +26,9 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.naming.NamingException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.tests.util.JMSTestBase; /** * A CreateCFTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/TextMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/TextMessageTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/TextMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/TextMessageTest.java index 53379d027f..f66c57ea2f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/TextMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/TextMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; @@ -19,11 +19,11 @@ import javax.jms.Session; import javax.jms.TextMessage; import java.util.List; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.tests.util.JMSTestBase; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq6.tests.util.RandomUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/TopicCleanupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/TopicCleanupTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/TopicCleanupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/TopicCleanupTest.java index 8a20a4e7cd..1789c7c40c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/TopicCleanupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/TopicCleanupTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.client; +package org.apache.activemq6.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.MessageConsumer; @@ -19,14 +19,14 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.impl.FilterImpl; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.impl.FilterImpl; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/BindingsClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/BindingsClusterTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/BindingsClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/BindingsClusterTest.java index b4313e3e81..3a57f40808 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/BindingsClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/BindingsClusterTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.cluster; +package org.apache.activemq6.tests.integration.jms.cluster; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.impl.BridgeImpl; -import org.hornetq.core.server.cluster.impl.ClusterConnectionImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.JMSClusteredTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.cluster.Bridge; +import org.apache.activemq6.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.JMSClusteredTestBase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSFailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSFailoverListenerTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSFailoverListenerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSFailoverListenerTest.java index 73efc4f05c..53f94a996d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSFailoverListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSFailoverListenerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.cluster; +package org.apache.activemq6.tests.integration.jms.cluster; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -26,33 +26,33 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.FailoverEventListener; -import org.hornetq.api.core.client.FailoverEventType; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.remoting.impl.invm.InVMRegistry; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.jms.client.HornetQConnection; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.jms.server.management.JMSUtil; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.InVMNodeManagerServer; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.FailoverEventListener; +import org.apache.activemq6.api.core.client.FailoverEventType; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.InVMRegistry; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.jms.client.HornetQConnection; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQSession; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.jms.server.management.JMSUtil; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.InVMNodeManagerServer; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSFailoverTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSFailoverTest.java index ec7b7688f3..933096a6a4 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.cluster; +package org.apache.activemq6.tests.integration.jms.cluster; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -28,38 +28,38 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.invm.InVMRegistry; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.impl.InVMNodeManager; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.jms.server.management.JMSUtil; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.InVMNodeManagerServer; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; +import org.apache.activemq6.core.remoting.impl.invm.InVMRegistry; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.NodeManager; +import org.apache.activemq6.core.server.impl.InVMNodeManager; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQSession; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.jms.server.management.JMSUtil; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.InVMNodeManagerServer; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSReconnectTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSReconnectTest.java index 25eb15c174..5d1feaade6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSReconnectTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.cluster; +package org.apache.activemq6.tests.integration.jms.cluster; import org.junit.Before; import org.junit.After; @@ -31,24 +31,24 @@ import javax.jms.Topic; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMRegistry; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQSession; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMRegistry; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQSession; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @@ -79,7 +79,7 @@ public class JMSReconnectTest extends UnitTestCase private void testReconnectOrReattachSameNode(boolean reattach) throws Exception { - HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setBlockOnDurableSend(true); jbcf.setBlockOnNonDurableSend(true); @@ -183,7 +183,7 @@ public class JMSReconnectTest extends UnitTestCase //Test that non durable JMS sub gets recreated in auto reconnect private void testReconnectSameNodeServerRestartedWithNonDurableSubOrTempQueue(final boolean nonDurableSub) throws Exception { - HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setReconnectAttempts(-1); @@ -259,7 +259,7 @@ public class JMSReconnectTest extends UnitTestCase @Test public void testNoReconnectCloseAfterFailToReconnectWithTopicConsumer() throws Exception { - HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setReconnectAttempts(0); @@ -291,7 +291,7 @@ public class JMSReconnectTest extends UnitTestCase @Test public void testNoReconnectCloseAfterFailToReconnectWithTempQueue() throws Exception { - HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setReconnectAttempts(0); @@ -325,7 +325,7 @@ public class JMSReconnectTest extends UnitTestCase Configuration liveConf = createBasicConfig() .setJournalType(getDefaultJournalType()) - .addAcceptorConfiguration(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")) + .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory")) .setBindingsDirectory(getBindingsDir()) .setJournalMinFiles(2) .setJournalDirectory(getJournalDir()) diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java index a87cdb5e2f..ded4c7dea5 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.cluster; +package org.apache.activemq6.tests.integration.jms.cluster; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -20,13 +20,13 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.tests.util.JMSClusteredTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.tests.util.JMSClusteredTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java index 38c152379e..abab755b93 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.cluster; +package org.apache.activemq6.tests.integration.jms.cluster; import javax.jms.Connection; import javax.jms.Session; import java.util.concurrent.CountDownLatch; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.tests.util.JMSClusteredTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.tests.util.JMSClusteredTestBase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java similarity index 83% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java index f1cd191ae3..28e8ea6714 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.cluster; +package org.apache.activemq6.tests.integration.jms.cluster; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; /** * A ReplicatedJMSFailoverTest @@ -58,7 +58,7 @@ public class ReplicatedJMSFailoverTest extends JMSFailoverTest liveConf = createBasicConfig() .setJournalType(getDefaultJournalType()) .addConnectorConfiguration("toBackup", new TransportConfiguration(INVM_CONNECTOR_FACTORY, backupParams)) - .addAcceptorConfiguration(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")) + .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory")) .setBindingsDirectory(getBindingsDir(0, false)) .setJournalMinFiles(2) .setJournalDirectory(getJournalDir(0, false)) diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/TemporaryQueueClusterTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/TemporaryQueueClusterTest.java index e8bc008dcd..4db4317694 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/TemporaryQueueClusterTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.cluster; +package org.apache.activemq6.tests.integration.jms.cluster; import org.junit.Before; import org.junit.After; @@ -23,7 +23,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.tests.util.JMSClusteredTestBase; +import org.apache.activemq6.tests.util.JMSClusteredTestBase; /** * A TopicClusterTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/TopicClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/TopicClusterTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/TopicClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/TopicClusterTest.java index 296b1f44e1..ece8c4c16f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/TopicClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/TopicClusterTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.cluster; +package org.apache.activemq6.tests.integration.jms.cluster; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -20,7 +20,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.hornetq.tests.util.JMSClusteredTestBase; +import org.apache.activemq6.tests.util.JMSClusteredTestBase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java similarity index 76% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java index 9bb95eecf2..d4e5f8f28f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.connection; +package org.apache.activemq6.tests.integration.jms.connection; import java.util.concurrent.atomic.AtomicInteger; import javax.jms.Connection; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.tests.util.JMSTestBase; /** * @@ -53,7 +53,7 @@ public class CloseConnectionFactoryOnGCest extends JMSTestBase for (int i = 0; i < 100; i++) { HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, - new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); Connection conn = cf.createConnection(); cf = null; conn.close(); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseConnectionOnGCTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseConnectionOnGCTest.java index 72bcc349b3..d8b94ec716 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseConnectionOnGCTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.connection; +package org.apache.activemq6.tests.integration.jms.connection; import org.junit.Before; import org.junit.After; @@ -26,14 +26,14 @@ import javax.jms.Session; import org.junit.Assert; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.JMSTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.remoting.CloseListener; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @@ -53,7 +53,7 @@ public class CloseConnectionOnGCTest extends JMSTestBase { super.setUp(); - cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseDestroyedConnectionTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseDestroyedConnectionTest.java index 2e1cc84540..5b6cca7ac7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseDestroyedConnectionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.connection; +package org.apache.activemq6.tests.integration.jms.connection; import org.junit.Before; import org.junit.After; @@ -23,19 +23,19 @@ import javax.jms.Session; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.client.HornetQTemporaryTopic; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQSession; +import org.apache.activemq6.jms.client.HornetQTemporaryTopic; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.JMSTestBase; /** * @author Tim Fox diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConcurrentSessionCloseTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConcurrentSessionCloseTest.java index 898aa94e41..db43eb9a52 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConcurrentSessionCloseTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.connection; +package org.apache.activemq6.tests.integration.jms.connection; import org.junit.Before; import org.junit.After; @@ -21,11 +21,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.jms.Connection; import javax.jms.Session; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.tests.util.JMSTestBase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConnectionFactorySerializationTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConnectionFactorySerializationTest.java index af11610f29..4450042f32 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConnectionFactorySerializationTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.connection; +package org.apache.activemq6.tests.integration.jms.connection; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -23,11 +23,11 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -93,7 +93,7 @@ public class ConnectionFactorySerializationTest extends JMSTestBase { cf = (HornetQConnectionFactory) namingContext.lookup("/MyConnectionFactory"); - // apparently looking up the connection factory with the org.hornetq.jms.tests.tools.container.InVMInitialContextFactory + // apparently looking up the connection factory with the org.apache.activemq6.jms.tests.tools.container.InVMInitialContextFactory // is not enough to actually serialize it so we serialize it manually byte[] x = serialize(cf); HornetQConnectionFactory y = deserialize(x, HornetQConnectionFactory.class); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java index ae632323ea..4002c10306 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.connection; +package org.apache.activemq6.tests.integration.jms.connection; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -21,12 +21,12 @@ import java.io.Serializable; import javax.jms.Queue; -import org.hornetq.api.core.BroadcastEndpointFactoryConfiguration; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.JGroupsBroadcastGroupConfiguration; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.BroadcastEndpointFactoryConfiguration; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.JGroupsBroadcastGroupConfiguration; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.tests.util.JMSTestBase; import org.jgroups.JChannel; import org.jgroups.conf.PlainConfigurator; import org.junit.After; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ExceptionListenerTest.java similarity index 80% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ExceptionListenerTest.java index 82589a7ac7..2b9e9eaf39 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ExceptionListenerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.connection; +package org.apache.activemq6.tests.integration.jms.connection; import org.junit.Before; import org.junit.After; @@ -26,20 +26,20 @@ import javax.jms.Session; import org.junit.Assert; -import org.hornetq.api.core.HornetQInternalErrorException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQConnection; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.jms.server.management.NullInitialContext; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQInternalErrorException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQConnection; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQSession; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.jms.server.management.NullInitialContext; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @@ -66,13 +66,13 @@ public class ExceptionListenerTest extends UnitTestCase super.setUp(); Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); + .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory")); server = addServer(HornetQServers.newHornetQServer(conf, false)); jmsServer = new JMSServerManagerImpl(server); jmsServer.setContext(new NullInitialContext()); jmsServer.start(); jmsServer.createQueue(false, ExceptionListenerTest.Q_NAME, null, true, ExceptionListenerTest.Q_NAME); - cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/InvalidConnectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/InvalidConnectorTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/InvalidConnectorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/InvalidConnectorTest.java index 5eb7a55098..803b6e5bd7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/InvalidConnectorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/InvalidConnectorTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.connection; +package org.apache.activemq6.tests.integration.jms.connection; import org.junit.Before; import org.junit.After; import org.junit.Test; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.tests.util.JMSTestBase; import java.net.InetAddress; import java.util.ArrayList; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/consumer/ConsumerTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/consumer/ConsumerTest.java index 61be8dbaad..4a5e2b4a51 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/consumer/ConsumerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.consumer; +package org.apache.activemq6.tests.integration.jms.consumer; import javax.jms.Connection; import javax.jms.JMSConsumer; @@ -28,17 +28,17 @@ import javax.jms.TextMessage; import java.util.Enumeration; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.HornetQJMSConstants; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.server.Queue; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.JMSTestBase; -import org.hornetq.utils.ReusableLatch; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.HornetQJMSConstants; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq6.utils.ReusableLatch; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -75,7 +75,7 @@ public class ConsumerTest extends JMSTestBase jmsServer.createQueue(false, ConsumerTest.Q_NAME, null, true, ConsumerTest.Q_NAME); jmsServer.createTopic(true, T_NAME, "/topic/" + T_NAME); jmsServer.createTopic(true, T2_NAME, "/topic/" + T2_NAME); - cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); } @Override diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/divert/DivertAndACKClientTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/divert/DivertAndACKClientTest.java index c92995de68..69cd9da7e7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/divert/DivertAndACKClientTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.divert; +package org.apache.activemq6.tests.integration.jms.divert; import org.junit.Test; @@ -26,12 +26,12 @@ import javax.jms.TextMessage; import org.junit.Assert; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.tests.util.JMSTestBase; /** * A DivertAndACKClientTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/BodyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/BodyTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/BodyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/BodyTest.java index 952caee468..735b5b5969 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/BodyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/BodyTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.jms2client; +package org.apache.activemq6.tests.integration.jms.jms2client; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -20,8 +20,8 @@ import javax.jms.MessageFormatException; import javax.jms.MessageProducer; import javax.jms.Session; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/InvalidDestinationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/InvalidDestinationTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/InvalidDestinationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/InvalidDestinationTest.java index 78b93d90e4..626c15d49f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/InvalidDestinationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/InvalidDestinationTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.jms2client; +package org.apache.activemq6.tests.integration.jms.jms2client; import javax.jms.Connection; import javax.jms.Destination; @@ -26,7 +26,7 @@ import javax.jms.Topic; import java.util.HashMap; import java.util.Map; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/JmsContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/JmsContextTest.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/JmsContextTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/JmsContextTest.java index 37c3175c47..3f8bfb4930 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/JmsContextTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/JmsContextTest.java @@ -13,7 +13,7 @@ /** * */ -package org.hornetq.tests.integration.jms.jms2client; +package org.apache.activemq6.tests.integration.jms.jms2client; import javax.jms.BytesMessage; import javax.jms.CompletionListener; @@ -39,7 +39,7 @@ import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java index f80c559e9f..03323b530a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java @@ -13,7 +13,7 @@ /** * */ -package org.hornetq.tests.integration.jms.jms2client; +package org.apache.activemq6.tests.integration.jms.jms2client; import javax.jms.CompletionListener; import javax.jms.Connection; @@ -31,8 +31,8 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/NonExistentQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/NonExistentQueueTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/NonExistentQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/NonExistentQueueTest.java index 2878559869..fd237c7cf1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/NonExistentQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/NonExistentQueueTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.jms2client; +package org.apache.activemq6.tests.integration.jms.jms2client; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -26,11 +26,11 @@ import javax.jms.Queue; import javax.jms.Session; import java.util.Random; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/SharedConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/SharedConsumerTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/SharedConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/SharedConsumerTest.java index 20ceaf870f..bbbd863a7f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/jms2client/SharedConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/SharedConsumerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.jms2client; +package org.apache.activemq6.tests.integration.jms.jms2client; import javax.jms.JMSConsumer; import javax.jms.JMSContext; @@ -19,9 +19,9 @@ import javax.jms.JMSRuntimeException; import javax.jms.Topic; import java.util.Random; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.tests.util.JMSTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/largemessage/JMSLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/largemessage/JMSLargeMessageTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/largemessage/JMSLargeMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/largemessage/JMSLargeMessageTest.java index fcb300599b..b02b6972c2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/largemessage/JMSLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/largemessage/JMSLargeMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.largemessage; +package org.apache.activemq6.tests.integration.jms.largemessage; import javax.jms.BytesMessage; import javax.jms.JMSException; @@ -26,9 +26,9 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.tests.util.JMSTestBase; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.UUIDGenerator; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/JMSServerDeployerTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/JMSServerDeployerTest.java index 73605e447f..1ff22c840c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/JMSServerDeployerTest.java @@ -10,29 +10,29 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server; +package org.apache.activemq6.tests.integration.jms.server; import javax.jms.Queue; import javax.jms.Topic; import javax.naming.Context; import java.net.URI; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.deployers.DeploymentManager; -import org.hornetq.core.deployers.impl.FileDeploymentManager; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSServerDeployer; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.deployers.DeploymentManager; +import org.apache.activemq6.core.deployers.impl.FileDeploymentManager; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.impl.JMSServerDeployer; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -73,7 +73,7 @@ public class JMSServerDeployerTest extends ServiceTestBase String xml = " " + ""; - Element rootNode = org.hornetq.utils.XMLUtil.stringToElement(xml); + Element rootNode = org.apache.activemq6.utils.XMLUtil.stringToElement(xml); deployer.validate(rootNode); } @@ -117,7 +117,7 @@ public class JMSServerDeployerTest extends ServiceTestBase String xml = "" + "" + ""; - Element rootNode = org.hornetq.utils.XMLUtil.stringToElement(xml); + Element rootNode = org.apache.activemq6.utils.XMLUtil.stringToElement(xml); deployer.deploy(rootNode); @@ -136,7 +136,7 @@ public class JMSServerDeployerTest extends ServiceTestBase "" + "" + ""; - Element rootNode = org.hornetq.utils.XMLUtil.stringToElement(xml); + Element rootNode = org.apache.activemq6.utils.XMLUtil.stringToElement(xml); deployer.deploy(rootNode); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/JMSServerStartStopTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/JMSServerStartStopTest.java index 409159b411..ed0ef6e0e6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/JMSServerStartStopTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server; +package org.apache.activemq6.tests.integration.jms.server; import javax.jms.Connection; import javax.jms.MessageConsumer; @@ -21,19 +21,19 @@ import javax.jms.TextMessage; import java.util.HashSet; import java.util.Set; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.impl.FileConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.impl.FileConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/config/JMSConfigurationTest.java similarity index 75% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/config/JMSConfigurationTest.java index b36463cd02..8cdcf2b176 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/config/JMSConfigurationTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.config; +package org.apache.activemq6.tests.integration.jms.server.config; import org.junit.Test; @@ -25,23 +25,23 @@ import javax.naming.Context; import org.junit.Assert; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.config.TopicConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.config.impl.JMSQueueConfigurationImpl; -import org.hornetq.jms.server.config.impl.TopicConfigurationImpl; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.TopicConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.JMSQueueConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.TopicConfigurationImpl; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * A JMSConfigurationTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/config/JMSServerConfigParserTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/config/JMSServerConfigParserTest.java index 3cf9587bed..981d728c12 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/config/JMSServerConfigParserTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.config; +package org.apache.activemq6.tests.integration.jms.server.config; import org.junit.Test; import java.io.InputStream; import java.net.URL; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.jms.server.JMSServerConfigParser; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.config.JMSQueueConfiguration; -import org.hornetq.jms.server.config.TopicConfiguration; -import org.hornetq.jms.server.impl.JMSServerConfigParserImpl; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.jms.server.JMSServerConfigParser; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq6.jms.server.config.TopicConfiguration; +import org.apache.activemq6.jms.server.impl.JMSServerConfigParserImpl; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * A JMSServerConfigParserTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/ConnectionFactoryControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/ConnectionFactoryControlTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/ConnectionFactoryControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/ConnectionFactoryControlTest.java index 89e12d08c0..4e5b90eefa 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/ConnectionFactoryControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/ConnectionFactoryControlTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import java.util.ArrayList; import java.util.List; @@ -19,20 +19,20 @@ import javax.management.Notification; import org.junit.Before; import org.junit.After; import org.junit.Test; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.api.jms.management.ConnectionFactoryControl; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.jms.server.management.JMSNotificationType; -import org.hornetq.tests.integration.management.ManagementControlHelper; -import org.hornetq.tests.integration.management.ManagementTestBase; -import org.hornetq.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.api.jms.management.ConnectionFactoryControl; +import org.apache.activemq6.api.jms.management.JMSServerControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.jms.server.management.JMSNotificationType; +import org.apache.activemq6.tests.integration.management.ManagementControlHelper; +import org.apache.activemq6.tests.integration.management.ManagementTestBase; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; /** * A Connection Factory Control Test diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSMessagingProxy.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSMessagingProxy.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSMessagingProxy.java index d354ee1db9..0d7115fb83 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSMessagingProxy.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSMessagingProxy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import javax.jms.Message; import javax.jms.Queue; @@ -18,7 +18,7 @@ import javax.jms.QueueRequestor; import javax.jms.QueueSession; import javax.jms.Session; -import org.hornetq.api.jms.management.JMSManagementHelper; +import org.apache.activemq6.api.jms.management.JMSManagementHelper; /** * A MBeanUsingCoreMessage diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSQueueControlTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSQueueControlTest.java index 2d6b052a9a..5a29438eb8 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSQueueControlTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import javax.jms.Connection; import javax.jms.JMSException; @@ -27,35 +27,35 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.jms.server.management.JMSNotificationType; -import org.hornetq.tests.integration.management.ManagementControlHelper; -import org.hornetq.tests.integration.management.ManagementTestBase; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.utils.UUIDGenerator; -import org.hornetq.utils.json.JSONArray; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.api.jms.management.JMSQueueControl; +import org.apache.activemq6.api.jms.management.JMSServerControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQQueue; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.jms.server.management.JMSNotificationType; +import org.apache.activemq6.tests.integration.management.ManagementControlHelper; +import org.apache.activemq6.tests.integration.management.ManagementTestBase; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq6.utils.json.JSONArray; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -829,7 +829,7 @@ public class JMSQueueControlTest extends ManagementTestBase { ClientMessage msg = session.createMessage(true); - msg.putStringProperty(org.hornetq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i)); + msg.putStringProperty(org.apache.activemq6.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i)); prod1.send(msg); if (i < 5) @@ -910,7 +910,7 @@ public class JMSQueueControlTest extends ManagementTestBase { ClientMessage msg = session.createMessage(true); - msg.putStringProperty(org.hornetq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i)); + msg.putStringProperty(org.apache.activemq6.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i)); msg.setUserID(UUIDGenerator.getInstance().generateUUID()); @@ -992,7 +992,7 @@ public class JMSQueueControlTest extends ManagementTestBase ClientMessage msg = session.createMessage(true); - msg.putStringProperty(org.hornetq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-1")); + msg.putStringProperty(org.apache.activemq6.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-1")); prod1.send(msg); prod2.send(msg); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java index 13c8cb7733..c960d32419 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import org.junit.Before; import org.junit.After; @@ -20,14 +20,14 @@ import javax.jms.QueueConnection; import javax.jms.QueueSession; import javax.jms.Session; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQQueue; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.api.jms.management.JMSQueueControl; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQQueue; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControl2Test.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControl2Test.java index 1395a8149f..acea7bdfc1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControl2Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -28,30 +28,30 @@ import java.util.Arrays; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.management.JMSConnectionInfo; -import org.hornetq.api.jms.management.JMSConsumerInfo; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.api.jms.management.JMSSessionInfo; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.ra.inflow.HornetQActivation; -import org.hornetq.ra.inflow.HornetQActivationSpec; -import org.hornetq.tests.integration.management.ManagementControlHelper; -import org.hornetq.tests.integration.management.ManagementTestBase; -import org.hornetq.tests.unit.ra.MessageEndpointFactory; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.management.JMSConnectionInfo; +import org.apache.activemq6.api.jms.management.JMSConsumerInfo; +import org.apache.activemq6.api.jms.management.JMSServerControl; +import org.apache.activemq6.api.jms.management.JMSSessionInfo; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.ra.inflow.HornetQActivation; +import org.apache.activemq6.ra.inflow.HornetQActivationSpec; +import org.apache.activemq6.tests.integration.management.ManagementControlHelper; +import org.apache.activemq6.tests.integration.management.ManagementTestBase; +import org.apache.activemq6.tests.unit.ra.MessageEndpointFactory; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.RandomUtil; import org.junit.After; import org.junit.Assert; import org.junit.Test; @@ -521,10 +521,10 @@ public class JMSServerControl2Test extends ManagementTestBase ra = new HornetQResourceAdapter(); - ra.setConnectorClassName("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"); + ra.setConnectorClassName("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory"); ra.setUserName("userGlobal"); ra.setPassword("passwordGlobal"); - ra.start(new org.hornetq.tests.unit.ra.BootstrapContext()); + ra.start(new org.apache.activemq6.tests.unit.ra.BootstrapContext()); ra.setClientID("my-client-id"); ra.setUserName("user"); Connection conn = ra.getDefaultHornetQConnectionFactory().createConnection(); @@ -608,10 +608,10 @@ public class JMSServerControl2Test extends ManagementTestBase ra = new HornetQResourceAdapter(); - ra.setConnectorClassName("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"); + ra.setConnectorClassName("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory"); ra.setUserName("userGlobal"); ra.setPassword("passwordGlobal"); - ra.start(new org.hornetq.tests.unit.ra.BootstrapContext()); + ra.start(new org.apache.activemq6.tests.unit.ra.BootstrapContext()); Connection conn = ra.getDefaultHornetQConnectionFactory().createConnection(); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlRestartTest.java similarity index 81% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlRestartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlRestartTest.java index b6885f8704..136823bc7d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlRestartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlRestartTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import javax.jms.Connection; import javax.jms.Message; @@ -19,25 +19,25 @@ import javax.jms.QueueRequestor; import javax.jms.QueueSession; import javax.jms.Session; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.api.jms.management.JMSManagementHelper; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.JournalType; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.management.ManagementControlHelper; -import org.hornetq.tests.integration.management.ManagementTestBase; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.api.jms.management.JMSManagementHelper; +import org.apache.activemq6.api.jms.management.JMSServerControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.management.ManagementControlHelper; +import org.apache.activemq6.tests.integration.management.ManagementTestBase; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlTest.java index d7eefefd6b..342bbc773e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -34,38 +34,38 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.HornetQObjectClosedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.management.AddressControl; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQConnection; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQMessageConsumer; -import org.hornetq.jms.client.HornetQQueueConnectionFactory; -import org.hornetq.jms.persistence.JMSStorageManager; -import org.hornetq.jms.persistence.config.PersistedConnectionFactory; -import org.hornetq.jms.persistence.config.PersistedDestination; -import org.hornetq.jms.persistence.config.PersistedJNDI; -import org.hornetq.jms.persistence.config.PersistedType; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.management.ManagementControlHelper; -import org.hornetq.tests.integration.management.ManagementTestBase; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.json.JSONArray; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.HornetQObjectClosedException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.management.AddressControl; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.management.JMSServerControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.postoffice.QueueBinding; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQConnection; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQMessageConsumer; +import org.apache.activemq6.jms.client.HornetQQueueConnectionFactory; +import org.apache.activemq6.jms.persistence.JMSStorageManager; +import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq6.jms.persistence.config.PersistedDestination; +import org.apache.activemq6.jms.persistence.config.PersistedJNDI; +import org.apache.activemq6.jms.persistence.config.PersistedType; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.management.ManagementControlHelper; +import org.apache.activemq6.tests.integration.management.ManagementTestBase; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.json.JSONArray; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java index 13c3c91d66..db17bd8722 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import org.junit.Before; import org.junit.After; @@ -20,16 +20,16 @@ import javax.jms.QueueConnection; import javax.jms.QueueSession; import javax.jms.Session; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.client.HornetQQueueConnectionFactory; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.api.jms.management.JMSServerControl; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQQueue; +import org.apache.activemq6.jms.client.HornetQQueueConnectionFactory; /** * A JMSServerControlUsingCoreTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSUtil.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSUtil.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSUtil.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSUtil.java index ede6476fa2..ef5b2855b3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSUtil.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSUtil.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -32,25 +32,25 @@ import java.util.Collection; import java.util.Set; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.client.impl.Topology; -import org.hornetq.core.client.impl.TopologyMemberImpl; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.ClusterManager; -import org.hornetq.core.server.cluster.impl.ClusterConnectionImpl; -import org.hornetq.jms.client.HornetQConnection; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.tests.integration.cluster.failover.FailoverTestBase; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.client.impl.Topology; +import org.apache.activemq6.core.client.impl.TopologyMemberImpl; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.cluster.ClusterConnection; +import org.apache.activemq6.core.server.cluster.ClusterManager; +import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq6.jms.client.HornetQConnection; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.tests.integration.cluster.failover.FailoverTestBase; +import org.apache.activemq6.tests.util.RandomUtil; /** * A JMSUtil diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/NullInitialContext.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/NullInitialContext.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/NullInitialContext.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/NullInitialContext.java index f41472201f..d953bd9751 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/NullInitialContext.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/NullInitialContext.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import javax.naming.InitialContext; import javax.naming.Name; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/TopicControlClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlClusterTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/TopicControlClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlClusterTest.java index e2b1b3b566..1a21d18837 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/TopicControlClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlClusterTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import org.junit.Before; import org.junit.After; import org.junit.Test; -import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.tests.integration.management.ManagementControlHelper; -import org.hornetq.tests.util.JMSClusteredTestBase; +import org.apache.activemq6.api.jms.management.TopicControl; +import org.apache.activemq6.tests.integration.management.ManagementControlHelper; +import org.apache.activemq6.tests.util.JMSClusteredTestBase; import javax.jms.Connection; import javax.jms.Session; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlTest.java index d4deaebe2e..59bb7b2982 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import javax.jms.Connection; import javax.jms.Message; @@ -25,27 +25,27 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.api.jms.management.SubscriptionInfo; -import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQTopic; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.jms.server.management.JMSNotificationType; -import org.hornetq.tests.integration.management.ManagementControlHelper; -import org.hornetq.tests.integration.management.ManagementTestBase; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.utils.json.JSONArray; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.management.JMSServerControl; +import org.apache.activemq6.api.jms.management.SubscriptionInfo; +import org.apache.activemq6.api.jms.management.TopicControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQTopic; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.jms.server.management.JMSNotificationType; +import org.apache.activemq6.tests.integration.management.ManagementControlHelper; +import org.apache.activemq6.tests.integration.management.ManagementTestBase; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.utils.json.JSONArray; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -597,7 +597,7 @@ public class TopicControlTest extends ManagementTestBase super.setUp(); Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); + .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory")); server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlUsingJMSTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlUsingJMSTest.java index e0d3bbe885..90e16debb3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlUsingJMSTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.jms.server.management; +package org.apache.activemq6.tests.integration.jms.server.management; import org.junit.Before; import org.junit.After; import org.junit.Test; -import static org.hornetq.tests.util.RandomUtil.randomString; +import static org.apache.activemq6.tests.util.RandomUtil.randomString; import javax.jms.Connection; import javax.jms.Message; @@ -28,22 +28,22 @@ import javax.jms.TopicSubscriber; import org.junit.Assert; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.client.HornetQTopic; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.management.ManagementTestBase; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.client.HornetQQueue; +import org.apache.activemq6.jms.client.HornetQTopic; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.management.ManagementTestBase; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.RandomUtil; public class TopicControlUsingJMSTest extends ManagementTestBase { @@ -438,7 +438,7 @@ public class TopicControlUsingJMSTest extends ManagementTestBase super.setUp(); Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); + .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory")); server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/AIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOImportExportTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/AIOImportExportTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOImportExportTest.java index b4593f4f1a..e9ee909040 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/AIOImportExportTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOImportExportTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; +package org.apache.activemq6.tests.integration.journal; import java.io.File; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; import org.junit.BeforeClass; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/AIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOJournalCompactTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/AIOJournalCompactTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOJournalCompactTest.java index 809a76b342..66d2797247 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/AIOJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOJournalCompactTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; +package org.apache.activemq6.tests.integration.journal; import java.io.File; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.journal.impl.JournalConstants; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalConstants; import org.junit.BeforeClass; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/AIOJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOJournalImplTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/AIOJournalImplTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOJournalImplTest.java index 83d66bb6fc..29a5188f5b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/AIOJournalImplTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOJournalImplTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; +package org.apache.activemq6.tests.integration.journal; import java.io.File; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.journal.impl.JournalConstants; -import org.hornetq.tests.unit.core.journal.impl.JournalImplTestUnit; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalConstants; +import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestUnit; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/AIOSequentialFileFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOSequentialFileFactoryTest.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/AIOSequentialFileFactoryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOSequentialFileFactoryTest.java index 445bd0d437..4eb73c2636 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/AIOSequentialFileFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOSequentialFileFactoryTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; +package org.apache.activemq6.tests.integration.journal; import java.nio.ByteBuffer; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.SequentialFileFactoryTestBase; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.SequentialFileFactoryTestBase; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/JournalPerfTuneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/JournalPerfTuneTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/JournalPerfTuneTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/JournalPerfTuneTest.java index f25e9bf5bb..9505e26640 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/JournalPerfTuneTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/JournalPerfTuneTest.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; +package org.apache.activemq6.tests.integration.journal; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.IOCompletion; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.LoaderCallback; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.IOCompletion; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.LoaderCallback; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.DataConstants; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOBufferedJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOBufferedJournalCompactTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOBufferedJournalCompactTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOBufferedJournalCompactTest.java index f84a808fa6..d3b2d3ecd7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOBufferedJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOBufferedJournalCompactTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; +package org.apache.activemq6.tests.integration.journal; import java.io.File; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; /** * A NIOBufferedJournalCompactTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOImportExportTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOImportExportTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOImportExportTest.java index 8aa9658173..0c018bdfe3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOImportExportTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOImportExportTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; +package org.apache.activemq6.tests.integration.journal; import org.junit.After; import org.junit.Test; import java.io.File; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase; -import org.hornetq.tests.unit.core.journal.impl.fakes.SimpleEncoding; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.SimpleEncoding; /** * A NIOImportExportTest @@ -34,7 +34,7 @@ public class NIOImportExportTest extends JournalImplTestBase { /* (non-Javadoc) - * @see org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase#getFileFactory() + * @see org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase#getFileFactory() */ @Override protected SequentialFileFactory getFileFactory() throws Exception diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOJournalCompactTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOJournalCompactTest.java index a0f7b0dd32..289c16efed 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOJournalCompactTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; +package org.apache.activemq6.tests.integration.journal; import java.io.File; import java.io.FilenameFilter; @@ -26,29 +26,29 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.Pair; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AbstractJournalUpdateTask; -import org.hornetq.core.journal.impl.ExportJournal; -import org.hornetq.core.journal.impl.JournalCompactor; -import org.hornetq.core.journal.impl.JournalFile; -import org.hornetq.core.journal.impl.JournalFileImpl; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase; -import org.hornetq.tests.unit.core.journal.impl.fakes.SimpleEncoding; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.IDGenerator; -import org.hornetq.utils.OrderedExecutorFactory; -import org.hornetq.utils.SimpleIDGenerator; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AbstractJournalUpdateTask; +import org.apache.activemq6.core.journal.impl.ExportJournal; +import org.apache.activemq6.core.journal.impl.JournalCompactor; +import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq6.core.journal.impl.JournalFileImpl; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.SimpleEncoding; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.IDGenerator; +import org.apache.activemq6.utils.OrderedExecutorFactory; +import org.apache.activemq6.utils.SimpleIDGenerator; import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOJournalImplTest.java similarity index 79% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOJournalImplTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOJournalImplTest.java index e66ed05424..a90dd9d49c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOJournalImplTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOJournalImplTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; +package org.apache.activemq6.tests.integration.journal; import java.io.File; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.unit.core.journal.impl.JournalImplTestUnit; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestUnit; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIONoBufferJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIONoBufferJournalImplTest.java similarity index 79% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIONoBufferJournalImplTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIONoBufferJournalImplTest.java index 092506b857..47d33ac826 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIONoBufferJournalImplTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIONoBufferJournalImplTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; +package org.apache.activemq6.tests.integration.journal; import java.io.File; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.unit.core.journal.impl.JournalImplTestUnit; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestUnit; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java similarity index 77% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java index 90f85f6dba..af2f06b204 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.SequentialFileFactoryTestBase; +package org.apache.activemq6.tests.integration.journal; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.SequentialFileFactoryTestBase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOSequentialFileFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOSequentialFileFactoryTest.java similarity index 77% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOSequentialFileFactoryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOSequentialFileFactoryTest.java index 7a94481e44..184eaa7b2d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOSequentialFileFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOSequentialFileFactoryTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.SequentialFileFactoryTestBase; +package org.apache.activemq6.tests.integration.journal; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.SequentialFileFactoryTestBase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/OldFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/OldFormatTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/OldFormatTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/OldFormatTest.java index 16cc0b1365..681c378260 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/OldFormatTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/OldFormatTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; +package org.apache.activemq6.tests.integration.journal; import java.nio.ByteBuffer; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase; +import org.apache.activemq6.utils.DataConstants; import org.junit.Test; /** @@ -139,7 +139,7 @@ public class OldFormatTest extends JournalImplTestBase } /* (non-Javadoc) - * @see org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase#getFileFactory() + * @see org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase#getFileFactory() */ @Override protected SequentialFileFactory getFileFactory() throws Exception diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/ValidateTransactionHealthTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/ValidateTransactionHealthTest.java index abebb197a3..f7ed87c244 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/ValidateTransactionHealthTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.journal; +package org.apache.activemq6.tests.integration.journal; import java.io.File; import java.nio.ByteBuffer; import java.util.List; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.journal.LoaderCallback; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.journal.impl.JournalConstants; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.tests.util.SpawnedVMSupport; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.journal.LoaderCallback; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalConstants; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.tests.util.SpawnedVMSupport; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/largemessage/LargeMessageTestBase.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/largemessage/LargeMessageTestBase.java index 30e538d530..e48ebff8d4 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/largemessage/LargeMessageTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.largemessage; +package org.apache.activemq6.tests.integration.largemessage; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -23,25 +23,25 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.DataConstants; -import org.hornetq.utils.DeflaterReader; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +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.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq6.utils.DeflaterReader; import org.junit.Assert; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/largemessage/ServerLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/largemessage/ServerLargeMessageTest.java similarity index 79% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/largemessage/ServerLargeMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/largemessage/ServerLargeMessageTest.java index b6cc74792d..d784592426 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/largemessage/ServerLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/largemessage/ServerLargeMessageTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.largemessage; +package org.apache.activemq6.tests.integration.largemessage; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.persistence.impl.journal.LargeServerMessageImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/AcceptorControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AcceptorControlTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/AcceptorControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AcceptorControlTest.java index b55023beba..dc89e29545 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/AcceptorControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AcceptorControlTest.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Test; import java.util.HashMap; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.AcceptorControl; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.management.Notification; -import org.hornetq.tests.integration.SimpleNotificationService; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.AcceptorControl; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.tests.integration.SimpleNotificationService; +import org.apache.activemq6.tests.util.RandomUtil; /** * A AcceptorControlTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AcceptorControlUsingCoreTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AcceptorControlUsingCoreTest.java index a69a51a0dc..4937d34722 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AcceptorControlUsingCoreTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Test; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.AcceptorControl; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.management.AcceptorControl; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A AcceptorControlUsingCoreTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/AddressControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AddressControlTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/AddressControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AddressControlTest.java index 562e695870..365405b807 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/AddressControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AddressControlTest.java @@ -10,36 +10,36 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import java.util.HashSet; import java.util.Set; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.AddressControl; -import org.hornetq.api.core.management.RoleInfo; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.AddressControl; +import org.apache.activemq6.api.core.management.RoleInfo; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import static org.hornetq.tests.util.RandomUtil.randomString; +import static org.apache.activemq6.tests.util.RandomUtil.randomString; /** * A QueueControlTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AddressControlUsingCoreTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AddressControlUsingCoreTest.java index ef5a2e0b54..9f22639b2e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AddressControlUsingCoreTest.java @@ -10,32 +10,32 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Before; import org.junit.After; import org.junit.Test; -import static org.hornetq.tests.util.RandomUtil.randomString; +import static org.apache.activemq6.tests.util.RandomUtil.randomString; import java.util.HashSet; import java.util.Set; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.AddressControl; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.AddressControl; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.RandomUtil; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BridgeControlTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BridgeControlTest.java index 11acdb23cd..91cf8be340 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BridgeControlTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Before; import org.junit.Test; @@ -23,22 +23,22 @@ import javax.management.MBeanServer; import javax.management.MBeanServerFactory; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.BridgeControl; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.management.Notification; -import org.hornetq.tests.integration.SimpleNotificationService; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.BridgeControl; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.tests.integration.SimpleNotificationService; +import org.apache.activemq6.tests.util.RandomUtil; /** * A BridgeControlTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BridgeControlUsingCoreTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BridgeControlUsingCoreTest.java index 8ee4e78c05..c92f17b93b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BridgeControlUsingCoreTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Before; import org.junit.Test; @@ -24,22 +24,22 @@ import javax.management.MBeanServerFactory; import org.junit.Assert; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.management.ObjectNameBuilder; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.core.config.BridgeConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.RandomUtil; /** * A BridgeControlTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BroadcastGroupControlTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BroadcastGroupControlTest.java index 9c4364eadd..35fa66529d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BroadcastGroupControlTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Test; @@ -19,16 +19,16 @@ import java.util.List; import org.junit.Assert; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.management.BroadcastGroupControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.api.core.Pair; -import org.hornetq.utils.json.JSONArray; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.management.BroadcastGroupControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.utils.json.JSONArray; /** * @author Jeff Mesnil diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BroadcastGroupControlUsingCoreTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BroadcastGroupControlUsingCoreTest.java index 1494b50dc6..438bf4c8b5 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BroadcastGroupControlUsingCoreTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.BroadcastGroupControl; -import org.hornetq.api.core.management.ResourceNames; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.BroadcastGroupControl; +import org.apache.activemq6.api.core.management.ResourceNames; /** * A BroadcastGroupControlUsingCoreTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControl2Test.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControl2Test.java index 43e6010d46..feb728b211 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControl2Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Before; import org.junit.After; @@ -26,18 +26,18 @@ import javax.management.MBeanServerFactory; import org.junit.Assert; -import org.hornetq.api.core.BroadcastGroupConfiguration; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.management.ClusterConnectionControl; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.BroadcastGroupConfiguration; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.management.ClusterConnectionControl; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.RandomUtil; /** * A BridgeControlTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControlTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControlTest.java index 79985affe0..d6da5be9cd 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControlTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Before; import org.junit.After; import org.junit.Test; @@ -24,25 +24,25 @@ import javax.management.MBeanServer; import javax.management.MBeanServerFactory; import org.junit.Assert; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.management.ClusterConnectionControl; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.management.Notification; -import org.hornetq.tests.integration.SimpleNotificationService; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.utils.json.JSONArray; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.management.ClusterConnectionControl; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.management.Notification; +import org.apache.activemq6.tests.integration.SimpleNotificationService; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.utils.json.JSONArray; /** * A BridgeControlTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControlUsingCoreTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControlUsingCoreTest.java index 1e936bfff0..9b1d8b8e85 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControlUsingCoreTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.ClusterConnectionControl; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.management.ClusterConnectionControl; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/CoreMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/CoreMessagingProxy.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/CoreMessagingProxy.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/CoreMessagingProxy.java index d0b52581b4..14811b0d8d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/CoreMessagingProxy.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/CoreMessagingProxy.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientRequestor; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.management.ManagementHelper; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientRequestor; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.management.ManagementHelper; /** * A MBeanUsingCoreMessage diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/DivertControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/DivertControlTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/DivertControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/DivertControlTest.java index ef1e312059..45ac2982fb 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/DivertControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/DivertControlTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Before; import org.junit.After; @@ -18,17 +18,17 @@ import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.DivertControl; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.DivertControl; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.RandomUtil; /** * A BridgeControlTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/DivertControlUsingCoreTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/DivertControlUsingCoreTest.java index 4d7e93c669..4bc500a0b6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/DivertControlUsingCoreTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.DivertControl; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.management.DivertControl; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/HornetQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/HornetQServerControlTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/HornetQServerControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/HornetQServerControlTest.java index 12add436b5..c9b5118b87 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/HornetQServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/HornetQServerControlTest.java @@ -10,43 +10,43 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.AddressSettingsInfo; -import org.hornetq.api.core.management.BridgeControl; -import org.hornetq.api.core.management.DivertControl; -import org.hornetq.api.core.management.HornetQServerControl; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.core.management.RoleInfo; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.settings.impl.SlowConsumerPolicy; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.UUIDGenerator; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.AddressSettingsInfo; +import org.apache.activemq6.api.core.management.BridgeControl; +import org.apache.activemq6.api.core.management.DivertControl; +import org.apache.activemq6.api.core.management.HornetQServerControl; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.api.core.management.RoleInfo; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.messagecounter.impl.MessageCounterManagerImpl; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq6.utils.json.JSONObject; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/HornetQServerControlUsingCoreTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/HornetQServerControlUsingCoreTest.java index 41051f0f09..b2ab383cef 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/HornetQServerControlUsingCoreTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.HornetQServerControl; -import org.hornetq.api.core.management.Parameter; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.management.HornetQServerControl; +import org.apache.activemq6.api.core.management.Parameter; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/JMXDomainTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/JMXDomainTest.java similarity index 83% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/JMXDomainTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/JMXDomainTest.java index 44d1eed205..e4e53afc52 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/JMXDomainTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/JMXDomainTest.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; import org.junit.After; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementActivationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementActivationTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementActivationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementActivationTest.java index c672fbc51f..d41e63e20f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementActivationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementActivationTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import javax.jms.ConnectionFactory; import javax.jms.Queue; @@ -19,13 +19,13 @@ import javax.naming.NameNotFoundException; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.cluster.failover.FailoverTestBase; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.cluster.failover.FailoverTestBase; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementControlHelper.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementControlHelper.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementControlHelper.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementControlHelper.java index e3a62d2345..0674db4995 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementControlHelper.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementControlHelper.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import javax.jms.Queue; import javax.jms.Topic; @@ -18,20 +18,20 @@ import javax.management.MBeanServer; import javax.management.MBeanServerInvocationHandler; import javax.management.ObjectName; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.AcceptorControl; -import org.hornetq.api.core.management.AddressControl; -import org.hornetq.api.core.management.BridgeControl; -import org.hornetq.api.core.management.BroadcastGroupControl; -import org.hornetq.api.core.management.ClusterConnectionControl; -import org.hornetq.api.core.management.DivertControl; -import org.hornetq.api.core.management.HornetQServerControl; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.jms.management.ConnectionFactoryControl; -import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.api.jms.management.TopicControl; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.AcceptorControl; +import org.apache.activemq6.api.core.management.AddressControl; +import org.apache.activemq6.api.core.management.BridgeControl; +import org.apache.activemq6.api.core.management.BroadcastGroupControl; +import org.apache.activemq6.api.core.management.ClusterConnectionControl; +import org.apache.activemq6.api.core.management.DivertControl; +import org.apache.activemq6.api.core.management.HornetQServerControl; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.api.jms.management.ConnectionFactoryControl; +import org.apache.activemq6.api.jms.management.JMSQueueControl; +import org.apache.activemq6.api.jms.management.JMSServerControl; +import org.apache.activemq6.api.jms.management.TopicControl; /** * A ManagementControlHelper diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementHelperTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementHelperTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementHelperTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementHelperTest.java index d06b08c397..86b296fce8 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementHelperTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementHelperTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.client.impl.ClientMessageImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.client.impl.ClientMessageImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementServiceImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementServiceImplTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementServiceImplTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementServiceImplTest.java index 82ec49ccf1..cca33b06c5 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementServiceImplTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementServiceImplTest.java @@ -10,29 +10,29 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.management.AddressControl; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.server.management.impl.ManagementServiceImpl; -import org.hornetq.tests.integration.server.FakeStorageManager; -import org.hornetq.tests.unit.core.postoffice.impl.FakeQueue; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.management.AddressControl; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.persistence.impl.nullpm.NullStorageManager; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.server.management.impl.ManagementServiceImpl; +import org.apache.activemq6.tests.integration.server.FakeStorageManager; +import org.apache.activemq6.tests.unit.core.postoffice.impl.FakeQueue; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; /* * @author Jeff Mesnil diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementTestBase.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementTestBase.java index 5d2452a43c..20753bfbc9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementTestBase.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.jms.management.JMSQueueControl; +package org.apache.activemq6.tests.integration.management; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.api.jms.management.JMSQueueControl; import org.junit.Before; import org.junit.After; @@ -22,11 +22,11 @@ import javax.management.ObjectName; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.tests.util.ServiceTestBase; +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.activemq6.tests.util.ServiceTestBase; /** * A ManagementTestBase diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementWithPagingServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementWithPagingServerTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementWithPagingServerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementWithPagingServerTest.java index 53ea2bf4a6..bef208be29 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementWithPagingServerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementWithPagingServerTest.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import java.nio.ByteBuffer; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.utils.json.JSONArray; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.utils.json.JSONArray; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementWithStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementWithStompTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementWithStompTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementWithStompTest.java index 2bf9096671..f638ff7b0f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/ManagementWithStompTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementWithStompTest.java @@ -10,8 +10,8 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; -import org.hornetq.core.protocol.stomp.StompProtocolManagerFactory; +package org.apache.activemq6.tests.integration.management; +import org.apache.activemq6.core.protocol.stomp.StompProtocolManagerFactory; import org.junit.Before; import org.junit.After; @@ -28,21 +28,21 @@ import java.util.Map; import org.junit.Assert; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.protocol.stomp.Stomp; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.protocol.stomp.Stomp; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.RandomUtil; /** * A ManagementWithStompTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/NotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/NotificationTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/NotificationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/NotificationTest.java index d0f7a8f606..5818b25f7c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/NotificationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/NotificationTest.java @@ -10,36 +10,36 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.management.ManagementHelper; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import static org.hornetq.api.core.management.CoreNotificationType.BINDING_ADDED; -import static org.hornetq.api.core.management.CoreNotificationType.BINDING_REMOVED; -import static org.hornetq.api.core.management.CoreNotificationType.CONSUMER_CLOSED; -import static org.hornetq.api.core.management.CoreNotificationType.CONSUMER_CREATED; +import static org.apache.activemq6.api.core.management.CoreNotificationType.BINDING_ADDED; +import static org.apache.activemq6.api.core.management.CoreNotificationType.BINDING_REMOVED; +import static org.apache.activemq6.api.core.management.CoreNotificationType.CONSUMER_CLOSED; +import static org.apache.activemq6.api.core.management.CoreNotificationType.CONSUMER_CREATED; /** * A NotificationTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/QueueControlTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/QueueControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/QueueControlTest.java index 31bea0f2c8..bef36d804f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/QueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/QueueControlTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import java.util.LinkedList; import java.util.Map; @@ -19,34 +19,34 @@ import java.util.concurrent.TimeUnit; import javax.management.Notification; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.CoreNotificationType; -import org.hornetq.api.core.management.DayCounterInfo; -import org.hornetq.api.core.management.HornetQServerControl; -import org.hornetq.api.core.management.MessageCounterInfo; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.message.impl.MessageImpl; -import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.jms.server.management.JMSUtil; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.utils.json.JSONArray; +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.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.CoreNotificationType; +import org.apache.activemq6.api.core.management.DayCounterInfo; +import org.apache.activemq6.api.core.management.HornetQServerControl; +import org.apache.activemq6.api.core.management.MessageCounterInfo; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq6.core.messagecounter.impl.MessageCounterManagerImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.jms.server.management.JMSUtil; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.utils.json.JSONArray; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -1735,7 +1735,7 @@ public class QueueControlTest extends ManagementTestBase { ClientMessage msg = session.createMessage(true); - msg.putStringProperty(org.hornetq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i)); + msg.putStringProperty(org.apache.activemq6.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i)); prod1.send(msg); } @@ -1808,7 +1808,7 @@ public class QueueControlTest extends ManagementTestBase { ClientMessage msg = session.createMessage(true); - msg.putStringProperty(org.hornetq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i)); + msg.putStringProperty(org.apache.activemq6.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i)); prod1.send(msg); } diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/QueueControlUsingCoreTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/QueueControlUsingCoreTest.java index 4d6629bf19..3204f7d196 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/QueueControlUsingCoreTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.core.management.ResourceNames; +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.ServerLocator; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.api.core.management.ResourceNames; import org.junit.Before; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementTestBase.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementTestBase.java index ef071fdfbb..02a9bb1145 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementTestBase.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Before; import org.junit.After; import org.junit.Assert; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientRequestor; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientRequestor; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.management.ManagementHelper; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A SecurityManagementTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java index 19efdafccb..ba9da68e08 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Test; import java.util.Set; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl; /** * A SecurityManagementTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java similarity index 83% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java index 36a0889c29..77a0ef2993 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Test; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; /** * A SecurityManagementTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java index dbb0a36770..3080e9673b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Test; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; /** * A SecurityManagementTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityNotificationTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityNotificationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityNotificationTest.java index f0f91802b6..97202dbb57 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityNotificationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityNotificationTest.java @@ -10,40 +10,40 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.management; +package org.apache.activemq6.tests.integration.management; import org.junit.Before; import org.junit.After; import org.junit.Test; -import static org.hornetq.api.core.management.CoreNotificationType.SECURITY_AUTHENTICATION_VIOLATION; -import static org.hornetq.api.core.management.CoreNotificationType.SECURITY_PERMISSION_VIOLATION; +import static org.apache.activemq6.api.core.management.CoreNotificationType.SECURITY_AUTHENTICATION_VIOLATION; +import static org.apache.activemq6.api.core.management.CoreNotificationType.SECURITY_PERMISSION_VIOLATION; import java.util.HashSet; import java.util.Set; import org.junit.Assert; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.management.ManagementHelper; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A SecurityNotificationTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/BasicOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/BasicOpenWireTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/BasicOpenWireTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/BasicOpenWireTest.java index ae98d2e54b..8f0ef7106a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/BasicOpenWireTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/BasicOpenWireTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire; +package org.apache.activemq6.tests.integration.openwire; import java.util.HashMap; import java.util.Iterator; @@ -27,7 +27,7 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.api.core.SimpleString; +import org.apache.activemq6.api.core.SimpleString; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/BasicSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/BasicSecurityTest.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/BasicSecurityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/BasicSecurityTest.java index e7b09d2c5d..8da8af0c0e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/BasicSecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/BasicSecurityTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire; +package org.apache.activemq6.tests.integration.openwire; import javax.jms.Connection; import javax.jms.Destination; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/OpenWireTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/OpenWireTestBase.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/OpenWireTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/OpenWireTestBase.java index 668095f22d..b88ef6f4e0 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/OpenWireTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/OpenWireTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire; +package org.apache.activemq6.tests.integration.openwire; import java.util.ArrayList; import java.util.HashMap; @@ -23,20 +23,20 @@ import javax.jms.ConnectionFactory; import javax.management.MBeanServer; import javax.management.MBeanServerFactory; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.management.ManagementControlHelper; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.management.JMSServerControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.management.ManagementControlHelper; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/OpenWireUtilTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/OpenWireUtilTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/OpenWireUtilTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/OpenWireUtilTest.java index b17b8dff85..07dbffecd3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/OpenWireUtilTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/OpenWireUtilTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire; +package org.apache.activemq6.tests.integration.openwire; import static org.junit.Assert.assertEquals; -import org.hornetq.core.protocol.openwire.OpenWireUtil; +import org.apache.activemq6.core.protocol.openwire.OpenWireUtil; import org.junit.Test; public class OpenWireUtilTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/SimpleOpenWireTest.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/SimpleOpenWireTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/SimpleOpenWireTest.java index faf6fe1f5d..5711485abc 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/SimpleOpenWireTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/SimpleOpenWireTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire; +package org.apache.activemq6.tests.integration.openwire; import javax.jms.Connection; import javax.jms.Destination; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer10Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer10Test.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer10Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer10Test.java index d6a99423ce..e2f575c0a2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer10Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer10Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -22,7 +22,7 @@ import javax.jms.Session; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer11Test.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer11Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer11Test.java index 5376f88ccf..2b1769e472 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer11Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer11Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -22,7 +22,7 @@ import javax.jms.Session; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer12Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer12Test.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer12Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer12Test.java index 633cd01b8c..b1c48f1dce 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer12Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer12Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -20,7 +20,7 @@ import javax.jms.MessageConsumer; import javax.jms.Session; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer13Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer13Test.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer13Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer13Test.java index 82d8326d2d..79af12d2e6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer13Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer13Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -22,7 +22,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer1Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer1Test.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer1Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer1Test.java index 622a55ba8b..40bf4ee053 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer1Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer1Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -25,7 +25,7 @@ import javax.jms.Session; import org.apache.activemq.ActiveMQMessageConsumer; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer2Test.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer2Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer2Test.java index cee95451be..e42af39d28 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer2Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer2Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.lang.Thread.UncaughtExceptionHandler; import java.util.Collections; @@ -29,7 +29,7 @@ import javax.jms.Session; import org.apache.activemq.ActiveMQMessageConsumer; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer3Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer3Test.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer3Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer3Test.java index a444fffe2e..d3b1028a00 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer3Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer3Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -22,7 +22,7 @@ import javax.jms.Session; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer4Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer4Test.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer4Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer4Test.java index d4fe157bdc..1d4c38e5cf 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer4Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer4Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -24,7 +24,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer5Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer5Test.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer5Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer5Test.java index 70d7c41bc4..58c40635d2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer5Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer5Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -27,7 +27,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer6Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer6Test.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer6Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer6Test.java index d17dd06acd..f023024cbb 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer6Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer6Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -28,7 +28,7 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQMessageConsumer; import org.apache.activemq.ActiveMQSession; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer7Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer7Test.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer7Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer7Test.java index a3cb991b41..3b6711f728 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer7Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer7Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -27,7 +27,7 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer8Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer8Test.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer8Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer8Test.java index cfcfce48c7..ba424331a3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer8Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer8Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -27,7 +27,7 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer9Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer9Test.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer9Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer9Test.java index a69e0e31e3..deea0f729d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSConsumer9Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer9Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -25,7 +25,7 @@ import javax.jms.MessageListener; import javax.jms.Session; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java index dd1e93164f..97b0a1d34e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.Message; import javax.jms.Session; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSIndividualAckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSIndividualAckTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSIndividualAckTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSIndividualAckTest.java index 203ade9e07..63618c0879 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSIndividualAckTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSIndividualAckTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.JMSException; import javax.jms.Message; @@ -22,7 +22,7 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQSession; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSMessageTest.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSMessageTest.java index fccd13627f..4cc2cdcd97 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -32,7 +32,7 @@ import javax.jms.StreamMessage; import javax.jms.TextMessage; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSQueueRedeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSQueueRedeliverTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSQueueRedeliverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSQueueRedeliverTest.java index fb975b8131..aa34e3d09f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSQueueRedeliverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSQueueRedeliverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSUsecase1Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSUsecase1Test.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSUsecase1Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSUsecase1Test.java index ae28bafd7d..c5e3731542 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSUsecase1Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSUsecase1Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -23,7 +23,7 @@ import javax.jms.Session; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMessage; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSUsecaseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSUsecaseTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSUsecaseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSUsecaseTest.java index 9d25feb4e7..368f2c468a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JMSUsecaseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSUsecaseTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Arrays; import java.util.Collection; @@ -25,7 +25,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsAutoAckListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsAutoAckListenerTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsAutoAckListenerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsAutoAckListenerTest.java index 8cd09cf2d8..06b761c008 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsAutoAckListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsAutoAckListenerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -22,7 +22,7 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsAutoAckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsAutoAckTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsAutoAckTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsAutoAckTest.java index 0e766e1390..bd0900d794 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsAutoAckTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsAutoAckTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.JMSException; import javax.jms.Message; @@ -19,7 +19,7 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsClientAckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsClientAckTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsClientAckTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsClientAckTest.java index 9e7d04224d..0d813025a2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsClientAckTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsClientAckTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.JMSException; import javax.jms.Message; @@ -19,7 +19,7 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsConnectionStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsConnectionStartStopTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsConnectionStartStopTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsConnectionStartStopTest.java index b8d237f09b..26f618e62a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsConnectionStartStopTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsConnectionStartStopTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Random; import java.util.Vector; @@ -28,7 +28,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java index d3bd648cc5..0bcb9969a2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Vector; import java.util.concurrent.CountDownLatch; @@ -27,7 +27,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java index fec6c7955c..2e9e1a6fc6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.Message; import javax.jms.MessageConsumer; @@ -20,7 +20,7 @@ import javax.jms.Session; import javax.jms.Topic; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java index 823e6e6d1c..2e68655da6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.DeliveryMode; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java index 71dc28898d..918efef745 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java index ad3c51465a..c172beb277 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.Connection; import javax.jms.Destination; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java index e1ff83166c..f36478b224 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.DeliveryMode; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java index ba71427b76..af38b471ae 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.DeliveryMode; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsQueueBrowserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsQueueBrowserTest.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsQueueBrowserTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsQueueBrowserTest.java index 7634f1dd98..34bfbf3df8 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsQueueBrowserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsQueueBrowserTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Enumeration; @@ -23,7 +23,7 @@ import javax.jms.TextMessage; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQQueue; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java index a913e4db70..30ca75b583 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsResourceProvider.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsResourceProvider.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsResourceProvider.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsResourceProvider.java index 3b117ad163..c786896eff 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsResourceProvider.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsResourceProvider.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.Connection; import javax.jms.ConnectionConsumer; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java index 7f7de07a5b..a79647c921 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.ArrayList; import java.util.Arrays; @@ -29,7 +29,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicRedeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicRedeliverTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicRedeliverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicRedeliverTest.java index 4c9fdc8e28..df2f5fa08a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicRedeliverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicRedeliverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.Destination; import javax.jms.JMSException; @@ -23,7 +23,7 @@ import javax.jms.Topic; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java index 1c3f505339..5a458614cf 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.List; import java.util.Vector; @@ -28,7 +28,7 @@ import javax.jms.TemporaryTopic; import javax.jms.TextMessage; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicSelectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSelectorTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicSelectorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSelectorTest.java index 3776dd955b..0a5302d394 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicSelectorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSelectorTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -23,7 +23,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java index 2828149b60..5176c92eed 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.DeliveryMode; import javax.jms.JMSException; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java index 874ab90450..aeef9cdc51 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.Connection; import javax.jms.Destination; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicTransactionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicTransactionTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicTransactionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicTransactionTest.java index 1f76e18b97..055418e55b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicTransactionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicTransactionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; /** * adapted from: org.apache.activemq.JmsTopicTransactionTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java index 3da52af24a..333acb0eeb 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.DeliveryMode; import javax.jms.Destination; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTransactionTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTransactionTestSupport.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTransactionTestSupport.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTransactionTestSupport.java index 6680925dd8..dc9da42c8b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/JmsTransactionTestSupport.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTransactionTestSupport.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.ArrayList; import java.util.List; @@ -27,7 +27,7 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ActiveMQPrefetchPolicy; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java index ad0a94508b..0893060216 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.ArrayList; import java.util.concurrent.CountDownLatch; @@ -35,7 +35,7 @@ import org.apache.activemq.RedeliveryPolicy; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQQueue; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java index 6f3d440f22..3cbf45150d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; @@ -27,9 +27,9 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ActiveMQConnectionFactory; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/ProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ProducerFlowControlTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/ProducerFlowControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ProducerFlowControlTest.java index 87643de91d..452d96dba8 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/ProducerFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ProducerFlowControlTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.io.IOException; import java.util.Map; @@ -28,10 +28,10 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.transport.tcp.TcpTransport; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java index 92127535e9..57927b5f4b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.Connection; import javax.jms.InvalidClientIDException; @@ -18,7 +18,7 @@ import javax.jms.JMSException; import javax.jms.Session; import org.apache.activemq.ActiveMQConnection; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.After; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/RedeliveryPolicyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/RedeliveryPolicyTest.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/RedeliveryPolicyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/RedeliveryPolicyTest.java index 4c7f3a9f0a..87121bd4be 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/RedeliveryPolicyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/RedeliveryPolicyTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; @@ -22,7 +22,7 @@ import org.apache.activemq.broker.region.policy.RedeliveryPolicyMap; import org.apache.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQTopic; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/TimeStampTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/TimeStampTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/TimeStampTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/TimeStampTest.java index 0feb51c958..ca6d337b5f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/TimeStampTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/TimeStampTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -19,7 +19,7 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/TransactionContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/TransactionContextTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/TransactionContextTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/TransactionContextTest.java index dca1dd077c..ea66ed68ab 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/amq/TransactionContextTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/TransactionContextTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.amq; +package org.apache.activemq6.tests.integration.openwire.amq; import java.util.concurrent.atomic.AtomicInteger; @@ -18,7 +18,7 @@ import javax.jms.TransactionRolledBackException; import org.apache.activemq.TransactionContext; import org.apache.activemq.transaction.Synchronization; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/interop/GeneralInteropTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/interop/GeneralInteropTest.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/interop/GeneralInteropTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/interop/GeneralInteropTest.java index eec76908fc..db550356f3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/interop/GeneralInteropTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/interop/GeneralInteropTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.interop; +package org.apache.activemq6.tests.integration.openwire.interop; import java.io.Serializable; @@ -28,8 +28,8 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQMessageConsumer; import org.apache.activemq.ActiveMQMessageProducer; import org.apache.activemq.command.ActiveMQDestination; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.tests.integration.openwire.BasicOpenWireTest; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.tests.integration.openwire.BasicOpenWireTest; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/util/Wait.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/util/Wait.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/util/Wait.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/util/Wait.java index e2166ed914..0e5eddd69f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/openwire/util/Wait.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/util/Wait.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.openwire.util; +package org.apache.activemq6.tests.integration.openwire.util; import java.util.concurrent.TimeUnit; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/MultipleProducersPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/MultipleProducersPagingTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/MultipleProducersPagingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/MultipleProducersPagingTest.java index 0020ab9876..f5b1766d56 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/MultipleProducersPagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/MultipleProducersPagingTest.java @@ -13,7 +13,7 @@ /** * */ -package org.hornetq.tests.integration.paging; +package org.apache.activemq6.tests.integration.paging; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -34,18 +34,18 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.config.impl.JMSQueueConfigurationImpl; -import org.hornetq.jms.server.embedded.EmbeddedJMS; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.JMSQueueConfigurationImpl; +import org.apache.activemq6.jms.server.embedded.EmbeddedJMS; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/NettyPagingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/NettyPagingSendTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/NettyPagingSendTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/NettyPagingSendTest.java index 5bb275ca7a..67290ec511 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/NettyPagingSendTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/NettyPagingSendTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.paging; +package org.apache.activemq6.tests.integration.paging; /** * A NettyPagingSendTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PageCountSyncOnNonTXTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PageCountSyncOnNonTXTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PageCountSyncOnNonTXTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PageCountSyncOnNonTXTest.java index 7e09ca1e52..53a50e40cc 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PageCountSyncOnNonTXTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PageCountSyncOnNonTXTest.java @@ -11,19 +11,19 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.paging; +package org.apache.activemq6.tests.integration.paging; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PageCountSyncServer.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PageCountSyncServer.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PageCountSyncServer.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PageCountSyncServer.java index 1e72c8ba8a..dc611611b8 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PageCountSyncServer.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PageCountSyncServer.java @@ -11,13 +11,13 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.paging; +package org.apache.activemq6.tests.integration.paging; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.SpawnedVMSupport; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.SpawnedVMSupport; /** - * This is a sub process of the test {@link org.hornetq.tests.integration.paging.PageCountSyncOnNonTXTest} + * This is a sub process of the test {@link org.apache.activemq6.tests.integration.paging.PageCountSyncOnNonTXTest} * The System.out calls here are meant to be here as they will appear on the process output and test output. * It helps to identify what happened on the test in case of failures. * @author Clebert Suconic diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingCounterTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingCounterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingCounterTest.java index 816b274a5f..8929e892e0 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingCounterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingCounterTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.paging; +package org.apache.activemq6.tests.integration.paging; import javax.transaction.xa.Xid; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.paging.cursor.PageSubscriptionCounter; -import org.hornetq.core.paging.cursor.impl.PageSubscriptionCounterImpl; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.impl.TransactionImpl; -import org.hornetq.tests.util.ServiceTestBase; +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.ServerLocator; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq6.core.paging.cursor.impl.PageSubscriptionCounterImpl; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingReceiveTest.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingReceiveTest.java index b6f117ac09..628fc5f209 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingReceiveTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.paging; +package org.apache.activemq6.tests.integration.paging; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingSendTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingSendTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingSendTest.java index bb08fbd59f..34c2033aa9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingSendTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingSendTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.paging; +package org.apache.activemq6.tests.integration.paging; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingWithFailoverAndCountersTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverAndCountersTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingWithFailoverAndCountersTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverAndCountersTest.java index bdf6ca8cfd..04343e5ec8 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingWithFailoverAndCountersTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverAndCountersTest.java @@ -11,20 +11,20 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.paging; +package org.apache.activemq6.tests.integration.paging; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingWithFailoverBackup.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverBackup.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingWithFailoverBackup.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverBackup.java index bd04ab3322..348e916b0b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingWithFailoverBackup.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverBackup.java @@ -11,12 +11,12 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.paging; +package org.apache.activemq6.tests.integration.paging; -import org.hornetq.tests.util.SpawnedVMSupport; +import org.apache.activemq6.tests.util.SpawnedVMSupport; /** - * There is no difference between this class and {@link org.hornetq.tests.integration.paging.PagingWithFailoverServer} + * There is no difference between this class and {@link org.apache.activemq6.tests.integration.paging.PagingWithFailoverServer} * other than helping us identify it on the logs, as it will show with a different name through spawned logs * * @author Clebert Suconic diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingWithFailoverServer.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverServer.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingWithFailoverServer.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverServer.java index 55ce4444c5..ea5ce3ef65 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingWithFailoverServer.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverServer.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.paging; +package org.apache.activemq6.tests.integration.paging; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.SpawnedVMSupport; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.SpawnedVMSupport; /** * @author Clebert Suconic diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/SpawnedServerSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/SpawnedServerSupport.java similarity index 78% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/SpawnedServerSupport.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/SpawnedServerSupport.java index 610fc26045..801f6beed0 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/SpawnedServerSupport.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/SpawnedServerSupport.java @@ -11,28 +11,28 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.paging; +package org.apache.activemq6.tests.integration.paging; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.HAPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.HAPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * Support class for server that are using an external process on the testsuite @@ -60,7 +60,7 @@ public class SpawnedServerSupport Configuration conf = ServiceTestBase.createBasicConfig(folder, 0) .setPersistenceEnabled(true) .addAddressesSetting("#", settings) - .addAcceptorConfiguration(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory")); + .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory")); return conf; } @@ -134,7 +134,7 @@ public class SpawnedServerSupport className = NettyConnectorFactory.class.getName(); } Map serverParams = new HashMap(); - serverParams.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port); + serverParams.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port); return new TransportConfiguration(className, serverParams); } diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java index eea6973427..d72074481a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; import org.junit.Before; import org.junit.After; @@ -20,11 +20,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.persistence.config.PersistedAddressSetting; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; /** * A ConfigurationStorageTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/DeleteMessagesOnStartupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DeleteMessagesOnStartupTest.java similarity index 76% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/DeleteMessagesOnStartupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DeleteMessagesOnStartupTest.java index a656d46972..40d968c751 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/DeleteMessagesOnStartupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DeleteMessagesOnStartupTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; import java.util.ArrayList; import java.util.HashMap; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.persistence.GroupingInfo; -import org.hornetq.core.persistence.QueueBindingInfo; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.PostOfficeJournalLoader; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.tests.unit.core.postoffice.impl.FakeQueue; -import org.hornetq.tests.unit.core.server.impl.fakes.FakePostOffice; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.persistence.GroupingInfo; +import org.apache.activemq6.core.persistence.QueueBindingInfo; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.PostOfficeJournalLoader; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.tests.unit.core.postoffice.impl.FakeQueue; +import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakePostOffice; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DeleteQueueRestartTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DeleteQueueRestartTest.java index 3a6977c3c3..a7d60e5ad4 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DeleteQueueRestartTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.client.HornetQBytesMessage; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.client.HornetQBytesMessage; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/DuplicateCacheTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DuplicateCacheTest.java similarity index 86% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/DuplicateCacheTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DuplicateCacheTest.java index 149c69f8c6..ed2c5613bd 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/DuplicateCacheTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DuplicateCacheTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.postoffice.DuplicateIDCache; -import org.hornetq.core.postoffice.impl.DuplicateIDCacheImpl; -import org.hornetq.core.transaction.impl.TransactionImpl; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.postoffice.DuplicateIDCache; +import org.apache.activemq6.core.postoffice.impl.DuplicateIDCacheImpl; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.tests.util.RandomUtil; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/ExportFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/ExportFormatTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/ExportFormatTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/ExportFormatTest.java index 919cd0ed84..0a3663f9d6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/ExportFormatTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/ExportFormatTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; import org.junit.Test; import java.io.StringReader; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.journal.impl.ExportJournal; -import org.hornetq.core.journal.impl.ImportJournal; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.journal.impl.ExportJournal; +import org.apache.activemq6.core.journal.impl.ImportJournal; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * A ExportFormatTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java index 66e64dc8a7..c296594fc6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.Pair; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.jms.persistence.config.PersistedConnectionFactory; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.tests.util.RandomUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/JMSDynamicConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSDynamicConfigTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/JMSDynamicConfigTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSDynamicConfigTest.java index ecd4fc63c0..82fbde78cc 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/JMSDynamicConfigTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSDynamicConfigTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; import org.junit.Test; @@ -18,10 +18,10 @@ import java.util.ArrayList; import javax.naming.NamingException; -import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.hornetq.tests.util.JMSTestBase; +import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.tests.util.JMSTestBase; /** * A JMSDynamicConfigTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/JMSStorageManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSStorageManagerTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/JMSStorageManagerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSStorageManagerTest.java index 2fddfda158..ee81d02496 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/JMSStorageManagerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSStorageManagerTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; import org.junit.Test; import java.util.List; -import org.hornetq.jms.persistence.config.PersistedDestination; -import org.hornetq.jms.persistence.config.PersistedJNDI; -import org.hornetq.jms.persistence.config.PersistedType; +import org.apache.activemq6.jms.persistence.config.PersistedDestination; +import org.apache.activemq6.jms.persistence.config.PersistedJNDI; +import org.apache.activemq6.jms.persistence.config.PersistedType; /** * A JMSStorageManagerTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/RestartSMTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/RestartSMTest.java similarity index 81% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/RestartSMTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/RestartSMTest.java index ae5de15ec7..97b9efe510 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/RestartSMTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/RestartSMTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; import java.io.File; import java.util.ArrayList; import java.util.HashMap; @@ -18,17 +18,17 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutorService; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.persistence.GroupingInfo; -import org.hornetq.core.persistence.QueueBindingInfo; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.unit.core.server.impl.fakes.FakeJournalLoader; -import org.hornetq.tests.unit.core.server.impl.fakes.FakePostOffice; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.utils.ExecutorFactory; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.persistence.GroupingInfo; +import org.apache.activemq6.core.persistence.QueueBindingInfo; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakeJournalLoader; +import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakePostOffice; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.utils.ExecutorFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/RolesConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/RolesConfigurationStorageTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/RolesConfigurationStorageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/RolesConfigurationStorageTest.java index d00c321afe..125a21cc9e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/RolesConfigurationStorageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/RolesConfigurationStorageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; import org.junit.Before; import org.junit.Test; @@ -19,8 +19,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.persistence.config.PersistedRoles; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.persistence.config.PersistedRoles; /** * A ConfigurationStorageTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/StorageManagerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/StorageManagerTestBase.java similarity index 78% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/StorageManagerTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/StorageManagerTestBase.java index 94fb58581d..484b3d6601 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/StorageManagerTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/StorageManagerTestBase.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.persistence.GroupingInfo; -import org.hornetq.core.persistence.QueueBindingInfo; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.server.Queue; -import org.hornetq.jms.persistence.JMSStorageManager; -import org.hornetq.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; -import org.hornetq.tests.unit.core.server.impl.fakes.FakeJournalLoader; -import org.hornetq.tests.unit.core.server.impl.fakes.FakePostOffice; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.TimeAndCounterIDGenerator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.persistence.GroupingInfo; +import org.apache.activemq6.core.persistence.QueueBindingInfo; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.jms.persistence.JMSStorageManager; +import org.apache.activemq6.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; +import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakeJournalLoader; +import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakePostOffice; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.TimeAndCounterIDGenerator; import org.junit.After; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java index 1151258fd0..0b763de7cd 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; import org.junit.Test; @@ -19,14 +19,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.jms.server.config.impl.TransportConfigurationEncodingSupport; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.api.core.Pair; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.jms.server.config.impl.TransportConfigurationEncodingSupport; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.api.core.Pair; import org.junit.Assert; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/XmlImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/XmlImportExportTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/XmlImportExportTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/XmlImportExportTest.java index 5e50d47f5f..954c2ec578 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/persistence/XmlImportExportTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/XmlImportExportTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.persistence; +package org.apache.activemq6.tests.integration.persistence; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.unit.util.InVMContext; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.unit.util.InVMContext; import org.junit.Test; import java.io.ByteArrayInputStream; @@ -25,24 +25,24 @@ import java.io.ByteArrayOutputStream; import java.util.Arrays; import java.util.List; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.persistence.impl.journal.LargeServerMessageImpl; -import org.hornetq.tools.XmlDataConstants; -import org.hornetq.tools.XmlDataExporter; -import org.hornetq.tools.XmlDataImporter; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageImpl; +import org.apache.activemq6.tools.XmlDataConstants; +import org.apache.activemq6.tools.XmlDataExporter; +import org.apache.activemq6.tools.XmlDataImporter; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.utils.UUIDGenerator; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -431,10 +431,10 @@ public class XmlImportExportTest extends ServiceTestBase assertEquals(clientFailureCheckPeriod, hcf1.getClientFailureCheckPeriod()); assertEquals(connectionTTl, hcf1.getConnectionTTL()); assertEquals(callTimeout, hcf1.getCallTimeout()); -// Assert.assertEquals(callFailoverTimeout, hcf1.getCallFailoverTimeout()); // this value isn't currently persisted by org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl.encode() -// Assert.assertEquals(cacheLargeMessagesClient, hcf1.isCacheLargeMessagesClient()); // this value isn't currently supported by org.hornetq.api.jms.management.JMSServerControl.createConnectionFactory(java.lang.String, boolean, boolean, int, java.lang.String, java.lang.String, java.lang.String, long, long, long, long, int, boolean, int, int, int, int, int, boolean, boolean, boolean, boolean, boolean, java.lang.String, int, int, boolean, int, int, long, double, long, int, boolean, java.lang.String) +// Assert.assertEquals(callFailoverTimeout, hcf1.getCallFailoverTimeout()); // this value isn't currently persisted by org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl.encode() +// Assert.assertEquals(cacheLargeMessagesClient, hcf1.isCacheLargeMessagesClient()); // this value isn't currently supported by org.apache.activemq6.api.jms.management.JMSServerControl.createConnectionFactory(java.lang.String, boolean, boolean, int, java.lang.String, java.lang.String, java.lang.String, long, long, long, long, int, boolean, int, int, int, int, int, boolean, boolean, boolean, boolean, boolean, java.lang.String, int, int, boolean, int, int, long, double, long, int, boolean, java.lang.String) assertEquals(minLargeMessageSize, hcf1.getMinLargeMessageSize()); -// Assert.assertEquals(compressLargeMessages, hcf1.isCompressLargeMessage()); // this value isn't currently handled properly by org.hornetq.jms.server.impl.JMSServerManagerImpl.createConnectionFactory(java.lang.String, boolean, org.hornetq.api.jms.JMSFactoryType, java.util.List, java.lang.String, long, long, long, long, boolean, int, boolean, int, int, int, int, int, boolean, boolean, boolean, boolean, boolean, java.lang.String, int, int, boolean, int, int, long, double, long, int, boolean, java.lang.String, java.lang.String...)() +// Assert.assertEquals(compressLargeMessages, hcf1.isCompressLargeMessage()); // this value isn't currently handled properly by org.apache.activemq6.jms.server.impl.JMSServerManagerImpl.createConnectionFactory(java.lang.String, boolean, org.hornetq.api.jms.JMSFactoryType, java.util.List, java.lang.String, long, long, long, long, boolean, int, boolean, int, int, int, int, int, boolean, boolean, boolean, boolean, boolean, java.lang.String, int, int, boolean, int, int, long, double, long, int, boolean, java.lang.String, java.lang.String...)() assertEquals(consumerWindowSize, hcf1.getConsumerWindowSize()); assertEquals(consumerMaxRate, hcf1.getConsumerMaxRate()); assertEquals(confirmationWindowSize, hcf1.getConfirmationWindowSize()); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/proton/ProtonTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/proton/ProtonTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/proton/ProtonTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/proton/ProtonTest.java index 78c88b6b55..e8846a9755 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/proton/ProtonTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/proton/ProtonTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.proton; +package org.apache.activemq6.tests.integration.proton; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -41,15 +41,15 @@ import org.apache.qpid.amqp_1_0.client.Sender; import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl; import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl; import org.apache.qpid.amqp_1_0.type.UnsignedInteger; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.utils.ByteUtil; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.utils.ByteUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -285,7 +285,7 @@ public class ProtonTest extends ServiceTestBase MessageConsumer cons = session.createConsumer(createQueue(address)); - org.hornetq.core.server.Queue serverQueue = server.locateQueue(SimpleString.toSimpleString(coreAddress)); + org.apache.activemq6.core.server.Queue serverQueue = server.locateQueue(SimpleString.toSimpleString(coreAddress)); assertEquals(1, serverQueue.getConsumerCount()); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/DummyTransaction.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/DummyTransaction.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/DummyTransaction.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/DummyTransaction.java index fbcce3d683..8d0e9fd846 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/DummyTransaction.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/DummyTransaction.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ra; +package org.apache.activemq6.tests.integration.ra; import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/DummyTransactionManager.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/DummyTransactionManager.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/DummyTransactionManager.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/DummyTransactionManager.java index a20287217e..996be37e19 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/DummyTransactionManager.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/DummyTransactionManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ra; +package org.apache.activemq6.tests.integration.ra; import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQActivationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQActivationTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQActivationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQActivationTest.java index 8b34d88558..ba1f1336e5 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQActivationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQActivationTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ra; +package org.apache.activemq6.tests.integration.ra; import org.junit.Test; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.ra.inflow.HornetQActivationSpec; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.ra.inflow.HornetQActivationSpec; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * A HornetQActivationTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQClusteredTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQClusteredTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQClusteredTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQClusteredTest.java index 91b8012321..e478bec077 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQClusteredTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQClusteredTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ra; +package org.apache.activemq6.tests.integration.ra; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.server.Queue; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.ra.inflow.HornetQActivation; -import org.hornetq.ra.inflow.HornetQActivationSpec; +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.core.server.Queue; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.ra.inflow.HornetQActivation; +import org.apache.activemq6.ra.inflow.HornetQActivationSpec; import org.junit.Test; import java.util.concurrent.CountDownLatch; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQMessageHandlerSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerSecurityTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQMessageHandlerSecurityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerSecurityTest.java index f4e7c6b53b..be3203456b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQMessageHandlerSecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerSecurityTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ra; +package org.apache.activemq6.tests.integration.ra; import java.util.HashSet; import java.util.Set; import java.util.concurrent.CountDownLatch; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.security.Role; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.ra.inflow.HornetQActivationSpec; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.ra.inflow.HornetQActivationSpec; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQMessageHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQMessageHandlerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerTest.java index 2fd44f5392..8720a5607d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQMessageHandlerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ra; +package org.apache.activemq6.tests.integration.ra; import javax.jms.Message; import javax.resource.ResourceException; @@ -20,21 +20,21 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSession.QueueQuery; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.ra.inflow.HornetQActivation; -import org.hornetq.ra.inflow.HornetQActivationSpec; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.UnitTestCase; +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.ClientSession.QueueQuery; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.ra.inflow.HornetQActivation; +import org.apache.activemq6.ra.inflow.HornetQActivationSpec; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Test; /** diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQMessageHandlerXATest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerXATest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQMessageHandlerXATest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerXATest.java index 27bb7c7c6e..549001bced 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQMessageHandlerXATest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerXATest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ra; +package org.apache.activemq6.tests.integration.ra; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.server.Queue; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.server.Queue; import org.junit.Test; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.ra.inflow.HornetQActivationSpec; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.UUIDGenerator; +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.core.transaction.impl.XidImpl; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.ra.inflow.HornetQActivationSpec; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.UUIDGenerator; import javax.jms.Message; import javax.resource.ResourceException; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQRAClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQRAClusteredTestBase.java similarity index 88% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQRAClusteredTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQRAClusteredTestBase.java index b3f1ec498c..cf32e06d47 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQRAClusteredTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQRAClusteredTestBase.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ra; +package org.apache.activemq6.tests.integration.ra; import java.util.HashMap; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Before; public class HornetQRAClusteredTestBase extends HornetQRATestBase diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQRATestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQRATestBase.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQRATestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQRATestBase.java index 986a18641b..409db9d295 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/HornetQRATestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQRATestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ra; +package org.apache.activemq6.tests.integration.ra; import javax.jms.Message; import javax.jms.MessageListener; @@ -32,14 +32,14 @@ import java.util.Map; import java.util.Timer; import java.util.concurrent.CountDownLatch; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.ra.inflow.HornetQActivation; -import org.hornetq.tests.util.JMSTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.ra.inflow.HornetQActivation; +import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/JMSContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/JMSContextTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/JMSContextTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/JMSContextTest.java index 05dd156099..c4475e158a 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/JMSContextTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/JMSContextTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ra; +package org.apache.activemq6.tests.integration.ra; import javax.jms.JMSContext; import javax.jms.JMSRuntimeException; @@ -18,13 +18,13 @@ import javax.transaction.TransactionManager; import java.util.HashSet; import java.util.Set; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.security.Role; -import org.hornetq.ra.HornetQRAConnectionFactory; -import org.hornetq.ra.HornetQRAConnectionFactoryImpl; -import org.hornetq.ra.HornetQRAConnectionManager; -import org.hornetq.ra.HornetQRAManagedConnectionFactory; -import org.hornetq.ra.HornetQResourceAdapter; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.ra.HornetQRAConnectionFactory; +import org.apache.activemq6.ra.HornetQRAConnectionFactoryImpl; +import org.apache.activemq6.ra.HornetQRAConnectionManager; +import org.apache.activemq6.ra.HornetQRAManagedConnectionFactory; +import org.apache.activemq6.ra.HornetQResourceAdapter; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/OutgoingConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/OutgoingConnectionTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/OutgoingConnectionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/OutgoingConnectionTest.java index 96de8bab57..d57ddadcfc 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/OutgoingConnectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/OutgoingConnectionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ra; +package org.apache.activemq6.tests.integration.ra; import javax.jms.Connection; import javax.jms.JMSContext; @@ -35,23 +35,23 @@ import javax.transaction.xa.Xid; import java.util.HashSet; import java.util.Set; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.security.Role; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.ra.HornetQRAConnectionFactory; -import org.hornetq.ra.HornetQRAConnectionFactoryImpl; -import org.hornetq.ra.HornetQRAConnectionManager; -import org.hornetq.ra.HornetQRAManagedConnectionFactory; -import org.hornetq.ra.HornetQRASession; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.utils.UUIDGenerator; -import org.hornetq.ra.HornetQXAResourceWrapper; -import org.hornetq.utils.VersionLoader; +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.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.ra.HornetQRAConnectionFactory; +import org.apache.activemq6.ra.HornetQRAConnectionFactoryImpl; +import org.apache.activemq6.ra.HornetQRAConnectionManager; +import org.apache.activemq6.ra.HornetQRAManagedConnectionFactory; +import org.apache.activemq6.ra.HornetQRASession; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq6.ra.HornetQXAResourceWrapper; +import org.apache.activemq6.utils.VersionLoader; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/ResourceAdapterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/ResourceAdapterTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/ResourceAdapterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/ResourceAdapterTest.java index a8dddcd925..1e6ce56841 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ra/ResourceAdapterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/ResourceAdapterTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ra; +package org.apache.activemq6.tests.integration.ra; import javax.jms.Connection; import javax.resource.ResourceException; @@ -23,25 +23,25 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.server.recovery.RecoveryDiscovery; -import org.hornetq.jms.server.recovery.XARecoveryConfig; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.ra.inflow.HornetQActivation; -import org.hornetq.ra.inflow.HornetQActivationSpec; -import org.hornetq.tests.unit.ra.MessageEndpointFactory; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.DefaultSensitiveStringCodec; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ServerLocatorImpl; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.server.recovery.RecoveryDiscovery; +import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.ra.inflow.HornetQActivation; +import org.apache.activemq6.ra.inflow.HornetQActivationSpec; +import org.apache.activemq6.tests.unit.ra.MessageEndpointFactory; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.DefaultSensitiveStringCodec; import org.junit.Test; /** @@ -62,12 +62,12 @@ public class ResourceAdapterTest extends HornetQRATestBase HornetQResourceAdapter ra = new HornetQResourceAdapter(); - ra.setConnectorClassName("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"); + ra.setConnectorClassName("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory"); ra.setUserName("userGlobal"); ra.setPassword("passwordGlobal"); ra.setTransactionManagerLocatorClass(""); ra.setTransactionManagerLocatorMethod(""); - ra.start(new org.hornetq.tests.unit.ra.BootstrapContext()); + ra.start(new org.apache.activemq6.tests.unit.ra.BootstrapContext()); Connection conn = ra.getDefaultHornetQConnectionFactory().createConnection(); @@ -724,7 +724,7 @@ public class ResourceAdapterTest extends HornetQRATestBase public void testRecoveryDiscoveryAsKey() throws Exception { Set discoverySet = new HashSet(); - String factClass = "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"; + String factClass = "org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory"; TransportConfiguration transportConfig = new TransportConfiguration(factClass, null, "netty"); XARecoveryConfig config = new XARecoveryConfig(false, new TransportConfiguration[]{transportConfig}, null, null); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/BatchDelayTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/BatchDelayTest.java similarity index 79% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/BatchDelayTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/BatchDelayTest.java index f8afa404ce..4dec3c2788 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/BatchDelayTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/BatchDelayTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.remoting; +package org.apache.activemq6.tests.integration.remoting; import org.junit.Before; import org.junit.Test; @@ -18,18 +18,18 @@ import org.junit.Test; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/DestroyConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/DestroyConsumerTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/DestroyConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/DestroyConsumerTest.java index 31ca875bbb..ef3052af96 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/DestroyConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/DestroyConsumerTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.remoting; +package org.apache.activemq6.tests.integration.remoting; import org.junit.Test; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.ServiceTestBase; public class DestroyConsumerTest extends ServiceTestBase { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/DirectDeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/DirectDeliverTest.java similarity index 75% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/DirectDeliverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/DirectDeliverTest.java index 2d3f8154e2..3e3e8d9f4f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/DirectDeliverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/DirectDeliverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.remoting; +package org.apache.activemq6.tests.integration.remoting; import org.junit.Before; import org.junit.Test; @@ -18,24 +18,24 @@ import org.junit.Test; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/NettyNetworkAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NettyNetworkAddressTest.java similarity index 83% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/NettyNetworkAddressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NettyNetworkAddressTest.java index 6d71bcfd10..d97d2a327e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/NettyNetworkAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NettyNetworkAddressTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.remoting; +package org.apache.activemq6.tests.integration.remoting; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; /** * A NettyNetworkAddressTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/NettySynchronousCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NettySynchronousCloseTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/NettySynchronousCloseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NettySynchronousCloseTest.java index 27302bfb1e..5db77ce6ef 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/NettySynchronousCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NettySynchronousCloseTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.remoting; +package org.apache.activemq6.tests.integration.remoting; /** * A NettySynchronousCloseTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NetworkAddressTestBase.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NetworkAddressTestBase.java index 4ed4249406..d4dd61bc3c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NetworkAddressTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.remoting; +package org.apache.activemq6.tests.integration.remoting; import java.net.Inet4Address; import java.net.InetAddress; @@ -23,14 +23,14 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.ServiceTestBase; +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.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/PingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/PingTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/PingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/PingTest.java index 13be1a689c..5c8b1508a4 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/PingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/PingTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.remoting; +package org.apache.activemq6.tests.integration.remoting; -import org.hornetq.core.protocol.core.impl.wireformat.Ping; +import org.apache.activemq6.core.protocol.core.impl.wireformat.Ping; import org.junit.Before; import org.junit.Test; @@ -23,26 +23,26 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.client.SessionFailureListener; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.remoting.CloseListener; +import org.apache.activemq6.core.remoting.server.impl.RemotingServiceImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * @author Jeff Mesnil @@ -170,7 +170,7 @@ public class PingTest extends ServiceTestBase @Test public void testNoFailureNoPinging() throws Exception { - TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); + TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory"); ServerLocator locator = addServerLocator(HornetQClient.createServerLocatorWithoutHA(transportConfig)); locator.setClientFailureCheckPeriod(-1); locator.setConnectionTTL(-1); @@ -247,7 +247,7 @@ public class PingTest extends ServiceTestBase } }); - TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"); + TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory"); ServerLocator locator = addServerLocator(HornetQClient.createServerLocatorWithoutHA(transportConfig)); ClientSessionFactory csf = createSessionFactory(locator); @@ -272,7 +272,7 @@ public class PingTest extends ServiceTestBase @Test public void testServerFailureNoPing() throws Exception { - TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); + TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory"); ServerLocator locator = addServerLocator(HornetQClient.createServerLocatorWithoutHA(transportConfig)); locator.setClientFailureCheckPeriod(PingTest.CLIENT_FAILURE_CHECK_PERIOD); locator.setConnectionTTL(PingTest.CLIENT_FAILURE_CHECK_PERIOD * 2); @@ -368,7 +368,7 @@ public class PingTest extends ServiceTestBase } }); - TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); + TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory"); ServerLocator locator = addServerLocator(HornetQClient.createServerLocatorWithoutHA(transportConfig)); locator.setClientFailureCheckPeriod(PingTest.CLIENT_FAILURE_CHECK_PERIOD); locator.setConnectionTTL(PingTest.CLIENT_FAILURE_CHECK_PERIOD * 2); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/ReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/ReconnectTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/ReconnectTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/ReconnectTest.java index bbe0b62ce4..c56c238e72 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/ReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/ReconnectTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.remoting; +package org.apache.activemq6.tests.integration.remoting; import org.junit.Test; @@ -21,14 +21,14 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * A ReconnectSimpleTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/SynchronousCloseTest.java similarity index 83% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/SynchronousCloseTest.java index ac29ec6f90..951623695c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/SynchronousCloseTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.remoting; +package org.apache.activemq6.tests.integration.remoting; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/replication/ReplicationOrderTest.java similarity index 83% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationOrderTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/replication/ReplicationOrderTest.java index 53be01b5ee..d0e90b12b0 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationOrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/replication/ReplicationOrderTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.replication; +package org.apache.activemq6.tests.integration.replication; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.tests.integration.cluster.failover.FailoverTestBase; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.tests.integration.cluster.failover.FailoverTestBase; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; /** * A ReplicationOrderTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/replication/ReplicationTest.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/replication/ReplicationTest.java index eda4b4a3eb..4a3e06472c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/replication/ReplicationTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.replication; +package org.apache.activemq6.tests.integration.replication; import java.util.ArrayList; import java.util.Arrays; @@ -26,61 +26,61 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.IOCompletion; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.JournalLoadInformation; -import org.hornetq.core.journal.LoaderCallback; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.TransactionFailureCallback; -import org.hornetq.core.journal.impl.JournalFile; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.impl.PagedMessageImpl; -import org.hornetq.core.paging.impl.PagingManagerImpl; -import org.hornetq.core.paging.impl.PagingStoreFactoryNIO; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.core.protocol.core.CoreRemotingConnection; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.replication.ReplicatedJournal; -import org.hornetq.core.replication.ReplicationManager; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.ReplicatedBackupUtils; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.TransportConfigurationUtils; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.HornetQThreadFactory; -import org.hornetq.utils.OrderedExecutorFactory; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.IOCompletion; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.JournalLoadInformation; +import org.apache.activemq6.core.journal.LoaderCallback; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.TransactionFailureCallback; +import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.impl.PagedMessageImpl; +import org.apache.activemq6.core.paging.impl.PagingManagerImpl; +import org.apache.activemq6.core.paging.impl.PagingStoreFactoryNIO; +import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.replication.ReplicatedJournal; +import org.apache.activemq6.core.replication.ReplicationManager; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.ReplicatedBackupUtils; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.TransportConfigurationUtils; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.HornetQThreadFactory; +import org.apache.activemq6.utils.OrderedExecutorFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/scheduling/DelayedMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/DelayedMessageTest.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/scheduling/DelayedMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/DelayedMessageTest.java index 5d3ce1ef7d..e2ff5b6257 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/scheduling/DelayedMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/DelayedMessageTest.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.scheduling; +package org.apache.activemq6.tests.integration.scheduling; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Jeff Mesnil diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/scheduling/MultipliedDelayedMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/MultipliedDelayedMessageTest.java similarity index 83% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/scheduling/MultipliedDelayedMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/MultipliedDelayedMessageTest.java index 49536c7e3f..1f0bc2ab18 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/scheduling/MultipliedDelayedMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/MultipliedDelayedMessageTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.scheduling; +package org.apache.activemq6.tests.integration.scheduling; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -135,7 +135,7 @@ public class MultipliedDelayedMessageTest extends ServiceTestBase return message; } - // This is based on org.hornetq.core.server.impl.QueueImpl.calculateRedeliveryDelay() + // This is based on org.apache.activemq6.core.server.impl.QueueImpl.calculateRedeliveryDelay() private long calculateExpectedDelay(final long redeliveryDelay, final long maxRedeliveryDelay, final double redeliveryMultiplier, final int deliveryCount) { int tmpDeliveryCount = deliveryCount > 0 ? deliveryCount - 1 : 0; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/ScheduledMessageTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/ScheduledMessageTest.java index a9103b37fe..21630b51c7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/ScheduledMessageTest.java @@ -10,30 +10,30 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.scheduling; +package org.apache.activemq6.tests.integration.scheduling; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; import java.util.ArrayList; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.UUIDGenerator; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/security/NettySecurityClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/NettySecurityClientTest.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/security/NettySecurityClientTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/NettySecurityClientTest.java index 53f2caa01f..36a24a1408 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/security/NettySecurityClientTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/NettySecurityClientTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.security; +package org.apache.activemq6.tests.integration.security; import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.URL; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.SpawnedVMSupport; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.SpawnedVMSupport; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/security/SecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/SecurityTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/security/SecurityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/SecurityTest.java index 65d09d5c7c..acab85a8ab 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/security/SecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/SecurityTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.security; +package org.apache.activemq6.tests.integration.security; import javax.security.auth.Subject; import javax.security.auth.callback.Callback; @@ -28,24 +28,24 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQSecurityException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.spi.core.security.JAASSecurityManager; -import org.hornetq.tests.util.CreateMessage; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQSecurityException; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.spi.core.security.JAASSecurityManager; +import org.apache.activemq6.tests.util.CreateMessage; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.jboss.security.SimpleGroup; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/security/SimpleClient.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/SimpleClient.java similarity index 81% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/security/SimpleClient.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/SimpleClient.java index 1e39f9c68d..5d8f8b66d1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/security/SimpleClient.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/SimpleClient.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.security; +package org.apache.activemq6.tests.integration.security; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.util.RandomUtil; /** * Code to be run in an external VM, via main() diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/AIOFileLockTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/AIOFileLockTimeoutTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/AIOFileLockTimeoutTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/AIOFileLockTimeoutTest.java index ebcb5beba1..5c50f8c5c1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/AIOFileLockTimeoutTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/AIOFileLockTimeoutTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.server; +package org.apache.activemq6.tests.integration.server; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/AddressFullLoggingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/AddressFullLoggingTest.java similarity index 84% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/AddressFullLoggingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/AddressFullLoggingTest.java index ec1e03adec..82e8fcfd9e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/AddressFullLoggingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/AddressFullLoggingTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.server; +package org.apache.activemq6.tests.integration.server; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; @@ -19,18 +19,18 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.logging.AssertionLoggerHandler; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.logging.AssertionLoggerHandler; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/ExpiryRunnerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ExpiryRunnerTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/ExpiryRunnerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ExpiryRunnerTest.java index 6449780fff..16d32a2562 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/ExpiryRunnerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ExpiryRunnerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.server; +package org.apache.activemq6.tests.integration.server; import org.junit.Before; import org.junit.After; @@ -23,22 +23,22 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/FakeStorageManager.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/FakeStorageManager.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/FakeStorageManager.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/FakeStorageManager.java index 13fd53ab77..0973e5f8d6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/FakeStorageManager.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/FakeStorageManager.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.server; +package org.apache.activemq6.tests.integration.server; import java.util.ArrayList; import java.util.List; -import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.core.persistence.impl.nullpm.NullStorageManager; +import org.apache.activemq6.core.server.ServerMessage; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/FileLockTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/FileLockTimeoutTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/FileLockTimeoutTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/FileLockTimeoutTest.java index 58f42c0079..57fc2e66fc 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/FileLockTimeoutTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/FileLockTimeoutTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.server; +package org.apache.activemq6.tests.integration.server; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.JournalType; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.logging.AssertionLoggerHandler; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.logging.AssertionLoggerHandler; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/LVQRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/LVQRecoveryTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/LVQRecoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/LVQRecoveryTest.java index cc7fa63d87..5ae20e1784 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/LVQRecoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/LVQRecoveryTest.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.server; +package org.apache.activemq6.tests.integration.server; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +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.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/LVQTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/LVQTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/LVQTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/LVQTest.java index 28c4e06f53..53262c9f3c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/LVQTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/LVQTest.java @@ -10,8 +10,8 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.server; -import org.hornetq.core.server.Queue; +package org.apache.activemq6.tests.integration.server; +import org.apache.activemq6.core.server.Queue; import org.junit.Before; import org.junit.After; @@ -19,22 +19,22 @@ import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.UnitTestCase; +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.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Andy Taylor diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/NIOFileLockTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/NIOFileLockTimeoutTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/NIOFileLockTimeoutTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/NIOFileLockTimeoutTest.java index ec203504ac..6b9eadf08d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/NIOFileLockTimeoutTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/NIOFileLockTimeoutTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.server; +package org.apache.activemq6.tests.integration.server; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/PredefinedQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/PredefinedQueueTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/PredefinedQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/PredefinedQueueTest.java index dbd9f5c732..19b47fae7d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/PredefinedQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/PredefinedQueueTest.java @@ -10,29 +10,29 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.server; +package org.apache.activemq6.tests.integration.server; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQQueueExistsException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +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.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/ScaleDown3NodeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ScaleDown3NodeTest.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/ScaleDown3NodeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ScaleDown3NodeTest.java index 6661560cc3..1853e01054 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/ScaleDown3NodeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ScaleDown3NodeTest.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.server; +package org.apache.activemq6.tests.integration.server; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.config.ScaleDownConfiguration; -import org.hornetq.core.config.ha.LiveOnlyPolicyConfiguration; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.persistence.impl.journal.LargeServerMessageImpl; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.Queue; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.config.ScaleDownConfiguration; +import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageImpl; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/ScaleDownTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ScaleDownTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/ScaleDownTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ScaleDownTest.java index 19bec09627..46c1ea94e7 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/ScaleDownTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ScaleDownTest.java @@ -10,29 +10,29 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.server; +package org.apache.activemq6.tests.integration.server; import java.util.Arrays; import java.util.Collection; import java.util.Map; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.config.ScaleDownConfiguration; -import org.hornetq.core.config.ha.LiveOnlyPolicyConfiguration; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.persistence.impl.journal.LargeServerMessageImpl; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.Message; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.config.ScaleDownConfiguration; +import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageImpl; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/SuppliedThreadPoolTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/SuppliedThreadPoolTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/SuppliedThreadPoolTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/SuppliedThreadPoolTest.java index b99be28c0a..f45b6adf6d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/server/SuppliedThreadPoolTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/SuppliedThreadPoolTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.server; +package org.apache.activemq6.tests.integration.server; import java.lang.reflect.Field; import java.util.concurrent.ExecutorService; @@ -21,10 +21,10 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.core.server.impl.ServiceRegistry; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.core.server.impl.ServiceRegistry; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/spring/ExampleListener.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/ExampleListener.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/spring/ExampleListener.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/ExampleListener.java index e4a3f728b7..9e8e7edebd 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/spring/ExampleListener.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/ExampleListener.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.spring; +package org.apache.activemq6.tests.integration.spring; import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageListener; import javax.jms.TextMessage; -import org.hornetq.utils.ReusableLatch; +import org.apache.activemq6.utils.ReusableLatch; /** * @author Bill Burke diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/spring/MessageSender.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/MessageSender.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/spring/MessageSender.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/MessageSender.java index 321eec0e4d..40aaedafac 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/spring/MessageSender.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/MessageSender.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.spring; +package org.apache.activemq6.tests.integration.spring; import javax.jms.Connection; import javax.jms.ConnectionFactory; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/spring/SpringIntegrationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/SpringIntegrationTest.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/spring/SpringIntegrationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/SpringIntegrationTest.java index a648a7eef6..fac1037a83 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/spring/SpringIntegrationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/SpringIntegrationTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.spring; +package org.apache.activemq6.tests.integration.spring; import java.util.concurrent.TimeUnit; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.embedded.EmbeddedJMS; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.server.embedded.EmbeddedJMS; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ssl/CoreClientOverOneWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ssl/CoreClientOverOneWaySSLTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ssl/CoreClientOverOneWaySSLTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ssl/CoreClientOverOneWaySSLTest.java index 8ea8645bba..6fc58ed129 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ssl/CoreClientOverOneWaySSLTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ssl/CoreClientOverOneWaySSLTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ssl; +package org.apache.activemq6.tests.integration.ssl; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; @@ -19,26 +19,26 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.HornetQConnectionTimedOutException; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.remoting.impl.ssl.SSLSupport; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQConnectionTimedOutException; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.remoting.impl.ssl.SSLSupport; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java similarity index 85% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java index 6d8c1b1035..ddb9161147 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.ssl; +package org.apache.activemq6.tests.integration.ssl; import javax.net.ssl.SSLPeerUnverifiedException; import java.util.Arrays; @@ -19,28 +19,28 @@ import java.util.HashMap; import java.util.Map; import io.netty.handler.ssl.SslHandler; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.remoting.impl.netty.NettyConnection; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnection; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/ExtraStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/ExtraStompTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/ExtraStompTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/ExtraStompTest.java index 3ee0bcbcb0..aa4d19f98f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/ExtraStompTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/ExtraStompTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp; +package org.apache.activemq6.tests.integration.stomp; import javax.jms.Message; import javax.jms.MessageConsumer; @@ -20,28 +20,28 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.protocol.stomp.Stomp; -import org.hornetq.core.protocol.stomp.StompProtocolManagerFactory; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.config.impl.JMSQueueConfigurationImpl; -import org.hornetq.jms.server.config.impl.TopicConfigurationImpl; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.largemessage.LargeMessageTestBase; -import org.hornetq.tests.integration.largemessage.LargeMessageTestBase.TestLargeMessageInputStream; -import org.hornetq.tests.integration.stomp.util.ClientStompFrame; -import org.hornetq.tests.integration.stomp.util.StompClientConnection; -import org.hornetq.tests.integration.stomp.util.StompClientConnectionFactory; -import org.hornetq.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.protocol.stomp.Stomp; +import org.apache.activemq6.core.protocol.stomp.StompProtocolManagerFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.JMSQueueConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.TopicConfigurationImpl; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.largemessage.LargeMessageTestBase; +import org.apache.activemq6.tests.integration.largemessage.LargeMessageTestBase.TestLargeMessageInputStream; +import org.apache.activemq6.tests.integration.stomp.util.ClientStompFrame; +import org.apache.activemq6.tests.integration.stomp.util.StompClientConnection; +import org.apache.activemq6.tests.integration.stomp.util.StompClientConnectionFactory; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompConnectionCleanupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompConnectionCleanupTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompConnectionCleanupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompConnectionCleanupTest.java index 9427eec0dc..c3d29c2cab 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompConnectionCleanupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompConnectionCleanupTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp; +package org.apache.activemq6.tests.integration.stomp; import org.junit.Test; @@ -19,8 +19,8 @@ import javax.jms.MessageConsumer; import org.junit.Assert; -import org.hornetq.core.protocol.stomp.Stomp; -import org.hornetq.jms.server.JMSServerManager; +import org.apache.activemq6.core.protocol.stomp.Stomp; +import org.apache.activemq6.jms.server.JMSServerManager; /** * A StompConnectionCleanupTest diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompOverHttpTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompOverHttpTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompOverHttpTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompOverHttpTest.java index 5e6564b059..ea0b36a29c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompOverHttpTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompOverHttpTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp; +package org.apache.activemq6.tests.integration.stomp; import java.nio.charset.StandardCharsets; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompOverWebsocketTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompOverWebsocketTest.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompOverWebsocketTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompOverWebsocketTest.java index 8168363212..4f2ee4cfb9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompOverWebsocketTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompOverWebsocketTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp; +package org.apache.activemq6.tests.integration.stomp; import java.net.URI; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompTest.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompTest.java index 6c88110cc2..ee92e31497 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp; +package org.apache.activemq6.tests.integration.stomp; import javax.jms.BytesMessage; import javax.jms.DeliveryMode; @@ -26,8 +26,8 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.hornetq.core.protocol.stomp.Stomp; -import org.hornetq.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.core.protocol.stomp.Stomp; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; import org.junit.Assert; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompTestBase.java similarity index 89% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompTestBase.java index 37958aab81..28da795c48 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp; +package org.apache.activemq6.tests.integration.stomp; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -45,25 +45,25 @@ import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.codec.string.StringDecoder; import io.netty.handler.codec.string.StringEncoder; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.protocol.stomp.StompProtocolManagerFactory; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.config.impl.JMSQueueConfigurationImpl; -import org.hornetq.jms.server.config.impl.TopicConfigurationImpl; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.protocol.stomp.StompProtocolManagerFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.JMSQueueConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.TopicConfigurationImpl; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompWebSocketTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompWebSocketTest.java similarity index 74% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompWebSocketTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompWebSocketTest.java index 9bc6ad85e3..3a64d24685 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/StompWebSocketTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompWebSocketTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp; +package org.apache.activemq6.tests.integration.stomp; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.protocol.stomp.StompProtocolManagerFactory; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.protocol.stomp.StompProtocolManagerFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/AbstractClientStompFrame.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/AbstractClientStompFrame.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/AbstractClientStompFrame.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/AbstractClientStompFrame.java index c963155cfc..0c4813a2bc 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/AbstractClientStompFrame.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/AbstractClientStompFrame.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/AbstractStompClientConnection.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/AbstractStompClientConnection.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/AbstractStompClientConnection.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/AbstractStompClientConnection.java index 64a540bd24..64ec4b873f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/AbstractStompClientConnection.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/AbstractStompClientConnection.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrame.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrame.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrame.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrame.java index 2039e1b1b0..ed94a80e66 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrame.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrame.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; import java.nio.ByteBuffer; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrameV10.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV10.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrameV10.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV10.java index a810318baa..487db993b3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrameV10.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV10.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrameV11.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV11.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrameV11.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV11.java index 4b46eb4853..d7ce2973b6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrameV11.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV11.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; /** * @author Howard Gao diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrameV12.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV12.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrameV12.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV12.java index 97ee6678eb..e56208b099 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrameV12.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV12.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; /** */ diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnection.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnection.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnection.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnection.java index 022ba71528..06db4442a2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnection.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnection.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; import java.io.IOException; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionFactory.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionFactory.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionFactory.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionFactory.java index 6e106a6b8b..3d84a9d18d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionFactory.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; import java.io.IOException; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV10.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV10.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV10.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV10.java index 2aa610446e..fd2e0d5f0b 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV10.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV10.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; import java.io.IOException; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV11.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV11.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV11.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV11.java index fc71371860..1bea1cf639 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV11.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV11.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; import java.io.IOException; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV12.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV12.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV12.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV12.java index 555470d553..373811f91d 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV12.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV12.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; import java.io.IOException; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactory.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactory.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactory.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactory.java index 84a8211a61..af92334d13 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactory.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactoryFactory.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryFactory.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactoryFactory.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryFactory.java index 9ed9b82b73..b097e0054c 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactoryFactory.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; /** * diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactoryV10.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV10.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactoryV10.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV10.java index e9f608baf7..eb7b578dd2 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactoryV10.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV10.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; import java.util.StringTokenizer; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactoryV11.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV11.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactoryV11.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV11.java index c7b50c0198..c6dd450796 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactoryV11.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV11.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; import java.util.StringTokenizer; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactoryV12.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV12.java similarity index 98% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactoryV12.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV12.java index b9108b2f1e..78d523ff13 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompFrameFactoryV12.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV12.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.util; +package org.apache.activemq6.tests.integration.stomp.util; import java.util.StringTokenizer; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/ExtraStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/ExtraStompTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/ExtraStompTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/ExtraStompTest.java index 9f81cefc21..9b4046b2f1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/ExtraStompTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/ExtraStompTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.v11; +package org.apache.activemq6.tests.integration.stomp.v11; import java.nio.charset.StandardCharsets; -import org.hornetq.tests.integration.stomp.util.ClientStompFrame; -import org.hornetq.tests.integration.stomp.util.StompClientConnection; -import org.hornetq.tests.integration.stomp.util.StompClientConnectionFactory; +import org.apache.activemq6.tests.integration.stomp.util.ClientStompFrame; +import org.apache.activemq6.tests.integration.stomp.util.StompClientConnection; +import org.apache.activemq6.tests.integration.stomp.util.StompClientConnectionFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompV11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/StompV11Test.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompV11Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/StompV11Test.java index c13b6ca251..bdc81a0929 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompV11Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/StompV11Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.v11; +package org.apache.activemq6.tests.integration.stomp.v11; import javax.jms.BytesMessage; import javax.jms.DeliveryMode; @@ -26,11 +26,11 @@ import java.util.UUID; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.stomp.util.ClientStompFrame; -import org.hornetq.tests.integration.stomp.util.StompClientConnection; -import org.hornetq.tests.integration.stomp.util.StompClientConnectionFactory; -import org.hornetq.tests.integration.stomp.util.StompClientConnectionV11; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.stomp.util.ClientStompFrame; +import org.apache.activemq6.tests.integration.stomp.util.StompClientConnection; +import org.apache.activemq6.tests.integration.stomp.util.StompClientConnectionFactory; +import org.apache.activemq6.tests.integration.stomp.util.StompClientConnectionV11; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompV11TestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/StompV11TestBase.java similarity index 81% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompV11TestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/StompV11TestBase.java index 42f8335f98..a32e263ec4 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompV11TestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/StompV11TestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.v11; +package org.apache.activemq6.tests.integration.stomp.v11; import org.junit.Before; import org.junit.After; @@ -28,24 +28,24 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.hornetq.core.protocol.stomp.StompProtocolManagerFactory; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.config.JMSConfiguration; -import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.config.impl.JMSQueueConfigurationImpl; -import org.hornetq.jms.server.config.impl.TopicConfigurationImpl; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.protocol.stomp.StompProtocolManagerFactory; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq6.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.JMSQueueConfigurationImpl; +import org.apache.activemq6.jms.server.config.impl.TopicConfigurationImpl; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.UnitTestCase; public abstract class StompV11TestBase extends UnitTestCase { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v12/StompV12Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v12/StompV12Test.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v12/StompV12Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v12/StompV12Test.java index 03a8f96e07..9bb0a84f56 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v12/StompV12Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v12/StompV12Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.stomp.v12; +package org.apache.activemq6.tests.integration.stomp.v12; import javax.jms.BytesMessage; import javax.jms.DeliveryMode; @@ -27,13 +27,13 @@ import java.util.UUID; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.stomp.util.ClientStompFrame; -import org.hornetq.tests.integration.stomp.util.StompClientConnection; -import org.hornetq.tests.integration.stomp.util.StompClientConnectionFactory; -import org.hornetq.tests.integration.stomp.util.StompClientConnectionV11; -import org.hornetq.tests.integration.stomp.util.StompClientConnectionV12; -import org.hornetq.tests.integration.stomp.v11.StompV11TestBase; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.stomp.util.ClientStompFrame; +import org.apache.activemq6.tests.integration.stomp.util.StompClientConnection; +import org.apache.activemq6.tests.integration.stomp.util.StompClientConnectionFactory; +import org.apache.activemq6.tests.integration.stomp.util.StompClientConnectionV11; +import org.apache.activemq6.tests.integration.stomp.util.StompClientConnectionV12; +import org.apache.activemq6.tests.integration.stomp.v11.StompV11TestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/tools/TransferMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/tools/TransferMessageTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/tools/TransferMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/tools/TransferMessageTest.java index 8a707ec47d..91c862376e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/tools/TransferMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/tools/TransferMessageTest.java @@ -11,24 +11,24 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.integration.tools; +package org.apache.activemq6.tests.integration.tools; import java.util.ArrayList; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.postoffice.impl.PostOfficeImpl; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.cluster.impl.ClusterConnectionBridge; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; -import org.hornetq.tools.Main; +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.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionBridge; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq6.tools.Main; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/transports/netty/HornetQFrameDecoder2Test.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/transports/netty/HornetQFrameDecoder2Test.java index b697e6b7db..90ac97be42 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/transports/netty/HornetQFrameDecoder2Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.transports.netty; +package org.apache.activemq6.tests.integration.transports.netty; import java.util.ArrayList; import java.util.List; @@ -19,8 +19,8 @@ import java.util.Random; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; -import org.hornetq.core.remoting.impl.netty.HornetQFrameDecoder2; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.remoting.impl.netty.HornetQFrameDecoder2; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java similarity index 82% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java index 05d8ccd2c1..d3d19935e9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.transports.netty; +package org.apache.activemq6.tests.integration.transports.netty; import java.util.HashMap; import java.util.Map; @@ -29,26 +29,26 @@ import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpRequestDecoder; import io.netty.handler.codec.http.HttpResponseEncoder; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.HornetQNotConnectedException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.netty.NettyAcceptor; -import org.hornetq.core.remoting.impl.netty.PartialPooledByteBufAllocator; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.api.core.HornetQNotConnectedException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptor; +import org.apache.activemq6.core.remoting.impl.netty.PartialPooledByteBufAllocator; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -56,11 +56,11 @@ import org.junit.Test; import static io.netty.handler.codec.http.HttpHeaders.Names.UPGRADE; import static io.netty.handler.codec.http.HttpResponseStatus.SWITCHING_PROTOCOLS; import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1; -import static org.hornetq.core.remoting.impl.netty.NettyConnector.MAGIC_NUMBER; -import static org.hornetq.core.remoting.impl.netty.NettyConnector.SEC_HORNETQ_REMOTING_ACCEPT; -import static org.hornetq.core.remoting.impl.netty.NettyConnector.SEC_HORNETQ_REMOTING_KEY; -import static org.hornetq.core.remoting.impl.netty.NettyConnector.createExpectedResponse; -import static org.hornetq.tests.util.RandomUtil.randomString; +import static org.apache.activemq6.core.remoting.impl.netty.NettyConnector.MAGIC_NUMBER; +import static org.apache.activemq6.core.remoting.impl.netty.NettyConnector.SEC_HORNETQ_REMOTING_ACCEPT; +import static org.apache.activemq6.core.remoting.impl.netty.NettyConnector.SEC_HORNETQ_REMOTING_KEY; +import static org.apache.activemq6.core.remoting.impl.netty.NettyConnector.createExpectedResponse; +import static org.apache.activemq6.tests.util.RandomUtil.randomString; /** * Test that Netty Connector can connect to a Web Server and upgrade from a HTTP request to its remoting protocol. @@ -181,7 +181,7 @@ public class NettyConnectorWithHTTPUpgradeTest extends UnitTestCase e = x; } - // make sure we failed *before* the HTTP hand-shake timeout elapsed (which is hard-coded to 30 seconds, see org.hornetq.core.remoting.impl.netty.NettyConnector.HttpUpgradeHandler.awaitHandshake()) + // make sure we failed *before* the HTTP hand-shake timeout elapsed (which is hard-coded to 30 seconds, see org.apache.activemq6.core.remoting.impl.netty.NettyConnector.HttpUpgradeHandler.awaitHandshake()) assertTrue((System.currentTimeMillis() - start) < 30000); assertNotNull(e); assertTrue(e instanceof HornetQNotConnectedException); diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/twitter/TwitterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/twitter/TwitterTest.java similarity index 94% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/twitter/TwitterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/twitter/TwitterTest.java index d9a0e527ef..4056d04071 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/twitter/TwitterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/twitter/TwitterTest.java @@ -10,31 +10,31 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.twitter; +package org.apache.activemq6.tests.integration.twitter; import java.util.HashMap; import java.util.Iterator; import java.util.Set; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ConnectorServiceConfiguration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.integration.twitter.TwitterConstants; -import org.hornetq.integration.twitter.TwitterIncomingConnectorServiceFactory; -import org.hornetq.integration.twitter.TwitterOutgoingConnectorServiceFactory; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ConnectorServiceConfiguration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.integration.twitter.TwitterConstants; +import org.apache.activemq6.integration.twitter.TwitterIncomingConnectorServiceFactory; +import org.apache.activemq6.integration.twitter.TwitterOutgoingConnectorServiceFactory; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/vertx/HornetQVertxUnitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/vertx/HornetQVertxUnitTest.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/vertx/HornetQVertxUnitTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/vertx/HornetQVertxUnitTest.java index ef9d907a66..4a5a95243e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/vertx/HornetQVertxUnitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/vertx/HornetQVertxUnitTest.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.vertx; +package org.apache.activemq6.tests.integration.vertx; import java.util.HashMap; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ConnectorServiceConfiguration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.integration.vertx.VertxConstants; -import org.hornetq.integration.vertx.VertxIncomingConnectorServiceFactory; -import org.hornetq.integration.vertx.VertxOutgoingConnectorServiceFactory; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.TransportConfiguration; +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.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.core.config.Configuration; +import org.apache.activemq6.core.config.ConnectorServiceConfiguration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.integration.vertx.VertxConstants; +import org.apache.activemq6.integration.vertx.VertxIncomingConnectorServiceFactory; +import org.apache.activemq6.integration.vertx.VertxOutgoingConnectorServiceFactory; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -57,17 +57,17 @@ public class HornetQVertxUnitTest extends ServiceTestBase protected String port = "0"; protected String incomingQueue1 = "vertxTestIncomingQueue1"; - protected String incomingVertxAddress1 = "org.hornetq.test.incoming1"; + protected String incomingVertxAddress1 = "org.apache.activemq6.test.incoming1"; //outgoing using send protected String inOutQueue1 = "vertxTestInOutQueue1"; - protected String incomingVertxAddress2 = "org.hornetq.test.incoming2"; - protected String outgoingVertxAddress1 = "org.hornetq.test.outgoing1"; + protected String incomingVertxAddress2 = "org.apache.activemq6.test.incoming2"; + protected String outgoingVertxAddress1 = "org.apache.activemq6.test.outgoing1"; //outgoing using publish protected String inOutQueue2 = "vertxTestInOutQueue2"; - protected String incomingVertxAddress3 = "org.hornetq.test.incoming3"; - protected String outgoingVertxAddress2 = "org.hornetq.test.outgoing2"; + protected String incomingVertxAddress3 = "org.apache.activemq6.test.incoming3"; + protected String outgoingVertxAddress2 = "org.apache.activemq6.test.outgoing2"; // Vertx is changing the classLoader to null.. this will preserve the original classloader diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/BasicXaRecoveryTest.java similarity index 97% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/BasicXaRecoveryTest.java index 75896f18fc..acb5b7e1b6 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/BasicXaRecoveryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.xa; +package org.apache.activemq6.tests.integration.xa; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -20,26 +20,26 @@ import javax.management.MBeanServerFactory; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.jms.client.HornetQBytesMessage; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.integration.management.ManagementControlHelper; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.UUIDGenerator; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.jms.client.HornetQBytesMessage; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.management.ManagementControlHelper; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.UUIDGenerator; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/BasicXaTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/BasicXaTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/BasicXaTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/BasicXaTest.java index ca0c62958b..64f7102940 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/BasicXaTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/BasicXaTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.xa; +package org.apache.activemq6.tests.integration.xa; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -20,23 +20,23 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.ra.HornetQRAXAResource; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.utils.UUIDGenerator; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.ra.HornetQRAXAResource; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.utils.UUIDGenerator; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/XaTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/XaTimeoutTest.java similarity index 93% rename from tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/XaTimeoutTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/XaTimeoutTest.java index 9397d01cad..466ea77e0e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/XaTimeoutTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/XaTimeoutTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.integration.xa; +package org.apache.activemq6.tests.integration.xa; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -22,31 +22,31 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.wireformat.SessionXAStartMessage; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionOperationAbstract; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAStartMessage; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionOperationAbstract; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.UUIDGenerator; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -711,7 +711,7 @@ public class XaTimeoutTest extends UnitTestCase { /* (non-Javadoc) - * @see org.hornetq.api.core.Interceptor#intercept(org.hornetq.core.protocol.core.Packet, org.hornetq.spi.core.protocol.RemotingConnection) + * @see org.apache.activemq6.api.core.Interceptor#intercept(org.hornetq.core.protocol.core.Packet, org.hornetq.spi.core.protocol.RemotingConnection) */ @Override public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/largemessage/LargeMessageTestBase.java similarity index 95% rename from tests/integration-tests/src/test/java/org/hornetq/tests/largemessage/LargeMessageTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/largemessage/LargeMessageTestBase.java index 267b46df00..35cb170cb4 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/largemessage/LargeMessageTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/largemessage/LargeMessageTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.largemessage; +package org.apache.activemq6.tests.largemessage; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -21,24 +21,24 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.DataConstants; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +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.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.DataConstants; import org.junit.After; import org.junit.Assert; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JMSClusteredTestBase.java similarity index 90% rename from tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JMSClusteredTestBase.java index bf36f54f5d..773076eb03 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JMSClusteredTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.util; +package org.apache.activemq6.tests.util; import javax.jms.ConnectionFactory; import javax.jms.Queue; @@ -22,19 +22,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.IntegrationTestLogger; -import org.hornetq.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.core.config.ClusterConnectionConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; import org.junit.After; import org.junit.Before; @@ -298,7 +298,7 @@ public class JMSClusteredTestBase extends ServiceTestBase { Map params = new HashMap(); - params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, node); + params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, node); return params; } diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JMSTestBase.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JMSTestBase.java index 21d44a6575..ab625c61e1 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JMSTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.util; +package org.apache.activemq6.tests.util; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -30,16 +30,16 @@ import java.util.List; import java.util.Random; import java.util.Set; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.QueueControl; +import org.apache.activemq6.api.jms.management.JMSQueueControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/util/JournalExample.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JournalExample.java similarity index 92% rename from tests/integration-tests/src/test/java/org/hornetq/tests/util/JournalExample.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JournalExample.java index a4c4aafc8d..c1f506789f 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/util/JournalExample.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JournalExample.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.util; +package org.apache.activemq6.tests.util; import java.util.ArrayList; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.utils.TimeAndCounterIDGenerator; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.utils.TimeAndCounterIDGenerator; /** * A JournalExample: Just an example on how to use the Journal Directly diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/util/NonSerializableFactory.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/NonSerializableFactory.java similarity index 99% rename from tests/integration-tests/src/test/java/org/hornetq/tests/util/NonSerializableFactory.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/NonSerializableFactory.java index e011f4644b..ad8d3d2963 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/util/NonSerializableFactory.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/NonSerializableFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.util; +package org.apache.activemq6.tests.util; import javax.naming.Context; import javax.naming.Name; diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/util/ReplicatedBackupUtils.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/ReplicatedBackupUtils.java similarity index 87% rename from tests/integration-tests/src/test/java/org/hornetq/tests/util/ReplicatedBackupUtils.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/ReplicatedBackupUtils.java index 33ae7bb75e..578af8d257 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/util/ReplicatedBackupUtils.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/ReplicatedBackupUtils.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.util; +package org.apache.activemq6.tests.util; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ha.ReplicaPolicyConfiguration; -import org.hornetq.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; public final class ReplicatedBackupUtils { diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/util/TransportConfigurationUtils.java b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/TransportConfigurationUtils.java similarity index 91% rename from tests/integration-tests/src/test/java/org/hornetq/tests/util/TransportConfigurationUtils.java rename to tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/TransportConfigurationUtils.java index bbe2d9cdfa..e7786df9e3 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/util/TransportConfigurationUtils.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/TransportConfigurationUtils.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.util; +package org.apache.activemq6.tests.util; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; public final class TransportConfigurationUtils { @@ -99,7 +99,7 @@ public final class TransportConfigurationUtils { Map serverParams = new HashMap(); Integer port = live ? 5445 : 5545; - serverParams.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port); + serverParams.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port); return new TransportConfiguration(classname, serverParams); } @@ -114,7 +114,7 @@ public final class TransportConfigurationUtils { Map serverParams = new HashMap(); Integer port = live ? 5445 : 5545; - serverParams.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port); + serverParams.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port); return new TransportConfiguration(classname, serverParams, name); } diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml index b9582cf550..ca292144a3 100644 --- a/tests/jms-tests/pom.xml +++ b/tests/jms-tests/pom.xml @@ -2,14 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.tests - hornetq-tests-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.tests + activemq6-tests-pom + 6.0.0-SNAPSHOT jms-tests jar - HornetQ JMS Tests + ActiveMQ6 JMS Tests ${project.basedir}/../.. @@ -17,49 +17,49 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} test test-jar - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests unit-tests ${project.version} test test-jar - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-commons + org.apache.activemq6 + activemq6-commons ${project.version} - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-ra + org.apache.activemq6 + activemq6-ra ${project.version} - org.hornetq - hornetq-bootstrap + org.apache.activemq6 + activemq6-bootstrap ${project.version} diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/AcknowledgementTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/AcknowledgementTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/AcknowledgementTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/AcknowledgementTest.java index d02b001afb..e0528b2490 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/AcknowledgementTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/AcknowledgementTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -27,7 +27,7 @@ import javax.jms.TopicSession; import javax.jms.TopicSubscriber; import java.util.concurrent.CountDownLatch; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/AutoAckMesageListenerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/AutoAckMesageListenerTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/AutoAckMesageListenerTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/AutoAckMesageListenerTest.java index 98eb5e04ed..07b22e7762 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/AutoAckMesageListenerTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/AutoAckMesageListenerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/BrowserTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/BrowserTest.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/BrowserTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/BrowserTest.java index 124f807bba..3bb12c7719 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/BrowserTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/BrowserTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import java.util.Enumeration; import javax.jms.Connection; @@ -23,10 +23,10 @@ import javax.jms.QueueBrowser; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/CTSMiscellaneousTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/CTSMiscellaneousTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/CTSMiscellaneousTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/CTSMiscellaneousTest.java index 629b2709b0..bbdba1629b 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/CTSMiscellaneousTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/CTSMiscellaneousTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import java.util.ArrayList; import java.util.List; @@ -19,9 +19,9 @@ import javax.jms.DeliveryMode; import javax.jms.MessageProducer; import javax.jms.Session; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionClosedTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionClosedTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionClosedTest.java index 6cb97a4eb5..304ec7d267 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionClosedTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionClosedTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -24,7 +24,7 @@ import javax.jms.TopicConnectionFactory; import javax.jms.TopicSession; import javax.jms.TopicSubscriber; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionFactoryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionFactoryTest.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionFactoryTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionFactoryTest.java index e0a94cf08a..c50ccdeefd 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionFactoryTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionFactoryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import java.util.ArrayList; import java.util.Random; @@ -35,8 +35,8 @@ import javax.jms.XAQueueConnectionFactory; import javax.jms.XATopicConnection; import javax.jms.XATopicConnectionFactory; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionTest.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionTest.java index 0083218d26..33cb10ffd6 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConnectionTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.ConnectionMetaData; @@ -22,7 +22,7 @@ import javax.jms.ServerSessionPool; import javax.jms.Session; import javax.jms.TopicConnection; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Assert; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConsumerClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConsumerClosedTest.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConsumerClosedTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConsumerClosedTest.java index 2d3bb3d6b3..946a1b9d5e 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ConsumerClosedTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConsumerClosedTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.MessageConsumer; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/DeliveryOrderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/DeliveryOrderTest.java similarity index 93% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/DeliveryOrderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/DeliveryOrderTest.java index 50e79bf54a..0aae730c56 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/DeliveryOrderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/DeliveryOrderTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.JMSException; @@ -22,7 +22,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import java.util.concurrent.CountDownLatch; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Assert; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/DurableSubscriptionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/DurableSubscriptionTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/DurableSubscriptionTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/DurableSubscriptionTest.java index 39d7e02fab..aa6967f1d8 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/DurableSubscriptionTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/DurableSubscriptionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -26,7 +26,7 @@ import javax.jms.Topic; import javax.jms.TopicSubscriber; import java.util.List; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/HornetQServerTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/HornetQServerTestCase.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/HornetQServerTestCase.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/HornetQServerTestCase.java index 1f339ab18b..2c86fbe01b 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/HornetQServerTestCase.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/HornetQServerTestCase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -34,15 +34,15 @@ import java.util.List; import java.util.Set; import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.tests.tools.ServerManagement; -import org.hornetq.jms.tests.tools.container.Server; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.tests.tools.ServerManagement; +import org.apache.activemq6.jms.tests.tools.container.Server; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -58,7 +58,7 @@ import org.junit.runner.Description; * @author Andy Taylor * @author Jeff Mesnil * @deprecated this infrastructure should not be used for new code. New tests should go into - * org.hornetq.tests.integration.jms at the integration-tests project. + * org.apache.activemq6.tests.integration.jms at the integration-tests project. */ @Deprecated public abstract class HornetQServerTestCase @@ -188,7 +188,7 @@ public abstract class HornetQServerTestCase public String getContextFactory() { - return org.hornetq.jms.tests.tools.container.InVMInitialContextFactory.class.getCanonicalName(); + return org.apache.activemq6.jms.tests.tools.container.InVMInitialContextFactory.class.getCanonicalName(); } public void start() throws Exception diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/JMSTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JMSTest.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/JMSTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JMSTest.java index 917ce31ef4..3ee9cdc642 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/JMSTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JMSTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -24,7 +24,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/JMSTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JMSTestCase.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/JMSTestCase.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JMSTestCase.java index f6e6fc754b..f28b647905 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/JMSTestCase.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JMSTestCase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import java.util.ArrayList; import javax.jms.Connection; @@ -22,17 +22,17 @@ import javax.jms.TopicConnection; import javax.jms.XAConnection; import javax.naming.InitialContext; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.jms.client.HornetQQueueConnectionFactory; -import org.hornetq.jms.client.HornetQTopicConnectionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.jms.client.HornetQQueueConnectionFactory; +import org.apache.activemq6.jms.client.HornetQTopicConnectionFactory; import org.junit.After; import org.junit.Before; /** * @deprecated this infrastructure should not be used for new code. New tests should go into - * org.hornetq.tests.integration.jms at the integration-tests project. + * org.apache.activemq6.tests.integration.jms at the integration-tests project. * @author Tim Fox */ @Deprecated diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/JmsTestLogger.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JmsTestLogger.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/JmsTestLogger.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JmsTestLogger.java index 5b397dcd28..d81a12b0c8 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/JmsTestLogger.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JmsTestLogger.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageConsumerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageConsumerTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageConsumerTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageConsumerTest.java index 372c243448..1fc55ae66f 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageConsumerTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageConsumerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -40,8 +40,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.jms.tests.util.ProxyAssertSupport; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageProducerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageProducerTest.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageProducerTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageProducerTest.java index 86a3a0191d..019c4042cb 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageProducerTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageProducerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.CompletionListener; import javax.jms.Connection; @@ -27,10 +27,10 @@ import java.io.Serializable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.jms.tests.message.SimpleJMSMessage; -import org.hornetq.jms.tests.message.SimpleJMSTextMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.jms.tests.message.SimpleJMSMessage; +import org.apache.activemq6.jms.tests.message.SimpleJMSTextMessage; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageWithReadResolveTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageWithReadResolveTest.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageWithReadResolveTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageWithReadResolveTest.java index 30dabae2bd..c09e030cd1 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/MessageWithReadResolveTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageWithReadResolveTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -20,7 +20,7 @@ import javax.jms.ObjectMessage; import javax.jms.Session; import java.io.Serializable; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/MiscellaneousTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MiscellaneousTest.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/MiscellaneousTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MiscellaneousTest.java index d11534e1ac..6b3acf8389 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/MiscellaneousTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MiscellaneousTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import java.util.Enumeration; import javax.jms.Connection; @@ -23,7 +23,7 @@ import javax.jms.QueueBrowser; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/NonDurableSubscriberTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/NonDurableSubscriberTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/NonDurableSubscriberTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/NonDurableSubscriberTest.java index fe3a15758f..fc25513d2e 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/NonDurableSubscriberTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/NonDurableSubscriberTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.InvalidSelectorException; import javax.jms.Session; @@ -18,7 +18,7 @@ import javax.jms.TopicConnection; import javax.jms.TopicSession; import javax.naming.InitialContext; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/PersistenceTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/PersistenceTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/PersistenceTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/PersistenceTest.java index bf0963c03d..0bc0aa51b0 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/PersistenceTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/PersistenceTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -19,7 +19,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/QueueReceiverTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/QueueReceiverTest.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/QueueReceiverTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/QueueReceiverTest.java index f65410b4bc..1e2cc52cc9 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/QueueReceiverTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/QueueReceiverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.QueueConnection; import javax.jms.QueueReceiver; @@ -19,7 +19,7 @@ import javax.jms.QueueSession; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/QueueTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/QueueTest.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/QueueTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/QueueTest.java index f645561ed4..e3418c983a 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/QueueTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/QueueTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -22,7 +22,7 @@ import javax.jms.TextMessage; import java.util.HashSet; import java.util.Set; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ReferenceableTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ReferenceableTest.java similarity index 89% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/ReferenceableTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ReferenceableTest.java index a8599a9795..39552a59c6 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/ReferenceableTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ReferenceableTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -23,14 +23,14 @@ import javax.naming.Reference; import javax.naming.Referenceable; import java.io.Serializable; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.client.HornetQTopic; -import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory; -import org.hornetq.jms.referenceable.DestinationObjectFactory; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +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.HornetQQueue; +import org.apache.activemq6.jms.client.HornetQTopic; +import org.apache.activemq6.jms.referenceable.ConnectionFactoryObjectFactory; +import org.apache.activemq6.jms.referenceable.DestinationObjectFactory; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/SecurityTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/SecurityTest.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/SecurityTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/SecurityTest.java index 8cfd63daf0..25b5b8dabe 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/SecurityTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/SecurityTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -18,7 +18,7 @@ import javax.jms.IllegalStateException; import javax.jms.JMSSecurityException; import javax.jms.Session; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/SessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/SessionTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/SessionTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/SessionTest.java index a187168cc8..acccbd0f18 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/SessionTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/SessionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -29,7 +29,7 @@ import javax.jms.TopicSession; import javax.jms.XAConnection; import javax.jms.XASession; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/TemporaryDestinationTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TemporaryDestinationTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/TemporaryDestinationTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TemporaryDestinationTest.java index 9fbf3ced2d..fbed22858f 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/TemporaryDestinationTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TemporaryDestinationTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.JMSException; @@ -23,7 +23,7 @@ import javax.jms.TemporaryTopic; import javax.jms.TextMessage; import javax.naming.NamingException; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/TopicTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TopicTest.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/TopicTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TopicTest.java index 30de9adf4b..fab100feb7 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/TopicTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TopicTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -24,7 +24,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import java.io.Serializable; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/TransactedSessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TransactedSessionTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/TransactedSessionTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TransactedSessionTest.java index 85409a777c..f24994802d 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/TransactedSessionTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TransactedSessionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -24,7 +24,7 @@ import javax.jms.TextMessage; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Assert; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/XARecoveryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/XARecoveryTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/XARecoveryTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/XARecoveryTest.java index 581cdbff9c..ec747337e9 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/XARecoveryTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/XARecoveryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import javax.jms.Connection; import javax.jms.Message; @@ -25,8 +25,8 @@ import javax.transaction.xa.Xid; import com.arjuna.ats.arjuna.common.Uid; import com.arjuna.ats.jta.xa.XidImple; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Ignore; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/XATest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/XATest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/XATest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/XATest.java index dbb3f3916b..b2ce0d3748 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/XATest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/XATest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests; +package org.apache.activemq6.jms.tests; import java.util.ArrayList; import java.util.List; @@ -34,8 +34,8 @@ import javax.transaction.xa.Xid; import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.jboss.tm.TxUtils; import org.junit.After; import org.junit.Before; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/BodyIsAssignableFromTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/BodyIsAssignableFromTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/BodyIsAssignableFromTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/BodyIsAssignableFromTest.java index e876e72e77..02a337e351 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/BodyIsAssignableFromTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/BodyIsAssignableFromTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.BytesMessage; import javax.jms.JMSException; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/BytesMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/BytesMessageTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/BytesMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/BytesMessageTest.java index 7dcd15bd84..0e14a9a858 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/BytesMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/BytesMessageTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.BytesMessage; import javax.jms.JMSException; import javax.jms.Message; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Before; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/ExpiredMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ExpiredMessageTest.java similarity index 92% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/ExpiredMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ExpiredMessageTest.java index 6bac284088..a4caf9b8c2 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/ExpiredMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ExpiredMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.Connection; import javax.jms.Message; @@ -19,8 +19,8 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.jms.tests.JMSTestCase; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.JMSTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSCorrelationIDHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSCorrelationIDHeaderTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSCorrelationIDHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSCorrelationIDHeaderTest.java index 4928d219a5..4d6faaed47 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSCorrelationIDHeaderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSCorrelationIDHeaderTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.Message; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSDeliveryModeHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSDeliveryModeHeaderTest.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSDeliveryModeHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSDeliveryModeHeaderTest.java index 4b3f814f1f..495936f298 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSDeliveryModeHeaderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSDeliveryModeHeaderTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import org.junit.Test; import javax.jms.DeliveryMode; import javax.jms.Message; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; /** * @author Ovidiu Feodorov diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSDestinationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSDestinationHeaderTest.java similarity index 93% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSDestinationHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSDestinationHeaderTest.java index 0637421294..735ee44741 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSDestinationHeaderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSDestinationHeaderTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.Message; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSExpirationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSExpirationHeaderTest.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSExpirationHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSExpirationHeaderTest.java index e075b86a6f..9250cd6d45 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSExpirationHeaderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSExpirationHeaderTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import javax.jms.DeliveryMode; import javax.jms.Message; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSMessageIDHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSMessageIDHeaderTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSMessageIDHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSMessageIDHeaderTest.java index 987283b438..7d937b29d4 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSMessageIDHeaderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSMessageIDHeaderTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.Message; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSPriorityHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSPriorityHeaderTest.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSPriorityHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSPriorityHeaderTest.java index ba3a8b849b..a6f8d31414 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSPriorityHeaderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSPriorityHeaderTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -19,8 +19,8 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSReplyToHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSReplyToHeaderTest.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSReplyToHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSReplyToHeaderTest.java index a490ddbbc7..fc44b58141 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSReplyToHeaderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSReplyToHeaderTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import org.junit.Test; import javax.jms.Message; import javax.jms.TemporaryQueue; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; /** * diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSTimestampHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSTimestampHeaderTest.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSTimestampHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSTimestampHeaderTest.java index 6644dc8513..5c7a3ba3c8 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSTimestampHeaderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSTimestampHeaderTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import org.junit.Test; import javax.jms.Message; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; /** * @author Ovidiu Feodorov diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSTypeHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSTypeHeaderTest.java similarity index 94% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSTypeHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSTypeHeaderTest.java index 568bb2ebed..6d320aaed1 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSTypeHeaderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSTypeHeaderTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import org.junit.Test; import javax.jms.Message; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; /** * @author Rajdeep Dua diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSXDeliveryCountTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSXDeliveryCountTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSXDeliveryCountTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSXDeliveryCountTest.java index ed3fc3e3af..4e9005b817 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/JMSXDeliveryCountTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSXDeliveryCountTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -29,8 +29,8 @@ import javax.transaction.xa.Xid; import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MapMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MapMessageTest.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MapMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MapMessageTest.java index 319c9bd6bc..714dac0a8d 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MapMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MapMessageTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.JMSException; import javax.jms.MapMessage; import javax.jms.Message; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageBodyTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageBodyTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageBodyTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageBodyTest.java index fcd581667a..910f227e5f 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageBodyTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageBodyTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.BytesMessage; import javax.jms.MapMessage; @@ -25,7 +25,7 @@ import java.io.Serializable; import java.util.Enumeration; import java.util.HashSet; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Assert; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageBodyTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageBodyTestCase.java similarity index 94% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageBodyTestCase.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageBodyTestCase.java index 27eea22949..8d0e3db885 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageBodyTestCase.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageBodyTestCase.java @@ -13,13 +13,13 @@ /** * */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.Connection; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; -import org.hornetq.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; import org.junit.Before; public abstract class MessageBodyTestCase extends HornetQServerTestCase diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageHeaderTest.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageHeaderTest.java index d2da80f9b6..59353a2c98 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageHeaderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageHeaderTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import java.io.File; import java.io.Serializable; @@ -34,26 +34,26 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.FailoverEventListener; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.client.impl.ClientMessageImpl; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.jms.client.HornetQBytesMessage; -import org.hornetq.jms.client.HornetQMapMessage; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.jms.client.HornetQObjectMessage; -import org.hornetq.jms.client.HornetQStreamMessage; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +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.ClientProducer; +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.SendAcknowledgementHandler; +import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq6.core.client.impl.ClientMessageImpl; +import org.apache.activemq6.core.remoting.FailureListener; +import org.apache.activemq6.jms.client.HornetQBytesMessage; +import org.apache.activemq6.jms.client.HornetQMapMessage; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.jms.client.HornetQObjectMessage; +import org.apache.activemq6.jms.client.HornetQStreamMessage; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Test; /** @@ -1388,7 +1388,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase } /* (non-Javadoc) - * @see org.hornetq.api.core.client.ClientSession#createBuffer(byte[]) + * @see org.apache.activemq6.api.core.client.ClientSession#createBuffer(byte[]) */ public HornetQBuffer createBuffer(final byte[] bytes) { @@ -1397,7 +1397,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase } /* (non-Javadoc) - * @see org.hornetq.api.core.client.ClientSession#createBuffer(int) + * @see org.apache.activemq6.api.core.client.ClientSession#createBuffer(int) */ public HornetQBuffer createBuffer(final int size) { @@ -1419,7 +1419,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase } /* (non-Javadoc) - * @see org.hornetq.api.core.client.ClientSession#createQueue(org.hornetq.utils.SimpleString, org.hornetq.utils.SimpleString) + * @see org.apache.activemq6.api.core.client.ClientSession#createQueue(org.hornetq.utils.SimpleString, org.hornetq.utils.SimpleString) */ public void createQueue(SimpleString address, SimpleString queueName) throws HornetQException { @@ -1428,7 +1428,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase } /* (non-Javadoc) - * @see org.hornetq.api.core.client.ClientSession#setClientID(java.lang.String) + * @see org.apache.activemq6.api.core.client.ClientSession#setClientID(java.lang.String) */ public void setClientID(String clientID) { @@ -1437,7 +1437,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase } /* (non-Javadoc) - * @see org.hornetq.api.core.client.ClientSession#addMetaData(java.lang.String, java.lang.String) + * @see org.apache.activemq6.api.core.client.ClientSession#addMetaData(java.lang.String, java.lang.String) */ public void addMetaData(String key, String data) throws HornetQException { @@ -1446,7 +1446,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase } /* (non-Javadoc) - * @see org.hornetq.api.core.client.ClientSession#addUniqueMetaData(java.lang.String, java.lang.String) + * @see org.apache.activemq6.api.core.client.ClientSession#addUniqueMetaData(java.lang.String, java.lang.String) */ public void addUniqueMetaData(String key, String data) throws HornetQException { diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageHeaderTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageHeaderTestBase.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageHeaderTestBase.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageHeaderTestBase.java index 0d1dd1e65b..d7b1d8bee8 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageHeaderTestBase.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageHeaderTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import java.util.Arrays; import java.util.Enumeration; @@ -28,15 +28,15 @@ import javax.jms.Session; import javax.jms.StreamMessage; import javax.jms.TextMessage; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.jms.client.HornetQBytesMessage; -import org.hornetq.jms.client.HornetQMapMessage; -import org.hornetq.jms.client.HornetQMessage; -import org.hornetq.jms.client.HornetQObjectMessage; -import org.hornetq.jms.client.HornetQStreamMessage; -import org.hornetq.jms.client.HornetQTextMessage; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.jms.client.HornetQBytesMessage; +import org.apache.activemq6.jms.client.HornetQMapMessage; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.jms.client.HornetQObjectMessage; +import org.apache.activemq6.jms.client.HornetQStreamMessage; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Before; /** diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessagePropertyConversionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessagePropertyConversionTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessagePropertyConversionTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessagePropertyConversionTest.java index 511e960a4a..eb18ddd105 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessagePropertyConversionTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessagePropertyConversionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.Connection; import javax.jms.JMSContext; @@ -23,9 +23,9 @@ import javax.jms.MessageFormatRuntimeException; import javax.jms.MessageProducer; import javax.jms.Session; -import org.hornetq.api.core.SimpleString; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageTestBase.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageTestBase.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageTestBase.java index f7fb30ab06..c372c96436 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/MessageTestBase.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.Connection; import javax.jms.DeliveryMode; import javax.jms.JMSException; @@ -19,8 +19,8 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/ObjectMessageDeliveryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ObjectMessageDeliveryTest.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/ObjectMessageDeliveryTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ObjectMessageDeliveryTest.java index acffd6ba32..f8aa4e1b5c 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/ObjectMessageDeliveryTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ObjectMessageDeliveryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import org.junit.Test; @@ -23,8 +23,8 @@ import javax.jms.TopicPublisher; import javax.jms.TopicSession; import javax.jms.TopicSubscriber; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; /** * diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/ObjectMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ObjectMessageTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/ObjectMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ObjectMessageTest.java index 11ecc57e37..a0e191afad 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/ObjectMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ObjectMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.DeliveryMode; import javax.jms.JMSException; @@ -22,7 +22,7 @@ import java.net.URLClassLoader; import java.util.ArrayList; import java.util.StringTokenizer; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -76,7 +76,7 @@ public class ObjectMessageTest extends MessageTestBase Object testObject2 = r.getObject(); - ProxyAssertSupport.assertEquals("org.hornetq.jms.tests.message.SomeObject", testObject2.getClass().getName()); + ProxyAssertSupport.assertEquals("org.apache.activemq6.jms.tests.message.SomeObject", testObject2.getClass().getName()); ProxyAssertSupport.assertNotSame(testObject, testObject2); ProxyAssertSupport.assertNotSame(testObject.getClass(), testObject2.getClass()); ProxyAssertSupport.assertNotSame(testObject.getClass().getClassLoader(), testObject2.getClass() diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSBytesMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSBytesMessage.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSBytesMessage.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSBytesMessage.java index 83032a8c60..718b760e71 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSBytesMessage.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSBytesMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSMapMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSMapMessage.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSMapMessage.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSMapMessage.java index 6198d23a65..a9c94b062d 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSMapMessage.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSMapMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import java.util.Collections; import java.util.Enumeration; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSMessage.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSMessage.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSMessage.java index fb1c039ce8..6ccd4d4e41 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSMessage.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import java.util.Collections; import java.util.Enumeration; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSObjectMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSObjectMessage.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSObjectMessage.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSObjectMessage.java index 431d840fa0..9d7b0374d1 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSObjectMessage.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSObjectMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import java.io.Serializable; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSStreamMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSStreamMessage.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSStreamMessage.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSStreamMessage.java index 5a0cc63df9..18df761c11 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSStreamMessage.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSStreamMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import java.util.ArrayList; import java.util.List; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSTextMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSTextMessage.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSTextMessage.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSTextMessage.java index 6606b98ff8..43b3f5fbba 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SimpleJMSTextMessage.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSTextMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.JMSException; import javax.jms.TextMessage; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SomeObject.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SomeObject.java similarity index 93% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SomeObject.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SomeObject.java index 280105f7bb..5dd815a4b4 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/SomeObject.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SomeObject.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import java.io.Serializable; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/StreamMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/StreamMessageTest.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/StreamMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/StreamMessageTest.java index bb7a8f4698..64f4d873b6 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/StreamMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/StreamMessageTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import javax.jms.JMSException; import javax.jms.Message; import javax.jms.StreamMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/TextMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/TextMessageTest.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/TextMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/TextMessageTest.java index 0c9fac47d6..3339ffeb54 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/TextMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/TextMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message; +package org.apache.activemq6.jms.tests.message; import org.junit.Before; import org.junit.After; @@ -20,7 +20,7 @@ import javax.jms.JMSException; import javax.jms.Message; import javax.jms.TextMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; /** * A test that sends/receives text messages to the JMS provider and verifies their integrity. diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignBytesMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignBytesMessageTest.java similarity index 90% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignBytesMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignBytesMessageTest.java index 7015ec6b6e..29236c5b0a 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignBytesMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignBytesMessageTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message.foreign; +package org.apache.activemq6.jms.tests.message.foreign; import javax.jms.BytesMessage; import javax.jms.JMSException; import javax.jms.Message; -import org.hornetq.jms.tests.message.SimpleJMSBytesMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.message.SimpleJMSBytesMessage; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; /** * diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignMapMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignMapMessageTest.java similarity index 92% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignMapMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignMapMessageTest.java index 84c5094d36..b8efb1d684 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignMapMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignMapMessageTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message.foreign; +package org.apache.activemq6.jms.tests.message.foreign; import javax.jms.JMSException; import javax.jms.MapMessage; import javax.jms.Message; -import org.hornetq.jms.tests.message.SimpleJMSMapMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.message.SimpleJMSMapMessage; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; /** * Tests the delivery/receipt of a foreign map message diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignMessageTest.java similarity index 90% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignMessageTest.java index a45a62db7d..4b44829ea0 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignMessageTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message.foreign; +package org.apache.activemq6.jms.tests.message.foreign; import javax.jms.Message; import javax.jms.TextMessage; -import org.hornetq.api.jms.HornetQJMSConstants; -import org.hornetq.jms.tests.message.MessageTestBase; -import org.hornetq.jms.tests.message.SimpleJMSMessage; -import org.hornetq.jms.tests.message.SimpleJMSTextMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.api.jms.HornetQJMSConstants; +import org.apache.activemq6.jms.tests.message.MessageTestBase; +import org.apache.activemq6.jms.tests.message.SimpleJMSMessage; +import org.apache.activemq6.jms.tests.message.SimpleJMSTextMessage; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignObjectMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignObjectMessageTest.java similarity index 91% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignObjectMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignObjectMessageTest.java index d2cd18ba2d..a55c8e8338 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignObjectMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignObjectMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message.foreign; +package org.apache.activemq6.jms.tests.message.foreign; import org.junit.Before; import org.junit.After; @@ -18,8 +18,8 @@ import javax.jms.JMSException; import javax.jms.Message; import javax.jms.ObjectMessage; -import org.hornetq.jms.tests.message.SimpleJMSObjectMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.message.SimpleJMSObjectMessage; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; /** * Tests the delivery/receipt of a foreign object message diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignStreamMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignStreamMessageTest.java similarity index 92% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignStreamMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignStreamMessageTest.java index 996747ed74..7aa8e0cecd 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignStreamMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignStreamMessageTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message.foreign; +package org.apache.activemq6.jms.tests.message.foreign; import javax.jms.JMSException; import javax.jms.Message; import javax.jms.StreamMessage; -import org.hornetq.jms.tests.message.SimpleJMSStreamMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.message.SimpleJMSStreamMessage; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; /** * Tests the delivery/receipt of a foreign stream message diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignTestObject.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignTestObject.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignTestObject.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignTestObject.java index b8b635e756..f6e0be4576 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignTestObject.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignTestObject.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message.foreign; +package org.apache.activemq6.jms.tests.message.foreign; import java.io.Serializable; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignTextMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignTextMessageTest.java similarity index 88% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignTextMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignTextMessageTest.java index d86394be6a..bcf21ad0ad 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/message/foreign/ForeignTextMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignTextMessageTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.message.foreign; +package org.apache.activemq6.jms.tests.message.foreign; import javax.jms.JMSException; import javax.jms.Message; import javax.jms.TextMessage; -import org.hornetq.jms.tests.message.SimpleJMSTextMessage; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.message.SimpleJMSTextMessage; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; /** * Tests the delivery/receipt of a foreign text message diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/selector/SelectorTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/selector/SelectorTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/selector/SelectorTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/selector/SelectorTest.java index fcbda7f0bc..c45f74808c 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/selector/SelectorTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/selector/SelectorTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.selector; +package org.apache.activemq6.jms.tests.selector; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -24,10 +24,10 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.util.ProxyAssertSupport; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/ConcurrentCloseStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/ConcurrentCloseStressTest.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/ConcurrentCloseStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/ConcurrentCloseStressTest.java index c9deff3432..0a63a6c3a8 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/ConcurrentCloseStressTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/ConcurrentCloseStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; import java.util.ArrayList; import java.util.List; @@ -23,9 +23,9 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.JmsTestLogger; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/CorruptMessageStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/CorruptMessageStressTest.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/CorruptMessageStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/CorruptMessageStressTest.java index c22875dbce..e782f794d6 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/CorruptMessageStressTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/CorruptMessageStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.DeliveryMode; @@ -20,7 +20,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.naming.InitialContext; -import org.hornetq.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/JMSStressTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/JMSStressTestBase.java similarity index 90% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/JMSStressTestBase.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/JMSStressTestBase.java index bef3c1893f..860649143f 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/JMSStressTestBase.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/JMSStressTestBase.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; import javax.jms.ConnectionFactory; import javax.jms.Destination; import javax.jms.Topic; import javax.jms.XASession; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.BeforeClass; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/ManyConnectionsStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/ManyConnectionsStressTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/ManyConnectionsStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/ManyConnectionsStressTest.java index 2783577931..6966be5a3d 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/ManyConnectionsStressTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/ManyConnectionsStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -26,8 +26,8 @@ import javax.naming.InitialContext; import java.util.HashSet; import java.util.Set; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/OpenCloseStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/OpenCloseStressTest.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/OpenCloseStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/OpenCloseStressTest.java index ad5d615708..f7f59cbd09 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/OpenCloseStressTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/OpenCloseStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.DeliveryMode; @@ -25,9 +25,9 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.naming.InitialContext; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.util.ProxyAssertSupport; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.utils.UUIDGenerator; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/QueueStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/QueueStressTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/QueueStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/QueueStressTest.java index 4cf251b1d3..16bb547289 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/QueueStressTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/QueueStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; import javax.jms.Connection; import javax.jms.DeliveryMode; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Receiver.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Receiver.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Receiver.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Receiver.java index 28861a6cc5..7d4500a3e0 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Receiver.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Receiver.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; import java.util.HashMap; import java.util.Map; @@ -26,7 +26,7 @@ import javax.jms.ServerSession; import javax.jms.ServerSessionPool; import javax.jms.Session; -import org.hornetq.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.JmsTestLogger; /** * Receives messages from a destination for stress testing diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/RecoveringReceiver.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/RecoveringReceiver.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/RecoveringReceiver.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/RecoveringReceiver.java index 05ec4268f2..c5958b4dd6 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/RecoveringReceiver.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/RecoveringReceiver.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; -import org.hornetq.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.JmsTestLogger; import javax.jms.Message; import javax.jms.MessageConsumer; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/RelayStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/RelayStressTest.java similarity index 92% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/RelayStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/RelayStressTest.java index ac90606931..57e11bd6d2 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/RelayStressTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/RelayStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.DeliveryMode; @@ -23,9 +23,9 @@ import javax.jms.Session; import javax.jms.Topic; import javax.naming.InitialContext; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.JmsTestLogger; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Runner.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Runner.java similarity index 93% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Runner.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Runner.java index 22a4f850d3..807fff6422 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Runner.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Runner.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; -import org.hornetq.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.JmsTestLogger; import javax.jms.Session; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Sender.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Sender.java similarity index 94% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Sender.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Sender.java index 6f02166081..332aa0196b 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Sender.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Sender.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; -import org.hornetq.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.JmsTestLogger; import javax.jms.Message; import javax.jms.MessageProducer; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/SeveralClientsStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/SeveralClientsStressTest.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/SeveralClientsStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/SeveralClientsStressTest.java index ef7a5f4d09..c9934ad721 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/SeveralClientsStressTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/SeveralClientsStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; import java.util.HashSet; import java.util.Random; import java.util.concurrent.LinkedBlockingQueue; @@ -27,9 +27,9 @@ import javax.jms.Queue; import javax.jms.Session; import javax.naming.Context; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.jms.tests.JmsTestLogger; -import org.hornetq.jms.tests.util.ProxyAssertSupport; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TopicStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TopicStressTest.java similarity index 99% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TopicStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TopicStressTest.java index e3d6796e86..9ff643ea6b 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TopicStressTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TopicStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; import javax.jms.Connection; import javax.jms.DeliveryMode; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Transactional2PCReceiver.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Transactional2PCReceiver.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Transactional2PCReceiver.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Transactional2PCReceiver.java index b78c971b70..9b1912e8a5 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Transactional2PCReceiver.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Transactional2PCReceiver.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.XASession; import javax.transaction.xa.XAResource; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.jms.tests.JmsTestLogger; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.jms.tests.JmsTestLogger; +import org.apache.activemq6.utils.UUIDGenerator; /** * diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Transactional2PCSender.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Transactional2PCSender.java similarity index 94% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Transactional2PCSender.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Transactional2PCSender.java index e03a403441..c1851025dd 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/Transactional2PCSender.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Transactional2PCSender.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; import javax.jms.Message; import javax.jms.MessageProducer; import javax.jms.XASession; import javax.transaction.xa.XAResource; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.jms.tests.JmsTestLogger; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.jms.tests.JmsTestLogger; +import org.apache.activemq6.utils.UUIDGenerator; /** * diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TransactionalReceiver.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TransactionalReceiver.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TransactionalReceiver.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TransactionalReceiver.java index 81743664ce..1bf0898eac 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TransactionalReceiver.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TransactionalReceiver.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; -import org.hornetq.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.JmsTestLogger; import javax.jms.Message; import javax.jms.MessageConsumer; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TransactionalSender.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TransactionalSender.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TransactionalSender.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TransactionalSender.java index a5217bfce0..bc7403b75e 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/stress/TransactionalSender.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TransactionalSender.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.stress; +package org.apache.activemq6.jms.tests.stress; -import org.hornetq.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.JmsTestLogger; import javax.jms.Message; import javax.jms.MessageProducer; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/ServerManagement.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/ServerManagement.java similarity index 93% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/ServerManagement.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/ServerManagement.java index 6f222a2181..9554210cdf 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/ServerManagement.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/ServerManagement.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.tools; +package org.apache.activemq6.jms.tests.tools; import java.util.ArrayList; import java.util.Hashtable; import java.util.List; -import org.hornetq.jms.tests.JmsTestLogger; -import org.hornetq.jms.tests.tools.container.InVMInitialContextFactory; -import org.hornetq.jms.tests.tools.container.LocalTestServer; -import org.hornetq.jms.tests.tools.container.Server; +import org.apache.activemq6.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.tools.container.InVMInitialContextFactory; +import org.apache.activemq6.jms.tests.tools.container.LocalTestServer; +import org.apache.activemq6.jms.tests.tools.container.Server; /** * Collection of static methods to use to start/stop and interact with the in-memory JMS server. It diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/WrappedJNDIServer.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/WrappedJNDIServer.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/WrappedJNDIServer.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/WrappedJNDIServer.java index 08a3b0caee..9d11f95e56 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/WrappedJNDIServer.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/WrappedJNDIServer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.tools; +package org.apache.activemq6.jms.tests.tools; import java.net.UnknownHostException; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/Constants.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/Constants.java similarity index 93% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/Constants.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/Constants.java index 9c05aa0e31..035e359dbe 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/Constants.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/Constants.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.tools.container; +package org.apache.activemq6.jms.tests.tools.container; /** * @author Ovidiu Feodorov diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/InVMContext.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMContext.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/InVMContext.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMContext.java index 140c51ab34..ca98fffc3f 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/InVMContext.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMContext.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.tools.container; +package org.apache.activemq6.jms.tests.tools.container; import java.io.Serializable; import java.util.ArrayList; @@ -32,7 +32,7 @@ import javax.naming.NamingException; import javax.naming.RefAddr; import javax.naming.Reference; -import org.hornetq.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.JmsTestLogger; /** * @author Ovidiu Feodorov diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/InVMInitialContextFactory.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMInitialContextFactory.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/InVMInitialContextFactory.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMInitialContextFactory.java index abf9d93bb3..15b5f7d008 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/InVMInitialContextFactory.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMInitialContextFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.tools.container; +package org.apache.activemq6.jms.tests.tools.container; import java.util.HashMap; import java.util.Hashtable; @@ -51,7 +51,7 @@ public class InVMInitialContextFactory implements InitialContextFactory public static Hashtable getJNDIEnvironment(final int serverIndex) { Hashtable env = new Hashtable(); - env.put("java.naming.factory.initial", "org.hornetq.jms.tests.tools.container.InVMInitialContextFactory"); + env.put("java.naming.factory.initial", "org.apache.activemq6.jms.tests.tools.container.InVMInitialContextFactory"); env.put("java.naming.provider.url", "org.jboss.naming:org.jnp.interface"); // env.put("java.naming.factory.url.pkgs", ""); env.put(Constants.SERVER_INDEX_PROPERTY_NAME, Integer.toString(serverIndex)); diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java index 66f34e09b8..ea70b90351 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.tools.container; +package org.apache.activemq6.jms.tests.tools.container; -import org.hornetq.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.JmsTestLogger; import java.util.Hashtable; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/InVMNameParser.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMNameParser.java similarity index 97% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/InVMNameParser.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMNameParser.java index 2a381bd4aa..2a73344ca9 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/InVMNameParser.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMNameParser.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.tools.container; +package org.apache.activemq6.jms.tests.tools.container; import java.io.Serializable; import java.util.Properties; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/LocalTestServer.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/LocalTestServer.java similarity index 93% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/LocalTestServer.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/LocalTestServer.java index 29640c17b3..fd05b4dbf5 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/LocalTestServer.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/LocalTestServer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.tools.container; +package org.apache.activemq6.jms.tests.tools.container; import java.io.File; import java.lang.management.ManagementFactory; @@ -25,22 +25,22 @@ import javax.management.MBeanServerInvocationHandler; import javax.management.ObjectName; import javax.naming.InitialContext; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.core.config.impl.FileConfiguration; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.jms.tests.JmsTestLogger; -import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.api.jms.management.JMSQueueControl; +import org.apache.activemq6.api.jms.management.TopicControl; +import org.apache.activemq6.core.config.impl.FileConfiguration; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.jms.tests.JmsTestLogger; +import org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl; import org.jnp.server.Main; import org.jnp.server.NamingBeanImpl; @@ -386,7 +386,7 @@ public class LocalTestServer implements Server, Runnable { Properties props = new Properties(); props.setProperty("java.naming.factory.initial", - "org.hornetq.jms.tests.tools.container.InVMInitialContextFactory"); + "org.apache.activemq6.jms.tests.tools.container.InVMInitialContextFactory"); props.setProperty(Constants.SERVER_INDEX_PROPERTY_NAME, "" + getServerID()); // props.setProperty("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces"); return new InitialContext(props); diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/NonSerializableFactory.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/NonSerializableFactory.java similarity index 98% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/NonSerializableFactory.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/NonSerializableFactory.java index 3c2ba6ed43..235ae050ab 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/NonSerializableFactory.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/NonSerializableFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.tools.container; +package org.apache.activemq6.jms.tests.tools.container; import java.util.Collections; import java.util.HashMap; diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/Server.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/Server.java similarity index 96% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/Server.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/Server.java index 4370c8d6db..9454ff8003 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/Server.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/Server.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.tools.container; +package org.apache.activemq6.jms.tests.tools.container; import javax.naming.InitialContext; import java.rmi.Remote; @@ -18,9 +18,9 @@ import java.util.HashMap; import java.util.List; import java.util.Set; -import org.hornetq.core.security.Role; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.server.JMSServerManager; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.server.JMSServerManager; /** * The remote interface exposed by TestServer. diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/util/JNDIUtilTest.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/util/JNDIUtilTest.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/util/JNDIUtilTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/util/JNDIUtilTest.java index a18ecee484..088fd5d14e 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/util/JNDIUtilTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/util/JNDIUtilTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.util; +package org.apache.activemq6.jms.tests.util; import org.junit.Before; import org.junit.Test; @@ -18,8 +18,8 @@ import org.junit.Test; import javax.naming.InitialContext; import javax.naming.NameNotFoundException; -import org.hornetq.jms.tests.HornetQServerTestCase; -import org.hornetq.utils.JNDIUtil; +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.utils.JNDIUtil; /** * @author Ovidiu Feodorov diff --git a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/util/ProxyAssertSupport.java b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/util/ProxyAssertSupport.java similarity index 95% rename from tests/jms-tests/src/test/java/org/hornetq/jms/tests/util/ProxyAssertSupport.java rename to tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/util/ProxyAssertSupport.java index 988ef262ef..aaed1045ac 100644 --- a/tests/jms-tests/src/test/java/org/hornetq/jms/tests/util/ProxyAssertSupport.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/util/ProxyAssertSupport.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms.tests.util; +package org.apache.activemq6.jms.tests.util; -import org.hornetq.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.JmsTestLogger; import org.junit.Assert; /** diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml index 6a5c8ab12e..5309205e5e 100644 --- a/tests/joram-tests/pom.xml +++ b/tests/joram-tests/pom.xml @@ -15,14 +15,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.tests - hornetq-tests-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.tests + activemq6-tests-pom + 6.0.0-SNAPSHOT joram-tests jar - HornetQ Joram Tests + ActiveMQ6 Joram Tests ${project.basedir}/../.. @@ -30,20 +30,20 @@ - org.hornetq.tests + org.apache.activemq6.tests unit-tests ${project.version} test test-jar - org.hornetq - hornetq-ra + org.apache.activemq6 + activemq6-ra ${project.version} - org.hornetq - hornetq-bootstrap + org.apache.activemq6 + activemq6-bootstrap ${project.version} diff --git a/tests/joram-tests/src/test/java/org/hornetq/jms/AbstractAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq6/jms/AbstractAdmin.java similarity index 98% rename from tests/joram-tests/src/test/java/org/hornetq/jms/AbstractAdmin.java rename to tests/joram-tests/src/test/java/org/apache/activemq6/jms/AbstractAdmin.java index 50991b2dca..5cb34b5840 100644 --- a/tests/joram-tests/src/test/java/org/hornetq/jms/AbstractAdmin.java +++ b/tests/joram-tests/src/test/java/org/apache/activemq6/jms/AbstractAdmin.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms; +package org.apache.activemq6.jms; import javax.naming.InitialContext; import javax.naming.NamingException; diff --git a/tests/joram-tests/src/test/java/org/hornetq/jms/GenericAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq6/jms/GenericAdmin.java similarity index 99% rename from tests/joram-tests/src/test/java/org/hornetq/jms/GenericAdmin.java rename to tests/joram-tests/src/test/java/org/apache/activemq6/jms/GenericAdmin.java index a53507f434..381cb47111 100644 --- a/tests/joram-tests/src/test/java/org/hornetq/jms/GenericAdmin.java +++ b/tests/joram-tests/src/test/java/org/apache/activemq6/jms/GenericAdmin.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms; +package org.apache.activemq6.jms; import javax.naming.Context; import javax.naming.NamingException; diff --git a/tests/joram-tests/src/test/java/org/hornetq/jms/HornetQAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq6/jms/HornetQAdmin.java similarity index 91% rename from tests/joram-tests/src/test/java/org/hornetq/jms/HornetQAdmin.java rename to tests/joram-tests/src/test/java/org/apache/activemq6/jms/HornetQAdmin.java index ead927eb4f..0beb356b1e 100644 --- a/tests/joram-tests/src/test/java/org/hornetq/jms/HornetQAdmin.java +++ b/tests/joram-tests/src/test/java/org/apache/activemq6/jms/HornetQAdmin.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms; +package org.apache.activemq6.jms; import javax.naming.Context; import javax.naming.InitialContext; @@ -20,18 +20,18 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.util.Hashtable; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientRequestor; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.tests.util.SpawnedVMSupport; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientRequestor; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.management.ManagementHelper; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.tests.util.SpawnedVMSupport; import org.junit.Assert; import org.objectweb.jtests.jms.admin.Admin; @@ -62,7 +62,7 @@ public class HornetQAdmin implements Admin * @see https://github.com/hornetq/hornetq-version-tests */ private final boolean serverLifeCycleActive; - private static final String SERVER_LIVE_CYCLE_PROPERTY = "org.hornetq.jms.HornetQAdmin.serverLifeCycle"; + private static final String SERVER_LIVE_CYCLE_PROPERTY = "org.apache.activemq6.jms.HornetQAdmin.serverLifeCycle"; public HornetQAdmin() { diff --git a/tests/joram-tests/src/test/java/org/hornetq/jms/JoramAggregationTest.java b/tests/joram-tests/src/test/java/org/apache/activemq6/jms/JoramAggregationTest.java similarity index 99% rename from tests/joram-tests/src/test/java/org/hornetq/jms/JoramAggregationTest.java rename to tests/joram-tests/src/test/java/org/apache/activemq6/jms/JoramAggregationTest.java index 3284b2952c..b4499d1d54 100644 --- a/tests/joram-tests/src/test/java/org/hornetq/jms/JoramAggregationTest.java +++ b/tests/joram-tests/src/test/java/org/apache/activemq6/jms/JoramAggregationTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms; +package org.apache.activemq6.jms; import java.io.IOException; import java.util.Properties; diff --git a/tests/joram-tests/src/test/java/org/hornetq/jms/SpawnedJMSServer.java b/tests/joram-tests/src/test/java/org/apache/activemq6/jms/SpawnedJMSServer.java similarity index 88% rename from tests/joram-tests/src/test/java/org/hornetq/jms/SpawnedJMSServer.java rename to tests/joram-tests/src/test/java/org/apache/activemq6/jms/SpawnedJMSServer.java index 89330e468c..bc8fb561df 100644 --- a/tests/joram-tests/src/test/java/org/hornetq/jms/SpawnedJMSServer.java +++ b/tests/joram-tests/src/test/java/org/apache/activemq6/jms/SpawnedJMSServer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.jms; +package org.apache.activemq6.jms; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -18,15 +18,15 @@ import java.util.Hashtable; import javax.naming.InitialContext; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; import org.jnp.server.Main; import org.jnp.server.NamingBeanImpl; diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml index 1c01498f34..5356f8fac3 100644 --- a/tests/performance-tests/pom.xml +++ b/tests/performance-tests/pom.xml @@ -15,14 +15,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.tests - hornetq-tests-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.tests + activemq6-tests-pom + 6.0.0-SNAPSHOT performance-tests jar - HornetQ performance Tests + ActiveMQ6 performance Tests ${project.basedir}/../.. @@ -30,46 +30,46 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} test test-jar - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests unit-tests ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests integration-tests ${project.version} test test-jar - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-ra + org.apache.activemq6 + activemq6-ra ${project.version} - org.hornetq - hornetq-bootstrap + org.apache.activemq6 + activemq6-bootstrap ${project.version} diff --git a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/journal/impl/FakeJournalImplTest.java b/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/FakeJournalImplTest.java similarity index 81% rename from tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/journal/impl/FakeJournalImplTest.java rename to tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/FakeJournalImplTest.java index 03d7ec5790..03dc1816da 100644 --- a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/journal/impl/FakeJournalImplTest.java +++ b/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/FakeJournalImplTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.timing.core.journal.impl; +package org.apache.activemq6.tests.performance.journal; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; /** * diff --git a/tests/performance-tests/src/test/java/org/hornetq/tests/performance/journal/JournalImplTestUnit.java b/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/JournalImplTestUnit.java similarity index 92% rename from tests/performance-tests/src/test/java/org/hornetq/tests/performance/journal/JournalImplTestUnit.java rename to tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/JournalImplTestUnit.java index 1cc872328c..babd52105d 100644 --- a/tests/performance-tests/src/test/java/org/hornetq/tests/performance/journal/JournalImplTestUnit.java +++ b/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/JournalImplTestUnit.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.performance.journal; +package org.apache.activemq6.tests.performance.journal; import org.junit.After; import org.junit.Test; @@ -19,14 +19,14 @@ import java.util.ArrayList; import org.junit.Assert; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase; -import org.hornetq.tests.unit.core.journal.impl.fakes.SimpleEncoding; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.SimpleEncoding; /** * diff --git a/tests/performance-tests/src/test/java/org/hornetq/tests/performance/journal/RealJournalImplAIOTest.java b/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/RealJournalImplAIOTest.java similarity index 86% rename from tests/performance-tests/src/test/java/org/hornetq/tests/performance/journal/RealJournalImplAIOTest.java rename to tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/RealJournalImplAIOTest.java index e52206842d..39d64dfe7e 100644 --- a/tests/performance-tests/src/test/java/org/hornetq/tests/performance/journal/RealJournalImplAIOTest.java +++ b/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/RealJournalImplAIOTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.performance.journal; +package org.apache.activemq6.tests.performance.journal; import java.io.File; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.tests.unit.UnitTestLogger; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.tests.unit.UnitTestLogger; import org.junit.Before; import org.junit.BeforeClass; diff --git a/tests/performance-tests/src/test/java/org/hornetq/tests/performance/journal/RealJournalImplNIOTest.java b/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/RealJournalImplNIOTest.java similarity index 83% rename from tests/performance-tests/src/test/java/org/hornetq/tests/performance/journal/RealJournalImplNIOTest.java rename to tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/RealJournalImplNIOTest.java index 382587ac1a..2c20c05e45 100644 --- a/tests/performance-tests/src/test/java/org/hornetq/tests/performance/journal/RealJournalImplNIOTest.java +++ b/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/RealJournalImplNIOTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.performance.journal; +package org.apache.activemq6.tests.performance.journal; import java.io.File; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.tests.unit.UnitTestLogger; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.tests.unit.UnitTestLogger; /** * diff --git a/tests/performance-tests/src/test/java/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java b/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/paging/MeasurePagingMultiThreadTest.java similarity index 89% rename from tests/performance-tests/src/test/java/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java rename to tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/paging/MeasurePagingMultiThreadTest.java index 5ca103ce32..92b9ba52dd 100644 --- a/tests/performance-tests/src/test/java/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java +++ b/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/paging/MeasurePagingMultiThreadTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.performance.paging; +package org.apache.activemq6.tests.performance.paging; import java.util.HashMap; import java.util.concurrent.CountDownLatch; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Test; /** diff --git a/tests/pom.xml b/tests/pom.xml index 866bbccf77..e9c3c40da6 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -1,15 +1,15 @@ - org.hornetq - hornetq-pom - 2.5.0-SNAPSHOT + org.apache.activemq6 + activemq6-pom + 6.0.0-SNAPSHOT - HornetQ Tests POM + ActiveMQ6 Tests POM 4.0.0 - org.hornetq.tests - hornetq-tests-pom + org.apache.activemq6.tests + activemq6-tests-pom pom diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml index 8d814c5559..257ce5d6ae 100644 --- a/tests/soak-tests/pom.xml +++ b/tests/soak-tests/pom.xml @@ -15,14 +15,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.tests - hornetq-tests-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.tests + activemq6-tests-pom + 6.0.0-SNAPSHOT soak-tests jar - HornetQ soak Tests + ActiveMQ6 soak Tests ${project.basedir}/../.. @@ -30,53 +30,53 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} test test-jar - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests unit-tests ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests integration-tests ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests jms-tests ${project.version} test test-jar - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-ra + org.apache.activemq6 + activemq6-ra ${project.version} - org.hornetq - hornetq-bootstrap + org.apache.activemq6 + activemq6-bootstrap ${project.version} diff --git a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/ClientAbstract.java b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientAbstract.java similarity index 94% rename from tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/ClientAbstract.java rename to tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientAbstract.java index 11df9c54fa..0307c1272a 100644 --- a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/ClientAbstract.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientAbstract.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.soak.client; +package org.apache.activemq6.tests.soak.client; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.core.transaction.impl.XidImpl; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.utils.UUIDGenerator; /** * WARNING: This is not a sample on how you should handle XA. You are supposed to use a diff --git a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/ClientNonDivertedSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientNonDivertedSoakTest.java similarity index 87% rename from tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/ClientNonDivertedSoakTest.java rename to tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientNonDivertedSoakTest.java index f3caa7cc38..f1d24251d0 100644 --- a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/ClientNonDivertedSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientNonDivertedSoakTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.soak.client; +package org.apache.activemq6.tests.soak.client; import java.util.HashMap; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; diff --git a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/ClientSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientSoakTest.java similarity index 89% rename from tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/ClientSoakTest.java rename to tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientSoakTest.java index 9542629292..398a456b7e 100644 --- a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/ClientSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientSoakTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.soak.client; +package org.apache.activemq6.tests.soak.client; import java.util.ArrayList; import java.util.HashMap; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.DivertConfiguration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/Receiver.java b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/Receiver.java similarity index 89% rename from tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/Receiver.java rename to tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/Receiver.java index 1898de4a94..9f35b56c21 100644 --- a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/Receiver.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/Receiver.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.soak.client; +package org.apache.activemq6.tests.soak.client; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.utils.ReusableLatch; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.utils.ReusableLatch; /** * A Receiver @@ -112,7 +112,7 @@ public class Receiver extends ClientAbstract } /* (non-Javadoc) - * @see org.hornetq.jms.example.ClientAbstract#connectClients() + * @see org.apache.activemq6.jms.example.ClientAbstract#connectClients() */ @Override protected void connectClients() throws Exception @@ -124,7 +124,7 @@ public class Receiver extends ClientAbstract } /* (non-Javadoc) - * @see org.hornetq.jms.example.ClientAbstract#onCommit() + * @see org.apache.activemq6.jms.example.ClientAbstract#onCommit() */ @Override protected void onCommit() @@ -136,7 +136,7 @@ public class Receiver extends ClientAbstract } /* (non-Javadoc) - * @see org.hornetq.jms.example.ClientAbstract#onRollback() + * @see org.apache.activemq6.jms.example.ClientAbstract#onRollback() */ @Override protected void onRollback() diff --git a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/Sender.java b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/Sender.java similarity index 88% rename from tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/Sender.java rename to tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/Sender.java index 22b61d3921..40f803bc8c 100644 --- a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/Sender.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/Sender.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.soak.client; +package org.apache.activemq6.tests.soak.client; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSessionFactory; /** * A Sender @@ -85,7 +85,7 @@ public class Sender extends ClientAbstract } /* (non-Javadoc) - * @see org.hornetq.jms.example.ClientAbstract#onCommit() + * @see org.apache.activemq6.jms.example.ClientAbstract#onCommit() */ @Override protected void onCommit() @@ -100,7 +100,7 @@ public class Sender extends ClientAbstract } /* (non-Javadoc) - * @see org.hornetq.jms.example.ClientAbstract#onRollback() + * @see org.apache.activemq6.jms.example.ClientAbstract#onRollback() */ @Override protected void onRollback() diff --git a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/SimpleSendReceiveSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/SimpleSendReceiveSoakTest.java similarity index 84% rename from tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/SimpleSendReceiveSoakTest.java rename to tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/SimpleSendReceiveSoakTest.java index be0ca96dcd..4c2e0db0c2 100644 --- a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/client/SimpleSendReceiveSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/SimpleSendReceiveSoakTest.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.soak.client; +package org.apache.activemq6.tests.soak.client; import org.junit.Before; import org.junit.Test; import java.util.HashMap; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * A ClientSoakTest diff --git a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/failover/RandomFailoverSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/failover/RandomFailoverSoakTest.java similarity index 87% rename from tests/soak-tests/src/test/java/org/hornetq/tests/soak/failover/RandomFailoverSoakTest.java rename to tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/failover/RandomFailoverSoakTest.java index e8840e476c..2ab1b75a58 100644 --- a/tests/soak-tests/src/test/java/org/hornetq/tests/soak/failover/RandomFailoverSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/failover/RandomFailoverSoakTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.soak.failover; +package org.apache.activemq6.tests.soak.failover; -import org.hornetq.tests.integration.cluster.reattach.RandomReattachTest; +import org.apache.activemq6.tests.integration.cluster.reattach.RandomReattachTest; /** * A RandomFailoverSoakTest diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml index 161a0bcd40..383911c5d9 100644 --- a/tests/stress-tests/pom.xml +++ b/tests/stress-tests/pom.xml @@ -15,14 +15,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.tests - hornetq-tests-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.tests + activemq6-tests-pom + 6.0.0-SNAPSHOT stress-tests jar - HornetQ stress Tests + ActiveMQ6 stress Tests ${project.basedir}/../.. @@ -30,53 +30,53 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} test test-jar - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests unit-tests ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests integration-tests ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests jms-tests ${project.version} test test-jar - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} - org.hornetq - hornetq-ra + org.apache.activemq6 + activemq6-ra ${project.version} - org.hornetq - hornetq-bootstrap + org.apache.activemq6 + activemq6-bootstrap ${project.version} diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/chunk/LargeMessageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/chunk/LargeMessageStressTest.java similarity index 93% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/chunk/LargeMessageStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/chunk/LargeMessageStressTest.java index 40a33e0898..70076587c0 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/chunk/LargeMessageStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/chunk/LargeMessageStressTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.chunk; +package org.apache.activemq6.tests.stress.chunk; import org.junit.Test; -import org.hornetq.tests.integration.largemessage.LargeMessageTestBase; +import org.apache.activemq6.tests.integration.largemessage.LargeMessageTestBase; /** * A MessageChunkSoakTest diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/client/SendStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/client/SendStressTest.java similarity index 87% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/client/SendStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/client/SendStressTest.java index b68dc3103e..8ca2da90f1 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/client/SendStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/client/SendStressTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.client; +package org.apache.activemq6.tests.stress.client; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/failover/MultiThreadRandomReattachStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/failover/MultiThreadRandomReattachStressTest.java similarity index 86% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/failover/MultiThreadRandomReattachStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/failover/MultiThreadRandomReattachStressTest.java index 12ba003153..94e23b81a2 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/failover/MultiThreadRandomReattachStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/failover/MultiThreadRandomReattachStressTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.failover; +package org.apache.activemq6.tests.stress.failover; -import org.hornetq.tests.integration.cluster.reattach.MultiThreadRandomReattachTest; +import org.apache.activemq6.tests.integration.cluster.reattach.MultiThreadRandomReattachTest; /** * A MultiThreadRandomFailoverStressTest diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/failover/RandomReattachStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/failover/RandomReattachStressTest.java similarity index 92% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/failover/RandomReattachStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/failover/RandomReattachStressTest.java index 4df2fa8eb6..8aa5a3dc7d 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/failover/RandomReattachStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/failover/RandomReattachStressTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.failover; +package org.apache.activemq6.tests.stress.failover; -import org.hornetq.tests.integration.cluster.reattach.RandomReattachTest; +import org.apache.activemq6.tests.integration.cluster.reattach.RandomReattachTest; /** * A RandomFailoverStressTest diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java similarity index 88% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java index bbc3e75789..d4f45dc8a9 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; import java.io.File; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.journal.impl.JournalConstants; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalConstants; /** * A NIOAllPossibilitiesCompactStressTest diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AIOMultiThreadCompactorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AIOMultiThreadCompactorStressTest.java similarity index 86% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AIOMultiThreadCompactorStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AIOMultiThreadCompactorStressTest.java index 898cdd19fb..a90c89a4fa 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AIOMultiThreadCompactorStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AIOMultiThreadCompactorStressTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.server.JournalType; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.server.JournalType; import org.junit.BeforeClass; /** diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AddAndRemoveStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AddAndRemoveStressTest.java similarity index 92% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AddAndRemoveStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AddAndRemoveStressTest.java index d7ea0818cb..c0a6f329d4 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AddAndRemoveStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AddAndRemoveStressTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; import java.util.ArrayList; import java.util.List; -import org.hornetq.core.journal.LoaderCallback; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.tests.unit.core.journal.impl.fakes.SimpleEncoding; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.journal.LoaderCallback; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.SimpleEncoding; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AllPossibilitiesCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AllPossibilitiesCompactStressTest.java similarity index 97% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AllPossibilitiesCompactStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AllPossibilitiesCompactStressTest.java index 44381cf056..07eb5524cf 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AllPossibilitiesCompactStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AllPossibilitiesCompactStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; /** diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java similarity index 96% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java index 53081d8033..19a7da8353 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; /** * A NIORandomCompactTest diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/CompactingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/CompactingStressTest.java similarity index 92% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/CompactingStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/CompactingStressTest.java index c8b5614e37..5a108feffa 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/CompactingStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/CompactingStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; import org.junit.Test; @@ -19,20 +19,20 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.JournalType; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A CompactingTest diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/JournalCleanupCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/JournalCleanupCompactStressTest.java similarity index 93% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/JournalCleanupCompactStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/JournalCleanupCompactStressTest.java index 1d840fc095..0692ab48cd 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/JournalCleanupCompactStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/JournalCleanupCompactStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; import java.io.File; import java.util.ArrayList; @@ -28,23 +28,23 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.TransactionFailureCallback; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.HornetQThreadFactory; -import org.hornetq.utils.OrderedExecutorFactory; -import org.hornetq.utils.SimpleIDGenerator; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.TransactionFailureCallback; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.HornetQThreadFactory; +import org.apache.activemq6.utils.OrderedExecutorFactory; +import org.apache.activemq6.utils.SimpleIDGenerator; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/JournalRestartStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/JournalRestartStressTest.java similarity index 90% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/JournalRestartStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/JournalRestartStressTest.java index 54d89652c7..5a833c84a6 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/JournalRestartStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/JournalRestartStressTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; import java.util.ArrayList; import java.util.Random; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Test; /** diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/LargeJournalStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/LargeJournalStressTest.java similarity index 91% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/LargeJournalStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/LargeJournalStressTest.java index 55901b13b0..7381697a2c 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/LargeJournalStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/LargeJournalStressTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.JournalType; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/MixupCompactorTestBase.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/MixupCompactorTestBase.java similarity index 93% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/MixupCompactorTestBase.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/MixupCompactorTestBase.java index f4befd3648..0d80ab3a78 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/MixupCompactorTestBase.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/MixupCompactorTestBase.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; import java.io.File; import java.io.FilenameFilter; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase; -import org.hornetq.utils.ReusableLatch; -import org.hornetq.utils.SimpleIDGenerator; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase; +import org.apache.activemq6.utils.ReusableLatch; +import org.apache.activemq6.utils.SimpleIDGenerator; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/MultiThreadConsumerStressTest.java similarity index 92% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/MultiThreadConsumerStressTest.java index 7cde84bed6..94a55348e9 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/MultiThreadConsumerStressTest.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; import java.util.ArrayList; import java.util.concurrent.CountDownLatch; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.JournalType; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/NIOMultiThreadCompactorStressTest.java similarity index 93% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/NIOMultiThreadCompactorStressTest.java index 51ea3c9d51..6ea1f58d69 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/NIOMultiThreadCompactorStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -18,25 +18,25 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.JournalType; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.JournalType; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/XmlImportExportStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/XmlImportExportStressTest.java similarity index 86% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/XmlImportExportStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/XmlImportExportStressTest.java index 33ea627eb6..99e8a9b3e7 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/XmlImportExportStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/XmlImportExportStressTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.journal; +package org.apache.activemq6.tests.stress.journal; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; +import org.apache.activemq6.api.core.client.ClientConsumer; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; import org.junit.Test; -import org.hornetq.tools.XmlDataExporter; -import org.hornetq.tools.XmlDataImporter; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.tools.XmlDataExporter; +import org.apache.activemq6.tools.XmlDataImporter; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.tests.util.ServiceTestBase; import java.io.BufferedOutputStream; import java.io.File; diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/MultipleConsumersPageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/MultipleConsumersPageStressTest.java similarity index 93% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/MultipleConsumersPageStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/MultipleConsumersPageStressTest.java index c03106c845..6c1482e750 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/MultipleConsumersPageStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/MultipleConsumersPageStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.paging; +package org.apache.activemq6.tests.stress.paging; import org.junit.Before; import org.junit.After; @@ -23,19 +23,19 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * A MultipleConsumersPageStressTest diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageCursorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/PageCursorStressTest.java similarity index 94% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageCursorStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/PageCursorStressTest.java index 73d99580ce..b6dd9355e6 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageCursorStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/PageCursorStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.paging; +package org.apache.activemq6.tests.stress.paging; import java.util.ArrayList; import java.util.HashMap; @@ -20,31 +20,31 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.paging.cursor.PageCache; -import org.hornetq.core.paging.cursor.PageCursorProvider; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.paging.cursor.PagedReference; -import org.hornetq.core.paging.cursor.impl.PageCursorProviderImpl; -import org.hornetq.core.paging.impl.PagingStoreImpl; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.RoutingContextImpl; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.impl.TransactionImpl; -import org.hornetq.tests.unit.core.postoffice.impl.FakeQueue; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.utils.LinkedListIterator; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.paging.cursor.PageCache; +import org.apache.activemq6.core.paging.cursor.PageCursorProvider; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.paging.cursor.PagedReference; +import org.apache.activemq6.core.paging.cursor.impl.PageCursorProviderImpl; +import org.apache.activemq6.core.paging.impl.PagingStoreImpl; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.RoutingContextImpl; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq6.tests.unit.core.postoffice.impl.FakeQueue; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.utils.LinkedListIterator; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/PageStressTest.java similarity index 90% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/PageStressTest.java index 5e127b9524..1e9283abc3 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/PageStressTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.paging; +package org.apache.activemq6.tests.stress.paging; import java.util.HashMap; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.jms.client.HornetQBytesMessage; -import org.hornetq.tests.util.ServiceTestBase; +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.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.jms.client.HornetQBytesMessage; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/remote/PingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/remote/PingStressTest.java similarity index 85% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/remote/PingStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/remote/PingStressTest.java index 39a19a1413..7d59923a9f 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/remote/PingStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/remote/PingStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.remote; +package org.apache.activemq6.tests.stress.remote; import org.junit.Before; import org.junit.Test; @@ -18,21 +18,21 @@ import org.junit.Test; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.impl.PacketImpl; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.spi.core.protocol.RemotingConnection; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.core.config.Configuration; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; /** * @author Clebert Suconic @@ -81,7 +81,7 @@ public class PingStressTest extends ServiceTestBase */ private void internalTest() throws Exception { - final TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); + final TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory"); Interceptor noPongInterceptor = new Interceptor() { diff --git a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/stomp/StompStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/stomp/StompStressTest.java similarity index 87% rename from tests/stress-tests/src/test/java/org/hornetq/tests/stress/stomp/StompStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/stomp/StompStressTest.java index 46b32b29c7..13db82ae51 100644 --- a/tests/stress-tests/src/test/java/org/hornetq/tests/stress/stomp/StompStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/stomp/StompStressTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.stress.stomp; +package org.apache.activemq6.tests.stress.stomp; import org.junit.Before; import org.junit.After; @@ -27,17 +27,17 @@ import java.util.Map; import org.junit.Assert; -import org.hornetq.core.protocol.stomp.StompProtocolManagerFactory; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.protocol.stomp.Stomp; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.protocol.stomp.StompProtocolManagerFactory; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.CoreQueueConfiguration; +import org.apache.activemq6.core.protocol.stomp.Stomp; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.tests.util.UnitTestCase; public class StompStressTest extends UnitTestCase { diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml index 208d0a339c..aa6473ce87 100644 --- a/tests/timing-tests/pom.xml +++ b/tests/timing-tests/pom.xml @@ -15,14 +15,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.tests - hornetq-tests-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.tests + activemq6-tests-pom + 6.0.0-SNAPSHOT timing-tests jar - HornetQ timing Tests + ActiveMQ6 timing Tests ${project.basedir}/../.. @@ -30,35 +30,35 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} test test-jar - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} test test-jar - org.hornetq.tests + org.apache.activemq6.tests unit-tests ${project.version} test test-jar - org.hornetq - hornetq-jms-client + org.apache.activemq6 + activemq6-jms-client ${project.version} test - org.hornetq - hornetq-bootstrap + org.apache.activemq6 + activemq6-bootstrap ${project.version} diff --git a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/journal/impl/AIOJournalImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/AIOJournalImplTest.java similarity index 86% rename from tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/journal/impl/AIOJournalImplTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/AIOJournalImplTest.java index 6718cfbc26..5312f979e2 100644 --- a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/journal/impl/AIOJournalImplTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/AIOJournalImplTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.timing.core.journal.impl; +package org.apache.activemq6.tests.timing.core.journal.impl; import java.io.File; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; import org.junit.BeforeClass; /** diff --git a/tests/performance-tests/src/test/java/org/hornetq/tests/performance/journal/FakeJournalImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/FakeJournalImplTest.java similarity index 81% rename from tests/performance-tests/src/test/java/org/hornetq/tests/performance/journal/FakeJournalImplTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/FakeJournalImplTest.java index 4f65f6ccce..1cb720da25 100644 --- a/tests/performance-tests/src/test/java/org/hornetq/tests/performance/journal/FakeJournalImplTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/FakeJournalImplTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.performance.journal; +package org.apache.activemq6.tests.timing.core.journal.impl; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; /** * diff --git a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/journal/impl/JournalImplTestUnit.java b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/JournalImplTestUnit.java similarity index 91% rename from tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/journal/impl/JournalImplTestUnit.java rename to tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/JournalImplTestUnit.java index 52d43c0a4c..5a422865a3 100644 --- a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/journal/impl/JournalImplTestUnit.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/JournalImplTestUnit.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.timing.core.journal.impl; +package org.apache.activemq6.tests.timing.core.journal.impl; import org.junit.After; import org.junit.Test; @@ -19,11 +19,11 @@ import java.util.ArrayList; import org.junit.Assert; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase; /** * diff --git a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/journal/impl/NIOJournalImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/NIOJournalImplTest.java similarity index 84% rename from tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/journal/impl/NIOJournalImplTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/NIOJournalImplTest.java index f7344a70d6..962ad8815e 100644 --- a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/journal/impl/NIOJournalImplTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/NIOJournalImplTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.timing.core.journal.impl; +package org.apache.activemq6.tests.timing.core.journal.impl; import java.io.File; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.tests.unit.UnitTestLogger; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.tests.unit.UnitTestLogger; /** * diff --git a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/server/impl/QueueImplTest.java similarity index 94% rename from tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/server/impl/QueueImplTest.java index 6b2bc1404b..a88d4e5b14 100644 --- a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/server/impl/QueueImplTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.timing.core.server.impl; +package org.apache.activemq6.tests.timing.core.server.impl; import org.junit.Before; import org.junit.After; @@ -26,13 +26,13 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.tests.unit.core.server.impl.fakes.FakeConsumer; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HandleStatus; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakeConsumer; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Andy Taylor diff --git a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java similarity index 95% rename from tests/timing-tests/src/test/java/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java index 1eb2a64d39..1c09204aa1 100644 --- a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.timing.jms.bridge.impl; +package org.apache.activemq6.tests.timing.jms.bridge.impl; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -38,26 +38,26 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.bridge.ConnectionFactoryFactory; -import org.hornetq.jms.bridge.DestinationFactory; -import org.hornetq.jms.bridge.QualityOfServiceMode; -import org.hornetq.jms.bridge.impl.JMSBridgeImpl; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.unit.util.InVMNamingContext; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.ObjectNameBuilder; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.api.jms.management.JMSQueueControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq6.jms.bridge.DestinationFactory; +import org.apache.activemq6.jms.bridge.QualityOfServiceMode; +import org.apache.activemq6.jms.bridge.impl.JMSBridgeImpl; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/util/ReusableLatchTest.java b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/ReusableLatchTest.java similarity index 88% rename from tests/timing-tests/src/test/java/org/hornetq/tests/timing/util/ReusableLatchTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/ReusableLatchTest.java index 92f321e605..85be3c272b 100644 --- a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/util/ReusableLatchTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/ReusableLatchTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.timing.util; +package org.apache.activemq6.tests.timing.util; import org.junit.Test; import org.junit.Assert; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.ReusableLatch; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.ReusableLatch; /** * @author Clebert Suconic diff --git a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/util/TokenBucketLimiterImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/TokenBucketLimiterImplTest.java similarity index 96% rename from tests/timing-tests/src/test/java/org/hornetq/tests/timing/util/TokenBucketLimiterImplTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/TokenBucketLimiterImplTest.java index 4a9b63f209..942cedc539 100644 --- a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/util/TokenBucketLimiterImplTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/TokenBucketLimiterImplTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.timing.util; +package org.apache.activemq6.tests.timing.util; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.TokenBucketLimiterImpl; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.TokenBucketLimiterImpl; import org.junit.Assert; import org.junit.Test; diff --git a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/util/UTF8Test.java b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/UTF8Test.java similarity index 92% rename from tests/timing-tests/src/test/java/org/hornetq/tests/timing/util/UTF8Test.java rename to tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/UTF8Test.java index a526bfce57..f01e3fd634 100644 --- a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/util/UTF8Test.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/UTF8Test.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.timing.util; +package org.apache.activemq6.tests.timing.util; import org.junit.After; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.UTF8Util; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.UTF8Util; /** * diff --git a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/util/UUIDTest.java b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/UUIDTest.java similarity index 89% rename from tests/timing-tests/src/test/java/org/hornetq/tests/timing/util/UUIDTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/UUIDTest.java index d3c08331a3..6469d23805 100644 --- a/tests/timing-tests/src/test/java/org/hornetq/tests/timing/util/UUIDTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/UUIDTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.timing.util; +package org.apache.activemq6.tests.timing.util; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.utils.UUIDGenerator; /** * * @author Clebert Suconic * */ -public class UUIDTest extends org.hornetq.tests.unit.util.UUIDTest +public class UUIDTest extends org.apache.activemq6.tests.unit.util.UUIDTest { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml index 326d377621..0521c9e0bb 100644 --- a/tests/unit-tests/pom.xml +++ b/tests/unit-tests/pom.xml @@ -2,14 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.hornetq.tests - hornetq-tests-pom - 2.5.0-SNAPSHOT + org.apache.activemq6.tests + activemq6-tests-pom + 6.0.0-SNAPSHOT unit-tests jar - HornetQ Unit Tests + ActiveMQ6 Unit Tests ${project.basedir}/../.. @@ -17,37 +17,37 @@ - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} test test-jar - org.hornetq - hornetq-server + org.apache.activemq6 + activemq6-server ${project.version} test test-jar - org.hornetq - hornetq-jms-server + org.apache.activemq6 + activemq6-jms-server ${project.version} - org.hornetq - hornetq-core-client + org.apache.activemq6 + activemq6-core-client ${project.version} - org.hornetq - hornetq-ra + org.apache.activemq6 + activemq6-ra ${project.version} - org.hornetq - hornetq-bootstrap + org.apache.activemq6 + activemq6-bootstrap ${project.version} diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/UnitTestLogger.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/UnitTestLogger.java similarity index 96% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/UnitTestLogger.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/UnitTestLogger.java index 6cb5b7fdcc..954d6a97fe 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/UnitTestLogger.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/UnitTestLogger.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit; +package org.apache.activemq6.tests.unit; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/AIOTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/AIOTestBase.java similarity index 93% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/AIOTestBase.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/AIOTestBase.java index 5046d1d2db..5113bcaa90 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/AIOTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/AIOTestBase.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.asyncio; +package org.apache.activemq6.tests.unit.core.asyncio; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.asyncio.AIOCallback; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.asyncio.AIOCallback; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/AsynchronousFileTest.java similarity index 98% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/AsynchronousFileTest.java index 6b69ba2ca5..330a1cc976 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/AsynchronousFileTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.asyncio; +package org.apache.activemq6.tests.unit.core.asyncio; import java.io.BufferedInputStream; import java.io.File; @@ -29,14 +29,14 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.asyncio.AIOCallback; -import org.hornetq.core.asyncio.BufferCallback; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.HornetQThreadFactory; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.asyncio.AIOCallback; +import org.apache.activemq6.core.asyncio.BufferCallback; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.HornetQThreadFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/LibaioDependencyCheckTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/LibaioDependencyCheckTest.java similarity index 90% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/LibaioDependencyCheckTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/LibaioDependencyCheckTest.java index d6e98eb4ba..c57a719127 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/LibaioDependencyCheckTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/LibaioDependencyCheckTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.asyncio; +package org.apache.activemq6.tests.unit.core.asyncio; import org.junit.Test; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A LibaioDependencyCheckTest diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java similarity index 95% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java index ed2044f8d6..f61cea2f01 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.asyncio; +package org.apache.activemq6.tests.unit.core.asyncio; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -20,13 +20,13 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.core.asyncio.AIOCallback; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.HornetQThreadFactory; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.core.asyncio.AIOCallback; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.HornetQThreadFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/client/impl/LargeMessageBufferTest.java similarity index 94% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/client/impl/LargeMessageBufferTest.java index 729ec352aa..71f09f2d0f 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/client/impl/LargeMessageBufferTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.client.impl; +package org.apache.activemq6.tests.unit.core.client.impl; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -26,24 +26,24 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.core.client.impl.ClientConsumerInternal; -import org.hornetq.core.client.impl.ClientLargeMessageInternal; -import org.hornetq.core.client.impl.ClientMessageInternal; -import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.client.impl.LargeMessageControllerImpl; -import org.hornetq.core.protocol.core.impl.HornetQConsumerContext; -import org.hornetq.spi.core.remoting.ConsumerContext; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.FutureLatch; -import org.hornetq.utils.HornetQBufferInputStream; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +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.ClientSession; +import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq6.core.client.impl.ClientConsumerInternal; +import org.apache.activemq6.core.client.impl.ClientLargeMessageInternal; +import org.apache.activemq6.core.client.impl.ClientMessageInternal; +import org.apache.activemq6.core.client.impl.ClientSessionInternal; +import org.apache.activemq6.core.client.impl.LargeMessageControllerImpl; +import org.apache.activemq6.core.protocol.core.impl.HornetQConsumerContext; +import org.apache.activemq6.spi.core.remoting.ConsumerContext; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.FutureLatch; +import org.apache.activemq6.utils.HornetQBufferInputStream; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -920,7 +920,7 @@ public class LargeMessageBufferTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.client.impl.ClientConsumerInternal#getNonXAsession() + * @see org.apache.activemq6.core.client.impl.ClientConsumerInternal#getNonXAsession() */ public ClientSessionInternal getSession() { @@ -929,7 +929,7 @@ public class LargeMessageBufferTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.client.impl.ClientConsumerInternal#prepareForClose() + * @see org.apache.activemq6.core.client.impl.ClientConsumerInternal#prepareForClose() */ public Thread prepareForClose(FutureLatch future) throws HornetQException { diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/ConfigurationValidationTest.java similarity index 90% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/ConfigurationValidationTest.java index 16ce2c19b5..5211e39df7 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/ConfigurationValidationTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.config.impl; +package org.apache.activemq6.tests.unit.core.config.impl; import org.junit.Test; import org.junit.Assert; -import org.hornetq.core.config.impl.FileConfiguration; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.XMLUtil; +import org.apache.activemq6.core.config.impl.FileConfiguration; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.XMLUtil; import org.w3c.dom.Element; /** diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConnectorsServiceTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/ConnectorsServiceTest.java similarity index 83% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConnectorsServiceTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/ConnectorsServiceTest.java index 0c554cc64c..4f88ae34eb 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConnectorsServiceTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/ConnectorsServiceTest.java @@ -11,21 +11,21 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.config.impl; +package org.apache.activemq6.tests.unit.core.config.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.ConnectorServiceConfiguration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.impl.ConnectorsService; -import org.hornetq.core.server.impl.ServiceRegistry; -import org.hornetq.tests.unit.core.config.impl.fakes.FakeConnectorService; -import org.hornetq.tests.unit.core.config.impl.fakes.FakeConnectorServiceFactory; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.ConnectorServiceConfiguration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.impl.ConnectorsService; +import org.apache.activemq6.core.server.impl.ServiceRegistry; +import org.apache.activemq6.tests.unit.core.config.impl.fakes.FakeConnectorService; +import org.apache.activemq6.tests.unit.core.config.impl.fakes.FakeConnectorServiceFactory; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/TransportConfigurationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/TransportConfigurationTest.java similarity index 93% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/TransportConfigurationTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/TransportConfigurationTest.java index 65296041ba..72c9b169b0 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/TransportConfigurationTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/TransportConfigurationTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.config.impl; +package org.apache.activemq6.tests.unit.core.config.impl; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A TransportConfigurationTest diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/fakes/FakeConnectorService.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/fakes/FakeConnectorService.java similarity index 89% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/fakes/FakeConnectorService.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/fakes/FakeConnectorService.java index 09eae43840..33abf58245 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/fakes/FakeConnectorService.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/fakes/FakeConnectorService.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.config.impl.fakes; +package org.apache.activemq6.tests.unit.core.config.impl.fakes; -import org.hornetq.core.server.ConnectorService; +import org.apache.activemq6.core.server.ConnectorService; /** * @author Martyn Taylor diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java similarity index 84% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java index 14c149e496..d95159ddc7 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java @@ -11,17 +11,17 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.config.impl.fakes; +package org.apache.activemq6.tests.unit.core.config.impl.fakes; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ConnectorService; -import org.hornetq.core.server.ConnectorServiceFactory; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ConnectorService; +import org.apache.activemq6.core.server.ConnectorServiceFactory; /** * @author Martyn Taylor diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java similarity index 88% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java index 13330b2303..a43d2bb85e 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.deployers.impl; +package org.apache.activemq6.tests.unit.core.deployers.impl; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.deployers.DeploymentManager; -import org.hornetq.core.deployers.impl.AddressSettingsDeployer; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.settings.impl.HierarchicalObjectRepository; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.XMLUtil; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.deployers.DeploymentManager; +import org.apache.activemq6.core.deployers.impl.AddressSettingsDeployer; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.XMLUtil; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -94,7 +94,7 @@ public class AddressSettingsDeployerTest extends UnitTestCase "" + ""; - Element rootNode = org.hornetq.utils.XMLUtil.stringToElement(xml); + Element rootNode = org.apache.activemq6.utils.XMLUtil.stringToElement(xml); addressSettingsDeployer.validate(rootNode); NodeList addressSettingsNode = rootNode.getElementsByTagName("address-setting"); Assert.assertEquals(1, addressSettingsNode.getLength()); diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java similarity index 96% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java index a5fbe443c0..d5e0d9c7f6 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.deployers.impl; +package org.apache.activemq6.tests.unit.core.deployers.impl; import org.junit.Before; import org.junit.After; import org.junit.Test; import org.junit.Assert; -import org.hornetq.core.deployers.DeploymentManager; -import org.hornetq.core.deployers.impl.BasicUserCredentialsDeployer; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.DefaultSensitiveStringCodec; -import org.hornetq.utils.XMLUtil; +import org.apache.activemq6.core.deployers.DeploymentManager; +import org.apache.activemq6.core.deployers.impl.BasicUserCredentialsDeployer; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.DefaultSensitiveStringCodec; +import org.apache.activemq6.utils.XMLUtil; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/FakeDeploymentManager.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/FakeDeploymentManager.java similarity index 86% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/FakeDeploymentManager.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/FakeDeploymentManager.java index 39701716f5..50f8d6b524 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/FakeDeploymentManager.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/FakeDeploymentManager.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.deployers.impl; +package org.apache.activemq6.tests.unit.core.deployers.impl; -import org.hornetq.core.deployers.Deployer; -import org.hornetq.core.deployers.DeploymentManager; +import org.apache.activemq6.core.deployers.Deployer; +import org.apache.activemq6.core.deployers.DeploymentManager; /** * @author Andy Taylor diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java similarity index 96% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java index 6001ef35f7..42ba5cdae3 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.deployers.impl; +package org.apache.activemq6.tests.unit.core.deployers.impl; import java.io.File; import java.net.URI; import java.util.Map; -import org.hornetq.api.core.Pair; -import org.hornetq.core.deployers.Deployer; -import org.hornetq.core.deployers.impl.FileDeploymentManager; -import org.hornetq.core.deployers.impl.FileDeploymentManager.DeployInfo; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.core.deployers.Deployer; +import org.apache.activemq6.core.deployers.impl.FileDeploymentManager; +import org.apache.activemq6.core.deployers.impl.FileDeploymentManager.DeployInfo; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/SecurityDeployerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/SecurityDeployerTest.java similarity index 93% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/SecurityDeployerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/SecurityDeployerTest.java index 150e797e12..1a925e0a11 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/SecurityDeployerTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/SecurityDeployerTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.deployers.impl; +package org.apache.activemq6.tests.unit.core.deployers.impl; import java.util.HashSet; import java.util.Set; -import org.hornetq.core.deployers.DeploymentManager; -import org.hornetq.core.deployers.impl.SecurityDeployer; -import org.hornetq.core.security.Role; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.HierarchicalObjectRepository; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.deployers.DeploymentManager; +import org.apache.activemq6.core.deployers.impl.SecurityDeployer; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -89,7 +89,7 @@ public class SecurityDeployerTest extends UnitTestCase @Test public void testSingle() throws Exception { - Element e = org.hornetq.utils.XMLUtil.stringToElement(conf); + Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(conf); deployer.deploy(e); HashSet roles = (HashSet) repository.getMatch("jms.topic.testTopic"); Assert.assertNotNull(roles); @@ -147,7 +147,7 @@ public class SecurityDeployerTest extends UnitTestCase private void testWithWhiteSpace(String conf) throws Exception { - Element e = org.hornetq.utils.XMLUtil.stringToElement(confWithWhiteSpace1); + Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(confWithWhiteSpace1); deployer.deploy(e); HashSet roles = (HashSet) repository.getMatch("jms.topic.testTopic"); Assert.assertNotNull(roles); @@ -194,8 +194,8 @@ public class SecurityDeployerTest extends UnitTestCase @Test public void testMultiple() throws Exception { - deployer.deploy(org.hornetq.utils.XMLUtil.stringToElement(conf)); - deployer.deploy(org.hornetq.utils.XMLUtil.stringToElement(conf2)); + deployer.deploy(org.apache.activemq6.utils.XMLUtil.stringToElement(conf)); + deployer.deploy(org.apache.activemq6.utils.XMLUtil.stringToElement(conf2)); HashSet roles = (HashSet) repository.getMatch("jms.topic.testTopic"); Assert.assertNotNull(roles); Assert.assertEquals(3, roles.size()); @@ -281,7 +281,7 @@ public class SecurityDeployerTest extends UnitTestCase @Test public void testNoRolesAdded() throws Exception { - deployer.deploy(org.hornetq.utils.XMLUtil.stringToElement(noRoles)); + deployer.deploy(org.apache.activemq6.utils.XMLUtil.stringToElement(noRoles)); HashSet roles = (HashSet) repository.getMatch("jms.topic.testQueue"); Assert.assertNull(roles); } @@ -300,7 +300,7 @@ public class SecurityDeployerTest extends UnitTestCase + "" + ""; - Element rootNode = org.hornetq.utils.XMLUtil.stringToElement(xml); + Element rootNode = org.apache.activemq6.utils.XMLUtil.stringToElement(xml); deployer.validate(rootNode); NodeList securityNodes = rootNode.getElementsByTagName("security-setting"); Assert.assertEquals(1, securityNodes.getLength()); diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/XMLDeployerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/XMLDeployerTest.java similarity index 94% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/XMLDeployerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/XMLDeployerTest.java index 966eb864b3..d921fa9951 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/XMLDeployerTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/XMLDeployerTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.deployers.impl; +package org.apache.activemq6.tests.unit.core.deployers.impl; import java.net.URI; import java.util.ArrayList; import java.util.HashMap; -import org.hornetq.core.deployers.impl.XmlDeployer; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.XMLUtil; +import org.apache.activemq6.core.deployers.impl.XmlDeployer; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.XMLUtil; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -91,7 +91,7 @@ public class XMLDeployerTest extends UnitTestCase TestDeployer testDeployer = new TestDeployer(); testDeployer.setElement(e); testDeployer.deploy(url); - e = org.hornetq.utils.XMLUtil.stringToElement(XMLDeployerTest.conf2); + e = org.apache.activemq6.utils.XMLUtil.stringToElement(XMLDeployerTest.conf2); testDeployer.setElement(e); testDeployer.redeploy(url); Assert.assertEquals(testDeployer.getDeployments(), 4); @@ -112,7 +112,7 @@ public class XMLDeployerTest extends UnitTestCase TestDeployer testDeployer = new TestDeployer(); testDeployer.setElement(e); testDeployer.deploy(url); - e = org.hornetq.utils.XMLUtil.stringToElement(XMLDeployerTest.conf3); + e = org.apache.activemq6.utils.XMLUtil.stringToElement(XMLDeployerTest.conf3); testDeployer.setElement(e); testDeployer.redeploy(url); Assert.assertEquals(testDeployer.getDeployments(), 2); @@ -131,7 +131,7 @@ public class XMLDeployerTest extends UnitTestCase TestDeployer testDeployer = new TestDeployer(); testDeployer.setElement(e); testDeployer.deploy(url); - e = org.hornetq.utils.XMLUtil.stringToElement(XMLDeployerTest.conf4); + e = org.apache.activemq6.utils.XMLUtil.stringToElement(XMLDeployerTest.conf4); testDeployer.setElement(e); testDeployer.redeploy(url); Assert.assertEquals(testDeployer.getDeployments(), 6); @@ -152,7 +152,7 @@ public class XMLDeployerTest extends UnitTestCase @Test public void testUndeploy() throws Exception { - Element e = org.hornetq.utils.XMLUtil.stringToElement(XMLDeployerTest.conf1); + Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(XMLDeployerTest.conf1); TestDeployer testDeployer = new TestDeployer(); testDeployer.setElement(e); testDeployer.deploy(url); diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/AlignedJournalImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/AlignedJournalImplTest.java similarity index 97% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/AlignedJournalImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/AlignedJournalImplTest.java index b4ab573f63..1cfb647bc2 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/AlignedJournalImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/AlignedJournalImplTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl; +package org.apache.activemq6.tests.unit.core.journal.impl; import org.junit.Before; import org.junit.After; @@ -27,18 +27,18 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.LoaderCallback; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.TransactionFailureCallback; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.fakes.SimpleEncoding; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.LoaderCallback; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.TransactionFailureCallback; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.SimpleEncoding; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/CleanBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/CleanBufferTest.java similarity index 85% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/CleanBufferTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/CleanBufferTest.java index 3e460011f7..3e0927d0b1 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/CleanBufferTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/CleanBufferTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl; +package org.apache.activemq6.tests.unit.core.journal.impl; import org.junit.Test; @@ -18,12 +18,12 @@ import java.nio.ByteBuffer; import org.junit.Assert; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/FakeJournalImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FakeJournalImplTest.java similarity index 83% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/FakeJournalImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FakeJournalImplTest.java index a99ebf7b41..766054a349 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/FakeJournalImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FakeJournalImplTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl; +package org.apache.activemq6.tests.unit.core.journal.impl; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; /** * diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java similarity index 81% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java index 4e54558f92..808fbd8b5c 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl; +package org.apache.activemq6.tests.unit.core.journal.impl; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; /** * diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/FileFactoryTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FileFactoryTestBase.java similarity index 88% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/FileFactoryTestBase.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FileFactoryTestBase.java index 6e8ecaf9f7..c427c4affd 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/FileFactoryTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FileFactoryTestBase.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl; +package org.apache.activemq6.tests.unit.core.journal.impl; import org.junit.Before; import java.nio.ByteBuffer; import org.junit.Assert; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalAsyncTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalAsyncTest.java similarity index 92% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalAsyncTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalAsyncTest.java index 4004053015..fa64952a94 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalAsyncTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalAsyncTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl; +package org.apache.activemq6.tests.unit.core.journal.impl; import java.util.ArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; -import org.hornetq.tests.unit.core.journal.impl.fakes.SimpleEncoding; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.SimpleEncoding; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalImplTestBase.java similarity index 96% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalImplTestBase.java index 22ec911df1..f7e386fc63 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalImplTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl; +package org.apache.activemq6.tests.unit.core.journal.impl; import org.junit.Before; import org.junit.After; @@ -26,16 +26,16 @@ import java.util.Map; import org.junit.Assert; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.TestableJournal; -import org.hornetq.core.journal.impl.ExportJournal; -import org.hornetq.core.journal.impl.ImportJournal; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.ReusableLatch; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.TestableJournal; +import org.apache.activemq6.core.journal.impl.ExportJournal; +import org.apache.activemq6.core.journal.impl.ImportJournal; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.ReusableLatch; /** * diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalImplTestUnit.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalImplTestUnit.java similarity index 99% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalImplTestUnit.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalImplTestUnit.java index 694bb2ad94..0e41fb08a4 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalImplTestUnit.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalImplTestUnit.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl; +package org.apache.activemq6.tests.unit.core.journal.impl; import java.nio.ByteBuffer; import java.util.List; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQIOErrorException; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.unit.core.journal.impl.fakes.SimpleEncoding; -import org.hornetq.tests.util.RandomUtil; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQIOErrorException; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.SimpleEncoding; +import org.apache.activemq6.tests.util.RandomUtil; import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/ReclaimerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/ReclaimerTest.java similarity index 92% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/ReclaimerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/ReclaimerTest.java index 5c0a532498..d53b69842d 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/ReclaimerTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/ReclaimerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl; +package org.apache.activemq6.tests.unit.core.journal.impl; import org.junit.Before; import org.junit.Test; @@ -22,11 +22,11 @@ import java.util.Set; import org.junit.Assert; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.impl.JournalFile; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.Reclaimer; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.Reclaimer; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @@ -913,14 +913,14 @@ public class ReclaimerTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#decPendingTransaction() + * @see org.apache.activemq6.core.journal.impl.JournalFile#decPendingTransaction() */ public void decPendingTransaction() { } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#getPendingTransactions() + * @see org.apache.activemq6.core.journal.impl.JournalFile#getPendingTransactions() */ public int getPendingTransactions() { @@ -928,14 +928,14 @@ public class ReclaimerTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#incPendingTransaction() + * @see org.apache.activemq6.core.journal.impl.JournalFile#incPendingTransaction() */ public void incPendingTransaction() { } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#getOrderingID() + * @see org.apache.activemq6.core.journal.impl.JournalFile#getOrderingID() */ public int getOrderingID() { @@ -952,7 +952,7 @@ public class ReclaimerTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#getSize() + * @see org.apache.activemq6.core.journal.impl.JournalFile#getSize() */ public int getLiveSize() { @@ -960,7 +960,7 @@ public class ReclaimerTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#isNeedCleanup() + * @see org.apache.activemq6.core.journal.impl.JournalFile#isNeedCleanup() */ public boolean isNeedCleanup() { @@ -968,7 +968,7 @@ public class ReclaimerTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#resetNegCount(org.hornetq.core.journal.impl.JournalFile) + * @see org.apache.activemq6.core.journal.impl.JournalFile#resetNegCount(org.hornetq.core.journal.impl.JournalFile) */ public boolean resetNegCount(final JournalFile file) { @@ -976,7 +976,7 @@ public class ReclaimerTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#setNeedCleanup(boolean) + * @see org.apache.activemq6.core.journal.impl.JournalFile#setNeedCleanup(boolean) */ public void setNeedCleanup(final boolean needCleanup) { @@ -985,7 +985,7 @@ public class ReclaimerTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#getRecordID() + * @see org.apache.activemq6.core.journal.impl.JournalFile#getRecordID() */ public int getRecordID() { @@ -993,7 +993,7 @@ public class ReclaimerTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#getTotalNegativeToOthers() + * @see org.apache.activemq6.core.journal.impl.JournalFile#getTotalNegativeToOthers() */ public int getTotalNegativeToOthers() { @@ -1001,7 +1001,7 @@ public class ReclaimerTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#getJournalVersion() + * @see org.apache.activemq6.core.journal.impl.JournalFile#getJournalVersion() */ public int getJournalVersion() { @@ -1009,7 +1009,7 @@ public class ReclaimerTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#getTotNeg() + * @see org.apache.activemq6.core.journal.impl.JournalFile#getTotNeg() */ public int getTotNeg() { @@ -1018,7 +1018,7 @@ public class ReclaimerTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.journal.impl.JournalFile#setTotNeg(int) + * @see org.apache.activemq6.core.journal.impl.JournalFile#setTotNeg(int) */ public void setTotNeg(int totNeg) { diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java similarity index 96% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java index a2ee2ce712..f31bb6526f 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl; +package org.apache.activemq6.tests.unit.core.journal.impl; import org.junit.Before; import org.junit.After; @@ -24,12 +24,12 @@ import java.util.UUID; import org.junit.Assert; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/TimedBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/TimedBufferTest.java similarity index 92% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/TimedBufferTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/TimedBufferTest.java index 72e470ce1f..7d121797ad 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/TimedBufferTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/TimedBufferTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl; +package org.apache.activemq6.tests.unit.core.journal.impl; import org.junit.Test; @@ -23,12 +23,12 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.impl.TimedBuffer; -import org.hornetq.core.journal.impl.TimedBufferObserver; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.impl.TimedBuffer; +import org.apache.activemq6.core.journal.impl.TimedBufferObserver; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A TimedBufferTest @@ -79,7 +79,7 @@ public class TimedBufferTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int) + * @see org.apache.activemq6.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int) */ public ByteBuffer newBuffer(final int minSize, final int maxSize) { @@ -154,7 +154,7 @@ public class TimedBufferTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int) + * @see org.apache.activemq6.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int) */ public ByteBuffer newBuffer(final int minSize, final int maxSize) { @@ -243,7 +243,7 @@ public class TimedBufferTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int) + * @see org.apache.activemq6.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int) */ public ByteBuffer newBuffer(final int minSize, final int maxSize) { @@ -329,7 +329,7 @@ public class TimedBufferTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int) + * @see org.apache.activemq6.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int) */ public ByteBuffer newBuffer(final int minSize, final int maxSize) { diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java similarity index 89% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java index a818196ab1..5e16bc27ac 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl.fakes; +package org.apache.activemq6.tests.unit.core.journal.impl.fakes; import java.io.File; import java.io.IOException; @@ -20,15 +20,15 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.core.asyncio.BufferCallback; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.TimedBuffer; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.core.asyncio.BufferCallback; +import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.TimedBuffer; /** * A FakeSequentialFileFactory @@ -487,7 +487,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#writeInternal(java.nio.ByteBuffer) + * @see org.apache.activemq6.core.journal.SequentialFile#writeInternal(java.nio.ByteBuffer) */ public void writeInternal(ByteBuffer bytes) throws Exception { @@ -557,7 +557,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#renameTo(org.hornetq.core.journal.SequentialFile) + * @see org.apache.activemq6.core.journal.SequentialFile#renameTo(org.hornetq.core.journal.SequentialFile) */ public void renameTo(final String newFileName) throws Exception { @@ -567,7 +567,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#fits(int) + * @see org.apache.activemq6.core.journal.SequentialFile#fits(int) */ public boolean fits(final int size) { @@ -575,21 +575,21 @@ public class FakeSequentialFileFactory implements SequentialFileFactory } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#setBuffering(boolean) + * @see org.apache.activemq6.core.journal.SequentialFile#setBuffering(boolean) */ public void setBuffering(final boolean buffering) { } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#lockBuffer() + * @see org.apache.activemq6.core.journal.SequentialFile#lockBuffer() */ public void disableAutoFlush() { } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#unlockBuffer() + * @see org.apache.activemq6.core.journal.SequentialFile#unlockBuffer() */ public void enableAutoFlush() { @@ -601,7 +601,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#write(org.hornetq.spi.core.remoting.HornetQBuffer, boolean, org.hornetq.core.journal.IOCallback) + * @see org.apache.activemq6.core.journal.SequentialFile#write(org.hornetq.spi.core.remoting.HornetQBuffer, boolean, org.hornetq.core.journal.IOCallback) */ public void write(final HornetQBuffer bytes, final boolean sync, final IOAsyncTask callback) throws Exception { @@ -612,7 +612,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#write(org.hornetq.spi.core.remoting.HornetQBuffer, boolean) + * @see org.apache.activemq6.core.journal.SequentialFile#write(org.hornetq.spi.core.remoting.HornetQBuffer, boolean) */ public void write(final HornetQBuffer bytes, final boolean sync) throws Exception { @@ -622,7 +622,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#write(org.hornetq.core.journal.EncodingSupport, boolean, org.hornetq.core.journal.IOCompletion) + * @see org.apache.activemq6.core.journal.SequentialFile#write(org.hornetq.core.journal.EncodingSupport, boolean, org.hornetq.core.journal.IOCompletion) */ public void write(final EncodingSupport bytes, final boolean sync, final IOAsyncTask callback) throws Exception { @@ -633,7 +633,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#write(org.hornetq.core.journal.EncodingSupport, boolean) + * @see org.apache.activemq6.core.journal.SequentialFile#write(org.hornetq.core.journal.EncodingSupport, boolean) */ public void write(final EncodingSupport bytes, final boolean sync) throws Exception { @@ -644,7 +644,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#exists() + * @see org.apache.activemq6.core.journal.SequentialFile#exists() */ public boolean exists() { @@ -654,14 +654,14 @@ public class FakeSequentialFileFactory implements SequentialFileFactory } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#setTimedBuffer(org.hornetq.core.journal.impl.TimedBuffer) + * @see org.apache.activemq6.core.journal.SequentialFile#setTimedBuffer(org.hornetq.core.journal.impl.TimedBuffer) */ public void setTimedBuffer(final TimedBuffer buffer) { } /* (non-Javadoc) - * @see org.hornetq.core.journal.SequentialFile#copyTo(org.hornetq.core.journal.SequentialFile) + * @see org.apache.activemq6.core.journal.SequentialFile#copyTo(org.hornetq.core.journal.SequentialFile) */ public void copyTo(SequentialFile newFileName) { diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/fakes/SimpleEncoding.java similarity index 91% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/fakes/SimpleEncoding.java index f502eb7364..8feef699da 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/fakes/SimpleEncoding.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.journal.impl.fakes; +package org.apache.activemq6.tests.unit.core.journal.impl.fakes; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.core.journal.EncodingSupport; /** * Provides a SimpleEncoding with a Fake Payload diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/message/impl/MessageImplTest.java similarity index 95% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/message/impl/MessageImplTest.java index a46ebbd83e..f628f7862f 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/message/impl/MessageImplTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.message.impl; +package org.apache.activemq6.tests.unit.core.message.impl; import java.util.ArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Message; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.client.impl.ClientMessageImpl; -import org.hornetq.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.Message; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.client.impl.ClientMessageImpl; +import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagePositionTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagePositionTest.java similarity index 93% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagePositionTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagePositionTest.java index 79bda8ca3f..1df2f156e5 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagePositionTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagePositionTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.paging.impl; +package org.apache.activemq6.tests.unit.core.paging.impl; import org.junit.Test; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A PagePositionTest diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PageTest.java similarity index 89% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PageTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PageTest.java index 24e7748251..d14ce4710a 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PageTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PageTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.paging.impl; +package org.apache.activemq6.tests.unit.core.paging.impl; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.paging.impl.PagedMessageImpl; -import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.paging.impl.PagedMessageImpl; +import org.apache.activemq6.core.persistence.impl.nullpm.NullStorageManager; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagingManagerImplTest.java similarity index 77% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagingManagerImplTest.java index 67571bc50e..a34dfd9123 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagingManagerImplTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.paging.impl; +package org.apache.activemq6.tests.unit.core.paging.impl; import java.io.File; import java.nio.ByteBuffer; @@ -18,23 +18,23 @@ import java.util.List; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.paging.impl.PagingManagerImpl; -import org.hornetq.core.paging.impl.PagingStoreFactoryNIO; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.RoutingContextImpl; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.settings.impl.HierarchicalObjectRepository; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.paging.impl.PagingManagerImpl; +import org.apache.activemq6.core.paging.impl.PagingStoreFactoryNIO; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.impl.nullpm.NullStorageManager; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.RoutingContextImpl; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagingStoreImplTest.java similarity index 94% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagingStoreImplTest.java index 873bc94533..ac557d4738 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagingStoreImplTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.paging.impl; +package org.apache.activemq6.tests.unit.core.paging.impl; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -26,33 +26,33 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.SequentialFile; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.paging.PageTransactionInfo; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.paging.PagingStoreFactory; -import org.hornetq.core.paging.impl.Page; -import org.hornetq.core.paging.impl.PageTransactionInfoImpl; -import org.hornetq.core.paging.impl.PagingStoreImpl; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.RoutingContextImpl; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; -import org.hornetq.tests.unit.util.FakePagingManager; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.ExecutorFactory; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.paging.PageTransactionInfo; +import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.paging.PagingStoreFactory; +import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq6.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq6.core.paging.impl.PagingStoreImpl; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.impl.nullpm.NullStorageManager; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.RoutingContextImpl; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; +import org.apache.activemq6.tests.unit.util.FakePagingManager; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.ExecutorFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java similarity index 84% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java index 7dd4cf7749..46efe78f2e 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.persistence.impl; +package org.apache.activemq6.tests.unit.core.persistence.impl; import java.util.ArrayList; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.journal.impl.NIOSequentialFileFactory; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.persistence.impl.journal.BatchingIDGenerator; -import org.hornetq.core.persistence.impl.journal.JournalRecordIds; -import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.journal.PreparedTransactionInfo; +import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq6.core.persistence.impl.journal.BatchingIDGenerator; +import org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq6.core.persistence.impl.nullpm.NullStorageManager; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/persistence/impl/OperationContextUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/persistence/impl/OperationContextUnitTest.java similarity index 95% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/persistence/impl/OperationContextUnitTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/persistence/impl/OperationContextUnitTest.java index 295d4efe8e..a1ceded009 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/persistence/impl/OperationContextUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/persistence/impl/OperationContextUnitTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.persistence.impl; +package org.apache.activemq6.tests.unit.core.persistence.impl; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -18,10 +18,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/AddressImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/AddressImplTest.java similarity index 96% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/AddressImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/AddressImplTest.java index 41d56ce7ad..bcd3abda85 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/AddressImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/AddressImplTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.postoffice.impl; +package org.apache.activemq6.tests.unit.core.postoffice.impl; import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.postoffice.Address; -import org.hornetq.core.postoffice.impl.AddressImpl; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.postoffice.Address; +import org.apache.activemq6.core.postoffice.impl.AddressImpl; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Andy Taylor diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/BindingsImplTest.java similarity index 77% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/BindingsImplTest.java index d5ba45a937..3ff1e1268b 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/BindingsImplTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.postoffice.impl; +package org.apache.activemq6.tests.unit.core.postoffice.impl; -import org.hornetq.core.server.impl.RefsOperation; +import org.apache.activemq6.core.server.impl.RefsOperation; import org.junit.Test; import java.util.Collections; @@ -21,22 +21,22 @@ import java.util.Set; import javax.transaction.xa.Xid; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.impl.BindingsImpl; -import org.hornetq.core.server.Bindable; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.RoutingContextImpl; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.core.transaction.TransactionOperation; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.impl.BindingsImpl; +import org.apache.activemq6.core.server.Bindable; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.RoutingContextImpl; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.core.transaction.TransactionOperation; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A BindingImplTest @@ -204,7 +204,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.transaction.Transaction#rollback() + * @see org.apache.activemq6.core.transaction.Transaction#rollback() */ public void rollback() throws Exception { @@ -212,7 +212,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.transaction.Transaction#setState(org.hornetq.core.transaction.Transaction.State) + * @see org.apache.activemq6.core.transaction.Transaction#setState(org.hornetq.core.transaction.Transaction.State) */ public void setState(final State state) { @@ -220,7 +220,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.transaction.Transaction#suspend() + * @see org.apache.activemq6.core.transaction.Transaction#suspend() */ public void suspend() { @@ -228,7 +228,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.transaction.Transaction#getDistinctQueues() + * @see org.apache.activemq6.core.transaction.Transaction#getDistinctQueues() */ public Set getDistinctQueues() { @@ -267,7 +267,7 @@ public class BindingsImplTest extends UnitTestCase { /* (non-Javadoc) - * @see org.hornetq.core.filter.Filter#getFilterString() + * @see org.apache.activemq6.core.filter.Filter#getFilterString() */ public SimpleString getFilterString() { @@ -275,7 +275,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.filter.Filter#match(org.hornetq.core.server.ServerMessage) + * @see org.apache.activemq6.core.filter.Filter#match(org.hornetq.core.server.ServerMessage) */ public boolean match(final ServerMessage message) { @@ -312,7 +312,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.postoffice.Binding#getBindable() + * @see org.apache.activemq6.core.postoffice.Binding#getBindable() */ public Bindable getBindable() { @@ -321,7 +321,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.postoffice.Binding#getClusterName() + * @see org.apache.activemq6.core.postoffice.Binding#getClusterName() */ public SimpleString getClusterName() { @@ -330,7 +330,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.postoffice.Binding#getDistance() + * @see org.apache.activemq6.core.postoffice.Binding#getDistance() */ public int getDistance() { @@ -338,7 +338,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.postoffice.Binding#getFilter() + * @see org.apache.activemq6.core.postoffice.Binding#getFilter() */ public Filter getFilter() { @@ -351,7 +351,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.postoffice.Binding#getRoutingName() + * @see org.apache.activemq6.core.postoffice.Binding#getRoutingName() */ public SimpleString getRoutingName() { @@ -359,7 +359,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.postoffice.Binding#getType() + * @see org.apache.activemq6.core.postoffice.Binding#getType() */ public BindingType getType() { @@ -368,7 +368,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.postoffice.Binding#getUniqueName() + * @see org.apache.activemq6.core.postoffice.Binding#getUniqueName() */ public SimpleString getUniqueName() { @@ -391,7 +391,7 @@ public class BindingsImplTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.core.postoffice.Binding#toManagementString() + * @see org.apache.activemq6.core.postoffice.Binding#toManagementString() */ @Override public String toManagementString() diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java similarity index 83% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java index ef6b6510db..37d918cca8 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.postoffice.impl; +package org.apache.activemq6.tests.unit.core.postoffice.impl; import java.util.ArrayList; import java.util.HashMap; @@ -19,23 +19,23 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.persistence.GroupingInfo; -import org.hornetq.core.persistence.QueueBindingInfo; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.impl.DuplicateIDCacheImpl; -import org.hornetq.core.server.impl.PostOfficeJournalLoader; -import org.hornetq.core.transaction.impl.ResourceManagerImpl; -import org.hornetq.tests.unit.core.server.impl.fakes.FakePostOffice; -import org.hornetq.tests.unit.util.FakePagingManager; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.OrderedExecutorFactory; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.persistence.GroupingInfo; +import org.apache.activemq6.core.persistence.QueueBindingInfo; +import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.impl.DuplicateIDCacheImpl; +import org.apache.activemq6.core.server.impl.PostOfficeJournalLoader; +import org.apache.activemq6.core.transaction.impl.ResourceManagerImpl; +import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakePostOffice; +import org.apache.activemq6.tests.unit.util.FakePagingManager; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq6.utils.OrderedExecutorFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/FakeQueue.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/FakeQueue.java similarity index 92% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/FakeQueue.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/FakeQueue.java index 16d639d230..015f5ced99 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/FakeQueue.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/FakeQueue.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.postoffice.impl; +package org.apache.activemq6.tests.unit.core.postoffice.impl; import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.transaction.Transaction; -import org.hornetq.utils.LinkedListIterator; -import org.hornetq.utils.ReferenceCounter; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq6.utils.LinkedListIterator; +import org.apache.activemq6.utils.ReferenceCounter; /** * A FakeQueue @@ -586,14 +586,14 @@ public class FakeQueue implements Queue } /* (non-Javadoc) - * @see org.hornetq.core.server.Queue#destroyPaging() + * @see org.apache.activemq6.core.server.Queue#destroyPaging() */ public void destroyPaging() { } /* (non-Javadoc) - * @see org.hornetq.core.server.Queue#getDeliveringMessages() + * @see org.apache.activemq6.core.server.Queue#getDeliveringMessages() */ @Override public Map> getDeliveringMessages() diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/QueueComparatorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/QueueComparatorTest.java similarity index 88% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/QueueComparatorTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/QueueComparatorTest.java index a3da2d4ee4..c3ecfff971 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/QueueComparatorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/QueueComparatorTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.postoffice.impl; +package org.apache.activemq6.tests.unit.core.postoffice.impl; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.impl.ScaleDownHandler; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.impl.ScaleDownHandler; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java similarity index 88% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java index 3806020279..ee2e608ee7 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.postoffice.impl; +package org.apache.activemq6.tests.unit.core.postoffice.impl; import java.util.ArrayList; import java.util.Collection; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.BindingType; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.BindingsFactory; -import org.hornetq.core.postoffice.impl.WildcardAddressManager; -import org.hornetq.core.server.Bindable; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.BindingType; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.BindingsFactory; +import org.apache.activemq6.core.postoffice.impl.WildcardAddressManager; +import org.apache.activemq6.core.server.Bindable; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/HornetQBufferTestBase.java similarity index 97% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/HornetQBufferTestBase.java index 60a92917b9..36f329f818 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/HornetQBufferTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.remoting; +package org.apache.activemq6.tests.unit.core.remoting; import org.junit.Before; import org.junit.After; @@ -18,10 +18,10 @@ import org.junit.Test; import org.junit.Assert; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Jeff Mesnil. diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java similarity index 88% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java index 5c8f2e50f8..7e0f53d3fe 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java @@ -11,14 +11,14 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.remoting.impl.invm; +package org.apache.activemq6.tests.unit.core.remoting.impl.invm; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.remoting.impl.invm.InVMConnector; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnector; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java similarity index 87% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java index e6ac04c4ba..743c5f44b5 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.remoting.impl.netty; +package org.apache.activemq6.tests.unit.core.remoting.impl.netty; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.tests.unit.core.remoting.HornetQBufferTestBase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.tests.unit.core.remoting.HornetQBufferTestBase; /** * Same as ChannelBufferWrapperTest, but using a different constructor diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java similarity index 77% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java index 50a453ec60..28a15b7680 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.remoting.impl.netty; +package org.apache.activemq6.tests.unit.core.remoting.impl.netty; import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executors; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.remoting.impl.netty.NettyAcceptor; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.spi.core.remoting.Acceptor; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptor; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java similarity index 83% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java index 6815392d31..165a370e26 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.remoting.impl.netty; +package org.apache.activemq6.tests.unit.core.remoting.impl.netty; import java.util.HashMap; import java.util.Map; @@ -18,16 +18,16 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.remoting.impl.netty.NettyAcceptor; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptor; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java similarity index 84% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java index 0c594b5fb6..39c9816422 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.remoting.impl.netty; +package org.apache.activemq6.tests.unit.core.remoting.impl.netty; import java.nio.ByteBuffer; import java.util.Collections; @@ -19,14 +19,14 @@ import java.util.Map; import io.netty.channel.Channel; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.embedded.EmbeddedChannel; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.remoting.impl.netty.NettyConnection; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnection; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java similarity index 88% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java index e2f5fd8f38..a7d414abc4 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java @@ -11,14 +11,14 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.remoting.impl.netty; +package org.apache.activemq6.tests.unit.core.remoting.impl.netty; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.remoting.impl.netty.NettyConnector; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnector; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java similarity index 94% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java index 44533258ff..e334b13549 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.remoting.impl.netty; +package org.apache.activemq6.tests.unit.core.remoting.impl.netty; import org.junit.Test; @@ -20,15 +20,15 @@ import java.util.concurrent.Executors; import org.junit.Assert; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.remoting.impl.netty.NettyConnector; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnector; +import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq6.spi.core.remoting.BufferHandler; +import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Tim Fox diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java similarity index 96% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java index 459d953aeb..d94b329539 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.remoting.impl.ssl; +package org.apache.activemq6.tests.unit.core.remoting.impl.ssl; import java.io.File; import java.net.URL; import java.util.Arrays; import java.util.Collection; -import org.hornetq.core.remoting.impl.ssl.SSLSupport; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.remoting.impl.ssl.SSLSupport; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java similarity index 92% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java index 0f946a1aca..638a3ae35d 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.remoting.server.impl; +package org.apache.activemq6.tests.unit.core.remoting.server.impl; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -19,13 +19,13 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; -import org.hornetq.core.server.impl.ServiceRegistry; -import org.hornetq.tests.unit.core.remoting.server.impl.fake.FakeInterceptor; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq6.core.remoting.server.impl.RemotingServiceImpl; +import org.apache.activemq6.core.server.impl.ServiceRegistry; +import org.apache.activemq6.tests.unit.core.remoting.server.impl.fake.FakeInterceptor; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java similarity index 75% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java index a53eb619fd..9be3a5f8c2 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java @@ -11,12 +11,12 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.remoting.server.impl.fake; +package org.apache.activemq6.tests.unit.core.remoting.server.impl.fake; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.protocol.core.Packet; -import org.hornetq.spi.core.protocol.RemotingConnection; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.Interceptor; +import org.apache.activemq6.core.protocol.core.Packet; +import org.apache.activemq6.spi.core.protocol.RemotingConnection; /** * @author Martyn Taylor diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java similarity index 96% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java index 52b6bce09d..a4f95458d1 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.security.impl; +package org.apache.activemq6.tests.unit.core.security.impl; import org.junit.Before; import org.junit.After; @@ -20,10 +20,10 @@ import java.util.HashSet; import org.junit.Assert; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl; +import org.apache.activemq6.tests.util.UnitTestCase; /** * tests HornetQSecurityManagerImpl diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/security/impl/JAASSecurityManagerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/security/impl/JAASSecurityManagerTest.java similarity index 96% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/security/impl/JAASSecurityManagerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/security/impl/JAASSecurityManagerTest.java index 72dcf9882a..5dc83cbfcb 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/security/impl/JAASSecurityManagerTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/security/impl/JAASSecurityManagerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.security.impl; +package org.apache.activemq6.tests.unit.core.security.impl; import javax.security.auth.Subject; import javax.security.auth.callback.Callback; @@ -30,10 +30,10 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.hornetq.core.security.CheckType; -import org.hornetq.core.security.Role; -import org.hornetq.spi.core.security.JAASSecurityManager; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.security.CheckType; +import org.apache.activemq6.core.security.Role; +import org.apache.activemq6.spi.core.security.JAASSecurityManager; +import org.apache.activemq6.tests.util.UnitTestCase; import org.jboss.security.SimpleGroup; import org.junit.After; import org.junit.Assert; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java similarity index 94% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java index dfe40f3996..66d10d0b48 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java @@ -11,11 +11,11 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.server.cluster.impl; +package org.apache.activemq6.tests.unit.core.server.cluster.impl; -import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.core.server.cluster.impl.ClusterConnectionBridge; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionBridge; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Test; /** diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java similarity index 87% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java index 78c7c7427b..01999bb500 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.server.cluster.impl; +package org.apache.activemq6.tests.unit.core.server.cluster.impl; import org.junit.Test; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.cluster.impl.RemoteQueueBindingImpl; -import org.hornetq.tests.unit.core.postoffice.impl.FakeQueue; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.cluster.impl.RemoteQueueBindingImpl; +import org.apache.activemq6.tests.unit.core.postoffice.impl.FakeQueue; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A RemoteQueueBindImplTest diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java similarity index 88% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java index d830fa77bf..5d7498521c 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.server.group.impl; +package org.apache.activemq6.tests.unit.core.server.group.impl; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq6.tests.util.UnitTestCase; public class SystemPropertyOverrideTest extends UnitTestCase { diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/FileLockTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/FileLockTest.java similarity index 87% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/FileLockTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/FileLockTest.java index b52147332d..c20e5b303f 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/FileLockTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/FileLockTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.server.impl; +package org.apache.activemq6.tests.unit.core.server.impl; import org.junit.Before; import org.junit.Test; import java.io.File; -import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; -import org.hornetq.core.server.impl.AIOFileLockNodeManager; -import org.hornetq.core.server.impl.FileLockNodeManager; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq6.core.server.impl.AIOFileLockNodeManager; +import org.apache.activemq6.core.server.impl.FileLockNodeManager; +import org.apache.activemq6.tests.util.UnitTestCase; /** * A FileLockTest diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/QueueImplTest.java similarity index 97% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/QueueImplTest.java index c006534e4a..ff5e8a1a36 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/QueueImplTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.server.impl; +package org.apache.activemq6.tests.unit.core.server.impl; import java.util.ArrayList; import java.util.Iterator; @@ -21,30 +21,30 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.filter.impl.FilterImpl; -import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.QueueImpl; -import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.tests.unit.core.server.impl.fakes.FakeConsumer; -import org.hornetq.tests.unit.core.server.impl.fakes.FakeFilter; -import org.hornetq.tests.unit.core.server.impl.fakes.FakePostOffice; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.FutureLatch; -import org.hornetq.utils.LinkedListIterator; +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.ClientSessionFactory; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.filter.impl.FilterImpl; +import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HandleStatus; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.QueueImpl; +import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakeConsumer; +import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakeFilter; +import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakePostOffice; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.FutureLatch; +import org.apache.activemq6.utils.LinkedListIterator; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakeConsumer.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeConsumer.java similarity index 93% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakeConsumer.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeConsumer.java index b879f3c9d5..803d48cb6d 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakeConsumer.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeConsumer.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.server.impl.fakes; +package org.apache.activemq6.tests.unit.core.server.impl.fakes; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.MessageReference; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.server.Consumer; +import org.apache.activemq6.core.server.HandleStatus; +import org.apache.activemq6.core.server.MessageReference; /** * diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakeFilter.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeFilter.java similarity index 87% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakeFilter.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeFilter.java index dee5566c0b..d879fb5dcb 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakeFilter.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeFilter.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.server.impl.fakes; +package org.apache.activemq6.tests.unit.core.server.impl.fakes; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.server.ServerMessage; /** * diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakeJournalLoader.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeJournalLoader.java similarity index 73% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakeJournalLoader.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeJournalLoader.java index 6bd669a9cf..808d9fe97d 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakeJournalLoader.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeJournalLoader.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.server.impl.fakes; +package org.apache.activemq6.tests.unit.core.server.impl.fakes; import javax.transaction.xa.Xid; import java.util.List; import java.util.Map; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.journal.Journal; -import org.hornetq.core.persistence.GroupingInfo; -import org.hornetq.core.persistence.QueueBindingInfo; -import org.hornetq.core.persistence.impl.PageCountPending; -import org.hornetq.core.persistence.impl.journal.AddMessageRecord; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.JournalLoader; -import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.journal.Journal; +import org.apache.activemq6.core.persistence.GroupingInfo; +import org.apache.activemq6.core.persistence.QueueBindingInfo; +import org.apache.activemq6.core.persistence.impl.PageCountPending; +import org.apache.activemq6.core.persistence.impl.journal.AddMessageRecord; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.JournalLoader; +import org.apache.activemq6.core.transaction.ResourceManager; +import org.apache.activemq6.core.transaction.Transaction; public class FakeJournalLoader implements JournalLoader { diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakePostOffice.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakePostOffice.java similarity index 80% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakePostOffice.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakePostOffice.java index c14c91376b..0af49d9f58 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakePostOffice.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakePostOffice.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.server.impl.fakes; +package org.apache.activemq6.tests.unit.core.server.impl.fakes; import java.util.Map; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.Bindings; -import org.hornetq.core.postoffice.DuplicateIDCache; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.postoffice.impl.DuplicateIDCacheImpl; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.RoutingContext; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.MessageReferenceImpl; -import org.hornetq.core.transaction.Transaction; +import org.apache.activemq6.api.core.Pair; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.persistence.impl.nullpm.NullStorageManager; +import org.apache.activemq6.core.postoffice.Binding; +import org.apache.activemq6.core.postoffice.Bindings; +import org.apache.activemq6.core.postoffice.DuplicateIDCache; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.postoffice.impl.DuplicateIDCacheImpl; +import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.RoutingContext; +import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq6.core.server.impl.MessageReferenceImpl; +import org.apache.activemq6.core.transaction.Transaction; public class FakePostOffice implements PostOffice { diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeQueueFactory.java similarity index 83% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeQueueFactory.java index 1aad9be54e..9a19f5f600 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeQueueFactory.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.core.server.impl.fakes; +package org.apache.activemq6.tests.unit.core.server.impl.fakes; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.filter.Filter; -import org.hornetq.core.paging.cursor.PageSubscription; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.QueueFactory; -import org.hornetq.core.server.impl.QueueImpl; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq6.core.paging.cursor.PageSubscription; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.Queue; +import org.apache.activemq6.core.server.QueueFactory; +import org.apache.activemq6.core.server.impl.QueueImpl; /** * diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/HornetQDestinationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/HornetQDestinationTest.java similarity index 94% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/HornetQDestinationTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/HornetQDestinationTest.java index f3f07b5c19..ecba2b7c0a 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/HornetQDestinationTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/HornetQDestinationTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.jms; +package org.apache.activemq6.tests.unit.jms; import org.junit.Test; @@ -20,9 +20,9 @@ import javax.jms.Topic; import org.junit.Assert; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Jeff Mesnil diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/client/HornetQMapMessageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/HornetQMapMessageTest.java similarity index 98% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/client/HornetQMapMessageTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/HornetQMapMessageTest.java index eef89d6f92..5295d42b79 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/client/HornetQMapMessageTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/HornetQMapMessageTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.jms.client; +package org.apache.activemq6.tests.unit.jms.client; import javax.jms.MessageFormatException; -import org.hornetq.jms.client.HornetQMapMessage; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.jms.client.HornetQMapMessage; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/HornetQStreamMessageTest.java similarity index 99% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/HornetQStreamMessageTest.java index 4442e72966..6e42d50429 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/HornetQStreamMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.jms.client; +package org.apache.activemq6.tests.unit.jms.client; import org.junit.Test; @@ -21,9 +21,9 @@ import javax.jms.MessageFormatException; import org.junit.Assert; -import org.hornetq.jms.client.HornetQStreamMessage; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.jms.client.HornetQStreamMessage; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Jeff Mesnil diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/client/JMSExceptionHelperTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/JMSExceptionHelperTest.java similarity index 86% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/client/JMSExceptionHelperTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/JMSExceptionHelperTest.java index ce8ddd471a..f0045b5331 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/client/JMSExceptionHelperTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/JMSExceptionHelperTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.jms.client; +package org.apache.activemq6.tests.unit.jms.client; -import static org.hornetq.api.core.HornetQExceptionType.CONNECTION_TIMEDOUT; -import static org.hornetq.api.core.HornetQExceptionType.GENERIC_EXCEPTION; -import static org.hornetq.api.core.HornetQExceptionType.INVALID_FILTER_EXPRESSION; +import static org.apache.activemq6.api.core.HornetQExceptionType.CONNECTION_TIMEDOUT; +import static org.apache.activemq6.api.core.HornetQExceptionType.GENERIC_EXCEPTION; +import static org.apache.activemq6.api.core.HornetQExceptionType.INVALID_FILTER_EXPRESSION; import javax.jms.IllegalStateException; import javax.jms.InvalidDestinationException; @@ -22,10 +22,10 @@ import javax.jms.InvalidSelectorException; import javax.jms.JMSException; import javax.jms.JMSSecurityException; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.jms.client.JMSExceptionHelper; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq6.jms.client.JMSExceptionHelper; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/client/SelectorTranslatorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/SelectorTranslatorTest.java similarity index 98% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/client/SelectorTranslatorTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/SelectorTranslatorTest.java index 541d52eeed..8c99abf0b8 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/client/SelectorTranslatorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/SelectorTranslatorTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.jms.client; +package org.apache.activemq6.tests.unit.jms.client; import org.junit.Test; import org.junit.Assert; -import org.hornetq.jms.client.SelectorTranslator; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.jms.client.SelectorTranslator; +import org.apache.activemq6.tests.util.UnitTestCase; /** * diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/misc/ManifestTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/misc/ManifestTest.java similarity index 89% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/misc/ManifestTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/misc/ManifestTest.java index eef8711638..a10a266eea 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/misc/ManifestTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/misc/ManifestTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.jms.misc; +package org.apache.activemq6.tests.unit.jms.misc; import org.junit.Test; @@ -25,11 +25,11 @@ import javax.jms.ConnectionMetaData; import org.junit.Assert; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQConnectionMetaData; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.jms.client.HornetQConnectionMetaData; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Andy Taylor diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java similarity index 94% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java index 2b513a069b..fa8ba599ff 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.jms.referenceable; +package org.apache.activemq6.tests.unit.jms.referenceable; import org.junit.Test; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Jeff Mesnil diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java similarity index 85% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java index f2f34bdde2..368c318023 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.jms.referenceable; +package org.apache.activemq6.tests.unit.jms.referenceable; import org.junit.Test; @@ -18,11 +18,11 @@ import javax.naming.Reference; import org.junit.Assert; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.referenceable.DestinationObjectFactory; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.jms.referenceable.DestinationObjectFactory; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; /** * @author Jeff Mesnil diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/BootstrapContext.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/BootstrapContext.java similarity index 98% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/BootstrapContext.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/BootstrapContext.java index be3a21976e..2dc6b0cc42 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/BootstrapContext.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/BootstrapContext.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.ra; +package org.apache.activemq6.tests.unit.ra; import javax.resource.spi.UnavailableException; import javax.resource.spi.XATerminator; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/ConnectionFactoryPropertiesTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/ConnectionFactoryPropertiesTest.java similarity index 95% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/ConnectionFactoryPropertiesTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/ConnectionFactoryPropertiesTest.java index b5cb28a3ca..c986d4a210 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/ConnectionFactoryPropertiesTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/ConnectionFactoryPropertiesTest.java @@ -12,16 +12,16 @@ */ -package org.hornetq.tests.unit.ra; +package org.apache.activemq6.tests.unit.ra; import java.beans.PropertyDescriptor; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Test; import static java.beans.Introspector.getBeanInfo; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/HornetQResourceAdapterConfigTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/HornetQResourceAdapterConfigTest.java similarity index 97% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/HornetQResourceAdapterConfigTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/HornetQResourceAdapterConfigTest.java index 52b32522ca..3a4538effe 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/HornetQResourceAdapterConfigTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/HornetQResourceAdapterConfigTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.unit.ra; +package org.apache.activemq6.tests.unit.ra; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -21,8 +21,8 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.tests.util.UnitTestCase; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -44,11 +44,11 @@ public class HornetQResourceAdapterConfigTest extends UnitTestCase "\n" + " \n" + " The transport type. Multiple connectors can be configured by using a comma separated list,\n" + - " i.e. org.hornetq.core.remoting.impl.invm.InVMConnectorFactory,org.hornetq.core.remoting.impl.invm.InVMConnectorFactory.\n" + + " i.e. org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory,org.hornetq.core.remoting.impl.invm.InVMConnectorFactory.\n" + " \n" + " ConnectorClassName\n" + " java.lang.String\n" + - " org.hornetq.core.remoting.impl.invm.InVMConnectorFactory\n" + + " org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory\n" + " \n" + " \n" + " The transport configuration. These values must be in the form of key=val;key=val;,\n" + @@ -298,7 +298,7 @@ public class HornetQResourceAdapterConfigTest extends UnitTestCase " \n" + " Add a new managed connection factory\n" + " ManagedConnectionFactory\n" + - " org.hornetq.ra.HornetQRAManagedConnectionFactory\n" + + " org.apache.activemq6.ra.HornetQRAManagedConnectionFactory\n" + " \n" + " " + " \n" + @@ -311,7 +311,7 @@ public class HornetQResourceAdapterConfigTest extends UnitTestCase " The class definition (full qualified name and its properties) used to encrypt the password\n" + " PasswordCodec\n" + " java.lang.String\n" + - " org.hornetq.utils.DefaultSensitiveStringCodec;key=clusterpassword;algorithm=ssss\n" + + " org.apache.activemq6.utils.DefaultSensitiveStringCodec;key=clusterpassword;algorithm=ssss\n" + " " + " " + " Whether the resource adapter must use auto recovery\n" + diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/MessageEndpointFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/MessageEndpointFactory.java similarity index 96% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/MessageEndpointFactory.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/MessageEndpointFactory.java index 45e5e88a26..51022c123d 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/MessageEndpointFactory.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/MessageEndpointFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.ra; +package org.apache.activemq6.tests.unit.ra; import javax.resource.spi.UnavailableException; import javax.resource.spi.endpoint.MessageEndpoint; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/ResourceAdapterTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/ResourceAdapterTest.java similarity index 95% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/ResourceAdapterTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/ResourceAdapterTest.java index ab7616d6d2..03d00787b9 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/ResourceAdapterTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/ResourceAdapterTest.java @@ -10,32 +10,32 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.ra; +package org.apache.activemq6.tests.unit.ra; import javax.jms.Connection; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.DiscoveryGroupConfiguration; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.UDPBroadcastGroupConfiguration; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.ra.ConnectionFactoryProperties; -import org.hornetq.ra.HornetQRAManagedConnectionFactory; -import org.hornetq.ra.HornetQResourceAdapter; -import org.hornetq.ra.inflow.HornetQActivation; -import org.hornetq.ra.inflow.HornetQActivationSpec; -import org.hornetq.tests.util.ServiceTestBase; +import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +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.HornetQJMSClient; +import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq6.ra.ConnectionFactoryProperties; +import org.apache.activemq6.ra.HornetQRAManagedConnectionFactory; +import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq6.ra.inflow.HornetQActivation; +import org.apache.activemq6.ra.inflow.HornetQActivationSpec; +import org.apache.activemq6.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; @@ -474,7 +474,7 @@ public class ResourceAdapterTest extends ServiceTestBase ra.setPassword("passwordGlobal"); ra.setTransactionManagerLocatorClass(""); ra.setTransactionManagerLocatorMethod(""); - ra.start(new org.hornetq.tests.unit.ra.BootstrapContext()); + ra.start(new org.apache.activemq6.tests.unit.ra.BootstrapContext()); Connection conn = ra.getDefaultHornetQConnectionFactory().createConnection(); @@ -530,7 +530,7 @@ public class ResourceAdapterTest extends ServiceTestBase ra.setPassword("badPassword"); ra.setTransactionManagerLocatorClass(""); ra.setTransactionManagerLocatorMethod(""); - ra.start(new org.hornetq.tests.unit.ra.BootstrapContext()); + ra.start(new org.apache.activemq6.tests.unit.ra.BootstrapContext()); HornetQActivationSpec spec = new HornetQActivationSpec(); diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/FakePagingManager.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/FakePagingManager.java similarity index 82% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/FakePagingManager.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/FakePagingManager.java index 9763e39198..1632c10c4f 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/FakePagingManager.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/FakePagingManager.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; import java.util.Collection; import java.util.Map; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.paging.PageTransactionInfo; -import org.hornetq.core.paging.PagingManager; -import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.ServerMessage; +import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq6.core.paging.PageTransactionInfo; +import org.apache.activemq6.core.paging.PagingManager; +import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq6.core.postoffice.PostOffice; +import org.apache.activemq6.core.server.ServerMessage; public final class FakePagingManager implements PagingManager { @@ -137,7 +137,7 @@ public final class FakePagingManager implements PagingManager /* * (non-Javadoc) - * @see org.hornetq.core.paging.PagingManager#isGlobalFull() + * @see org.apache.activemq6.core.paging.PagingManager#isGlobalFull() */ public boolean isGlobalFull() { @@ -146,7 +146,7 @@ public final class FakePagingManager implements PagingManager /* * (non-Javadoc) - * @see org.hornetq.core.paging.PagingManager#getTransactions() + * @see org.apache.activemq6.core.paging.PagingManager#getTransactions() */ public Map getTransactions() { @@ -155,7 +155,7 @@ public final class FakePagingManager implements PagingManager /* * (non-Javadoc) - * @see org.hornetq.core.paging.PagingManager#processReload() + * @see org.apache.activemq6.core.paging.PagingManager#processReload() */ public void processReload() { @@ -173,7 +173,7 @@ public final class FakePagingManager implements PagingManager /* * (non-Javadoc) - * @see org.hornetq.core.settings.HierarchicalRepositoryChangeListener#onChange() + * @see org.apache.activemq6.core.settings.HierarchicalRepositoryChangeListener#onChange() */ public void onChange() { diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/HornetQBufferInputStreamTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/HornetQBufferInputStreamTest.java similarity index 86% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/HornetQBufferInputStreamTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/HornetQBufferInputStreamTest.java index fe929686f9..d845f2513c 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/HornetQBufferInputStreamTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/HornetQBufferInputStreamTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.HornetQBufferInputStream; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.HornetQBufferInputStream; import org.junit.Test; /** diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMContext.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMContext.java similarity index 97% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMContext.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMContext.java index 81df107ab9..48497aa78e 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMContext.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMContext.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; import java.io.Serializable; import java.util.ArrayList; @@ -33,7 +33,7 @@ import javax.naming.NamingException; import javax.naming.RefAddr; import javax.naming.Reference; -import org.hornetq.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.unit.UnitTestLogger; /** * @author Ovidiu Feodorov @@ -272,7 +272,7 @@ public class InVMContext implements Context, Serializable public Hashtable getEnvironment() throws NamingException { Hashtable env = new Hashtable(); - env.put("java.naming.factory.initial", "org.hornetq.jms.tests.tools.container.InVMInitialContextFactory"); + env.put("java.naming.factory.initial", "org.apache.activemq6.jms.tests.tools.container.InVMInitialContextFactory"); env.put("java.naming.provider.url", "org.jboss.naming:org.jnp.interface"); return env; } diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMNameParser.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMNameParser.java similarity index 97% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMNameParser.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMNameParser.java index 9608f53acc..50974e9f21 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMNameParser.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMNameParser.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; import java.io.Serializable; import java.util.Properties; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMNamingContext.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMNamingContext.java similarity index 97% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMNamingContext.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMNamingContext.java index 065a03fa87..574fa25bb1 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMNamingContext.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMNamingContext.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; import java.io.Serializable; import java.util.ArrayList; @@ -33,7 +33,7 @@ import javax.naming.NamingException; import javax.naming.RefAddr; import javax.naming.Reference; -import org.hornetq.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.unit.UnitTestLogger; /** * @author Ovidiu Feodorov @@ -271,7 +271,7 @@ public class InVMNamingContext implements Context, Serializable public Hashtable getEnvironment() throws NamingException { Hashtable env = new Hashtable(); - env.put("java.naming.factory.initial", "org.hornetq.jms.tests.tools.container.InVMInitialContextFactory"); + env.put("java.naming.factory.initial", "org.apache.activemq6.jms.tests.tools.container.InVMInitialContextFactory"); env.put("java.naming.provider.url", "org.jboss.naming:org.jnp.interface"); return env; } diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/LinkedListTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/LinkedListTest.java similarity index 99% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/LinkedListTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/LinkedListTest.java index 0d9ec817bb..5fa548565c 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/LinkedListTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/LinkedListTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; import java.lang.ref.WeakReference; import java.util.LinkedList; @@ -18,9 +18,9 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.LinkedListImpl; -import org.hornetq.utils.LinkedListIterator; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.LinkedListImpl; +import org.apache.activemq6.utils.LinkedListIterator; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/MemorySizeTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/MemorySizeTest.java similarity index 82% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/MemorySizeTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/MemorySizeTest.java index d9c742c9f3..1be847618d 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/MemorySizeTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/MemorySizeTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; import org.junit.Test; import org.junit.Assert; -import org.hornetq.core.server.impl.MessageReferenceImpl; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.utils.MemorySize; +import org.apache.activemq6.core.server.impl.MessageReferenceImpl; +import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.utils.MemorySize; /** * A MemorySizeTest diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/NonSerializableFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/NonSerializableFactory.java similarity index 98% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/NonSerializableFactory.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/NonSerializableFactory.java index 1e435bce38..dcc5522cd9 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/NonSerializableFactory.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/NonSerializableFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; import javax.naming.Context; import javax.naming.Name; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java similarity index 95% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java index 1719554f0d..d6c84e2ef1 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; import org.junit.Test; @@ -33,8 +33,8 @@ import java.util.StringTokenizer; import org.junit.Assert; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.ObjectInputStreamWithClassLoader; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.ObjectInputStreamWithClassLoader; /** * @author Jeff Mesnil @@ -96,7 +96,7 @@ public class ObjectInputStreamWithClassLoaderTest extends UnitTestCase Thread.currentThread().setContextClassLoader(testClassLoader); ByteArrayInputStream bais = new ByteArrayInputStream(bytes); - org.hornetq.utils.ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(bais); + org.apache.activemq6.utils.ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(bais); Object deserializedObj = ois.readObject(); @@ -132,7 +132,7 @@ public class ObjectInputStreamWithClassLoaderTest extends UnitTestCase .newClassLoader(this.getClass()); Thread.currentThread().setContextClassLoader(testClassLoader); ByteArrayInputStream bais = new ByteArrayInputStream(bytes); - org.hornetq.utils.ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader( + org.apache.activemq6.utils.ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader( bais); Runnable toRun = (Runnable) testClassLoader.loadClass( diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/ReusableLatchTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/ReusableLatchTest.java similarity index 97% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/ReusableLatchTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/ReusableLatchTest.java index f2c070e764..9ae78ba390 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/ReusableLatchTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/ReusableLatchTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; import java.util.concurrent.CountDownLatch; -import org.hornetq.tests.unit.UnitTestLogger; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.ReusableLatch; +import org.apache.activemq6.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.ReusableLatch; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/SoftValueMapTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/SoftValueMapTest.java similarity index 94% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/SoftValueMapTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/SoftValueMapTest.java index da8b4cdd83..fa44203821 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/SoftValueMapTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/SoftValueMapTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.SoftValueHashMap; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.SoftValueHashMap; import org.junit.Test; /** @@ -134,7 +134,7 @@ public class SoftValueMapTest extends UnitTestCase } /* (non-Javadoc) - * @see org.hornetq.utils.SoftValueHashMap.ValueCache#isLive() + * @see org.apache.activemq6.utils.SoftValueHashMap.ValueCache#isLive() */ public boolean isLive() { diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/UTF8Test.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UTF8Test.java similarity index 92% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/UTF8Test.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UTF8Test.java index 9f7b069ce7..f6e507fa10 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/UTF8Test.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UTF8Test.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; import org.junit.After; import org.junit.Test; @@ -23,13 +23,13 @@ import java.nio.ByteBuffer; import org.junit.Assert; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.DataConstants; -import org.hornetq.utils.Random; -import org.hornetq.utils.UTF8Util; +import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq6.utils.Random; +import org.apache.activemq6.utils.UTF8Util; /** * A UTF8Test diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/UUIDGeneratorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UUIDGeneratorTest.java similarity index 95% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/UUIDGeneratorTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UUIDGeneratorTest.java index 25399f1fb4..5fcfdb317f 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/UUIDGeneratorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UUIDGeneratorTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.UUIDGenerator; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/UUIDTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UUIDTest.java similarity index 91% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/UUIDTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UUIDTest.java index 1b7b4bc46a..f43c789f5f 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/UUIDTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UUIDTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; import org.junit.Test; @@ -19,9 +19,9 @@ import java.util.Set; import org.junit.Assert; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.UUID; -import org.hornetq.utils.UUIDGenerator; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.UUID; +import org.apache.activemq6.utils.UUIDGenerator; /** * @author Jeff Mesnil diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/VersionLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/VersionLoaderTest.java similarity index 93% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/VersionLoaderTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/VersionLoaderTest.java index 16e9270318..c27d7b8200 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/VersionLoaderTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/VersionLoaderTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.unit.util; +package org.apache.activemq6.tests.unit.util; import java.util.Properties; import java.util.StringTokenizer; -import org.hornetq.core.version.Version; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.VersionLoader; +import org.apache.activemq6.core.version.Version; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq6.utils.VersionLoader; import org.junit.Assert; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/xa/XAResourceWrapperTest.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/xa/XAResourceWrapperTest.java similarity index 86% rename from tests/unit-tests/src/test/java/org/hornetq/tests/unit/xa/XAResourceWrapperTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/xa/XAResourceWrapperTest.java index 4f61edd304..1de2e279a8 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/unit/xa/XAResourceWrapperTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/xa/XAResourceWrapperTest.java @@ -11,13 +11,13 @@ * permissions and limitations under the License. */ -package org.hornetq.tests.unit.xa; +package org.apache.activemq6.tests.unit.xa; import javax.transaction.xa.XAResource; -import org.hornetq.ra.HornetQRAXAResource; -import org.hornetq.ra.HornetQXAResourceWrapper; -import org.hornetq.tests.util.UnitTestCase; +import org.apache.activemq6.ra.HornetQRAXAResource; +import org.apache.activemq6.ra.HornetQXAResourceWrapper; +import org.apache.activemq6.tests.util.UnitTestCase; import org.jboss.tm.XAResourceWrapper; import org.junit.Test; diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/util/CreateMessage.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/util/CreateMessage.java similarity index 89% rename from tests/unit-tests/src/test/java/org/hornetq/tests/util/CreateMessage.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/util/CreateMessage.java index fb85299aff..bbdb669278 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/util/CreateMessage.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/util/CreateMessage.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.util; +package org.apache.activemq6.tests.util; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.jms.client.HornetQBytesMessage; -import org.hornetq.jms.client.HornetQTextMessage; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.jms.client.HornetQBytesMessage; +import org.apache.activemq6.jms.client.HornetQTextMessage; public final class CreateMessage { diff --git a/tests/unit-tests/src/test/java/org/hornetq/tests/util/SpawnedVMSupport.java b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/util/SpawnedVMSupport.java similarity index 98% rename from tests/unit-tests/src/test/java/org/hornetq/tests/util/SpawnedVMSupport.java rename to tests/unit-tests/src/test/java/org/apache/activemq6/tests/util/SpawnedVMSupport.java index e5631b5983..5755efd278 100644 --- a/tests/unit-tests/src/test/java/org/hornetq/tests/util/SpawnedVMSupport.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq6/tests/util/SpawnedVMSupport.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.tests.util; +package org.apache.activemq6.tests.util; import java.io.BufferedReader; import java.io.IOException; @@ -24,7 +24,7 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeoutException; -import org.hornetq.tests.unit.UnitTestLogger; +import org.apache.activemq6.tests.unit.UnitTestLogger; import org.junit.Assert; import static java.util.concurrent.TimeUnit.SECONDS;