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

More rename updates

This commit is contained in:
jbertram 2015-04-29 12:20:31 -05:00
parent 5676d9a8e6
commit 791cc5c50c
40 changed files with 212 additions and 220 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.
* 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

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
private static boolean DEFAULT_JMX_MANAGEMENT_ENABLED = true;
// the JMX domain used to registered ActiveMQ MBeans in the MBeanServer
private static String DEFAULT_JMX_DOMAIN = "org.apache.activemq";
// the JMX domain used to registered ActiveMQ Artemis MBeans in the MBeanServer
private static String DEFAULT_JMX_DOMAIN = "org.apache.activemq.artemis";
// true means that message counters are enabled
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)
* @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
{

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>
* 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.
* @see org.apache.activemq.utils.IDGenerator
* @see org.apache.activemq.artemis.utils.IDGenerator
*/
public interface Journal extends ActiveMQComponent
{

12
artemis-native/README
View File

@ -25,19 +25,19 @@ STEPS TO BUILD
1. Make sure you have JAVA_HOME defined, and pointing to the root of your JDK:
Example:
$> export JAVA_HOME=/usr/share/jdk1.7
2. Call compile-native.sh. Bootstrap will call all the initial scripts you need
$> ./compile-native.sh
if you are missing any dependencies, autoconf would tell you what you're missing.
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.

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

@ -68,7 +68,7 @@
<address>jms.topic.priceUpdates</address>
<forwarding-address>jms.queue.priceForwarding</forwarding-address>
<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>
</divert>
</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
* <pre>
* &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>
* <p>
* you'll need something like this if the ActiveMQ Server is remote
* <pre>
* &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>
* <p>
* you'll need something like this if the ActiveMQ Server is remote and has failover configured
* <pre>
* &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>
*/
public class ActiveMQXAResourceRecovery

14
artemis_doap.rdf
View File

@ -25,7 +25,7 @@ under the License.
<homepage rdf:resource="" />
<shortdesc></shortdesc>
<description></description>
<maintainer>
<foaf:Person>
<foaf:name>Clebert Suconic</foaf:name>
@ -62,17 +62,9 @@ under the License.
<foaf:lastName>Taylor</foaf:lastName>
</foaf:Person>
</developer>
<release>
<Version>
<name>6.0.0</name>
<revision>6.0.0.final</revision>
<created>2013-16-12</created>
</Version>
</release>
<license rdf:resource="" />
<programming-language>Java</programming-language>
<programming-language>C/C++</programming-language>
<vendor>Red Hat</vendor>

2
distribution/artemis/pom.xml
View File

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

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

@ -1,7 +1,7 @@
{
"title": "ActiveMQ Documentation",
"description": "ActiveMQ User Guide and Reference Documentation",
"github": "apache/activemq-6",
"title": "ActiveMQ Artemis Documentation",
"description": "ActiveMQ Artemis User Guide and Reference Documentation",
"github": "apache/activemq-artemis",
"githubHost": "https://github.com/",
"links": {
"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.
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>`.
- Random. With this policy each node is chosen randomly.
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>`.
- Random Sticky. With this policy the first node is chosen randomly
and then re-used for subsequent connections.
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>`.
- First Element. With this policy the "first" (i.e. 0th) node is
always returned.
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>`.
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
using JMS or the core API. If you don't specify a policy then the
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
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:
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 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:
```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
@ -479,7 +479,7 @@ passwords using the new defined decoder.
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
implement the `org.apache.activemq.utils.SensitiveDataCodec<T>`
implement the `org.apache.activemq.artemis.utils.SensitiveDataCodec<T>`
interface:
``` 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>
<filter-string="name='aardvark'"/>
<transformer-class-name>
org.apache.activemq.jms.example.HatColourChangeTransformer
org.apache.activemq.artemis.jms.example.HatColourChangeTransformer
</transformer-class-name>
<retry-interval>1000</retry-interval>
<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>
<filter string="office='New York'"/>
<transformer-class-name>
org.apache.activemq.jms.example.AddForwardingTimeTransformer
org.apache.activemq.artemis.jms.example.AddForwardingTimeTransformer
</transformer-class-name>
<exclusive>true</exclusive>
</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.
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`
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.
``` 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
`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.
``` 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`:
``` java
package org.apache.activemq.api.core.interceptor;
package org.apache.artemis.activemq.api.core.interceptor;
public interface Interceptor
{
@ -45,13 +45,13 @@ Both incoming and outgoing interceptors are configured in
`broker.xml`:
<remoting-incoming-interceptors>
<class-name>org.apache.activemq.jms.example.LoginInterceptor</class-name>
<class-name>org.apache.activemq.jms.example.AdditionalPropertyInterceptor</class-name>
<class-name>org.apache.activemq.artemis.jms.example.LoginInterceptor</class-name>
<class-name>org.apache.activemq.artemis.jms.example.AdditionalPropertyInterceptor</class-name>
</remoting-incoming-interceptors>
<remoting-outgoing-interceptors>
<class-name>org.apache.activemq.jms.example.LogoutInterceptor</class-name>
<class-name>org.apache.activemq.jms.example.AdditionalPropertyInterceptor</class-name>
<class-name>org.apache.activemq.artemis.jms.example.LogoutInterceptor</class-name>
<class-name>org.apache.activemq.artemis.jms.example.AdditionalPropertyInterceptor</class-name>
</remoting-outgoing-interceptors>
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.
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.
## 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
Application Servers or JMS providers a new implementation may have to be
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
@ -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.
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

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>
</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:

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]
[INFO] ------------------------------------------------------------------------
[INFO] Building ActiveMQ Artemis Native POM 6.0.0
[INFO] Building ActiveMQ Artemis Native POM 1.0.0
[INFO] ------------------------------------------------------------------------
[INFO]
[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>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core-client</artifactId>
<version>6.0.0</version>
<version>1.0.0.Final</version>
</dependency>
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:
- *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
`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
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
operations `createQueue()` or `deployQueue()` or `destroyQueue()`)on
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`)
`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.
`createDivert()` and `destroyDivert()`) on 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`).
- It is possible to stop the server and force failover to occur with
any currently attached clients.
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`)
> **Note**
@ -145,7 +145,7 @@ full details of the API please consult the javadoc. In summary:
#### Core Address Management
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
`core.address.<the
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
`QueueControl` class defines the Core queue management operations (with
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
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()`
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
`core.acceptor.<the address name>`). The acceptors parameters
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()`
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
parameters can be retrieved using the `DivertControl` attributes
(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()`)
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
`core.bridge.<the bridge name>`). Bridges parameters can be retrieved
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()`
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
parameters can be retrieved using the `BroadcastGroupControl`
attributes (see [Clusters](clusters.md))
@ -281,7 +281,7 @@ transactions). These resources are:
They can be started or stopped using the `start()` or `stop()`
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
parameters can be retrieved using the `DiscoveryGroupControl`
attributes (see [Clusters](clusters.md))
@ -290,7 +290,7 @@ transactions). These resources are:
They can be started or stopped using the `start()` or `stop()`
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
connections parameters can be retrieved using the
`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
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`).
- Listing, creating, destroying connection factories
@ -359,7 +359,7 @@ using the `JMSServerControl` class (with the ObjectName
JMS Connection Factories can be managed using the
`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
`jms.connectionfactory.<the
connection factory name>`).
@ -376,7 +376,7 @@ JMS Connection Factories can be managed using the
#### JMS Queue Management
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>`).
@ -449,7 +449,7 @@ operations on a core queue.*
#### JMS Topic Management
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>`).
@ -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:
org.apache.activemq:module=JMS,type=Queue,name="exampleQueue"
org.apache.activemq.artemis:module=JMS,type=Queue,name="exampleQueue"
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
`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
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
> 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
domain can be configured for each individual Apache ActiveMQ Artemis server by setting
`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
to how to use refer to [Jolokia Documentation](http://www.jolokia.org/documentation.html),
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:
{"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
@ -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
body. For portability, results are returned as a [JSON](http://json.org)
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).
These steps can be simplified to make it easier to invoke management
@ -588,13 +588,13 @@ operations using Core messages:
2. Create a `ClientMessage`
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
4. Send the message using the `ClientRequestor`
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
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.
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
`exampleQueue`, `jms.topic.exampleTopic` for the JMS Topic
`exampleTopic`, etc.).
@ -662,13 +662,13 @@ API instead:
2. create a `Message`
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
4. send the message using the `QueueRequestor`
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
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
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
- `org.apache.activemq:module=JMS,type=Server` for notifications on
- `org.apache.activemq.artemis:module=JMS,type=Server` for notifications on
*JMS* resources
### 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)
- 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
<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

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.
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
previously mentioned attributes. There is one extra attribute that can
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>
<groupId>org.apache.activemq.rest</groupId>
<artifactId>activemq-rest</artifactId>
<version>6.0.0.Final</version>
<version>1.0.0.Final</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@ -179,7 +179,7 @@ Here's a Maven pom.xml file for creating a WAR for this environment. Make sure y
<dependency>
<groupId>org.apache.activemq.rest</groupId>
<artifactId>activemq-rest</artifactId>
<version>6.0.0.Final</version>
<version>1.0.0.Final</version>
</dependency>
</dependencies>
</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
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`.
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>
<!-- 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"/>
<Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
</Match>
<Match>
<!-- 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"/>
<Bug pattern="EI_EXPOSE_REP"/>
</Match>
@ -91,7 +91,7 @@ under the License.
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>
<Method name="getFloatProperty"/>
<Method name="getDoubleProperty"/>

24
examples/jms/bridge/readme.html
View File

@ -26,10 +26,10 @@ under the License.
</head>
<body onload="prettyPrint()">
<h1>Core Bridge Example</h1>
<p>This example demonstrates a core bridge deployed on one server, which consumes messages from a
local queue and forwards them to an address on a second server.</p>
<p>Core bridges are used to create message flows between any two ActiveMQ servers which are remotely separated.
Core bridges are resilient and will cope with temporary connection failure allowing them to be an ideal
choice for forwarding over unreliable connections, e.g. a WAN.</p>
@ -45,7 +45,7 @@ under the License.
<p>For more information on bridges, please see the ActiveMQ user manual.</p>
<p>In this example we will demonstrate a simple sausage factory for aardvarks.</p>
<p>We have a JMS queue on server 0 named <code>sausage-factory</code>, and we have a
<p>We have a JMS queue on server 0 named <code>sausage-factory</code>, and we have a
JMS queue on server 1 named <code>mincing-machine</code></p>
<p>We want to forward any messages that are sent to the <code>sausage-factory</code> queue on server 0, to the <code>mincing-machine</code>
on server 1.</p>
@ -53,7 +53,7 @@ under the License.
to "aardvark". It is known that other things, such are Sasquatches are also sent to the <code>sausage-factory</code> and we
want to reject those.</p>
<p>Moreover it is known that Aardvarks normally wear blue hats, and it's important that we only make sausages using
Aardvarks with green hats, so on the way we are going transform the property "hat" from "green" to "blue".</p>
Aardvarks with green hats, so on the way we are going transform the property "hat" from "green" to "blue".</p>
<p>Here's a snippet from <code>broker.xml</code> showing the bridge configuration</p>
<pre class="prettyprint">
<code>
@ -68,7 +68,7 @@ under the License.
&lt;/static-connectors>
&lt;/bridge&gt;
</code>
</pre>
</pre>
<h2>Example step-by-step</h2>
<p><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></p>
@ -107,14 +107,14 @@ under the License.
ConnectionFactory cf1 = (ConnectionFactory)ic1.lookup("/ConnectionFactory");
</code>
</pre>
<li>We create a JMS Connection connection0 which is a connection to server 0</li>
<pre class="prettyprint">
<code>
connection0 = cf0.createConnection();
</code>
</pre>
<li>We create a JMS Connection connection1 which is a connection to server 1</li>
<pre class="prettyprint">
<code>
@ -128,7 +128,7 @@ under the License.
Session session0 = connection0.createSession(false, Session.AUTO_ACKNOWLEDGE);
</code>
</pre>
<li>We create a JMS Session on server 1</li>
<pre class="prettyprint">
<code>
@ -169,7 +169,7 @@ under the License.
producer.send(message);
</code>
</pre>
<li>We successfully receive the aardvark message from the mincing-machine one node 1. The aardvark's
hat is now blue since it has been transformed!</li>
<pre class="prettyprint">
@ -177,7 +177,7 @@ under the License.
Message receivedMessage = consumer.receive(5000);
</code>
</pre>
<li>We create and send another message, this time representing a sasquatch with a mauve hat to the
sausage-factory on node 0. This won't be bridged to the mincing-machine since we only want aardvarks, not sasquatches.</li>
<pre class="prettyprint">
@ -191,14 +191,14 @@ under the License.
producer.send(message);
</code>
</pre>
<li>We don't receive the sasquatch message since it's not an aardvark!</li>
<pre class="prettyprint">
<code>
receivedMessage = (TextMessage)consumer.receive(1000);
</code>
</pre>
<li>And finally (no pun intended), <b>always</b> remember to close your JMS resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>

26
examples/jms/client-kickoff/readme.html
View File

@ -27,10 +27,10 @@ under the License.
<body onload="prettyPrint()">
<h1>Client Kickoff Example</h1>
<p>This example shows how to kick off a client connected to ActiveMQ
<p>This example shows how to kick off a client connected to ActiveMQ
using <a href="http://java.sun.com/javase/technologies/core/mntr-mgmt/javamanagement/">JMX</a></p>
<p>The example will connect to ActiveMQ. Using JMX, we will list the remote addresses connected to the
<p>The example will connect to ActiveMQ. Using JMX, we will list the remote addresses connected to the
server and close the corresponding connections. The client will be kicked off from ActiveMQ receiving
an exception that its JMS connection was interrupted.</p>
@ -45,10 +45,10 @@ under the License.
-Dcom.sun.management.jmxremote.authenticate=false</code>
</pre>
<p>These properties are explained in the Java 5 <a href="http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html#remote">Management guide</a>
(please note that for this example, we will disable user authentication for simplicity).</p>
<p>With these properties, ActiveMQ server will be manageable remotely using standard JMX URL on port <code>3000</code>.</p>
(please note that for this example, we will disable user authentication for simplicity).</p>
<p>With these properties, ActiveMQ server will be manageable remotely using standard JMX URL on port <code>3000</code>.</p>
</p>
<h2>Example step-by-step</h2>
<p><em>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</em></p>
<ol>
@ -66,7 +66,7 @@ under the License.
<pre class="prettyprint">
<code>connection = cf.createConnection();</code>
</pre>
<li>We set a <code>ExceptionListener</code> on the connection to be notified after a problem occurred</li>
<pre class="prettyprint">
<code>final AtomicReference&lt;JMSException&gt; exception = new AtomicReference&lt;JMSException&gt;();
@ -108,7 +108,7 @@ under the License.
</pre>
<p>It will display a single address corresponding to the connection opened at step 3.</p>
<li>We close the connections corresponding to this remote address</li>
<pre class="prettyprint">
<code>serverControl.closeConnectionsForAddress(remoteAddresses[0]);</code>
@ -121,15 +121,15 @@ under the License.
org.apache.activemq.artemis.jms.example.SpawnedJMSServer out:11:22:33,035 WARN @RMI TCP Connection(3)-192.168.0.10 [ServerSessionImpl] Cleared up resources for session 4646da35-2fe8-11de-9ce9-752ccc2b26e4
</code>
</pre>
<li>We display the exception received by the connection's ExceptionListener</li>
<pre class="prettyprint">
<code>exception.get().printStackTrace();</code>
</pre>
<p>When the connection was closed on the server-side by the call to <code>serverControl.closeConnectionsForAddress()</code>,
<p>When the connection was closed on the server-side by the call to <code>serverControl.closeConnectionsForAddress()</code>,
the client's connection was disconnected and its exception listener was notified.</p>
<li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
<pre class="prettyprint">
@ -146,9 +146,9 @@ under the License.
}</code>
</pre>
</ol>
<h2>More information</h2>
<ul>
<li><a href="http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html">Java 5 Management guide</a></li>
</ul>

128
examples/jms/divert/readme.html
View File

@ -42,7 +42,7 @@ under the License.
<p>Diverts are a very sophisticated concept, which when combined with bridges can be used to create
interesting and complex routings. The set of diverts can be thought of as a type of <i>routing table</i>
for messages.</p>
<h2>Example step-by-step</h2>
<p>In this example we will imagine a fictitious company which has two offices; one in London and another in New York.</p>
<p>The company accepts orders for it's products only at it's London office, and also generates price-updates
@ -57,9 +57,9 @@ under the License.
<p>Here's the xml config for that divert, from <code>broker.xml</code></p>
<pre class="prettyprint">
<code>
&lt;divert name="order-divert"&gt;
&lt;divert name="order-divert"&gt;
&lt;address&gt;jms.queue.orders&lt;/address&gt;
&lt;forwarding-address&gt;jms.topic.spyTopic&lt;/forwarding-address&gt;
&lt;forwarding-address&gt;jms.topic.spyTopic&lt;/forwarding-address&gt;
&lt;exclusive&gt;false&lt;/exclusive&gt;
&lt;/divert&gt;
</code>
@ -74,7 +74,7 @@ under the License.
<p>Here's the configuration for it:</p>
<pre class="prettyprint">
<code>
&lt;queues&gt;
&lt;queues&gt;
&lt;queue name="jms.queue.priceForwarding"&gt;
&lt;address&gt;jms.queue.priceForwarding&lt;/address&gt;
&lt;/queue&gt;
@ -84,9 +84,9 @@ under the License.
<p>Here's the configuration for the divert:</p>
<pre class="prettyprint">
<code>
&lt;divert name="prices-divert"&gt;
&lt;divert name="prices-divert"&gt;
&lt;address&gt;jms.topic.priceUpdates&lt;/address&gt;
&lt;forwarding-address&gt;jms.queue.priceForwarding&lt;/forwarding-address&gt;
&lt;forwarding-address&gt;jms.queue.priceForwarding&lt;/forwarding-address&gt;
&lt;filter string="office='New York'"/&gt;
&lt;transformer-class-name&gt;org.apache.activemq.artemis.jms.example.AddForwardingTimeTransformer&lt;/transformer-class-name&gt;
&lt;exclusive&gt;true&lt;/exclusive&gt;
@ -105,16 +105,16 @@ under the License.
&lt;bridges&gt;
&lt;bridge name="price-forward-bridge"&gt;
&lt;queue-name&gt;jms.queue.priceForwarding&lt;/queue-name&gt;
&lt;forwarding-address&gt;jms.topic.newYorkPriceUpdates&lt;/forwarding-address&gt;
&lt;forwarding-address&gt;jms.topic.newYorkPriceUpdates&lt;/forwarding-address&gt;
&lt;reconnect-attempts&gt;-1&lt;/reconnect-attempts&gt;
&lt;static-connectors>
&lt;connector-ref>newyork-connector&lt;/connector-ref>
&lt;/static-connectors>
&lt;/bridge&gt;
&lt;/bridges&gt;
</code>
</code>
</pre>
<p><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></p>
<ol>
@ -156,7 +156,7 @@ under the License.
<li>Look-up the topic newYorkPriceUpdates on the New York server - any price updates sent to priceUpdates on the London server will
be diverted to the queue priceForward on the London server, and a bridge will consume from that queue and forward
them to the address newYorkPriceUpdates on the New York server where they will be distributed to the topic subscribers on
the New York server.
the New York server.
</li>
<pre class="prettyprint">
<code>
@ -167,7 +167,7 @@ under the License.
<li>Perform a lookup on the Connection Factory on the London server</li>
<pre class="prettyprint">
<code>
ConnectionFactory cfLondon = (ConnectionFactory)initialContextLondon.lookup("/ConnectionFactory");
ConnectionFactory cfLondon = (ConnectionFactory)initialContextLondon.lookup("/ConnectionFactory");
</code>
</pre>
@ -184,27 +184,27 @@ under the License.
connectionLondon = cfLondon.createConnection();
</code>
</pre>
<li>Create a JMS Connection on the New York server</li>
<pre class="prettyprint">
<code>
connectionNewYork = cfNewYork.createConnection();
</code>
</pre>
</pre>
<li>Create a JMS Session on the London server.</li>
<pre class="prettyprint">
<code>
Session sessionLondon = connectionLondon.createSession(false, Session.AUTO_ACKNOWLEDGE);
Session sessionLondon = connectionLondon.createSession(false, Session.AUTO_ACKNOWLEDGE);
</code>
</pre>
<li>Create a JMS Session on the New York server.</li>
<pre class="prettyprint">
<code>
Session sessionNewYork = connectionNewYork.createSession(false, Session.AUTO_ACKNOWLEDGE);
Session sessionNewYork = connectionNewYork.createSession(false, Session.AUTO_ACKNOWLEDGE);
</code>
</pre>
</pre>
<li>Create a JMS MessageProducer orderProducer that sends to the queue orderQueue on the London server.</li>
<pre class="prettyprint">
@ -212,56 +212,56 @@ under the License.
MessageProducer orderProducer = sessionLondon.createProducer(orderQueue);
/code>
</pre>
<li>Create a JMS MessageProducer priceProducer that sends to the topic priceUpdates on the London server.</li>
<pre class="prettyprint">
<code>
MessageProducer priceProducer = sessionLondon.createProducer(priceUpdates);
/code>
</pre>
</pre>
<li>Create a JMS subscriber which subscribes to the spyTopic on the London server</li>
<pre class="prettyprint">
<code>
MessageConsumer spySubscriberA = sessionLondon.createConsumer(spyTopic);
MessageConsumer spySubscriberA = sessionLondon.createConsumer(spyTopic);
</code>
</pre>
</pre>
<li>Create another JMS subscriber which also subscribes to the spyTopic on the London server</li>
<pre class="prettyprint">
<code>
MessageConsumer spySubscriberB = sessionLondon.createConsumer(spyTopic);
</code>
</pre>
<li>Create a JMS MessageConsumer which consumes orders from the order queue on the London server</li>
<pre class="prettyprint">
<code>
MessageConsumer orderConsumer = sessionLondon.createConsumer(orderQueue);
</code>
</pre>
<li>Create a JMS subscriber which subscribes to the priceUpdates topic on the London server</li>
<pre class="prettyprint">
<code>
MessageConsumer priceUpdatesSubscriberLondon = sessionLondon.createConsumer(priceUpdates);
</code>
</pre>
</pre>
<li>Create a JMS subscriber which subscribes to the newYorkPriceUpdates topic on the New York server</li>
<pre class="prettyprint">
<code>
MessageConsumer newYorkPriceUpdatesSubscriberA = sessionNewYork.createConsumer(newYorkPriceUpdates);
</code>
</pre>
</pre>
<li>Create another JMS subscriber which also subscribes to the newYorkPriceUpdates topic on the New York server</li>
<pre class="prettyprint">
<code>
MessageConsumer newYorkPriceUpdatesSubscriberB = sessionNewYork.createConsumer(newYorkPriceUpdates);
</code>
</pre>
</pre>
<li>Start the connections</li>
<pre class="prettyprint">
<code>
@ -269,15 +269,15 @@ under the License.
connectionNewYork.start();
</code>
</pre>
</pre>
<li>Create an order message</li>
<pre class="prettyprint">
<code>
TextMessage orderMessage = sessionLondon.createTextMessage("This is an order");
</code>
</pre>
</pre>
<li>Send the order message to the order queue on the London server</li>
<pre class="prettyprint">
<code>
@ -285,8 +285,8 @@ under the License.
System.out.println("Sent message: " + orderMessage.getText());
</code>
</pre>
</pre>
<li>The order message is consumed by the orderConsumer on the London server</li>
<pre class="prettyprint">
<code>
@ -294,8 +294,8 @@ under the License.
System.out.println("Received order: " + receivedOrder.getText());
</code>
</pre>
</pre>
<li>A copy of the order is also received by the spyTopic subscribers on the London server</li>
<pre class="prettyprint">
<code>
@ -307,19 +307,19 @@ under the License.
System.out.println("Snooped on order: " + spiedOrder2.getText());
</code>
</pre>
</pre>
<li>Create and send a price update message, destined for London</li>
<pre class="prettyprint">
<code>
TextMessage priceUpdateMessageLondon = sessionLondon.createTextMessage("This is a price update for London");
priceUpdateMessageLondon.setStringProperty("office", "London");
priceProducer.send(priceUpdateMessageLondon);
</code>
</pre>
</pre>
<li>The price update *should* be received by the local subscriber since we only divert messages
where office = New York</li>
<pre class="prettyprint">
@ -328,8 +328,8 @@ under the License.
System.out.println("Received price update locally: " + receivedUpdate.getText());
</code>
</pre>
</pre>
<li>The price update *should not* be received in New York</li>
<pre class="prettyprint">
<code>
@ -339,36 +339,36 @@ under the License.
{
return false;
}
System.out.println("Did not received price update in New York, look it's: " + priceUpdate1);
TextMessage priceUpdate2 = (TextMessage)newYorkPriceUpdatesSubscriberB.receive(1000);
if (priceUpdate2 != null)
{
return false;
}
System.out.println("Did not received price update in New York, look it's: " + priceUpdate2);
</code>
</pre>
</pre>
<li>Create a price update message, destined for New York</li>
<pre class="prettyprint">
<code>
TextMessage priceUpdateMessageNewYork = sessionLondon.createTextMessage("This is a price update for New York");
priceUpdateMessageNewYork.setStringProperty("office", "New York");
</code>
</pre>
</pre>
<li>Send the price update message to the priceUpdates topic on the London server</li>
<pre class="prettyprint">
<code>
priceProducer.send(priceUpdateMessageNewYork);
priceProducer.send(priceUpdateMessageNewYork);
</code>
</pre>
</pre>
<li>The price update *should not* be received by the local subscriber to the priceUpdates topic
since it has been *exclusively* diverted to the priceForward queue, because it has a header saying
it is destined for the New York office</li>
@ -381,10 +381,10 @@ under the License.
return false;
}
System.out.println("Didn't receive local price update, look, it's: " + message);
System.out.println("Didn't receive local price update, look, it's: " + message);
</code>
</pre>
</pre>
<li>The remote subscribers on server 1 *should* receive a copy of the price update since
it has been diverted to a local priceForward queue which has a bridge consuming from it and which
forwards it to the same address on server 1.
@ -400,10 +400,10 @@ under the License.
priceUpdate2 = (TextMessage)newYorkPriceUpdatesSubscriberB.receive(5000);
System.out.println("Received forwarded price update on server 2: " + priceUpdate2.getText());
System.out.println("Time of forward: " + priceUpdate2.getLongProperty("time_of_forward"));
System.out.println("Time of forward: " + priceUpdate2.getLongProperty("time_of_forward"));
</code>
</pre>
</pre>
<li>And finally, <b>always</b> remember to close your resources after use, in a <code>finally</code> block.</li>

14
examples/jms/interceptor/readme.html
View File

@ -28,13 +28,13 @@ under the License.
<h1>JMS Interceptor Example</h1>
<p>This example shows you how to implement and configure a simple incoming, server-side interceptor with ActiveMQ.</p>
<p>ActiveMQ allows an application to use an interceptor to hook into the messaging system. All that needs to do is to implement the
Interceptor interface, as defined below: </p>
<pre class="prettyprint">
<code>
public interface Interceptor
{
{
boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException;
}
</code>
@ -51,15 +51,15 @@ under the License.
&lt;/configuration&gt;
</code>
</pre>
<p>With interceptor, you can handle various events in message processing. In this example, a simple interceptor, SimpleInterceptor, is implemented and configured.
When the example is running, the interceptor will print out each events that are passed in the interceptor. And it will add a string property to the message being
<p>With interceptor, you can handle various events in message processing. In this example, a simple interceptor, SimpleInterceptor, is implemented and configured.
When the example is running, the interceptor will print out each events that are passed in the interceptor. And it will add a string property to the message being
delivered. You can see that after the message is received, there will be a new string property appears in the received message.</p>
<p>With our interceptor we always return <code>true</code> from the <code>intercept</code> method. If we were
to return <code>false</code> that signifies that no more interceptors are to run or the target
is not to be called. Return <code>false</code> to abort processing of the packet.</p>
<h2>Example step-by-step</h2>
<p><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></p>

8
examples/jms/jms-bridge/readme.html
View File

@ -164,14 +164,14 @@ under the License.
TextMessage message = sourceSession.createTextMessage("this is a text message sent at " + System.currentTimeMillis());
sourceProducer.send(message);
</pre>
<li>We close the connection to the source server</li>
<pre class="prettyprint">
sourceConnection.close();
</pre>
<p>At this point, the JMS Bridge will consume the message from the source topic and
sends it to the target queue.
sends it to the target queue.
The client will check the bridge works by consuming a message from the target queue.</p>
<li>We look up the JMS resources from the target server</li>
@ -203,7 +203,7 @@ under the License.
System.out.format("Message ID : %s\n", messageReceived.getJMSMessageID());
System.out.format("Bridged Message ID : %s\n", messageReceived.getStringProperty("AMQ_BRIDGE_MSG_ID_LIST"));
</pre>
<p>Note that the message received from the target queue is <em>not the same message</em> sent to the source topic
(their message IDs are different) but they have the <em>same content</em>.
@ -230,7 +230,7 @@ under the License.
</ol>
<h2>More information</h2>
<ul>

12
pom.xml
View File

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

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

@ -19,19 +19,19 @@
# 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,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
logger.level=INFO
# ActiveMQ logger levels
logger.org.apache.activemq.core.server.level=TRACE
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.ra.level=INFO
logger.org.apache.activemq.tests.unit.level=INFO
logger.org.apache.activemq.tests.integration.level=INFO
logger.org.apache.activemq.jms.tests.level=INFO
logger.org.apache.activemq.artemis.core.server.level=TRACE
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.ra.level=INFO
logger.org.apache.activemq.artemis.tests.unit.level=INFO
logger.org.apache.activemq.artemis.tests.integration.level=INFO
logger.org.apache.activemq.artemis.jms.tests.level=INFO
# Root logger handlers
logger.handlers=CONSOLE,TEST
@ -53,7 +53,7 @@ handler.FILE.fileName=target/activemq.log
handler.FILE.formatter=PATTERN
# Console handler configuration
handler.TEST=org.apache.activemq.logs.AssertionLoggerHandler
handler.TEST=org.apache.activemq.artemis.logs.AssertionLoggerHandler
handler.TEST.level=TRACE
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(
"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...");
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)
* @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
{

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

@ -172,7 +172,7 @@
<!--
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.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.AshnaMQAdmin
#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)
* @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)
{
@ -151,7 +151,7 @@ public class TimedBufferTest extends UnitTestCase
}
/* (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)
{
@ -240,7 +240,7 @@ public class TimedBufferTest extends UnitTestCase
}
/* (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)
{
@ -326,7 +326,7 @@ public class TimedBufferTest extends UnitTestCase
}
/* (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)
{

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)
* @see org.apache.activemq.utils.SoftValueHashMap.ValueCache#isLive()
* @see org.apache.activemq.artemis.utils.SoftValueHashMap.ValueCache#isLive()
*/
public boolean isLive()
{