You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/04/28 18:02:55 UTC
[50/57] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-1 Artemis
rename
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 6303fab..28c29dc 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache ActiveMQ
+Apache ActiveMQ Artemis
Copyright [2014-2015] The Apache Software Foundation
This product includes software developed at
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index f10c439..9dc4087 100644
--- a/README.md
+++ b/README.md
@@ -154,7 +154,7 @@ class in the project tab and click "Run <classname>". If the "Run <classname>"
We have shared the style templates that are good for this project. If you want to apply them use these steps:
* File->Import Settings
-* Select the file under ./activemq6-cloned-folder/etc/IDEA-style.jar
+* Select the file under ./artemis-cloned-folder/etc/IDEA-style.jar
* Select both Code Style Templates and File templates (it's the default option)
* Select OK and restart Idea
@@ -234,7 +234,7 @@ Do not use the [maven-eclipse-plugin] to copy the files as it conflicts with [m2
The code repository for ActiveMQ Artemis is hosted by Apache org and lives here: https://git-wip-us.apache.org/repos/asf/activemq-6.git.
-We also host a mirror of the ActiveMQ repository on GitHub: https://github.com/apache/activemq-6. We use this mirror for all code submissions and reviews. To submit code to ActiveMQ Artemis please open a Pull Request as outlined as part of the GitHub workflow described here: https://guides.github.com/introduction/flow/index.html. Once a pull request is opened it will be reviewed and commented on. Any further changes as a result of comments / review process should be addressed and reflected in the original pull request as outlined in the GitHub workflow. When the pull request has went through the review process and ready to merge, the reviewer should comment with "Ack, Ready to Push". Once an Ack message is received one of the ActiveMQ Artemis core team members will push the changes to upstream Apache ActiveMQ Artemis repository and close the pull request.
+We also host a mirror of the ActiveMQ Artemis repository on GitHub: https://github.com/apache/activemq-6. We use this mirror for all code submissions and reviews. To submit code to ActiveMQ Artemis please open a Pull Request as outlined as part of the GitHub workflow described here: https://guides.github.com/introduction/flow/index.html. Once a pull request is opened it will be reviewed and commented on. Any further changes as a result of comments / review process should be addressed and reflected in the original pull request as outlined in the GitHub workflow. When the pull request has went through the review process and ready to merge, the reviewer should comment with "Ack, Ready to Push". Once an Ack message is received one of the ActiveMQ Artemis core team members will push the changes to upstream Apache ActiveMQ Artemis repository and close the pull request.
### Commit Messages
@@ -279,7 +279,7 @@ To setup repositories for reviewing and pushing:
# Clone the GitHub Mirror of ActiveMQ Artemis Repo:
git clone git@github.com: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 git@github.com: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 <artemis-repo>/.git/config statement to fetch all pull requests sent to the GitHub mirror. Note that the remote name for git@github.com:apache/activemq-6.git may be different. Be sure to edit all references to the remote name. In this case "activemq".
[remote "origin"]
url = git@github.com:apache/activemq-6.git
@@ -297,7 +297,7 @@ To setup repositories for reviewing and pushing:
To push commits from a pull request to the apache repository:
```bash
- cd <activemq6 repo>
+ cd <artemis-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/8f52a622/artemis-boot/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-boot/pom.xml b/artemis-boot/pom.xml
index b13d1f1..95527ec 100644
--- a/artemis-boot/pom.xml
+++ b/artemis-boot/pom.xml
@@ -22,12 +22,12 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-pom</artifactId>
- <version>10.0.0-SNAPSHOT</version>
+ <artifactId>artemis-pom</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>activemq-boot</artifactId>
+ <artifactId>artemis-boot</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ Artemis Boot</name>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java
----------------------------------------------------------------------
diff --git a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java
index afe965f..5182c54 100644
--- a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java
+++ b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.boot;
+package org.apache.activemq.artemis.boot;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
@@ -98,7 +98,7 @@ public class ActiveMQ
// Now setup our classloader..
URLClassLoader loader = new URLClassLoader(urls.toArray(new URL[urls.size()]));
Thread.currentThread().setContextClassLoader(loader);
- Class<?> clazz = loader.loadClass("org.apache.activemq.cli.ActiveMQ");
+ Class<?> clazz = loader.loadClass("org.apache.activemq.artemis.cli.ActiveMQ");
Method method = clazz.getMethod("main", args.getClass());
try
{
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/pom.xml b/artemis-bootstrap/pom.xml
index 1fd4bc5..9868d6e 100644
--- a/artemis-bootstrap/pom.xml
+++ b/artemis-bootstrap/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-pom</artifactId>
- <version>10.0.0-SNAPSHOT</version>
+ <artifactId>artemis-pom</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>activemq-bootstrap</artifactId>
+ <artifactId>artemis-bootstrap</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ Artemis Bootstrap</name>
@@ -34,17 +34,17 @@
<dependencies>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-server</artifactId>
+ <artifactId>artemis-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jms-server</artifactId>
+ <artifactId>artemis-jms-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-dto</artifactId>
+ <artifactId>artemis-dto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -76,19 +76,19 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-amqp-protocol</artifactId>
+ <artifactId>artemis-amqp-protocol</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-stomp-protocol</artifactId>
+ <artifactId>artemis-stomp-protocol</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-protocol</artifactId>
+ <artifactId>artemis-openwire-protocol</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt b/artemis-bootstrap/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt
index a3c04d7..7b6aade 100644
--- a/artemis-bootstrap/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt
+++ b/artemis-bootstrap/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt
@@ -1,8 +1,8 @@
- _ _ _ __ __ ___
- / \ ___| |_(_)_ _____| \/ |/ _ \
- / _ \ / __| __| | \ / / _ \ |\/| | | | |
- / ___ \ (__| |_| |\ V / __/ | | | |_| |
- /_/ \_\___|\__|_| \_/ \___|_| |_|\__\_\
- Apache ActiveMQ ${project.version}
+ _ _ _
+ / \ ____| |_ ___ __ __(_) _____
+ / _ \| _ \ __|/ _ \ \/ | |/ __/
+ / ___ \ | \/ |_/ __/ |\/| | |\___ \
+ /_/ \_\| \__\____|_| |_|_|/___ /
+ Apache ActiveMQ Artemis ${project.version}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java
index 64947c3..194ad44 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.cli;
+package org.apache.activemq.artemis.cli;
import io.airlift.command.Cli;
import io.airlift.command.ParseArgumentsUnexpectedException;
-import org.apache.activemq.cli.commands.Action;
-import org.apache.activemq.cli.commands.ActionContext;
-import org.apache.activemq.cli.commands.Create;
-import org.apache.activemq.cli.commands.HelpAction;
-import org.apache.activemq.cli.commands.Run;
-import org.apache.activemq.cli.commands.Stop;
+import org.apache.activemq.artemis.cli.commands.Action;
+import org.apache.activemq.artemis.cli.commands.ActionContext;
+import org.apache.activemq.artemis.cli.commands.Create;
+import org.apache.activemq.artemis.cli.commands.HelpAction;
+import org.apache.activemq.artemis.cli.commands.Run;
+import org.apache.activemq.artemis.cli.commands.Stop;
import java.io.InputStream;
import java.io.OutputStream;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ConfigurationException.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ConfigurationException.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ConfigurationException.java
index b9f9ab0..2e8f9d9 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ConfigurationException.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ConfigurationException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.cli;
+package org.apache.activemq.artemis.cli;
public class ConfigurationException extends Exception
{
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Action.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Action.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Action.java
index d2d1758..f2f0426 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Action.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Action.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.cli.commands;
+package org.apache.activemq.artemis.cli.commands;
public interface Action
{
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/ActionContext.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/ActionContext.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/ActionContext.java
index 13b76cd..a7ac12a 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/ActionContext.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/ActionContext.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.cli.commands;
+package org.apache.activemq.artemis.cli.commands;
import java.io.InputStream;
import java.io.PrintStream;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 49f7164..7618de5 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -1,4 +1,4 @@
-package org.apache.activemq.cli.commands;
+package org.apache.activemq.artemis.cli.commands;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/HelpAction.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/HelpAction.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/HelpAction.java
index 282ad77..a5d467c 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/HelpAction.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/HelpAction.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.cli.commands;
+package org.apache.activemq.artemis.cli.commands;
import io.airlift.command.Help;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
index b238d8a..a8e505c 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
@@ -14,21 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.cli.commands;
+package org.apache.activemq.artemis.cli.commands;
import io.airlift.command.Arguments;
import io.airlift.command.Command;
-import org.apache.activemq.cli.ActiveMQ;
-import org.apache.activemq.components.ExternalComponent;
-import org.apache.activemq.core.server.ActiveMQComponent;
-import org.apache.activemq.dto.BrokerDTO;
-import org.apache.activemq.dto.ComponentDTO;
-import org.apache.activemq.factory.BrokerFactory;
-import org.apache.activemq.factory.SecurityManagerFactory;
-import org.apache.activemq.integration.Broker;
-import org.apache.activemq.integration.bootstrap.ActiveMQBootstrapLogger;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.artemis.cli.ActiveMQ;
+import org.apache.activemq.artemis.components.ExternalComponent;
+import org.apache.activemq.artemis.core.server.ActiveMQComponent;
+import org.apache.activemq.artemis.dto.BrokerDTO;
+import org.apache.activemq.artemis.dto.ComponentDTO;
+import org.apache.activemq.artemis.factory.BrokerFactory;
+import org.apache.activemq.artemis.factory.SecurityManagerFactory;
+import org.apache.activemq.artemis.integration.Broker;
+import org.apache.activemq.artemis.integration.bootstrap.ActiveMQBootstrapLogger;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
import java.io.File;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java
index 225f4bf..0c4028c 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.cli.commands;
+package org.apache.activemq.artemis.cli.commands;
import io.airlift.command.Arguments;
import io.airlift.command.Command;
-import org.apache.activemq.dto.BrokerDTO;
-import org.apache.activemq.factory.BrokerFactory;
+import org.apache.activemq.artemis.dto.BrokerDTO;
+import org.apache.activemq.artemis.factory.BrokerFactory;
import java.io.File;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/components/ExternalComponent.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/components/ExternalComponent.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/components/ExternalComponent.java
index ae5d387..9317c1b 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/components/ExternalComponent.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/components/ExternalComponent.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.components;
+package org.apache.activemq.artemis.components;
-import org.apache.activemq.core.server.ActiveMQComponent;
-import org.apache.activemq.dto.ComponentDTO;
+import org.apache.activemq.artemis.core.server.ActiveMQComponent;
+import org.apache.activemq.artemis.dto.ComponentDTO;
public interface ExternalComponent extends ActiveMQComponent
{
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BasicSecurityHandler.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BasicSecurityHandler.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BasicSecurityHandler.java
index 8d48013..adb0850 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BasicSecurityHandler.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BasicSecurityHandler.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.factory;
+package org.apache.activemq.artemis.factory;
import java.io.File;
-import org.apache.activemq.core.config.impl.FileSecurityConfiguration;
-import org.apache.activemq.dto.BasicSecurityDTO;
-import org.apache.activemq.dto.SecurityDTO;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.core.config.impl.FileSecurityConfiguration;
+import org.apache.activemq.artemis.dto.BasicSecurityDTO;
+import org.apache.activemq.artemis.dto.SecurityDTO;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
public class BasicSecurityHandler implements SecurityHandler
{
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactory.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactory.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactory.java
index cfa52d8..06ad977 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactory.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactory.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.factory;
+package org.apache.activemq.artemis.factory;
-import org.apache.activemq.cli.ConfigurationException;
-import org.apache.activemq.dto.BrokerDTO;
-import org.apache.activemq.dto.ServerDTO;
-import org.apache.activemq.integration.Broker;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
-import org.apache.activemq.utils.FactoryFinder;
+import org.apache.activemq.artemis.cli.ConfigurationException;
+import org.apache.activemq.artemis.dto.BrokerDTO;
+import org.apache.activemq.artemis.dto.ServerDTO;
+import org.apache.activemq.artemis.integration.Broker;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.artemis.utils.FactoryFinder;
import java.io.File;
import java.io.IOException;
@@ -40,7 +40,7 @@ public class BrokerFactory
BrokerFactoryHandler factory = null;
try
{
- FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/");
+ FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/artemis/broker/");
factory = (BrokerFactoryHandler) finder.newInstance(configURI.getScheme());
}
catch (IOException ioe)
@@ -76,7 +76,7 @@ public class BrokerFactory
try
{
- FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/server/");
+ FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/artemis/broker/server/");
handler = (BrokerHandler) finder.newInstance(configURI.getScheme());
}
catch (IOException ioe)
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactoryHandler.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactoryHandler.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactoryHandler.java
index 9880a29..5ac0d73 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactoryHandler.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactoryHandler.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.factory;
+package org.apache.activemq.artemis.factory;
-import org.apache.activemq.dto.BrokerDTO;
+import org.apache.activemq.artemis.dto.BrokerDTO;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerHandler.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerHandler.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerHandler.java
index 0d56efa..bd51f39 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerHandler.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerHandler.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.factory;
+package org.apache.activemq.artemis.factory;
-import org.apache.activemq.dto.ServerDTO;
-import org.apache.activemq.integration.Broker;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.artemis.dto.ServerDTO;
+import org.apache.activemq.artemis.integration.Broker;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
public interface BrokerHandler
{
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/FileBrokerHandler.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/FileBrokerHandler.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/FileBrokerHandler.java
index 1aef548..ce0590f 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/FileBrokerHandler.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/FileBrokerHandler.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.factory;
+package org.apache.activemq.artemis.factory;
-import org.apache.activemq.dto.ServerDTO;
-import org.apache.activemq.integration.Broker;
-import org.apache.activemq.integration.FileBroker;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.artemis.dto.ServerDTO;
+import org.apache.activemq.artemis.integration.Broker;
+import org.apache.activemq.artemis.integration.FileBroker;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
public class FileBrokerHandler implements BrokerHandler
{
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityHandler.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityHandler.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityHandler.java
index 39a5e98..d157d7b 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityHandler.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityHandler.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.factory;
+package org.apache.activemq.artemis.factory;
-import org.apache.activemq.dto.SecurityDTO;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.artemis.dto.SecurityDTO;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
public interface SecurityHandler
{
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityManagerFactory.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityManagerFactory.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityManagerFactory.java
index 2c58007..d7fd588 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityManagerFactory.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityManagerFactory.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.factory;
+package org.apache.activemq.artemis.factory;
-import org.apache.activemq.dto.SecurityDTO;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
-import org.apache.activemq.utils.FactoryFinder;
+import org.apache.activemq.artemis.dto.SecurityDTO;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.artemis.utils.FactoryFinder;
import javax.xml.bind.annotation.XmlRootElement;
@@ -29,7 +29,7 @@ public class SecurityManagerFactory
{
if (config != null)
{
- FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/security/");
+ FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/artemis/broker/security/");
SecurityHandler securityHandler = (SecurityHandler)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name());
return securityHandler.createSecurityManager(config);
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/XmlBrokerFactoryHandler.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/XmlBrokerFactoryHandler.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/XmlBrokerFactoryHandler.java
index 7ee00ce..d600f79 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/XmlBrokerFactoryHandler.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/XmlBrokerFactoryHandler.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.factory;
+package org.apache.activemq.artemis.factory;
-import org.apache.activemq.cli.ConfigurationException;
-import org.apache.activemq.dto.BrokerDTO;
-import org.apache.activemq.dto.XmlUtil;
+import org.apache.activemq.artemis.cli.ConfigurationException;
+import org.apache.activemq.artemis.dto.BrokerDTO;
+import org.apache.activemq.artemis.dto.XmlUtil;
import java.io.File;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/Broker.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/Broker.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/Broker.java
index 8ba2f32..8fb5794 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/Broker.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/Broker.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.integration;
+package org.apache.activemq.artemis.integration;
-import org.apache.activemq.core.server.ActiveMQComponent;
+import org.apache.activemq.artemis.core.server.ActiveMQComponent;
/**
* A Broker os a set of ActiveMQComponents that create a Server, for instance core and jms.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
index 98e4d92..4bf2df2 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.integration;
-
-import org.apache.activemq.core.config.FileDeploymentManager;
-import org.apache.activemq.core.config.impl.FileConfiguration;
-import org.apache.activemq.core.server.ActiveMQComponent;
-import org.apache.activemq.dto.ServerDTO;
-import org.apache.activemq.integration.bootstrap.ActiveMQBootstrapLogger;
-import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+package org.apache.activemq.artemis.integration;
+
+import org.apache.activemq.artemis.core.config.FileDeploymentManager;
+import org.apache.activemq.artemis.core.config.impl.FileConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQComponent;
+import org.apache.activemq.artemis.dto.ServerDTO;
+import org.apache.activemq.artemis.integration.bootstrap.ActiveMQBootstrapLogger;
+import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapBundle.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapBundle.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapBundle.java
index f7d4900..4254e8a 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapBundle.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapBundle.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.integration.bootstrap;
+package org.apache.activemq.artemis.integration.bootstrap;
import org.jboss.logging.annotations.MessageBundle;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
index 8fcfd7f..c1bea17 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.integration.bootstrap;
+package org.apache.activemq.artemis.integration.bootstrap;
import org.jboss.logging.BasicLogger;
import org.jboss.logging.Logger;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/security/basic-security
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/security/basic-security b/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/security/basic-security
index b262a51..8418fe9 100644
--- a/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/security/basic-security
+++ b/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/security/basic-security
@@ -2,16 +2,16 @@
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
+## The ASF 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
+## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-class=org.apache.activemq.factory.BasicSecurityHandler
+class=org.apache.activemq.artemis.factory.BasicSecurityHandler
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/server/file
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/server/file b/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/server/file
index e3cf2b1..26ec4fb 100644
--- a/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/server/file
+++ b/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/server/file
@@ -2,16 +2,16 @@
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
+## The ASF 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
+## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-class=org.apache.activemq.factory.FileBrokerHandler
+class=org.apache.activemq.artemis.factory.FileBrokerHandler
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/xml
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/xml b/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/xml
index ce85c22..28251ef 100644
--- a/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/xml
+++ b/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/xml
@@ -2,16 +2,16 @@
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
+## The ASF 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
+## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-class=org.apache.activemq.factory.XmlBrokerFactoryHandler
+class=org.apache.activemq.artemis.factory.XmlBrokerFactoryHandler
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq
index bca157b..c72af5b 100755
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq
@@ -6,9 +6,9 @@
# 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
@@ -53,7 +53,7 @@ JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -X
# Load Profile Data
. "$ACTIVEMQ_INSTANCE/etc/activemq.profile"
-CLASSPATH="$ACTIVEMQ_HOME/lib/activemq-boot.jar"
+CLASSPATH="$ACTIVEMQ_HOME/lib/artemis-boot.jar"
# OS specific support.
cygwin=false;
@@ -116,4 +116,4 @@ exec "$JAVACMD" $JAVA_ARGS $ACTIVEMQ_CLUSTER_PROPS \
-Djava.util.logging.manager="$ACTIVEMQ_LOG_MANAGER" \
-Dlogging.configuration="$ACTIVEMQ_LOGGING_CONF" \
$DEBUG_ARGS \
- org.apache.activemq.boot.ActiveMQ $@
+ org.apache.activemq.artemis.boot.ActiveMQ $@
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml
index fa815aa..1a95c68 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml
@@ -20,7 +20,7 @@
<service>
<id>activemq-${host}</id>
<name>ActiveMQ: ${host}</name>
- <description>Apache ActiveMQ is a reliable messaging broker</description>
+ <description>Apache ActiveMQ Artemis is a reliable messaging broker</description>
<logpath>${activemq.instance}\log</logpath>
<logmode>roll</logmode>
@@ -40,7 +40,7 @@
-->
<argument>-classpath</argument>
- <argument>"${activemq.home}\lib\activemq-boot.jar"</argument>
+ <argument>"${activemq.home}\lib\artemis-boot.jar"</argument>
<argument>"-Dactivemq.home=${activemq.home}"</argument>
<argument>"-Dactivemq.instance=${activemq.instance}"</argument>
<argument>"-Ddata.dir=${activemq.instance}/data"</argument>
@@ -52,7 +52,7 @@
<argument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</argument>
-->
- <argument>org.apache.activemq.boot.ActiveMQ</argument>
+ <argument>ActiveMQ</argument>
<argument>run</argument>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd
index 357b44d..fd56f09 100755
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd
@@ -6,9 +6,9 @@ rem regarding copyright ownership. The ASF licenses this file
rem to you under the Apache License, Version 2.0 (the
rem "License"); you may not use this file except in compliance
rem with the License. You may obtain a copy of the License at
-rem
+rem
rem http://www.apache.org/licenses/LICENSE-2.0
-rem
+rem
rem Unless required by applicable law or agreed to in writing,
rem software distributed under the License is distributed on an
rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -59,7 +59,7 @@ call "%ACTIVEMQ_INSTANCE%\etc\activemq.profile.cmd" %*
rem "Create full JVM Args"
set JVM_ARGS=%JAVA_ARGS%
if not "%ACTIVEMQ_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ACTIVEMQ_CLUSTER_PROPS%
-set JVM_ARGS=%JVM_ARGS% -classpath "%ACTIVEMQ_HOME%\lib\activemq-boot.jar"
+set JVM_ARGS=%JVM_ARGS% -classpath "%ACTIVEMQ_HOME%\lib\artemis-boot.jar"
set JVM_ARGS=%JVM_ARGS% -Dactivemq.home="%ACTIVEMQ_HOME%"
set JVM_ARGS=%JVM_ARGS% -Dactivemq.instance="%ACTIVEMQ_INSTANCE%"
set JVM_ARGS=%JVM_ARGS% -Ddata.dir="%ACTIVEMQ_DATA_DIR%"
@@ -67,7 +67,7 @@ set JVM_ARGS=%JVM_ARGS% -Djava.util.logging.manager="%ACTIVEMQ_LOG_MANAGER%"
set JVM_ARGS=%JVM_ARGS% -Dlogging.configuration="%ACTIVEMQ_LOGGING_CONF%"
if not "%DEBUG_ARGS%"=="" set JVM_ARGS=%JVM_ARGS% %DEBUG_ARGS%
-"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.boot.ActiveMQ %*
+"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.artemis.boot.ActiveMQ %*
:END
endlocal
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
index 066ac9c..f4f4a81 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
@@ -17,16 +17,16 @@
# Additional logger names to configure (root logger is always configured)
# Root logger option
-loggers=org.jboss.logging,org.apache.activemq.core.server,org.apache.activemq.utils,org.apache.activemq.journal,org.apache.activemq.jms.server,org.apache.activemq.integration.bootstrap
+loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms.server,org.apache.activemq.artemis.integration.bootstrap
# Root logger level
logger.level=INFO
# ActiveMQ logger levels
-logger.org.apache.activemq.core.server.level=INFO
-logger.org.apache.activemq.journal.level=INFO
-logger.org.apache.activemq.utils.level=INFO
-logger.org.apache.activemq.jms.level=INFO
-logger.org.apache.activemq.integration.bootstrap.level=INFO
+logger.org.apache.activemq.artemis.core.server.level=INFO
+logger.org.apache.activemq.artemis.journal.level=INFO
+logger.org.apache.activemq.artemis.utils.level=INFO
+logger.org.apache.activemq.artemis.jms.level=INFO
+logger.org.apache.activemq.artemis.integration.bootstrap.level=INFO
# Root logger handlers
logger.handlers=FILE,CONSOLE
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java b/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java
index 92eb4ce..a177d65 100644
--- a/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java
+++ b/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.test;
+package org.apache.activemq.artemis.test;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
-import org.apache.activemq.dto.ServerDTO;
-import org.apache.activemq.integration.FileBroker;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.dto.ServerDTO;
+import org.apache.activemq.artemis.integration.FileBroker;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml
index 84bbf0e..9bd669c 100644
--- a/artemis-commons/pom.xml
+++ b/artemis-commons/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-pom</artifactId>
- <version>10.0.0-SNAPSHOT</version>
+ <artifactId>artemis-pom</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>activemq-commons</artifactId>
+ <artifactId>artemis-commons</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ Artemis Commons</name>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressExistsException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressExistsException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressExistsException.java
index 5cdf970..670219b 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressExistsException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressExistsException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.ADDRESS_EXISTS;
+package org.apache.activemq.artemis.api.core;
/**
* An operation failed because an address exists on the server.
@@ -27,11 +25,11 @@ public final class ActiveMQAddressExistsException extends ActiveMQException
public ActiveMQAddressExistsException()
{
- super(ADDRESS_EXISTS);
+ super(ActiveMQExceptionType.ADDRESS_EXISTS);
}
public ActiveMQAddressExistsException(String msg)
{
- super(ADDRESS_EXISTS, msg);
+ super(ActiveMQExceptionType.ADDRESS_EXISTS, msg);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressFullException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressFullException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressFullException.java
index ea5a528..f1ae2b5 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressFullException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressFullException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.ADDRESS_FULL;
+package org.apache.activemq.artemis.api.core;
/**
* An address is full.
@@ -27,11 +25,11 @@ public final class ActiveMQAddressFullException extends ActiveMQException
public ActiveMQAddressFullException(String message)
{
- super(ADDRESS_FULL, message);
+ super(ActiveMQExceptionType.ADDRESS_FULL, message);
}
public ActiveMQAddressFullException()
{
- super(ADDRESS_FULL);
+ super(ActiveMQExceptionType.ADDRESS_FULL);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAlreadyReplicatingException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAlreadyReplicatingException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAlreadyReplicatingException.java
index 8c8e1e8..6bd9629 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAlreadyReplicatingException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAlreadyReplicatingException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.ALREADY_REPLICATING;
+package org.apache.activemq.artemis.api.core;
/**
* The server is already paired with a replicating backup.
@@ -27,11 +25,11 @@ public final class ActiveMQAlreadyReplicatingException extends ActiveMQException
public ActiveMQAlreadyReplicatingException()
{
- super(ALREADY_REPLICATING);
+ super(ActiveMQExceptionType.ALREADY_REPLICATING);
}
public ActiveMQAlreadyReplicatingException(String msg)
{
- super(ALREADY_REPLICATING, msg);
+ super(ActiveMQExceptionType.ALREADY_REPLICATING, msg);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
index 62c38f1..dcdc0b2 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
import java.nio.ByteBuffer;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java
index d6402cd..294ff9a 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
import java.nio.ByteBuffer;
import io.netty.buffer.Unpooled;
-import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper;
+import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper;
/**
* Factory class to create instances of {@link ActiveMQBuffer}.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQClusterSecurityException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQClusterSecurityException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQClusterSecurityException.java
index e18e026..caa8212 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQClusterSecurityException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQClusterSecurityException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
/**
* Security exception thrown when the cluster user fails authentication.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
index 86c0bff..2061e9c 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.CONNECTION_TIMEDOUT;
+package org.apache.activemq.artemis.api.core;
/**
* A client timed out will connecting to ActiveMQ server.
@@ -27,11 +25,11 @@ public final class ActiveMQConnectionTimedOutException extends ActiveMQException
public ActiveMQConnectionTimedOutException()
{
- super(CONNECTION_TIMEDOUT);
+ super(ActiveMQExceptionType.CONNECTION_TIMEDOUT);
}
public ActiveMQConnectionTimedOutException(String msg)
{
- super(CONNECTION_TIMEDOUT, msg);
+ super(ActiveMQExceptionType.CONNECTION_TIMEDOUT, msg);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
index 3809b74..663269a 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.DISCONNECTED;
+package org.apache.activemq.artemis.api.core;
/**
* A client was disconnected from ActiveMQ server when the server has shut down.
@@ -27,11 +25,11 @@ public final class ActiveMQDisconnectedException extends ActiveMQException
public ActiveMQDisconnectedException()
{
- super(DISCONNECTED);
+ super(ActiveMQExceptionType.DISCONNECTED);
}
public ActiveMQDisconnectedException(String message)
{
- super(DISCONNECTED, message);
+ super(ActiveMQExceptionType.DISCONNECTED, message);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateIdException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateIdException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateIdException.java
index 649d2f4..674917b 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateIdException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateIdException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.DUPLICATE_ID_REJECTED;
+package org.apache.activemq.artemis.api.core;
/**
* A DuplicateID was rejected.
@@ -27,11 +25,11 @@ public final class ActiveMQDuplicateIdException extends ActiveMQException
public ActiveMQDuplicateIdException()
{
- super(DUPLICATE_ID_REJECTED);
+ super(ActiveMQExceptionType.DUPLICATE_ID_REJECTED);
}
public ActiveMQDuplicateIdException(String message)
{
- super(DUPLICATE_ID_REJECTED, message);
+ super(ActiveMQExceptionType.DUPLICATE_ID_REJECTED, message);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateMetaDataException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateMetaDataException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateMetaDataException.java
index 6427fae..9f4961c 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateMetaDataException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateMetaDataException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.DUPLICATE_METADATA;
+package org.apache.activemq.artemis.api.core;
/**
* A Session Metadata was set in duplication
@@ -27,11 +25,11 @@ public final class ActiveMQDuplicateMetaDataException extends ActiveMQException
public ActiveMQDuplicateMetaDataException()
{
- super(DUPLICATE_METADATA);
+ super(ActiveMQExceptionType.DUPLICATE_METADATA);
}
public ActiveMQDuplicateMetaDataException(String msg)
{
- super(DUPLICATE_METADATA, msg);
+ super(ActiveMQExceptionType.DUPLICATE_METADATA, msg);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
index df01dee..f8a09e9 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
/**
* ActiveMQException is the root exception for the ActiveMQ API.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
index 2df95d4..8c95a42 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
import java.util.Collections;
import java.util.EnumSet;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIOErrorException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIOErrorException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIOErrorException.java
index 30fab77..1c292d8 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIOErrorException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIOErrorException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.IO_ERROR;
+package org.apache.activemq.artemis.api.core;
/**
* Unexpected I/O error occurred on the server.
@@ -27,16 +25,16 @@ public final class ActiveMQIOErrorException extends ActiveMQException
public ActiveMQIOErrorException()
{
- super(IO_ERROR);
+ super(ActiveMQExceptionType.IO_ERROR);
}
public ActiveMQIOErrorException(String msg)
{
- super(IO_ERROR, msg);
+ super(ActiveMQExceptionType.IO_ERROR, msg);
}
public ActiveMQIOErrorException(String msg, Throwable cause)
{
- super(IO_ERROR, msg, cause);
+ super(ActiveMQExceptionType.IO_ERROR, msg, cause);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
index 2c32f4d..1bf4185 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.ILLEGAL_STATE;
+package org.apache.activemq.artemis.api.core;
/**
* A ActiveMQ resource is not in a legal state (e.g. calling ClientConsumer.receive() if a
@@ -28,11 +26,11 @@ public final class ActiveMQIllegalStateException extends ActiveMQException
public ActiveMQIllegalStateException()
{
- super(ILLEGAL_STATE);
+ super(ActiveMQExceptionType.ILLEGAL_STATE);
}
public ActiveMQIllegalStateException(String message)
{
- super(ILLEGAL_STATE, message);
+ super(ActiveMQExceptionType.ILLEGAL_STATE, message);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIncompatibleClientServerException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIncompatibleClientServerException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIncompatibleClientServerException.java
index ca9163e..7d71f5d 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIncompatibleClientServerException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIncompatibleClientServerException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS;
+package org.apache.activemq.artemis.api.core;
/**
* The server version and the client version are incompatible.
@@ -29,11 +27,11 @@ public final class ActiveMQIncompatibleClientServerException extends ActiveMQExc
public ActiveMQIncompatibleClientServerException()
{
- super(INCOMPATIBLE_CLIENT_SERVER_VERSIONS);
+ super(ActiveMQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS);
}
public ActiveMQIncompatibleClientServerException(String msg)
{
- super(INCOMPATIBLE_CLIENT_SERVER_VERSIONS, msg);
+ super(ActiveMQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS, msg);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterceptorRejectedPacketException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterceptorRejectedPacketException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterceptorRejectedPacketException.java
index 9c26b87..4705ffd 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterceptorRejectedPacketException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterceptorRejectedPacketException.java
@@ -14,13 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.INTERCEPTOR_REJECTED_PACKET;
+package org.apache.activemq.artemis.api.core;
/**
* An outgoing interceptor returned false.
- * See org.apache.activemq.api.core.client.ServerLocator#addOutgoingInterceptor(org.apache.activemq.api.core.Interceptor)
+ * See org.apache.activemq.artemis.api.core.client.ServerLocator#addOutgoingInterceptor(org.apache.activemq.artemis.api.core.Interceptor)
*/
// XXX I doubt any reader will make much sense of this Javadoc's text.
public final class ActiveMQInterceptorRejectedPacketException extends ActiveMQException
@@ -29,11 +27,11 @@ public final class ActiveMQInterceptorRejectedPacketException extends ActiveMQEx
public ActiveMQInterceptorRejectedPacketException()
{
- super(INTERCEPTOR_REJECTED_PACKET);
+ super(ActiveMQExceptionType.INTERCEPTOR_REJECTED_PACKET);
}
public ActiveMQInterceptorRejectedPacketException(String msg)
{
- super(INTERCEPTOR_REJECTED_PACKET, msg);
+ super(ActiveMQExceptionType.INTERCEPTOR_REJECTED_PACKET, msg);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
index 692b428..f1934d6 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.INTERNAL_ERROR;
+package org.apache.activemq.artemis.api.core;
/**
* Internal error which prevented ActiveMQ from performing an important operation.
@@ -27,21 +25,21 @@ public final class ActiveMQInternalErrorException extends ActiveMQException
public ActiveMQInternalErrorException()
{
- super(INTERNAL_ERROR);
+ super(ActiveMQExceptionType.INTERNAL_ERROR);
}
public ActiveMQInternalErrorException(String msg)
{
- super(INTERNAL_ERROR, msg);
+ super(ActiveMQExceptionType.INTERNAL_ERROR, msg);
}
public ActiveMQInternalErrorException(String message, Exception e)
{
- super(INTERNAL_ERROR, message, e);
+ super(ActiveMQExceptionType.INTERNAL_ERROR, message, e);
}
public ActiveMQInternalErrorException(String message, Throwable t)
{
- super(INTERNAL_ERROR, message, t);
+ super(ActiveMQExceptionType.INTERNAL_ERROR, message, t);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterruptedException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterruptedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterruptedException.java
index d20fe1c..8fd5c14 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterruptedException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterruptedException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.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/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidFilterExpressionException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidFilterExpressionException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidFilterExpressionException.java
index 290cfab..be4cb7b 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidFilterExpressionException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidFilterExpressionException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.INVALID_FILTER_EXPRESSION;
+package org.apache.activemq.artemis.api.core;
/**
* A filter expression was found to be invalid.
@@ -27,11 +25,11 @@ public final class ActiveMQInvalidFilterExpressionException extends ActiveMQExce
public ActiveMQInvalidFilterExpressionException()
{
- super(INVALID_FILTER_EXPRESSION);
+ super(ActiveMQExceptionType.INVALID_FILTER_EXPRESSION);
}
public ActiveMQInvalidFilterExpressionException(String msg)
{
- super(INVALID_FILTER_EXPRESSION, msg);
+ super(ActiveMQExceptionType.INVALID_FILTER_EXPRESSION, msg);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidTransientQueueUseException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidTransientQueueUseException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidTransientQueueUseException.java
index b66de62..278b399 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidTransientQueueUseException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidTransientQueueUseException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.INVALID_TRANSIENT_QUEUE_USE;
+package org.apache.activemq.artemis.api.core;
/**
* An operation failed because a queue exists on the server.
@@ -27,11 +25,11 @@ public final class ActiveMQInvalidTransientQueueUseException extends ActiveMQExc
public ActiveMQInvalidTransientQueueUseException()
{
- super(INVALID_TRANSIENT_QUEUE_USE);
+ super(ActiveMQExceptionType.INVALID_TRANSIENT_QUEUE_USE);
}
public ActiveMQInvalidTransientQueueUseException(String msg)
{
- super(INVALID_TRANSIENT_QUEUE_USE, msg);
+ super(ActiveMQExceptionType.INVALID_TRANSIENT_QUEUE_USE, msg);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageException.java
index 6b73904..0378e00 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.LARGE_MESSAGE_ERROR_BODY;
+package org.apache.activemq.artemis.api.core;
/**
* A problem occurred while manipulating the body of a large message.
@@ -27,11 +25,11 @@ public final class ActiveMQLargeMessageException extends ActiveMQException
public ActiveMQLargeMessageException()
{
- super(LARGE_MESSAGE_ERROR_BODY);
+ super(ActiveMQExceptionType.LARGE_MESSAGE_ERROR_BODY);
}
public ActiveMQLargeMessageException(String msg)
{
- super(LARGE_MESSAGE_ERROR_BODY, msg);
+ super(ActiveMQExceptionType.LARGE_MESSAGE_ERROR_BODY, msg);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageInterruptedException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageInterruptedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageInterruptedException.java
index cfe8786..ad75c21 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageInterruptedException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageInterruptedException.java
@@ -14,11 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
-import static org.apache.activemq.api.core.ActiveMQExceptionType.LARGE_MESSAGE_INTERRUPTED;
-
/**
*/
// XXX
@@ -28,11 +26,11 @@ public class ActiveMQLargeMessageInterruptedException extends ActiveMQException
public ActiveMQLargeMessageInterruptedException(String message)
{
- super(LARGE_MESSAGE_INTERRUPTED, message);
+ super(ActiveMQExceptionType.LARGE_MESSAGE_INTERRUPTED, message);
}
public ActiveMQLargeMessageInterruptedException()
{
- super(LARGE_MESSAGE_INTERRUPTED);
+ super(ActiveMQExceptionType.LARGE_MESSAGE_INTERRUPTED);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.java
index 7df1502..be48fe4 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
/**
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNonExistentQueueException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNonExistentQueueException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNonExistentQueueException.java
index 2bb0bb7..8e1b70c 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNonExistentQueueException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNonExistentQueueException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST;
+package org.apache.activemq.artemis.api.core;
/**
* An operation failed because a queue does not exist on the server.
@@ -27,11 +25,11 @@ public final class ActiveMQNonExistentQueueException extends ActiveMQException
public ActiveMQNonExistentQueueException()
{
- super(QUEUE_DOES_NOT_EXIST);
+ super(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST);
}
public ActiveMQNonExistentQueueException(String msg)
{
- super(QUEUE_DOES_NOT_EXIST, msg);
+ super(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, msg);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
index 3768ae6..2878d69 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.NOT_CONNECTED;
+package org.apache.activemq.artemis.api.core;
/**
* A client is not able to connect to ActiveMQ server.
@@ -27,11 +25,11 @@ public final class ActiveMQNotConnectedException extends ActiveMQException
public ActiveMQNotConnectedException(String message)
{
- super(NOT_CONNECTED, message);
+ super(ActiveMQExceptionType.NOT_CONNECTED, message);
}
public ActiveMQNotConnectedException()
{
- super(NOT_CONNECTED);
+ super(ActiveMQExceptionType.NOT_CONNECTED);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQObjectClosedException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQObjectClosedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQObjectClosedException.java
index 155fde7..76c0a81 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQObjectClosedException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQObjectClosedException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core;
-
-import static org.apache.activemq.api.core.ActiveMQExceptionType.OBJECT_CLOSED;
+package org.apache.activemq.artemis.api.core;
/**
* A client operation failed because the calling resource (ClientSession, ClientProducer, etc.) is
@@ -28,11 +26,11 @@ public final class ActiveMQObjectClosedException extends ActiveMQException
public ActiveMQObjectClosedException()
{
- super(OBJECT_CLOSED);
+ super(ActiveMQExceptionType.OBJECT_CLOSED);
}
public ActiveMQObjectClosedException(String msg)
{
- super(OBJECT_CLOSED, msg);
+ super(ActiveMQExceptionType.OBJECT_CLOSED, msg);
}
}