http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 008ad69..5b1eff0 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ do this with Eclipse Juno (4.2). The current recommended solution for Eclipse Kepler is to mark `javacc-maven-plugin` as ignored by Eclipse, run Maven from the -command line and then modify the project `activemq6-core-client` adding +command line and then modify the project `activemq-core-client` adding the folder `target/generated-sources/javacc` to its build path. [m2e connector for javacc-maven-plugin]: https://github.com/objectledge/maven-extensions @@ -189,7 +189,7 @@ To setup repositories for reviewing and pushing: # Clone the GitHub Mirror of ActiveMQ6 Repo: git clone [email protected]:apache/activemq-6.git - # Add the following section to your <activemq6 repo>/.git/config statement to fetch all pull requests sent to the GitHub mirror. Note that the remote name for [email protected]:apache/activemq-6.git may be different. Be sure to edit all references to the remote name. In this case "activemq". + # Add the following section to your <activemq repo>/.git/config statement to fetch all pull requests sent to the GitHub mirror. Note that the remote name for [email protected]:apache/activemq-6.git may be different. Be sure to edit all references to the remote name. In this case "activemq". [remote "origin"] url = [email protected]:apache/activemq-6.git fetch = +refs/heads/*:refs/remotes/origin/* @@ -206,7 +206,7 @@ To setup repositories for reviewing and pushing: To push commits from a pull request to the apache repository: ``` - cd <activemq6 repo> + cd <activemq repo> # Download all the remote branches etc... including all the pull requests. git fetch --all
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/pom.xml b/activemq-bootstrap/pom.xml index ce48154..f883de3 100644 --- a/activemq-bootstrap/pom.xml +++ b/activemq-bootstrap/pom.xml @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-pom</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pom</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-bootstrap</artifactId> + <artifactId>activemq-bootstrap</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 Bootstrap</name> @@ -18,18 +18,18 @@ <dependencies> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-dto</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-dto</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ConfigurationException.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ConfigurationException.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ConfigurationException.java index c4b39ea..ff0ae9e 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ConfigurationException.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ConfigurationException.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.cli; +package org.apache.activemq.cli; public class ConfigurationException extends Exception { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java index e1f102e..6f53eb5 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.cli; +package org.apache.activemq.cli; import io.airlift.command.Cli; import io.airlift.command.ParseArgumentsUnexpectedException; -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 org.apache.activemq.cli.commands.Action; +import org.apache.activemq.cli.commands.ActionContext; +import org.apache.activemq.cli.commands.HelpAction; +import org.apache.activemq.cli.commands.Run; +import org.apache.activemq.cli.commands.Stop; import java.io.InputStream; import java.io.OutputStream; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Action.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Action.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Action.java index 48dc98b..f294e68 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Action.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/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.apache.activemq6.cli.commands; +package org.apache.activemq.cli.commands; public interface Action { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/ActionContext.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/ActionContext.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/ActionContext.java index abc7f9c..ef42269 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/ActionContext.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/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.apache.activemq6.cli.commands; +package org.apache.activemq.cli.commands; import java.io.InputStream; import java.io.PrintStream; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/HelpAction.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/HelpAction.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/HelpAction.java index f6a79c3..df13a1b 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/HelpAction.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/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.apache.activemq6.cli.commands; +package org.apache.activemq.cli.commands; import io.airlift.command.Help; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java index d838aef..8aa0c0f 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/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.apache.activemq6.cli.commands; +package org.apache.activemq.cli.commands; import io.airlift.command.Arguments; import io.airlift.command.Command; -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 org.apache.activemq.cli.HornetQ; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.dto.BrokerDTO; +import org.apache.activemq.factory.BrokerFactory; +import org.apache.activemq.factory.CoreFactory; +import org.apache.activemq.factory.JmsFactory; +import org.apache.activemq.factory.SecurityManagerFactory; +import org.apache.activemq.integration.bootstrap.HornetQBootstrapLogger; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.config.JMSConfiguration; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.jms.server.impl.StandaloneNamingServer; +import org.apache.activemq.spi.core.security.HornetQSecurityManager; import javax.management.MBeanServer; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java index 684f37a..19a7226 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/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.apache.activemq6.cli.commands; +package org.apache.activemq.cli.commands; import io.airlift.command.Arguments; import io.airlift.command.Command; -import org.apache.activemq6.dto.BrokerDTO; -import org.apache.activemq6.factory.BrokerFactory; +import org.apache.activemq.dto.BrokerDTO; +import org.apache.activemq.factory.BrokerFactory; import java.io.File; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java index b713e42..3e5c86e 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.factory; +package org.apache.activemq.factory; -import org.apache.activemq6.cli.ConfigurationException; -import org.apache.activemq6.dto.BrokerDTO; -import org.apache.activemq6.utils.FactoryFinder; +import org.apache.activemq.cli.ConfigurationException; +import org.apache.activemq.dto.BrokerDTO; +import org.apache.activemq.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.apache.activemq6/broker/"); + FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq/broker/"); factory = (BrokerFactoryHandler)finder.newInstance(configURI.getScheme()); } catch (IOException ioe ) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactoryHandler.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactoryHandler.java index ff107ef..cd52a1e 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactoryHandler.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactoryHandler.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.factory; +package org.apache.activemq.factory; -import org.apache.activemq6.dto.BrokerDTO; +import org.apache.activemq.dto.BrokerDTO; import java.net.URI; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java index 0a8f613..942c79a 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.factory; +package org.apache.activemq.factory; -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 org.apache.activemq.cli.ConfigurationException; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.impl.ConfigurationImpl; +import org.apache.activemq.dto.CoreDTO; +import org.apache.activemq.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.apache.activemq6/broker/core/"); + FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq/broker/core/"); factory = (CoreFactoryHandler)finder.newInstance(configURI.getScheme()); } catch (IOException ioe ) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java index 0f5dccf..6a9638b 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.factory; +package org.apache.activemq.factory; -import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq.core.config.Configuration; import java.net.URI; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java index 5f693b1..1d75266 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.factory; +package org.apache.activemq.factory; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.impl.FileConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.impl.FileConfiguration; import java.net.URI; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java index 57cf1a1..7df44d8 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.factory; +package org.apache.activemq.factory; -import org.apache.activemq6.jms.server.config.JMSConfiguration; -import org.apache.activemq6.jms.server.impl.JMSServerConfigParserImpl; +import org.apache.activemq.jms.server.config.JMSConfiguration; +import org.apache.activemq.jms.server.impl.JMSServerConfigParserImpl; import java.io.FileInputStream; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java index 0d97ddf..35fd6f2 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.factory; +package org.apache.activemq.factory; import java.io.IOException; import java.net.URI; -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; +import org.apache.activemq.cli.ConfigurationException; +import org.apache.activemq.dto.JmsDTO; +import org.apache.activemq.jms.server.config.JMSConfiguration; +import org.apache.activemq.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.apache.activemq6/broker/jms/"); + FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq/broker/jms/"); factory = (JmsFactoryHandler)finder.newInstance(configURI.getScheme()); } catch (IOException ioe ) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java index b5772cc..169e8d5 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.factory; +package org.apache.activemq.factory; -import org.apache.activemq6.jms.server.config.JMSConfiguration; +import org.apache.activemq.jms.server.config.JMSConfiguration; import java.net.URI; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java index 0138670..b0a7dfb 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.factory; +package org.apache.activemq.factory; -import org.apache.activemq6.dto.SecurityDTO; -import org.apache.activemq6.spi.core.security.HornetQSecurityManager; -import org.apache.activemq6.utils.FactoryFinder; +import org.apache.activemq.dto.SecurityDTO; +import org.apache.activemq.spi.core.security.HornetQSecurityManager; +import org.apache.activemq.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.apache.activemq6/security/"); + FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq/security/"); HornetQSecurityManager manager = (HornetQSecurityManager)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name()); return manager; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/factory/XmlBrokerFactoryHandler.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/XmlBrokerFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/XmlBrokerFactoryHandler.java index 2512c68..7c776b0 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/XmlBrokerFactoryHandler.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/XmlBrokerFactoryHandler.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.factory; +package org.apache.activemq.factory; -import org.apache.activemq6.cli.ConfigurationException; -import org.apache.activemq6.dto.BrokerDTO; -import org.apache.activemq6.dto.XmlUtil; +import org.apache.activemq.cli.ConfigurationException; +import org.apache.activemq.dto.BrokerDTO; +import org.apache.activemq.dto.XmlUtil; import java.io.File; import java.net.URI; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapBundle.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapBundle.java b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapBundle.java index cab0b18..8ccdfff 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapBundle.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/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.apache.activemq6.integration.bootstrap; +package org.apache.activemq.integration.bootstrap; import org.jboss.logging.annotations.MessageBundle; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java index e862ba2..0ee6e60 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.integration.bootstrap; +package org.apache.activemq.integration.bootstrap; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file index f1d0e42..ed2fd5d 100644 --- a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file +++ b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file @@ -10,4 +10,4 @@ ## implied. See the License for the specific language governing ## permissions and limitations under the License. ## --------------------------------------------------------------------------- -class=org.apache.activemq6.factory.FileCoreFactoryHandler \ No newline at end of file +class=org.apache.activemq.factory.FileCoreFactoryHandler \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file index 6786ee0..8e0c789 100644 --- a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file +++ b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file @@ -10,4 +10,4 @@ ## implied. See the License for the specific language governing ## permissions and limitations under the License. ## --------------------------------------------------------------------------- -class=org.apache.activemq6.factory.FileJmsFactoryHandler \ No newline at end of file +class=org.apache.activemq.factory.FileJmsFactoryHandler \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/xml ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/xml b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/xml index af6443d..599f07e 100644 --- a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/xml +++ b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/xml @@ -10,4 +10,4 @@ ## implied. See the License for the specific language governing ## permissions and limitations under the License. ## --------------------------------------------------------------------------- -class=org.apache.activemq6.factory.XmlBrokerFactoryHandler \ No newline at end of file +class=org.apache.activemq.factory.XmlBrokerFactoryHandler \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-commons/pom.xml b/activemq-commons/pom.xml index 8b7651b..656b0f6 100644 --- a/activemq-commons/pom.xml +++ b/activemq-commons/pom.xml @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-pom</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pom</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-commons</artifactId> + <artifactId>activemq-commons</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 Commons</name> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressExistsException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressExistsException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressExistsException.java index 16154cd..bbf3da7 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressExistsException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressExistsException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.ADDRESS_EXISTS; +import static org.apache.activemq.api.core.HornetQExceptionType.ADDRESS_EXISTS; /** * An operation failed because an address exists on the server. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressFullException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressFullException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressFullException.java index e3c1a63..7045541 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressFullException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressFullException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.ADDRESS_FULL; +import static org.apache.activemq.api.core.HornetQExceptionType.ADDRESS_FULL; /** * An address is full. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAlreadyReplicatingException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAlreadyReplicatingException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAlreadyReplicatingException.java index a2a60bf..2d0731f 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAlreadyReplicatingException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAlreadyReplicatingException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.ALREADY_REPLICATING; +import static org.apache.activemq.api.core.HornetQExceptionType.ALREADY_REPLICATING; /** * The server is already paired with a replicating backup. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffer.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffer.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffer.java index 97fd810..82cc0fa 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffer.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffer.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; import java.nio.ByteBuffer; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffers.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffers.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffers.java index 18e3a6c..10af850 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffers.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffers.java @@ -11,12 +11,12 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; import java.nio.ByteBuffer; import io.netty.buffer.Unpooled; -import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper; /** * Factory class to create instances of {@link HornetQBuffer}. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQClusterSecurityException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQClusterSecurityException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQClusterSecurityException.java index b75957a..a4730a9 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQClusterSecurityException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQClusterSecurityException.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; /** * Security exception thrown when the cluster user fails authentication. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQConnectionTimedOutException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQConnectionTimedOutException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQConnectionTimedOutException.java index ff440da..c2b0cd0 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQConnectionTimedOutException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQConnectionTimedOutException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.CONNECTION_TIMEDOUT; +import static org.apache.activemq.api.core.HornetQExceptionType.CONNECTION_TIMEDOUT; /** * A client timed out will connecting to HornetQ server. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDisconnectedException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDisconnectedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDisconnectedException.java index 6c7d6d2..3c8668a 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDisconnectedException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDisconnectedException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.DISCONNECTED; +import static org.apache.activemq.api.core.HornetQExceptionType.DISCONNECTED; /** * A client was disconnected from HornetQ server when the server has shut down. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateIdException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateIdException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateIdException.java index f4cc95d..0692319 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateIdException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateIdException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.DUPLICATE_ID_REJECTED; +import static org.apache.activemq.api.core.HornetQExceptionType.DUPLICATE_ID_REJECTED; /** * A DuplicateID was rejected. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateMetaDataException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateMetaDataException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateMetaDataException.java index d1bdd83..7d7be30 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateMetaDataException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateMetaDataException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.DUPLICATE_METADATA; +import static org.apache.activemq.api.core.HornetQExceptionType.DUPLICATE_METADATA; /** * A Session Metadata was set in duplication http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQException.java index ec93477..6a738de 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/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.apache.activemq6.api.core; +package org.apache.activemq.api.core; /** * HornetQException is the root exception for the HornetQ API. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQExceptionType.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQExceptionType.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQExceptionType.java index c30890d..c0adf65 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQExceptionType.java +++ b/activemq-commons/src/main/java/org/apache/activemq/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.apache.activemq6.api.core; +package org.apache.activemq.api.core; import java.util.Collections; import java.util.EnumSet; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIOErrorException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIOErrorException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIOErrorException.java index c68da1a..88a206f 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIOErrorException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIOErrorException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.IO_ERROR; +import static org.apache.activemq.api.core.HornetQExceptionType.IO_ERROR; /** * Unexpected I/O error occurred on the server. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIllegalStateException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIllegalStateException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIllegalStateException.java index 570a9d2..07f5332 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIllegalStateException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIllegalStateException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.ILLEGAL_STATE; +import static org.apache.activemq.api.core.HornetQExceptionType.ILLEGAL_STATE; /** * A HornetQ resource is not in a legal state (e.g. calling ClientConsumer.receive() if a http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIncompatibleClientServerException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIncompatibleClientServerException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIncompatibleClientServerException.java index 087c341..42b864a 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIncompatibleClientServerException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIncompatibleClientServerException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS; +import static org.apache.activemq.api.core.HornetQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS; /** * The server version and the client version are incompatible. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterceptorRejectedPacketException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterceptorRejectedPacketException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterceptorRejectedPacketException.java index c62544e..19a6961 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterceptorRejectedPacketException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterceptorRejectedPacketException.java @@ -11,13 +11,13 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.INTERCEPTOR_REJECTED_PACKET; +import static org.apache.activemq.api.core.HornetQExceptionType.INTERCEPTOR_REJECTED_PACKET; /** * An outgoing interceptor returned false. - * @see org.apache.activemq6.api.core.client.ServerLocator#addOutgoingInterceptor(org.apache.activemq6.api.core.Interceptor) + * @see org.apache.activemq.api.core.client.ServerLocator#addOutgoingInterceptor(org.apache.activemq.api.core.Interceptor) * @author Justin Bertram */ // XXX I doubt any reader will make much sense of this Javadoc's text. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInternalErrorException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInternalErrorException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInternalErrorException.java index d52a5ff..a77f6bb 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInternalErrorException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInternalErrorException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.INTERNAL_ERROR; +import static org.apache.activemq.api.core.HornetQExceptionType.INTERNAL_ERROR; /** * Internal error which prevented HornetQ from performing an important operation. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterruptedException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterruptedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterruptedException.java index c6575cf..aef8fcf 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterruptedException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/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.apache.activemq6.api.core; +package org.apache.activemq.api.core; /** * When an interruption happens, we will just throw a non-checked exception. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidFilterExpressionException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidFilterExpressionException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidFilterExpressionException.java index fd8d44b..447c95d 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidFilterExpressionException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidFilterExpressionException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.INVALID_FILTER_EXPRESSION; +import static org.apache.activemq.api.core.HornetQExceptionType.INVALID_FILTER_EXPRESSION; /** * A filter expression was found to be invalid. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidTransientQueueUseException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidTransientQueueUseException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidTransientQueueUseException.java index 44c474a..653c6f2 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidTransientQueueUseException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidTransientQueueUseException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.INVALID_TRANSIENT_QUEUE_USE; +import static org.apache.activemq.api.core.HornetQExceptionType.INVALID_TRANSIENT_QUEUE_USE; /** * An operation failed because a queue exists on the server. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageException.java index 6735403..f5f4490 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.LARGE_MESSAGE_ERROR_BODY; +import static org.apache.activemq.api.core.HornetQExceptionType.LARGE_MESSAGE_ERROR_BODY; /** * A problem occurred while manipulating the body of a large message. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageInterruptedException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageInterruptedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageInterruptedException.java index 0c8334b..db0b4da 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageInterruptedException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageInterruptedException.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.LARGE_MESSAGE_INTERRUPTED; +import static org.apache.activemq.api.core.HornetQExceptionType.LARGE_MESSAGE_INTERRUPTED; /** * @author Clebert http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNativeIOError.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNativeIOError.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNativeIOError.java index eb821a2..1e6f445 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNativeIOError.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNativeIOError.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNonExistentQueueException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNonExistentQueueException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNonExistentQueueException.java index 2b33353..83f7c98 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNonExistentQueueException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNonExistentQueueException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.QUEUE_DOES_NOT_EXIST; +import static org.apache.activemq.api.core.HornetQExceptionType.QUEUE_DOES_NOT_EXIST; /** * An operation failed because a queue does not exist on the server. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNotConnectedException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNotConnectedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNotConnectedException.java index ededf30..efd6c49 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNotConnectedException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNotConnectedException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.NOT_CONNECTED; +import static org.apache.activemq.api.core.HornetQExceptionType.NOT_CONNECTED; /** * A client is not able to connect to HornetQ server. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQObjectClosedException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQObjectClosedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQObjectClosedException.java index 3923cdb..84d9169 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQObjectClosedException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQObjectClosedException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.OBJECT_CLOSED; +import static org.apache.activemq.api.core.HornetQExceptionType.OBJECT_CLOSED; /** * A client operation failed because the calling resource (ClientSession, ClientProducer, etc.) is http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQPropertyConversionException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQPropertyConversionException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQPropertyConversionException.java index 320489d..1ba8107 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQPropertyConversionException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/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.apache.activemq6.api.core; +package org.apache.activemq.api.core; /** - * A PropertyConversionException is thrown by {@code org.apache.activemq6.api.core.Message} methods when a + * A PropertyConversionException is thrown by {@code org.apache.activemq.api.core.Message} methods when a * property can not be converted to the expected type. * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> - * @see org.apache.activemq6.api.core.Message + * @see org.apache.activemq.api.core.Message */ public final class HornetQPropertyConversionException extends RuntimeException { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQQueueExistsException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQQueueExistsException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQQueueExistsException.java index 8dc26f4..2c5c65d 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQQueueExistsException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQQueueExistsException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.QUEUE_EXISTS; +import static org.apache.activemq.api.core.HornetQExceptionType.QUEUE_EXISTS; /** * An operation failed because a queue exists on the server. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSecurityException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSecurityException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSecurityException.java index f5f46f3..17e3a62 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSecurityException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSecurityException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.SECURITY_EXCEPTION; +import static org.apache.activemq.api.core.HornetQExceptionType.SECURITY_EXCEPTION; /** * A security problem occurred (authentication issues, permission issues,...) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSessionCreationException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSessionCreationException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSessionCreationException.java index b2191a8..15db001 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSessionCreationException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSessionCreationException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.SESSION_CREATION_REJECTED; +import static org.apache.activemq.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 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionOutcomeUnknownException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionOutcomeUnknownException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionOutcomeUnknownException.java index c3f5585..4817afc 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionOutcomeUnknownException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionOutcomeUnknownException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.TRANSACTION_OUTCOME_UNKNOWN; +import static org.apache.activemq.api.core.HornetQExceptionType.TRANSACTION_OUTCOME_UNKNOWN; /** * The outcome of a transaction is unknown. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionRolledBackException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionRolledBackException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionRolledBackException.java index d568780..19bd17f 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionRolledBackException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionRolledBackException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.TRANSACTION_ROLLED_BACK; +import static org.apache.activemq.api.core.HornetQExceptionType.TRANSACTION_ROLLED_BACK; /** * A transaction was rolled back. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnBlockedException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnBlockedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnBlockedException.java index f8ff6f7..13de034 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnBlockedException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnBlockedException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.UNBLOCKED; +import static org.apache.activemq.api.core.HornetQExceptionType.UNBLOCKED; /** * A blocking call from a client was unblocked during failover. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnsupportedPacketException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnsupportedPacketException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnsupportedPacketException.java index 7544832..38303a1 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnsupportedPacketException.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnsupportedPacketException.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; -import static org.apache.activemq6.api.core.HornetQExceptionType.UNSUPPORTED_PACKET; +import static org.apache.activemq.api.core.HornetQExceptionType.UNSUPPORTED_PACKET; /** * A packet of unsupported type was received by HornetQ PacketHandler. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/Pair.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/Pair.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/Pair.java index 74b3804..a5a3504 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/Pair.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/Pair.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/api/core/SimpleString.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/SimpleString.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/SimpleString.java index 1c62423..e1740e8 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/SimpleString.java +++ b/activemq-commons/src/main/java/org/apache/activemq/api/core/SimpleString.java @@ -11,13 +11,13 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.api.core; +package org.apache.activemq.api.core; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.utils.DataConstants; /** * A simple String class that can store all characters, and stores as simple {@code byte[]}, this http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java b/activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java index 8f7336c..0837113 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java +++ b/activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java @@ -11,16 +11,16 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.buffers.impl; +package org.apache.activemq.core.buffers.impl; import java.nio.ByteBuffer; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -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; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.utils.UTF8Util; /** * A ChannelBufferWrapper http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/core/server/HornetQComponent.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/core/server/HornetQComponent.java b/activemq-commons/src/main/java/org/apache/activemq/core/server/HornetQComponent.java index f00073f..5633bb6 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/core/server/HornetQComponent.java +++ b/activemq-commons/src/main/java/org/apache/activemq/core/server/HornetQComponent.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.server; +package org.apache.activemq.core.server; /** * A HornetQComponent http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/Base64.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/Base64.java b/activemq-commons/src/main/java/org/apache/activemq/utils/Base64.java index 766e34c..28e5979 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/Base64.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/Base64.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/ByteUtil.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ByteUtil.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ByteUtil.java index 4dee08b..3700592 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/ByteUtil.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/ByteUtil.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/ClassloadingUtil.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ClassloadingUtil.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ClassloadingUtil.java index 6390663..dffb37f 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/ClassloadingUtil.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/ClassloadingUtil.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.net.URL; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentHashSet.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentHashSet.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentHashSet.java index 742b710..bfc470f 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentHashSet.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentHashSet.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.util.AbstractSet; import java.util.Iterator; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentSet.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentSet.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentSet.java index dab80ac..56e5ca6 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentSet.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentSet.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.util.Set; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/DataConstants.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/DataConstants.java b/activemq-commons/src/main/java/org/apache/activemq/utils/DataConstants.java index 790f219..f2d2193 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/DataConstants.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/DataConstants.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/DefaultSensitiveStringCodec.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/DefaultSensitiveStringCodec.java b/activemq-commons/src/main/java/org/apache/activemq/utils/DefaultSensitiveStringCodec.java index d7d0326..532c6c5 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/DefaultSensitiveStringCodec.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/DefaultSensitiveStringCodec.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.math.BigInteger; import java.security.InvalidKeyException; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/FactoryFinder.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/FactoryFinder.java b/activemq-commons/src/main/java/org/apache/activemq/utils/FactoryFinder.java index 0773d38..8d14dc5 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/FactoryFinder.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/FactoryFinder.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.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.apache.activemq6.utils.FactoryFinder#setObjectFactory(org.apache.activemq6.utils.FactoryFinder.ObjectFactory)} + * {@link org.apache.activemq.utils.FactoryFinder#setObjectFactory(org.apache.activemq.utils.FactoryFinder.ObjectFactory)} * method with a custom implementation of ObjectFactory. * <p/> * The default ObjectFactory is typically changed out when running in a specialized container http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQThreadFactory.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQThreadFactory.java b/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQThreadFactory.java index 68341d3..f9a42df 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQThreadFactory.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQThreadFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.security.AccessController; import java.security.PrivilegedAction; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilBundle.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilBundle.java b/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilBundle.java index 42fc4c6..28f89df 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilBundle.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilBundle.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; -import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq.api.core.HornetQIllegalStateException; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilLogger.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilLogger.java b/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilLogger.java index 5149f2a..8d711a6 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilLogger.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilLogger.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java b/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java index c6b5052..880536b 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.HashMap; import java.util.Map; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; /** * A PasswordMarkingUtil http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounter.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounter.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounter.java index bbf887f..afd286d 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounter.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounter.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; /** * @author Clebert Suconic http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounterUtil.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounterUtil.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounterUtil.java index eed841a..5d8aa62 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounterUtil.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounterUtil.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/ReusableLatch.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ReusableLatch.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ReusableLatch.java index deecfd1..b1b4b12 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/ReusableLatch.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/ReusableLatch.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.AbstractQueuedSynchronizer; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/SensitiveDataCodec.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/SensitiveDataCodec.java b/activemq-commons/src/main/java/org/apache/activemq/utils/SensitiveDataCodec.java index 0bf6c52..2b16914 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/SensitiveDataCodec.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/SensitiveDataCodec.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java b/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java index 6e5d54d..3593b81 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.utils; +package org.apache.activemq.utils; import java.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.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQPropertyConversionException; -import org.apache.activemq6.api.core.SimpleString; - -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; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.SimpleString; + +import static org.apache.activemq.utils.DataConstants.BOOLEAN; +import static org.apache.activemq.utils.DataConstants.BYTE; +import static org.apache.activemq.utils.DataConstants.BYTES; +import static org.apache.activemq.utils.DataConstants.CHAR; +import static org.apache.activemq.utils.DataConstants.DOUBLE; +import static org.apache.activemq.utils.DataConstants.FLOAT; +import static org.apache.activemq.utils.DataConstants.INT; +import static org.apache.activemq.utils.DataConstants.LONG; +import static org.apache.activemq.utils.DataConstants.NULL; +import static org.apache.activemq.utils.DataConstants.SHORT; +import static org.apache.activemq.utils.DataConstants.STRING; /** * Property Value Conversion.
