Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACTIVEMQ6-1 Artemis rename 

Based on the Apache ActiveMQ community vote this project is being
renamed "Artemis."
This commit is contained in:
Justin Bertram 2015-04-27 17:32:30 -04:00 committed by Clebert Suconic
parent f509c075c6
commit 8f52a622d0
2391 changed files with 18600 additions and 18956 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NOTICE
View File

@ -1,4 +1,4 @@
Apache ActiveMQ
Apache ActiveMQ Artemis
Copyright [2014-2015] The Apache Software Foundation
This product includes software developed at

8
README.md
View File

@ -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

6
artemis-boot/pom.xml
View File

@ -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>

4
artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java
View File

@ -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
{

18
artemis-bootstrap/pom.xml
View File

@ -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>

12
artemis-bootstrap/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt
View File

@ -1,8 +1,8 @@
_ _ _ __ __ ___
/ \ ___| |_(_)_ _____| \/ |/ _ \
/ _ \ / __| __| | \ / / _ \ |\/| | | | |
/ ___ \ (__| |_| |\ V / __/ | | | |_| |
/_/ \_\___|\__|_| \_/ \___|_| |_|\__\_\
Apache ActiveMQ ${project.version}
_ _ _
/ \ ____| |_ ___ __ __(_) _____
/ _ \| _ \ __|/ _ \ \/ | |/ __/
/ ___ \ | \/ |_/ __/ |\/| | |\___ \
/_/ \_\| \__\____|_| |_|_|/___ /
Apache ActiveMQ Artemis ${project.version}

14
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java
View File

@ -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;

2
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ConfigurationException.java
View File

@ -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
{

2
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Action.java
View File

@ -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
{

2
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/ActionContext.java
View File

@ -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;

2
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
View File

@ -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;

2
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/HelpAction.java
View File

@ -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;

22
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
View File

@ -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;

6
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java
View File

@ -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;

6
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/components/ExternalComponent.java
View File

@ -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
{

12
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BasicSecurityHandler.java
View File

@ -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
{

18
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactory.java
View File

@ -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)

4
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactoryHandler.java
View File

@ -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;

8
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerHandler.java
View File

@ -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
{

10
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/FileBrokerHandler.java
View File

@ -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
{

6
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityHandler.java
View File

@ -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
{

10
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityManagerFactory.java
View File

@ -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);
}

8
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/XmlBrokerFactoryHandler.java
View File

@ -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;

4
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/Broker.java
View File

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

16
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
View File

@ -14,15 +14,15 @@
* 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.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;
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;

2
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapBundle.java
View File

@ -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;

2
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
View File

@ -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;

8
artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/security/basic-security
View 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.BasicSecurityHandler
class=org.apache.activemq.artemis.factory.BasicSecurityHandler

8
artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/server/file
View 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

8
artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/xml
View 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.XmlBrokerFactoryHandler
class=org.apache.activemq.artemis.factory.XmlBrokerFactoryHandler

8
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq
View File

@ -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 $@

6
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml
View File

@ -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>

8
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd
View File

@ -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

12
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
View File

@ -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

12
artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java
View File

@ -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;

6
artemis-commons/pom.xml
View File

@ -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>

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressExistsException.java
View File

@ -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);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressFullException.java
View File

@ -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);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAlreadyReplicatingException.java
View File

@ -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);
}
}

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
View File

@ -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;

4
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java
View File

@ -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}.

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQClusterSecurityException.java
View File

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

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
View File

@ -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);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
View File

@ -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);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateIdException.java
View File

@ -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);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateMetaDataException.java
View File

@ -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);
}
}

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
View File

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

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
View File

@ -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;

10
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIOErrorException.java
View File

@ -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);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
View File

@ -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);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIncompatibleClientServerException.java
View File

@ -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);
}
}

10
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterceptorRejectedPacketException.java
View File

@ -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);
}
}

12
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
View File

@ -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);
}
}

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterruptedException.java
View File

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

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidFilterExpressionException.java
View File

@ -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);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidTransientQueueUseException.java
View File

@ -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);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageException.java
View File

@ -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);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageInterruptedException.java
View File

@ -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);
}
}

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.java
View File

@ -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;
/**

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNonExistentQueueException.java
View File

@ -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);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
View File

@ -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);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQObjectClosedException.java
View File

@ -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);
}
}

4
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQPropertyConversionException.java
View File

@ -14,10 +14,10 @@
* 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;
/**
* A PropertyConversionException is thrown by {@code org.apache.activemq.api.core.Message} methods when a
* A PropertyConversionException is thrown by {@code org.apache.activemq.artemis.api.core.Message} methods when a
* property can not be converted to the expected type.
*/
public final class ActiveMQPropertyConversionException extends RuntimeException

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQQueueExistsException.java
View File

@ -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_EXISTS;
package org.apache.activemq.artemis.api.core;
/**
* An operation failed because a queue exists on the server.
@ -27,11 +25,11 @@ public final class ActiveMQQueueExistsException extends ActiveMQException
public ActiveMQQueueExistsException()
{
super(QUEUE_EXISTS);
super(ActiveMQExceptionType.QUEUE_EXISTS);
}
public ActiveMQQueueExistsException(String msg)
{
super(QUEUE_EXISTS, msg);
super(ActiveMQExceptionType.QUEUE_EXISTS, msg);
}
}

4
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSecurityException.java
View File

@ -14,9 +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.SECURITY_EXCEPTION;
import static org.apache.activemq.artemis.api.core.ActiveMQExceptionType.SECURITY_EXCEPTION;
/**
* A security problem occurred (authentication issues, permission issues,...)

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSessionCreationException.java
View File

@ -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.SESSION_CREATION_REJECTED;
package org.apache.activemq.artemis.api.core;
/**
* The creation of a session was rejected by the server (e.g. if the server is starting and has not
@ -28,11 +26,11 @@ public final class ActiveMQSessionCreationException extends ActiveMQException
public ActiveMQSessionCreationException()
{
super(SESSION_CREATION_REJECTED);
super(ActiveMQExceptionType.SESSION_CREATION_REJECTED);
}
public ActiveMQSessionCreationException(String msg)
{
super(SESSION_CREATION_REJECTED, msg);
super(ActiveMQExceptionType.SESSION_CREATION_REJECTED, msg);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionOutcomeUnknownException.java
View File

@ -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.TRANSACTION_OUTCOME_UNKNOWN;
package org.apache.activemq.artemis.api.core;
/**
* The outcome of a transaction is unknown.
@ -27,11 +25,11 @@ public final class ActiveMQTransactionOutcomeUnknownException extends ActiveMQEx
public ActiveMQTransactionOutcomeUnknownException()
{
super(TRANSACTION_OUTCOME_UNKNOWN);
super(ActiveMQExceptionType.TRANSACTION_OUTCOME_UNKNOWN);
}
public ActiveMQTransactionOutcomeUnknownException(String msg)
{
super(TRANSACTION_OUTCOME_UNKNOWN, msg);
super(ActiveMQExceptionType.TRANSACTION_OUTCOME_UNKNOWN, msg);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionRolledBackException.java
View File

@ -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.TRANSACTION_ROLLED_BACK;
package org.apache.activemq.artemis.api.core;
/**
* A transaction was rolled back.
@ -27,11 +25,11 @@ public final class ActiveMQTransactionRolledBackException extends ActiveMQExcept
public ActiveMQTransactionRolledBackException()
{
super(TRANSACTION_ROLLED_BACK);
super(ActiveMQExceptionType.TRANSACTION_ROLLED_BACK);
}
public ActiveMQTransactionRolledBackException(String msg)
{
super(TRANSACTION_ROLLED_BACK, msg);
super(ActiveMQExceptionType.TRANSACTION_ROLLED_BACK, msg);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnBlockedException.java
View File

@ -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.UNBLOCKED;
package org.apache.activemq.artemis.api.core;
/**
* A blocking call from a client was unblocked during failover.
@ -27,11 +25,11 @@ public final class ActiveMQUnBlockedException extends ActiveMQException
public ActiveMQUnBlockedException()
{
super(UNBLOCKED);
super(ActiveMQExceptionType.UNBLOCKED);
}
public ActiveMQUnBlockedException(String msg)
{
super(UNBLOCKED, msg);
super(ActiveMQExceptionType.UNBLOCKED, msg);
}
}

8
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
View File

@ -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.UNSUPPORTED_PACKET;
package org.apache.activemq.artemis.api.core;
/**
* A packet of unsupported type was received by ActiveMQ PacketHandler.
@ -27,11 +25,11 @@ public final class ActiveMQUnsupportedPacketException extends ActiveMQException
public ActiveMQUnsupportedPacketException()
{
super(UNSUPPORTED_PACKET);
super(ActiveMQExceptionType.UNSUPPORTED_PACKET);
}
public ActiveMQUnsupportedPacketException(String msg)
{
super(UNSUPPORTED_PACKET, msg);
super(ActiveMQExceptionType.UNSUPPORTED_PACKET, msg);
}
}

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/Pair.java
View File

@ -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.io.Serializable;

4
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
View File

@ -14,13 +14,13 @@
* 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.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.apache.activemq.utils.DataConstants;
import org.apache.activemq.artemis.utils.DataConstants;
/**
* A simple String class that can store all characters, and stores as simple {@code byte[]}, this

10
artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java
View File

@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.core.buffers.impl;
package org.apache.activemq.artemis.core.buffers.impl;
import java.nio.ByteBuffer;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import org.apache.activemq.api.core.ActiveMQBuffer;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.utils.DataConstants;
import org.apache.activemq.utils.UTF8Util;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.utils.DataConstants;
import org.apache.activemq.artemis.utils.UTF8Util;
public class ChannelBufferWrapper implements ActiveMQBuffer
{

2
artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQComponent.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.core.server;
package org.apache.activemq.artemis.core.server;
public interface ActiveMQComponent
{

4
artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.logs;
package org.apache.activemq.artemis.logs;
import org.apache.activemq.api.core.ActiveMQIllegalStateException;
import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
import org.jboss.logging.annotations.Cause;
import org.jboss.logging.annotations.Message;
import org.jboss.logging.annotations.MessageBundle;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.logs;
package org.apache.activemq.artemis.logs;
import org.jboss.logging.BasicLogger;
import org.jboss.logging.Logger;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.logs;
package org.apache.activemq.artemis.logs;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.security.AccessControlContext;
import java.security.AccessController;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java
View File

@ -9,7 +9,7 @@
* release to you under whatever reasonable license you desire: MIT, BSD, GPL, whatever."
*
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.UnpooledByteBufAllocator;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.net.URL;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.util.AbstractSet;
import java.util.Iterator;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentSet.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.util.Set;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DataConstants.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
public final class DataConstants
{

4
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.math.BigInteger;
import java.security.InvalidKeyException;
@ -107,7 +107,7 @@ public class DefaultSensitiveStringCodec implements SensitiveDataCodec<String>
{
if (args.length != 1)
{
System.err.println("Use: java -cp <classPath> org.apache.activemq.utils.DefaultSensitiveStringCodec password-to-encode");
System.err.println("Use: java -cp <classPath> org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec password-to-encode");
System.err.println("Error: no password on the args");
System.exit(-1);
}

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.io.BufferedInputStream;
import java.io.IOException;

8
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
View File

@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.HashMap;
import java.util.Map;
import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.api.core.ActiveMQExceptionType;
import org.apache.activemq.logs.ActiveMQUtilBundle;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
public class PasswordMaskingUtil
{

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
public interface ReferenceCounter
{

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.AbstractQueuedSynchronizer;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SensitiveDataCodec.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.util.Map;

32
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.nio.ByteBuffer;
import java.util.Collections;
@ -24,22 +24,22 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.apache.activemq.api.core.ActiveMQBuffer;
import org.apache.activemq.api.core.ActiveMQPropertyConversionException;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.logs.ActiveMQUtilBundle;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
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;
import static org.apache.activemq.artemis.utils.DataConstants.BOOLEAN;
import static org.apache.activemq.artemis.utils.DataConstants.BYTE;
import static org.apache.activemq.artemis.utils.DataConstants.BYTES;
import static org.apache.activemq.artemis.utils.DataConstants.CHAR;
import static org.apache.activemq.artemis.utils.DataConstants.DOUBLE;
import static org.apache.activemq.artemis.utils.DataConstants.FLOAT;
import static org.apache.activemq.artemis.utils.DataConstants.INT;
import static org.apache.activemq.artemis.utils.DataConstants.LONG;
import static org.apache.activemq.artemis.utils.DataConstants.NULL;
import static org.apache.activemq.artemis.utils.DataConstants.SHORT;
import static org.apache.activemq.artemis.utils.DataConstants.STRING;
/**
* Property Value Conversion.

8
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
View File

@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.lang.ref.SoftReference;
import org.apache.activemq.api.core.ActiveMQBuffer;
import org.apache.activemq.logs.ActiveMQUtilBundle;
import org.apache.activemq.logs.ActiveMQUtilLogger;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
/**
* A UTF8Util

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUID.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
/**

6
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.lang.reflect.Method;
import java.net.NetworkInterface;
@ -32,8 +32,8 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.logs.ActiveMQUtilLogger;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
public final class UUIDGenerator
{

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import java.util.Random;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/SchemaConstants.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils.uri;
package org.apache.activemq.artemis.utils.uri;
public class SchemaConstants
{

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URIFactory.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.activemq.utils.uri;
package org.apache.activemq.artemis.utils.uri;
import java.net.URI;
import java.net.URISyntaxException;

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils.uri;
package org.apache.activemq.artemis.utils.uri;
import java.beans.PropertyDescriptor;
import java.io.UnsupportedEncodingException;

2
artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.utils;
package org.apache.activemq.artemis.utils;
import org.junit.Assert;
import org.junit.Test;

Some files were not shown because too many files have changed in this diff Show More