Apache/activemq-artemis
1
0
Fork 0
mirror of https://github.com/apache/activemq-artemis.git synced 2025-02-07 10:38:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

this closes #216 on artemis rename

Browse Source
This commit is contained in:
Clebert Suconic 2015-04-30 13:14:02 -04:00
commit 63a857d18d
42 changed files with 249 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASING.md
View File

@ -10,7 +10,7 @@ Things to do before issuing a new release:
* Update the README to include appropriate release notes. * Update the README to include appropriate release notes.
* Bump the version numbers in example and test poms to the next release version. e.g. 6.0.0 * Bump the version numbers in example and test poms to the next release version. e.g. 2.0.0
* Build the release locally: mvn clean install -DskipLicenseCheck=false -Prelease * Build the release locally: mvn clean install -DskipLicenseCheck=false -Prelease

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
View File

@ -186,8 +186,8 @@ public final class ActiveMQDefaultConfiguration
// true means that the management API is available via JMX // true means that the management API is available via JMX
private static boolean DEFAULT_JMX_MANAGEMENT_ENABLED = true; private static boolean DEFAULT_JMX_MANAGEMENT_ENABLED = true;
// the JMX domain used to registered ActiveMQ MBeans in the MBeanServer // the JMX domain used to registered ActiveMQ Artemis MBeans in the MBeanServer
private static String DEFAULT_JMX_DOMAIN = "org.apache.activemq"; private static String DEFAULT_JMX_DOMAIN = "org.apache.activemq.artemis";
// true means that message counters are enabled // true means that message counters are enabled
private static boolean DEFAULT_MESSAGE_COUNTER_ENABLED = false; private static boolean DEFAULT_MESSAGE_COUNTER_ENABLED = false;

2
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
View File

@ -779,7 +779,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.activemq.jms.server.JMSServerManager#removeTopicFromBindings(java.lang.String, java.lang.String) * @see org.apache.activemq.artemis.jms.server.JMSServerManager#removeTopicFromBindings(java.lang.String, java.lang.String)
*/ */
public boolean removeTopicFromBindingRegistry(final String name) throws Exception public boolean removeTopicFromBindingRegistry(final String name) throws Exception
{ {

2
artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java
View File

@ -28,7 +28,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQComponent;
* <p> * <p>
* Notice also that even on the callback methods it's possible to pass the sync mode. That will only * Notice also that even on the callback methods it's possible to pass the sync mode. That will only
* make sense on the NIO operations. * make sense on the NIO operations.
* @see org.apache.activemq.utils.IDGenerator * @see org.apache.activemq.artemis.utils.IDGenerator
*/ */
public interface Journal extends ActiveMQComponent public interface Journal extends ActiveMQComponent
{ {

2
artemis-native/README
View File

@ -37,7 +37,7 @@ if you are missing any dependencies, autoconf would tell you what you're missing
COMPILED FILE COMPILED FILE
The produced file will be under the ./target/nar (example: ./target/nar/artemis-native-6.0.0-amd64-Linux-gpp-jni/lib/amd64-Linux-gpp/jni/libartemis-native-6.0.0.so) The produced file will be under the ./target/nar (example: ./target/nar/artemis-native-1.0.0-amd64-Linux-gpp-jni/lib/amd64-Linux-gpp/jni/libartemis-native-1.0.0.so)
and you will have to rename it manually under ./bin following the appropriate pattern. and you will have to rename it manually under ./bin following the appropriate pattern.

7
artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java
View File

@ -154,10 +154,17 @@ public class MinimalServer
} }
public synchronized void stop() public synchronized void stop()
{
if (serverChannelGroup != null)
{ {
serverChannelGroup.close().awaitUninterruptibly(); serverChannelGroup.close().awaitUninterruptibly();
}
if (channelGroup != null)
{
ChannelGroupFuture future = channelGroup.close().awaitUninterruptibly(); ChannelGroupFuture future = channelGroup.close().awaitUninterruptibly();
} }
}
public static void main(String[] arg) public static void main(String[] arg)

10
artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
View File

@ -546,7 +546,13 @@ public class NettyAcceptor implements Acceptor
// serverChannelGroup has been unbound in pause() // serverChannelGroup has been unbound in pause()
if (serverChannelGroup != null)
{
serverChannelGroup.close().awaitUninterruptibly(); serverChannelGroup.close().awaitUninterruptibly();
}
if (channelGroup != null)
{
ChannelGroupFuture future = channelGroup.close().awaitUninterruptibly(); ChannelGroupFuture future = channelGroup.close().awaitUninterruptibly();
if (!future.isSuccess()) if (!future.isSuccess())
@ -562,6 +568,7 @@ public class NettyAcceptor implements Acceptor
} }
} }
} }
}
// Shutdown the EventLoopGroup if no new task was added for 100ms or if // Shutdown the EventLoopGroup if no new task was added for 100ms or if
// 3000ms elapsed. // 3000ms elapsed.
@ -617,6 +624,8 @@ public class NettyAcceptor implements Acceptor
} }
// We *pause* the acceptor so no new connections are made // We *pause* the acceptor so no new connections are made
if (serverChannelGroup != null)
{
ChannelGroupFuture future = serverChannelGroup.close().awaitUninterruptibly(); ChannelGroupFuture future = serverChannelGroup.close().awaitUninterruptibly();
if (!future.isSuccess()) if (!future.isSuccess())
{ {
@ -631,6 +640,7 @@ public class NettyAcceptor implements Acceptor
} }
} }
} }
}
paused = true; paused = true;
} }

2
artemis-server/src/test/resources/divertRoutingNameNotRequired.xml
View File

@ -68,7 +68,7 @@
<address>jms.topic.priceUpdates</address> <address>jms.topic.priceUpdates</address>
<forwarding-address>jms.queue.priceForwarding</forwarding-address> <forwarding-address>jms.queue.priceForwarding</forwarding-address>
<filter string="office='New York'"/> <filter string="office='New York'"/>
<transformer-class-name>org.apache.activemq.jms.example.AddForwardingTimeTransformer</transformer-class-name> <transformer-class-name>org.apache.activemq.artemis.jms.example.AddForwardingTimeTransformer</transformer-class-name>
<exclusive>true</exclusive> <exclusive>true</exclusive>
</divert> </divert>
</diverts> </diverts>

6
artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
View File

@ -31,19 +31,19 @@ import org.apache.activemq.artemis.api.core.TransportConfiguration;
* To enable this add the following to the jbossts-properties file * To enable this add the following to the jbossts-properties file
* <pre> * <pre>
* &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ1" * &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ1"
* value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"/&gt; * value="org.apache.activemq.artemis.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"/&gt;
* </pre> * </pre>
* <p> * <p>
* you'll need something like this if the ActiveMQ Server is remote * you'll need something like this if the ActiveMQ Server is remote
* <pre> * <pre>
* &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2" * &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2"
* value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616"/&gt; * value="org.apache.activemq.artemis.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616"/&gt;
* </pre> * </pre>
* <p> * <p>
* you'll need something like this if the ActiveMQ Server is remote and has failover configured * you'll need something like this if the ActiveMQ Server is remote and has failover configured
* <pre> * <pre>
* &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2" * &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2"
* value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=61617"/&gt; * value="org.apache.activemq.artemis.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=61617"/&gt;
* </pre> * </pre>
*/ */
public class ActiveMQXAResourceRecovery public class ActiveMQXAResourceRecovery

8
artemis_doap.rdf
View File

@ -62,14 +62,6 @@ under the License.
<foaf:lastName>Taylor</foaf:lastName> <foaf:lastName>Taylor</foaf:lastName>
</foaf:Person> </foaf:Person>
</developer> </developer>
<release>
<Version>
<name>6.0.0</name>
<revision>6.0.0.final</revision>
<created>2013-16-12</created>
</Version>
</release>
<license rdf:resource="" /> <license rdf:resource="" />

2
distribution/artemis/pom.xml
View File

@ -182,7 +182,7 @@
<build> <build>
<resources> <resources>
<resource> <resource>
<directory>../activemq/src/main/resources</directory> <directory>../artemis/src/main/resources</directory>
<filtering>true</filtering> <filtering>true</filtering>
</resource> </resource>
</resources> </resources>

6
docs/user-manual/en/book.json
View File

@ -1,7 +1,7 @@
{ {
"title": "ActiveMQ Documentation", "title": "ActiveMQ Artemis Documentation",
"description": "ActiveMQ User Guide and Reference Documentation", "description": "ActiveMQ Artemis User Guide and Reference Documentation",
"github": "apache/activemq-6", "github": "apache/activemq-artemis",
"githubHost": "https://github.com/", "githubHost": "https://github.com/",
"links": { "links": {
"home": "http://activemq.apache.org/", "home": "http://activemq.apache.org/",

14
docs/user-manual/en/clusters.md
View File

@ -807,36 +807,36 @@ The out-of-the-box policies are
A, B or D, A, B, C, D, A, B, C, D or C, D, A, B, C, D, A, B, C. A, B or D, A, B, C, D, A, B, C, D or C, D, A, B, C, D, A, B, C.
Use Use
`org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy` `org.apache.activemq.artemis.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy`
as the `<connection-load-balancing-policy-class-name>`. as the `<connection-load-balancing-policy-class-name>`.
- Random. With this policy each node is chosen randomly. - Random. With this policy each node is chosen randomly.
Use Use
`org.apache.activemq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy` `org.apache.activemq.artemis.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy`
as the `<connection-load-balancing-policy-class-name>`. as the `<connection-load-balancing-policy-class-name>`.
- Random Sticky. With this policy the first node is chosen randomly - Random Sticky. With this policy the first node is chosen randomly
and then re-used for subsequent connections. and then re-used for subsequent connections.
Use Use
`org.apache.activemq.api.core.client.loadbalance.RandomStickyConnectionLoadBalancingPolicy` `org.apache.activemq.artemis.api.core.client.loadbalance.RandomStickyConnectionLoadBalancingPolicy`
as the `<connection-load-balancing-policy-class-name>`. as the `<connection-load-balancing-policy-class-name>`.
- First Element. With this policy the "first" (i.e. 0th) node is - First Element. With this policy the "first" (i.e. 0th) node is
always returned. always returned.
Use Use
`org.apache.activemq.api.core.client.loadbalance.FirstElementConnectionLoadBalancingPolicy` `org.apache.activemq.artemis.api.core.client.loadbalance.FirstElementConnectionLoadBalancingPolicy`
as the `<connection-load-balancing-policy-class-name>`. as the `<connection-load-balancing-policy-class-name>`.
You can also implement your own policy by implementing the interface You can also implement your own policy by implementing the interface
`org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy` `org.apache.activemq.artemis.api.core.client.loadbalance.ConnectionLoadBalancingPolicy`
Specifying which load balancing policy to use differs whether you are Specifying which load balancing policy to use differs whether you are
using JMS or the core API. If you don't specify a policy then the using JMS or the core API. If you don't specify a policy then the
default will be used which is default will be used which is
`org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy`. `org.apache.activemq.artemis.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy`.
If you're using JMS and you're using JNDI on the client to look up your If you're using JMS and you're using JNDI on the client to look up your
JMS connection factory instances then you can specify these parameters JMS connection factory instances then you can specify these parameters
@ -844,7 +844,7 @@ in the JNDI context environment in, e.g. `jndi.properties`, to specify
the load balancing policy directly: the load balancing policy directly:
java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
connection.myConnectionFactory=tcp://localhost:61616?loadBalancingPolicyClassName=org.apache.activemq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy connection.myConnectionFactory=tcp://localhost:61616?loadBalancingPolicyClassName=org.apache.activemq.artemis.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy
The above example would instantiate a JMS connection factory that uses The above example would instantiate a JMS connection factory that uses
the random connection load balancing policy. the random connection load balancing policy.

4
docs/user-manual/en/configuration-index.md
View File

@ -435,7 +435,7 @@ get a mask for a password, just run the main class at org.apache.activemq.artemi
An easy way to do it is through activemq-tools-<VERSION>-jar-with-dependencies.jar since it has all the dependencies: An easy way to do it is through activemq-tools-<VERSION>-jar-with-dependencies.jar since it has all the dependencies:
```sh ```sh
java -cp activemq-tools-6.0.0-jar-with-dependencies.jar org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec "your plaintext password" java -cp artemis-tools-1.0.0-jar-with-dependencies.jar org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec "your plaintext password"
``` ```
If you don't want to use the jar-with-dependencies, make sure the classpath is correct. You'll get something like If you don't want to use the jar-with-dependencies, make sure the classpath is correct. You'll get something like
@ -479,7 +479,7 @@ passwords using the new defined decoder.
To use a different decoder than the built-in one, you either pick one To use a different decoder than the built-in one, you either pick one
from existing libraries or you implement it yourself. All decoders must from existing libraries or you implement it yourself. All decoders must
implement the `org.apache.activemq.utils.SensitiveDataCodec<T>` implement the `org.apache.activemq.artemis.utils.SensitiveDataCodec<T>`
interface: interface:
``` java ``` java

2
docs/user-manual/en/core-bridges.md
View File

@ -46,7 +46,7 @@ with an example (this is actually from the bridge example):
<forwarding-address>jms.queue.mincing-machine</forwarding-address> <forwarding-address>jms.queue.mincing-machine</forwarding-address>
<filter-string="name='aardvark'"/> <filter-string="name='aardvark'"/>
<transformer-class-name> <transformer-class-name>
org.apache.activemq.jms.example.HatColourChangeTransformer org.apache.activemq.artemis.jms.example.HatColourChangeTransformer
</transformer-class-name> </transformer-class-name>
<retry-interval>1000</retry-interval> <retry-interval>1000</retry-interval>
<ha>true</ha> <ha>true</ha>

2
docs/user-manual/en/diverts.md
View File

@ -56,7 +56,7 @@ taken from the divert example:
<forwarding-address>jms.queue.priceForwarding</forwarding-address> <forwarding-address>jms.queue.priceForwarding</forwarding-address>
<filter string="office='New York'"/> <filter string="office='New York'"/>
<transformer-class-name> <transformer-class-name>
org.apache.activemq.jms.example.AddForwardingTimeTransformer org.apache.activemq.artemis.jms.example.AddForwardingTimeTransformer
</transformer-class-name> </transformer-class-name>
<exclusive>true</exclusive> <exclusive>true</exclusive>
</divert> </divert>

2
docs/user-manual/en/duplicate-detection.md
View File

@ -63,7 +63,7 @@ duplicate message for any message in the transaction, then it will
ignore the entire transaction. ignore the entire transaction.
The name of the property that you set is given by the value of The name of the property that you set is given by the value of
`org.apache.activemq.api.core.Message.HDR_DUPLICATE_DETECTION_ID`, which `org.apache.activemq.artemis.api.core.Message.HDR_DUPLICATE_DETECTION_ID`, which
is `_AMQ_DUPL_ID` is `_AMQ_DUPL_ID`
The value of the property can be of type `byte[]` or `SimpleString` if The value of the property can be of type `byte[]` or `SimpleString` if

4
docs/user-manual/en/embedding-activemq.md
View File

@ -78,7 +78,7 @@ enabled. Let's also assume that a queue and connection factory has been
defined in the `activemq-jms.xml` config file. defined in the `activemq-jms.xml` config file.
``` java ``` java
import org.apache.activemq.jms.server.embedded.EmbeddedJMS; import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
... ...
@ -129,7 +129,7 @@ config.setAcceptorConfigurations(transports);
``` ```
You need to instantiate an instance of You need to instantiate an instance of
`org.apache.activemq.api.core.server.embedded.EmbeddedActiveMQ` and add `org.apache.activemq.artemis.api.core.server.embedded.EmbeddedActiveMQ` and add
the configuration object to it. the configuration object to it.
``` java ``` java

10
docs/user-manual/en/intercepting-operations.md
View File

@ -12,7 +12,7 @@ makes interceptors powerful, but also potentially dangerous.
An interceptor must implement the `Interceptor interface`: An interceptor must implement the `Interceptor interface`:
``` java ``` java
package org.apache.activemq.api.core.interceptor; package org.apache.artemis.activemq.api.core.interceptor;
public interface Interceptor public interface Interceptor
{ {
@ -45,13 +45,13 @@ Both incoming and outgoing interceptors are configured in
`broker.xml`: `broker.xml`:
<remoting-incoming-interceptors> <remoting-incoming-interceptors>
<class-name>org.apache.activemq.jms.example.LoginInterceptor</class-name> <class-name>org.apache.activemq.artemis.jms.example.LoginInterceptor</class-name>
<class-name>org.apache.activemq.jms.example.AdditionalPropertyInterceptor</class-name> <class-name>org.apache.activemq.artemis.jms.example.AdditionalPropertyInterceptor</class-name>
</remoting-incoming-interceptors> </remoting-incoming-interceptors>
<remoting-outgoing-interceptors> <remoting-outgoing-interceptors>
<class-name>org.apache.activemq.jms.example.LogoutInterceptor</class-name> <class-name>org.apache.activemq.artemis.jms.example.LogoutInterceptor</class-name>
<class-name>org.apache.activemq.jms.example.AdditionalPropertyInterceptor</class-name> <class-name>org.apache.activemq.artemis.jms.example.AdditionalPropertyInterceptor</class-name>
</remoting-outgoing-interceptors> </remoting-outgoing-interceptors>
The interceptors classes (and their dependencies) must be added to the The interceptors classes (and their dependencies) must be added to the

6
docs/user-manual/en/jms-bridge.md
View File

@ -51,7 +51,7 @@ beans file that bridges 2 destinations which are actually on the same
server. server.
The JMS Bridge is a simple POJO so can be deployed with most frameworks, The JMS Bridge is a simple POJO so can be deployed with most frameworks,
simply instantiate the `org.apache.activemq.api.jms.bridge.impl.JMSBridgeImpl` simply instantiate the `org.apache.activemq.artemis.api.jms.bridge.impl.JMSBridgeImpl`
class and set the appropriate parameters. class and set the appropriate parameters.
## JMS Bridge Parameters ## JMS Bridge Parameters
@ -207,7 +207,7 @@ The configuration example above uses the default implementation provided
by Apache ActiveMQ Artemis that looks up the connection factory using JNDI. For other by Apache ActiveMQ Artemis that looks up the connection factory using JNDI. For other
Application Servers or JMS providers a new implementation may have to be Application Servers or JMS providers a new implementation may have to be
provided. This can easily be done by implementing the interface provided. This can easily be done by implementing the interface
`org.apache.activemq.jms.bridge.ConnectionFactoryFactory`. `org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory`.
## Source and Target Destination Factories ## Source and Target Destination Factories
@ -218,7 +218,7 @@ In the configuration example above, we have used the default provided by
Apache ActiveMQ Artemis that looks up the destination using JNDI. Apache ActiveMQ Artemis that looks up the destination using JNDI.
A new implementation can be provided by implementing A new implementation can be provided by implementing
`org.apache.activemq.jms.bridge.DestinationFactory` interface. `org.apache.activemq.artemis.jms.bridge.DestinationFactory` interface.
## Quality Of Service ## Quality Of Service

2
docs/user-manual/en/large-messages.md
View File

@ -182,7 +182,7 @@ which are also available through JMS by the use of object properties.
</tbody> </tbody>
</table> </table>
: org.apache.activemq.api.core.client.ClientMessage API : org.apache.activemq.artemis.api.core.client.ClientMessage API
To set the output stream when receiving a core message: To set the output stream when receiving a core message:

2
docs/user-manual/en/libaio.md
View File

@ -72,7 +72,7 @@ script `compile-native.sh`. This script will invoke the proper maven profile to
[INFO] Scanning for projects... [INFO] Scanning for projects...
[INFO] [INFO]
[INFO] ------------------------------------------------------------------------ [INFO] ------------------------------------------------------------------------
[INFO] Building ActiveMQ Artemis Native POM 6.0.0 [INFO] Building ActiveMQ Artemis Native POM 1.0.0
[INFO] ------------------------------------------------------------------------ [INFO] ------------------------------------------------------------------------
[INFO] [INFO]
[INFO] --- nar-maven-plugin:3.0.0:nar-validate (default-nar-validate) @ artemis-native --- [INFO] --- nar-maven-plugin:3.0.0:nar-validate (default-nar-validate) @ artemis-native ---

2
docs/user-manual/en/logging.md
View File

@ -62,7 +62,7 @@ add the following dependencies.
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>activemq-core-client</artifactId> <artifactId>activemq-core-client</artifactId>
<version>6.0.0</version> <version>1.0.0.Final</version>
</dependency> </dependency>
There are 2 properties you need to set when starting your java program, There are 2 properties you need to set when starting your java program,

62
docs/user-manual/en/management.md
View File

@ -36,10 +36,10 @@ what can be invoked for this type of resource.
Apache ActiveMQ Artemis exposes its managed resources in 2 packages: Apache ActiveMQ Artemis exposes its managed resources in 2 packages:
- *Core* resources are located in the - *Core* resources are located in the
`org.apache.activemq.api.core.management` package `org.apache.activemq.artemis.api.core.management` package
- *JMS* resources are located in the - *JMS* resources are located in the
`org.apache.activemq.api.jms.management` package `org.apache.activemq.artemis.api.jms.management` package
The way to invoke a *management operations* depends whether JMX, core The way to invoke a *management operations* depends whether JMX, core
messages, or JMS messages are used. messages, or JMS messages are used.
@ -66,7 +66,7 @@ full details of the API please consult the javadoc. In summary:
Core queues can be created or destroyed using the management Core queues can be created or destroyed using the management
operations `createQueue()` or `deployQueue()` or `destroyQueue()`)on operations `createQueue()` or `deployQueue()` or `destroyQueue()`)on
the `ActiveMQServerControl` (with the ObjectName the `ActiveMQServerControl` (with the ObjectName
`org.apache.activemq:module=Core,type=Server` or the resource name `org.apache.activemq.artemis:module=Core,type=Server` or the resource name
`core.server`) `core.server`)
`createQueue` will fail if the queue already exists while `createQueue` will fail if the queue already exists while
@ -126,14 +126,14 @@ full details of the API please consult the javadoc. In summary:
management operations `createBridge()` and `destroyBridge()` (resp. management operations `createBridge()` and `destroyBridge()` (resp.
`createDivert()` and `destroyDivert()`) on the `createDivert()` and `destroyDivert()`) on the
`ActiveMQServerControl` (with the ObjectName `ActiveMQServerControl` (with the ObjectName
`org.apache.activemq:module=Core,type=Server` or the resource name `org.apache.activemq.artemis:module=Core,type=Server` or the resource name
`core.server`). `core.server`).
- It is possible to stop the server and force failover to occur with - It is possible to stop the server and force failover to occur with
any currently attached clients. any currently attached clients.
to do this use the `forceFailover()` on the `ActiveMQServerControl` to do this use the `forceFailover()` on the `ActiveMQServerControl`
(with the ObjectName `org.apache.activemq:module=Core,type=Server` (with the ObjectName `org.apache.activemq.artemis:module=Core,type=Server`
or the resource name `core.server`) or the resource name `core.server`)
> **Note** > **Note**
@ -145,7 +145,7 @@ full details of the API please consult the javadoc. In summary:
#### Core Address Management #### Core Address Management
Core addresses can be managed using the `AddressControl` class (with the Core addresses can be managed using the `AddressControl` class (with the
ObjectName `org.apache.activemq:module=Core,type=Address,name="<the ObjectName `org.apache.activemq.artemis:module=Core,type=Address,name="<the
address name>"` or the resource name address name>"` or the resource name
`core.address.<the `core.address.<the
address name>`). address name>`).
@ -161,7 +161,7 @@ ObjectName `org.apache.activemq:module=Core,type=Address,name="<the
The bulk of the core management API deals with core queues. The The bulk of the core management API deals with core queues. The
`QueueControl` class defines the Core queue management operations (with `QueueControl` class defines the Core queue management operations (with
the ObjectName the ObjectName
`org.apache.activemq:module=Core,type=Queue,address="<the bound `org.apache.activemq.artemis:module=Core,type=Queue,address="<the bound
address>",name="<the queue name>"` or the resource address>",name="<the queue name>"` or the resource
name `core.queue.<the queue name>`). name `core.queue.<the queue name>`).
@ -245,7 +245,7 @@ transactions). These resources are:
They can be started or stopped using the `start()` or. `stop()` They can be started or stopped using the `start()` or. `stop()`
method on the `AcceptorControl` class (with the ObjectName method on the `AcceptorControl` class (with the ObjectName
`org.apache.activemq:module=Core,type=Acceptor,name="<the acceptor name>"` `org.apache.activemq.artemis:module=Core,type=Acceptor,name="<the acceptor name>"`
or the resource name or the resource name
`core.acceptor.<the address name>`). The acceptors parameters `core.acceptor.<the address name>`). The acceptors parameters
can be retrieved using the `AcceptorControl` attributes (see [Understanding Acceptors](configuring-transports.md)) can be retrieved using the `AcceptorControl` attributes (see [Understanding Acceptors](configuring-transports.md))
@ -254,7 +254,7 @@ transactions). These resources are:
They can be started or stopped using the `start()` or `stop()` They can be started or stopped using the `start()` or `stop()`
method on the `DivertControl` class (with the ObjectName method on the `DivertControl` class (with the ObjectName
`org.apache.activemq:module=Core,type=Divert,name=<the divert name>` `org.apache.activemq.artemis:module=Core,type=Divert,name=<the divert name>`
or the resource name `core.divert.<the divert name>`). Diverts or the resource name `core.divert.<the divert name>`). Diverts
parameters can be retrieved using the `DivertControl` attributes parameters can be retrieved using the `DivertControl` attributes
(see [Diverting and Splitting Message Flows)](diverts.md)) (see [Diverting and Splitting Message Flows)](diverts.md))
@ -263,7 +263,7 @@ transactions). These resources are:
They can be started or stopped using the `start()` (resp. `stop()`) They can be started or stopped using the `start()` (resp. `stop()`)
method on the `BridgeControl` class (with the ObjectName method on the `BridgeControl` class (with the ObjectName
`org.apache.activemq:module=Core,type=Bridge,name="<the bridge name>"` `org.apache.activemq.artemis:module=Core,type=Bridge,name="<the bridge name>"`
or the resource name or the resource name
`core.bridge.<the bridge name>`). Bridges parameters can be retrieved `core.bridge.<the bridge name>`). Bridges parameters can be retrieved
using the `BridgeControl` attributes (see [Core bridges](core-bridges.md)) using the `BridgeControl` attributes (see [Core bridges](core-bridges.md))
@ -272,7 +272,7 @@ transactions). These resources are:
They can be started or stopped using the `start()` or `stop()` They can be started or stopped using the `start()` or `stop()`
method on the `BroadcastGroupControl` class (with the ObjectName method on the `BroadcastGroupControl` class (with the ObjectName
`org.apache.activemq:module=Core,type=BroadcastGroup,name="<the broadcast group name>"` or the resource name `org.apache.activemq.artemis:module=Core,type=BroadcastGroup,name="<the broadcast group name>"` or the resource name
`core.broadcastgroup.<the broadcast group name>`). Broadcast groups `core.broadcastgroup.<the broadcast group name>`). Broadcast groups
parameters can be retrieved using the `BroadcastGroupControl` parameters can be retrieved using the `BroadcastGroupControl`
attributes (see [Clusters](clusters.md)) attributes (see [Clusters](clusters.md))
@ -281,7 +281,7 @@ transactions). These resources are:
They can be started or stopped using the `start()` or `stop()` They can be started or stopped using the `start()` or `stop()`
method on the `DiscoveryGroupControl` class (with the ObjectName method on the `DiscoveryGroupControl` class (with the ObjectName
`org.apache.activemq:module=Core,type=DiscoveryGroup,name="<the discovery group name>"` or the resource name `org.apache.activemq.artemis:module=Core,type=DiscoveryGroup,name="<the discovery group name>"` or the resource name
`core.discovery.<the discovery group name>`). Discovery groups `core.discovery.<the discovery group name>`). Discovery groups
parameters can be retrieved using the `DiscoveryGroupControl` parameters can be retrieved using the `DiscoveryGroupControl`
attributes (see [Clusters](clusters.md)) attributes (see [Clusters](clusters.md))
@ -290,7 +290,7 @@ transactions). These resources are:
They can be started or stopped using the `start()` or `stop()` They can be started or stopped using the `start()` or `stop()`
method on the `ClusterConnectionControl` class (with the ObjectName method on the `ClusterConnectionControl` class (with the ObjectName
`org.apache.activemq:module=Core,type=ClusterConnection,name="<the cluster connection name>"` or the resource name `org.apache.activemq.artemis:module=Core,type=ClusterConnection,name="<the cluster connection name>"` or the resource name
`core.clusterconnection.<the cluster connection name>`). Cluster `core.clusterconnection.<the cluster connection name>`). Cluster
connections parameters can be retrieved using the connections parameters can be retrieved using the
`ClusterConnectionControl` attributes (see [Clusters](clusters.md)) `ClusterConnectionControl` attributes (see [Clusters](clusters.md))
@ -304,7 +304,7 @@ objects* (i.e. JMS queues, topics and connection factories).
JMS Resources (connection factories and destinations) can be created JMS Resources (connection factories and destinations) can be created
using the `JMSServerControl` class (with the ObjectName using the `JMSServerControl` class (with the ObjectName
`org.apache.activemq:module=JMS,type=Server` or the resource name `org.apache.activemq.artemis:module=JMS,type=Server` or the resource name
`jms.server`). `jms.server`).
- Listing, creating, destroying connection factories - Listing, creating, destroying connection factories
@ -359,7 +359,7 @@ using the `JMSServerControl` class (with the ObjectName
JMS Connection Factories can be managed using the JMS Connection Factories can be managed using the
`ConnectionFactoryControl` class (with the ObjectName `ConnectionFactoryControl` class (with the ObjectName
`org.apache.activemq:module=JMS,type=ConnectionFactory,name="<the connection factory `org.apache.activemq.artemis:module=JMS,type=ConnectionFactory,name="<the connection factory
name>"` or the resource name name>"` or the resource name
`jms.connectionfactory.<the `jms.connectionfactory.<the
connection factory name>`). connection factory name>`).
@ -376,7 +376,7 @@ JMS Connection Factories can be managed using the
#### JMS Queue Management #### JMS Queue Management
JMS queues can be managed using the `JMSQueueControl` class (with the JMS queues can be managed using the `JMSQueueControl` class (with the
ObjectName `org.apache.activemq:module=JMS,type=Queue,name="<the queue ObjectName `org.apache.activemq.artemis:module=JMS,type=Queue,name="<the queue
name>"` or the resource name `jms.queue.<the queue name>"` or the resource name `jms.queue.<the queue
name>`). name>`).
@ -449,7 +449,7 @@ operations on a core queue.*
#### JMS Topic Management #### JMS Topic Management
JMS Topics can be managed using the `TopicControl` class (with the JMS Topics can be managed using the `TopicControl` class (with the
ObjectName `org.apache.activemq:module=JMS,type=Topic,name="<the topic ObjectName `org.apache.activemq.artemis:module=JMS,type=Topic,name="<the topic
name>"` or the resource name `jms.topic.<the topic name>"` or the resource name `jms.topic.<the topic
name>`). name>`).
@ -485,14 +485,14 @@ Apache ActiveMQ Artemis registers its resources with the domain `org.apache.acti
For example, the `ObjectName` to manage a JMS Queue `exampleQueue` is: For example, the `ObjectName` to manage a JMS Queue `exampleQueue` is:
org.apache.activemq:module=JMS,type=Queue,name="exampleQueue" org.apache.activemq.artemis:module=JMS,type=Queue,name="exampleQueue"
and the MBean is: and the MBean is:
org.apache.activemq.api.jms.management.JMSQueueControl org.apache.activemq.artemis.api.jms.management.JMSQueueControl
The MBean's `ObjectName` are built using the helper class The MBean's `ObjectName` are built using the helper class
`org.apache.activemq.api.core.management.ObjectNameBuilder`. You can `org.apache.activemq.artemis.api.core.management.ObjectNameBuilder`. You can
also use `jconsole` to find the `ObjectName` of the MBeans you want to also use `jconsole` to find the `ObjectName` of the MBeans you want to
manage. manage.
@ -519,7 +519,7 @@ If JMX is enabled, Apache ActiveMQ Artemis can be managed locally using `jconsol
> to configure the server for remote management (system properties must > to configure the server for remote management (system properties must
> be set in `run.sh` or `run.bat` scripts). > be set in `run.sh` or `run.bat` scripts).
By default, Apache ActiveMQ Artemis server uses the JMX domain "org.apache.activemq". By default, Apache ActiveMQ Artemis server uses the JMX domain "org.apache.activemq.artemis".
To manage several Apache ActiveMQ Artemis servers from the *same* MBeanServer, the JMX To manage several Apache ActiveMQ Artemis servers from the *same* MBeanServer, the JMX
domain can be configured for each individual Apache ActiveMQ Artemis server by setting domain can be configured for each individual Apache ActiveMQ Artemis server by setting
`jmx-domain` in `broker.xml`: `jmx-domain` in `broker.xml`:
@ -545,11 +545,11 @@ http agent deployed as a Web Application. Jolokia is a remote
JMX over HTTP bridge that exposed mBeans, for a full guids as JMX over HTTP bridge that exposed mBeans, for a full guids as
to how to use refer to [Jolokia Documentation](http://www.jolokia.org/documentation.html), to how to use refer to [Jolokia Documentation](http://www.jolokia.org/documentation.html),
however a simple example to query thebrokers version would however a simple example to query thebrokers version would
be to use a brower and go to the URL http://localhost:8161/jolokia/read/org.apache.activemq:module=Core,type=Server/Version. be to use a brower and go to the URL http://localhost:8161/jolokia/read/org.apache.activemq.artemis:module=Core,type=Server/Version.
This would give you back something like the following: This would give you back something like the following:
{"timestamp":1422019706,"status":200,"request":{"mbean":"org.apache.activemq:module=Core,type=Server","attribute":"Version","type":"read"},"value":"6.0.0.SNAPSHOT (Active Hornet, 126)"} {"timestamp":1422019706,"status":200,"request":{"mbean":"org.apache.activemq.artemis:module=Core,type=Server","attribute":"Version","type":"read"},"value":"1.0.0.SNAPSHOT (Active Hornet, 126)"}
## Using Management Via Core API ## Using Management Via Core API
@ -576,7 +576,7 @@ A `ClientConsumer` can be used to consume the management reply and
retrieve the result of the operation (if any) stored in the reply's retrieve the result of the operation (if any) stored in the reply's
body. For portability, results are returned as a [JSON](http://json.org) body. For portability, results are returned as a [JSON](http://json.org)
String rather than Java Serialization (the String rather than Java Serialization (the
`org.apache.activemq.api.core.management.ManagementHelper` can be used `org.apache.activemq.artemis.api.core.management.ManagementHelper` can be used
to convert the JSON string to Java objects). to convert the JSON string to Java objects).
These steps can be simplified to make it easier to invoke management These steps can be simplified to make it easier to invoke management
@ -588,13 +588,13 @@ operations using Core messages:
2. Create a `ClientMessage` 2. Create a `ClientMessage`
3. Use the helper class 3. Use the helper class
`org.apache.activemq.api.core.management.ManagementHelper` to fill `org.apache.activemq.artemis.api.core.management.ManagementHelper` to fill
the message with the management properties the message with the management properties
4. Send the message using the `ClientRequestor` 4. Send the message using the `ClientRequestor`
5. Use the helper class 5. Use the helper class
`org.apache.activemq.api.core.management.ManagementHelper` to `org.apache.activemq.artemis.api.core.management.ManagementHelper` to
retrieve the operation result from the management reply retrieve the operation result from the management reply
For example, to find out the number of messages in the core queue For example, to find out the number of messages in the core queue
@ -615,7 +615,7 @@ Management operation name and parameters must conform to the Java
interfaces defined in the `management` packages. interfaces defined in the `management` packages.
Names of the resources are built using the helper class Names of the resources are built using the helper class
`org.apache.activemq.api.core.management.ResourceNames` and are `org.apache.activemq.artemis.api.core.management.ResourceNames` and are
straightforward (`core.queue.exampleQueue` for the Core Queue straightforward (`core.queue.exampleQueue` for the Core Queue
`exampleQueue`, `jms.topic.exampleTopic` for the JMS Topic `exampleQueue`, `jms.topic.exampleTopic` for the JMS Topic
`exampleTopic`, etc.). `exampleTopic`, etc.).
@ -662,13 +662,13 @@ API instead:
2. create a `Message` 2. create a `Message`
3. use the helper class 3. use the helper class
`org.apache.activemq.api.jms.management.JMSManagementHelper` to fill `org.apache.activemq.artemis.api.jms.management.JMSManagementHelper` to fill
the message with the management properties the message with the management properties
4. send the message using the `QueueRequestor` 4. send the message using the `QueueRequestor`
5. use the helper class 5. use the helper class
`org.apache.activemq.api.jms.management.JMSManagementHelper` to `org.apache.activemq.artemis.api.jms.management.JMSManagementHelper` to
retrieve the operation result from the management reply retrieve the operation result from the management reply
For example, to know the number of messages in the JMS queue For example, to know the number of messages in the JMS queue
@ -714,10 +714,10 @@ These notifications can be received by 3 different ways:
If JMX is enabled (see Configuring JMX section), JMX notifications can be received by If JMX is enabled (see Configuring JMX section), JMX notifications can be received by
subscribing to 2 MBeans: subscribing to 2 MBeans:
- `org.apache.activemq:module=Core,type=Server` for notifications on - `org.apache.activemq.artemis:module=Core,type=Server` for notifications on
*Core* resources *Core* resources
- `org.apache.activemq:module=JMS,type=Server` for notifications on - `org.apache.activemq.artemis:module=JMS,type=Server` for notifications on
*JMS* resources *JMS* resources
### Core Messages Notifications ### Core Messages Notifications

4
docs/user-manual/en/project-info.md
View File

@ -20,10 +20,10 @@ page:<http://activemq.apache.org/download.html>
- Follow us on [twitter](https://twitter.com/activemq) - Follow us on [twitter](https://twitter.com/activemq)
- Apache ActiveMQ Artemis Git repository is <https://github.com/apache/activemq-6> - Apache ActiveMQ Artemis Git repository is <https://github.com/apache/activemq-artemis>
- All release tags are available from - All release tags are available from
<https://github.com/apache/activemq-6/releases> <https://github.com/apache/activemq-artemis/releases>
And many thanks to all our contributors, both old and new who helped And many thanks to all our contributors, both old and new who helped

2
docs/user-manual/en/queue-attributes.md
View File

@ -65,7 +65,7 @@ which are.
Queues can also be created using the core API or the management API. Queues can also be created using the core API or the management API.
For the core API, queues can be created via the For the core API, queues can be created via the
`org.apache.activemq.api.core.client.ClientSession` interface. There are `org.apache.activemq.artemis.api.core.client.ClientSession` interface. There are
multiple `createQueue` methods that support setting all of the multiple `createQueue` methods that support setting all of the
previously mentioned attributes. There is one extra attribute that can previously mentioned attributes. There is one extra attribute that can
be set via this API which is `temporary`. setting this to true means be set via this API which is `temporary`. setting this to true means

4
docs/user-manual/en/rest.md
View File

@ -103,7 +103,7 @@ Within your WEB-INF/lib directory you must have the Apache ActiveMQ Artemis-rest
<dependency> <dependency>
<groupId>org.apache.activemq.rest</groupId> <groupId>org.apache.activemq.rest</groupId>
<artifactId>activemq-rest</artifactId> <artifactId>activemq-rest</artifactId>
<version>6.0.0.Final</version> <version>1.0.0.Final</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>*</groupId> <groupId>*</groupId>
@ -179,7 +179,7 @@ Here's a Maven pom.xml file for creating a WAR for this environment. Make sure y
<dependency> <dependency>
<groupId>org.apache.activemq.rest</groupId> <groupId>org.apache.activemq.rest</groupId>
<artifactId>activemq-rest</artifactId> <artifactId>activemq-rest</artifactId>
<version>6.0.0.Final</version> <version>1.0.0.Final</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
docs/user-manual/en/send-guarantees.md
View File

@ -126,7 +126,7 @@ session factory. Please see [Client Reconnection and Session Reattachment](clien
# Asynchronous Send Acknowledgements # Asynchronous Send Acknowledgements
To use the feature using the core API, you implement the interface To use the feature using the core API, you implement the interface
`org.apache.activemq.api.core.client.SendAcknowledgementHandler` and set `org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler` and set
a handler instance on your `ClientSession`. a handler instance on your `ClientSession`.
Then, you just send messages as normal using your `ClientSession`, and Then, you just send messages as normal using your `ClientSession`, and

6
etc/findbugs-exclude.xml
View File

@ -22,14 +22,14 @@ under the License.
<Match> <Match>
<!-- Having str restored to null is fine for our purposes --> <!-- Having str restored to null is fine for our purposes -->
<Class name="org.apache.activemq.api.core.SimpleString"/> <Class name="org.apache.activemq.artemis.api.core.SimpleString"/>
<Field name="str"/> <Field name="str"/>
<Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/> <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
</Match> </Match>
<Match> <Match>
<!-- The whole point of SimpleString is to expose this data without any performance penalty --> <!-- The whole point of SimpleString is to expose this data without any performance penalty -->
<Class name="org.apache.activemq.api.core.SimpleString"/> <Class name="org.apache.activemq.artemis.api.core.SimpleString"/>
<method name="getData"/> <method name="getData"/>
<Bug pattern="EI_EXPOSE_REP"/> <Bug pattern="EI_EXPOSE_REP"/>
</Match> </Match>
@ -91,7 +91,7 @@ under the License.
so methods are passed null arguments to trigger the exact same exceptions. so methods are passed null arguments to trigger the exact same exceptions.
--> -->
<Class name="org.apache.activemq.utils.TypedProperties"/> <Class name="org.apache.activemq.artemis.utils.TypedProperties"/>
<Or> <Or>
<Method name="getFloatProperty"/> <Method name="getFloatProperty"/>
<Method name="getDoubleProperty"/> <Method name="getDoubleProperty"/>

12
pom.xml
View File

@ -105,10 +105,10 @@
</properties> </properties>
<scm> <scm>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/activemq-6.git</connection> <connection>scm:git:http://git-wip-us.apache.org/repos/asf/activemq-artemis.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/activemq-6.git</developerConnection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/activemq-artemis.git</developerConnection>
<url>https://fisheye6.atlassian.com/browse/~br=master/activemq-6-git</url> <url>https://fisheye6.atlassian.com/browse/~br=master/activemq-artemis-git</url>
<tag>6.0.0-SNAPSHOT</tag> <tag>1.0.0-SNAPSHOT</tag>
</scm> </scm>
<distributionManagement> <distributionManagement>
@ -931,9 +931,9 @@
<exclude>**/*.iml</exclude> <exclude>**/*.iml</exclude>
<exclude>**/*.jceks</exclude> <exclude>**/*.jceks</exclude>
<exclude>**/*.jks</exclude> <exclude>**/*.jks</exclude>
<exclude>**/org/apache/activemq/utils/json/**</exclude> <exclude>**/org/apache/activemq/artemis/utils/json/**</exclude>
<exclude>**/src/main/resources/META-INF/LICENSE</exclude> <exclude>**/src/main/resources/META-INF/LICENSE</exclude>
<exclude>**/org/apache/activemq/utils/Base64.java</exclude> <exclude>**/org/apache/activemq/artemis/utils/Base64.java</exclude>
</excludes> </excludes>
</configuration> </configuration>
<executions> <executions>

20
tests/config/logging.properties.trace
View File

@ -19,19 +19,19 @@
# Additional logger names to configure (root logger is always configured) # Additional logger names to configure (root logger is always configured)
# Root logger option # Root logger option
loggers=org.jboss.logging,org.apache.activemq.core.server,org.apache.activemq.utils,org.apache.activemq.journal,org.apache.activemq.jms,org.apache.activemq.ra,org.apache.activemq.tests.unit,org.apache.activemq.tests.integration,org.apache.activemq.jms.tests 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,org.apache.activemq.artemis.ra,org.apache.activemq.artemis.tests.unit,org.apache.activemq.artemis.tests.integration,org.apache.activemq.artemis.jms.tests
# Root logger level # Root logger level
logger.level=INFO logger.level=INFO
# ActiveMQ logger levels # ActiveMQ logger levels
logger.org.apache.activemq.core.server.level=TRACE logger.org.apache.activemq.artemis.core.server.level=TRACE
logger.org.apache.activemq.journal.level=INFO logger.org.apache.activemq.artemis.journal.level=INFO
logger.org.apache.activemq.utils.level=INFO logger.org.apache.activemq.artemis.utils.level=INFO
logger.org.apache.activemq.jms.level=INFO logger.org.apache.activemq.artemis.jms.level=INFO
logger.org.apache.activemq.ra.level=INFO logger.org.apache.activemq.artemis.ra.level=INFO
logger.org.apache.activemq.tests.unit.level=INFO logger.org.apache.activemq.artemis.tests.unit.level=INFO
logger.org.apache.activemq.tests.integration.level=INFO logger.org.apache.activemq.artemis.tests.integration.level=INFO
logger.org.apache.activemq.jms.tests.level=INFO logger.org.apache.activemq.artemis.jms.tests.level=INFO
# Root logger handlers # Root logger handlers
logger.handlers=CONSOLE,TEST logger.handlers=CONSOLE,TEST
@ -53,7 +53,7 @@ handler.FILE.fileName=target/activemq.log
handler.FILE.formatter=PATTERN handler.FILE.formatter=PATTERN
# Console handler configuration # Console handler configuration
handler.TEST=org.apache.activemq.logs.AssertionLoggerHandler handler.TEST=org.apache.activemq.artemis.logs.AssertionLoggerHandler
handler.TEST.level=TRACE handler.TEST.level=TRACE
handler.TEST.formatter=PATTERN handler.TEST.formatter=PATTERN

2
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsQueueBrowserTest.java
View File

@ -199,7 +199,7 @@ public class JmsQueueBrowserTest extends BasicOpenWireTest
} }
ObjectName queueViewMBeanName = new ObjectName( ObjectName queueViewMBeanName = new ObjectName(
"org.apache.activemq:type=Broker,brokerName=localhost,destinationType=Queue,destinationName=TEST"); "org.apache.activemq.artemis:type=Broker,brokerName=localhost,destinationType=Queue,destinationName=TEST");
System.out.println("Create QueueView MBean..."); System.out.println("Create QueueView MBean...");
QueueViewMBean proxy = (QueueViewMBean) broker.getManagementContext() QueueViewMBean proxy = (QueueViewMBean) broker.getManagementContext()

2
tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
View File

@ -1418,7 +1418,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see ClientSession#createQueue(org.apache.activemq.utils.SimpleString, org.apache.activemq.utils.SimpleString) * @see ClientSession#createQueue(org.apache.activemq.artemis.utils.SimpleString, org.apache.activemq.artemis.utils.SimpleString)
*/ */
public void createQueue(SimpleString address, SimpleString queueName) throws ActiveMQException public void createQueue(SimpleString address, SimpleString queueName) throws ActiveMQException
{ {

2
tests/jms-tests/src/test/resources/jbossjta-properties.xml
View File

@ -172,7 +172,7 @@
<!-- <!--
com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple
--> -->
<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ" value="org.apache.activemq.api.jms.server.recovery.ActiveMQXAResourceRecovery;adaptor1"/> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ" value="org.apache.activemq.artemis.api.jms.server.recovery.ActiveMQXAResourceRecovery;adaptor1"/>

2
tests/joram-tests/src/test/resources/provider.properties
View File

@ -20,7 +20,7 @@
## ##
jms.provider.admin.class=org.apache.activemq.artemis.jms.ActiveMQAdmin jms.provider.admin.class=org.apache.activemq.artemis.jms.ActiveMQAdmin
#jms.provider.admin.class = org.apache.activemq.api.jms.GenericAdmin #jms.provider.admin.class = org.apache.activemq.artemis.api.jms.GenericAdmin
#jms.provider.admin.class = org.objectweb.jtests.providers.admin.JoramAdmin #jms.provider.admin.class = org.objectweb.jtests.providers.admin.JoramAdmin
#jms.provider.admin.class = org.objectweb.jtests.providers.admin.AshnaMQAdmin #jms.provider.admin.class = org.objectweb.jtests.providers.admin.AshnaMQAdmin
#jms.provider.admin.class = org.objectweb.jtests.providers.admin.FioranoMQAdmin #jms.provider.admin.class = org.objectweb.jtests.providers.admin.FioranoMQAdmin

8
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
View File

@ -76,7 +76,7 @@ public class TimedBufferTest extends UnitTestCase
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.activemq.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int) * @see org.apache.activemq.artemis.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int)
*/ */
public ByteBuffer newBuffer(final int minSize, final int maxSize) public ByteBuffer newBuffer(final int minSize, final int maxSize)
{ {
@ -151,7 +151,7 @@ public class TimedBufferTest extends UnitTestCase
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.activemq.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int) * @see org.apache.activemq.artemis.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int)
*/ */
public ByteBuffer newBuffer(final int minSize, final int maxSize) public ByteBuffer newBuffer(final int minSize, final int maxSize)
{ {
@ -240,7 +240,7 @@ public class TimedBufferTest extends UnitTestCase
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.activemq.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int) * @see org.apache.activemq.artemis.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int)
*/ */
public ByteBuffer newBuffer(final int minSize, final int maxSize) public ByteBuffer newBuffer(final int minSize, final int maxSize)
{ {
@ -326,7 +326,7 @@ public class TimedBufferTest extends UnitTestCase
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.activemq.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int) * @see org.apache.activemq.artemis.utils.timedbuffer.TimedBufferObserver#newBuffer(int, int)
*/ */
public ByteBuffer newBuffer(final int minSize, final int maxSize) public ByteBuffer newBuffer(final int minSize, final int maxSize)
{ {

2
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java
View File

@ -133,7 +133,7 @@ public class SoftValueMapTest extends UnitTestCase
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.activemq.utils.SoftValueHashMap.ValueCache#isLive() * @see org.apache.activemq.artemis.utils.SoftValueHashMap.ValueCache#isLive()
*/ */
public boolean isLive() public boolean isLive()
{ {