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

Use new package names in config and classes

This commit is contained in:
Martyn Taylor 2014-11-11 15:40:01 +00:00
parent 23e8edd979
commit 1f869f9f4c
417 changed files with 1136 additions and 1136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -4,7 +4,7 @@ If you need information about the HornetQ project please go to
http://community.jboss.org/wiki/HornetQ
http://www.jboss.org/hornetq/
http://www.jboss.org.apache.activemq6/
This file describes some minimum 'stuff one needs to know' to get
started coding in this project.

2
activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/core/file
View File

@ -10,4 +10,4 @@
## implied. See the License for the specific language governing
## permissions and limitations under the License.
## ---------------------------------------------------------------------------
class=org.hornetq.factory.FileCoreFactoryHandler
class=org.apache.activemq6.factory.FileCoreFactoryHandler

2
activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/jms/file
View File

@ -10,4 +10,4 @@
## implied. See the License for the specific language governing
## permissions and limitations under the License.
## ---------------------------------------------------------------------------
class=org.hornetq.factory.FileJmsFactoryHandler
class=org.apache.activemq6.factory.FileJmsFactoryHandler

2
activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/xml
View File

@ -10,4 +10,4 @@
## implied. See the License for the specific language governing
## permissions and limitations under the License.
## ---------------------------------------------------------------------------
class=org.hornetq.factory.XmlBrokerFactoryHandler
class=org.apache.activemq6.factory.XmlBrokerFactoryHandler

2
activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterceptorRejectedPacketException.java
View File

@ -17,7 +17,7 @@ import static org.apache.activemq6.api.core.HornetQExceptionType.INTERCEPTOR_REJ
/**
* An outgoing interceptor returned false.
* @see org.apache.activemq6.api.core.client.ServerLocator#addOutgoingInterceptor(org.hornetq.api.core.Interceptor)
* @see org.apache.activemq6.api.core.client.ServerLocator#addOutgoingInterceptor(org.apache.activemq6.api.core.Interceptor)
* @author Justin Bertram
*/
// XXX I doubt any reader will make much sense of this Javadoc's text.

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

@ -23,7 +23,7 @@ public class FactoryFinder
/**
* The strategy that the FactoryFinder uses to find load and instantiate Objects
* can be changed out by calling the
* {@link org.apache.activemq6.utils.FactoryFinder#setObjectFactory(org.hornetq.utils.FactoryFinder.ObjectFactory)}
* {@link org.apache.activemq6.utils.FactoryFinder#setObjectFactory(org.apache.activemq6.utils.FactoryFinder.ObjectFactory)}
* method with a custom implementation of ObjectFactory.
* <p/>
* The default ObjectFactory is typically changed out when running in a specialized container

4
activemq6-core-client/pom.xml
View File

@ -73,7 +73,7 @@
<maxmemory>512m</maxmemory>
<quiet>false</quiet>
<aggregate>true</aggregate>
<excludePackageNames>org.hornetq.core:org.hornetq.utils</excludePackageNames>
<excludePackageNames>org.apache.activemq6.core:org.apache.activemq6.utils</excludePackageNames>
</configuration>
<executions>
<execution>
@ -103,7 +103,7 @@
<executions>
<!-- Adds a directory to the list of source folders to be used in this project. This is
here to let Maven know about:
target/generated-sources/xslt/org/hornetq/api/config/HornetQDefaultConfiguration.java
target/generated-sources/xslt/org.apache.activemq6/api/config/HornetQDefaultConfiguration.java
which is generated by ./src/main/resources/hqDefaults.xsl using the HornetQ
configuration schema. -->
<execution>

2
activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ServerLocator.java
View File

@ -165,7 +165,7 @@ public interface ServerLocator extends AutoCloseable
* Returns the blocking calls timeout.
* <p>
* If client's blocking calls to the server take more than this timeout, the call will throw a
* {@link org.apache.activemq6.api.core.HornetQException} with the code {@link org.hornetq.api.core.HornetQExceptionType#CONNECTION_TIMEDOUT}. Value
* {@link org.apache.activemq6.api.core.HornetQException} with the code {@link org.apache.activemq6.api.core.HornetQExceptionType#CONNECTION_TIMEDOUT}. Value
* is in milliseconds, default value is {@link HornetQClient#DEFAULT_CALL_TIMEOUT}.
*
* @return the blocking calls timeout

2
activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/Channel.java
View File

@ -20,7 +20,7 @@ import org.apache.activemq6.api.core.HornetQException;
* A channel is a way of interleaving data meant for different endpoints over the same {@link org.apache.activemq6.core.protocol.core.CoreRemotingConnection}.
* <p>
* Any packet sent will have its channel id set to the specific channel sending so it can be routed to its correct channel
* when received by the {@link org.apache.activemq6.core.protocol.core.CoreRemotingConnection}. see {@link org.hornetq.core.protocol.core.Packet#setChannelID(long)}.
* when received by the {@link org.apache.activemq6.core.protocol.core.CoreRemotingConnection}. see {@link org.apache.activemq6.core.protocol.core.Packet#setChannelID(long)}.
* <p>
* Each Channel should will forward any packets received to its {@link org.apache.activemq6.core.protocol.core.ChannelHandler}.
* <p>

2
activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java
View File

@ -34,7 +34,7 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage
* This field is only used at the client side.
*
* @see org.apache.activemq6.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler)
* @see org.apache.activemq6.api.core.client.ClientProducer#send(org.hornetq.api.core.SimpleString, org.hornetq.api.core.Message, SendAcknowledgementHandler)
* @see org.apache.activemq6.api.core.client.ClientProducer#send(org.apache.activemq6.api.core.SimpleString, org.apache.activemq6.api.core.Message, SendAcknowledgementHandler)
*/
private final transient SendAcknowledgementHandler handler;

2
activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendMessage.java
View File

@ -32,7 +32,7 @@ public class SessionSendMessage extends MessagePacket
* This field is only used at the client side.
*
* @see org.apache.activemq6.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler)
* @see org.apache.activemq6.api.core.client.ClientProducer#send(org.hornetq.api.core.SimpleString, org.hornetq.api.core.Message, SendAcknowledgementHandler)
* @see org.apache.activemq6.api.core.client.ClientProducer#send(org.apache.activemq6.api.core.SimpleString, org.apache.activemq6.api.core.Message, SendAcknowledgementHandler)
*/
private final transient SendAcknowledgementHandler handler;

2
activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/BufferDecoder.java
View File

@ -24,7 +24,7 @@ import org.apache.activemq6.api.core.HornetQBuffer;
public interface BufferDecoder
{
/**
* called by the remoting system prior to {@link org.apache.activemq6.spi.core.remoting.BufferHandler#bufferReceived(Object, org.hornetq.api.core.HornetQBuffer)}.
* called by the remoting system prior to {@link org.apache.activemq6.spi.core.remoting.BufferHandler#bufferReceived(Object, org.apache.activemq6.api.core.HornetQBuffer)}.
* <p>
* The implementation should return true if there is enough data in the buffer to decode. otherwise false.
* * @param buffer the buffer

2
activemq6-core-client/src/main/resources/hqDefaults.xsl
View File

@ -3,7 +3,7 @@
<xsl:stylesheet version="2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:hq="urn:org.hornetq"
xmlns:hq="urn:org.apache.activemq6"
xmlns:fn="http://www.w3.org/2005/xpath-functions">
<!-- This XSLT creates the class HornetQDefaultsConfiguration.java.

6
activemq6-dto/pom.xml
View File

@ -51,9 +51,9 @@
<configuration>
<tasks>
<taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask"/>
<mkdir dir="${project.build.directory}/schema/org/hornetq/dto"/>
<echo message="Generating XSD to: ${project.build.directory}/schema/org/hornetq/dto"/>
<schemagen srcdir="${basedir}/.." destdir="${project.build.directory}/schema/org/hornetq/dto"
<mkdir dir="${project.build.directory}/schema/org.apache.activemq6/dto"/>
<echo message="Generating XSD to: ${project.build.directory}/schema/org.apache.activemq6/dto"/>
<schemagen srcdir="${basedir}/.." destdir="${project.build.directory}/schema/org.apache.activemq6/dto"
includeantruntime="false">
<schema namespace="http://hornetq.org/schema" file="hornetq.xsd"/>
<classpath refid="maven.compile.classpath"/>

2
activemq6-jms-client/pom.xml
View File

@ -57,7 +57,7 @@
<maxmemory>512m</maxmemory>
<quiet>false</quiet>
<aggregate>true</aggregate>
<excludePackageNames>org.hornetq.core:org.hornetq.utils</excludePackageNames>
<excludePackageNames>org.apache.activemq6.core:org.apache.activemq6.utils</excludePackageNames>
</configuration>
<executions>
<execution>

2
activemq6-jms-server/pom.xml
View File

@ -80,7 +80,7 @@
<maxmemory>512m</maxmemory>
<quiet>false</quiet>
<aggregate>true</aggregate>
<excludePackageNames>org.hornetq.core:org.hornetq.utils</excludePackageNames>
<excludePackageNames>org.apache.activemq6.core:org.apache.activemq6.utils</excludePackageNames>
</configuration>
<executions>
<execution>

6
activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQXAResourceRecovery.java
View File

@ -29,19 +29,19 @@ import org.apache.activemq6.jms.server.HornetQJMSServerLogger;
* To enable this add the following to the jbossts-properties file
* <pre>
* &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
* value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/&gt;
* value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory"/&gt;
* </pre>
* <p>
* you'll need something like this if the HornetQ Server is remote
* <pre>
* &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ2"
* value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445"/&gt;
* value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445"/&gt;
* </pre>
* <p>
* you'll need something like this if the HornetQ Server is remote and has failover configured
* <pre>
* &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ2"
* value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=5446"/&gt;
* value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=5446"/&gt;
* </pre>
*
* @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>

4
activemq6-jms-server/src/main/resources/schema/hornetq-jms.xsd
View File

@ -3,7 +3,7 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="urn:hornetq"
xmlns="urn:hornetq"
xmlns:hq="urn:org.hornetq"
xmlns:hq="urn:org.apache.activemq6"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
@ -11,7 +11,7 @@
<xsd:element name="configuration" hq:schema="hornetq-jms-configuration">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="jmx-domain" type="xsd:string" default="org.hornetq"
<xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq6"
minOccurs="0" maxOccurs="1"/>
<xsd:element ref="connection-factory" maxOccurs="unbounded" minOccurs="0"/>
<xsd:choice maxOccurs="unbounded" minOccurs="0">

2
activemq6-journal/pom.xml
View File

@ -73,7 +73,7 @@
<maxmemory>512m</maxmemory>
<quiet>false</quiet>
<aggregate>true</aggregate>
<excludePackageNames>org.hornetq.core:org.hornetq.utils</excludePackageNames>
<excludePackageNames>org.apache.activemq6.core:org.apache.activemq6.utils</excludePackageNames>
</configuration>
<executions>
<execution>

BIN
activemq6-native/bin/libHornetQAIO32.so
View File

Binary file not shown.

BIN
activemq6-native/bin/libHornetQAIO64.so
View File

Binary file not shown.

2
activemq6-native/pom.xml
View File

@ -108,7 +108,7 @@
<libraries>
<library>
<type>jni</type>
<narSystemPackage>org.hornetq.core.libaio</narSystemPackage>
<narSystemPackage>org.apache.activemq6.core.libaio</narSystemPackage>
</library>
</libraries>
</configuration>

44
activemq6-native/src/main/c/JNI_AsynchronousFileImpl.cpp
View File

@ -21,7 +21,7 @@
#include <time.h>
#include <sys/file.h>
#include "org_hornetq_core_libaio_Native.h"
#include "org.apache.activemq6_core_libaio_Native.h"
#include "JavaUtilities.h"
@ -44,11 +44,11 @@ inline AIOController * getController(JNIEnv *env, jobject & controllerAddress)
/* Inaccessible static: loaded */
/* Inaccessible static: EXPECTED_NATIVE_VERSION */
/*
* Class: org_hornetq_core_asyncio_impl_AsynchronousFileImpl
* Class: org.apache.activemq6_core_asyncio_impl_AsynchronousFileImpl
* Method: openFile
* Signature: (Ljava/lang/String;)I
*/
JNIEXPORT jint JNICALL Java_org_hornetq_core_libaio_Native_openFile
JNIEXPORT jint JNICALL Java_org.apache.activemq6_core_libaio_Native_openFile
(JNIEnv * env , jclass , jstring jstrFileName)
{
std::string fileName = convertJavaString(env, jstrFileName);
@ -57,22 +57,22 @@ JNIEXPORT jint JNICALL Java_org_hornetq_core_libaio_Native_openFile
}
/*
* Class: org_hornetq_core_asyncio_impl_AsynchronousFileImpl
* Class: org.apache.activemq6_core_asyncio_impl_AsynchronousFileImpl
* Method: closeFile
* Signature: (I)V
*/
JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_closeFile
JNIEXPORT void JNICALL Java_org.apache.activemq6_core_libaio_Native_closeFile
(JNIEnv * , jclass , jint handle)
{
close(handle);
}
/*
* Class: org_hornetq_core_asyncio_impl_AsynchronousFileImpl
* Class: org.apache.activemq6_core_asyncio_impl_AsynchronousFileImpl
* Method: flock
* Signature: (I)Z
*/
JNIEXPORT jboolean JNICALL Java_org_hornetq_core_libaio_Native_flock
JNIEXPORT jboolean JNICALL Java_org.apache.activemq6_core_libaio_Native_flock
(JNIEnv * , jclass , jint handle)
{
return flock(handle, LOCK_EX | LOCK_NB) == 0;
@ -85,7 +85,7 @@ JNIEXPORT jboolean JNICALL Java_org_hornetq_core_libaio_Native_flock
* Method: init
* Signature: (Ljava/lang/String;Ljava/lang/Class;)J
*/
JNIEXPORT jobject JNICALL Java_org_hornetq_core_libaio_Native_init
JNIEXPORT jobject JNICALL Java_org.apache.activemq6_core_libaio_Native_init
(JNIEnv * env, jclass, jclass controllerClazz, jstring jstrFileName, jint maxIO, jobject logger)
{
AIOController * controller = 0;
@ -94,14 +94,14 @@ JNIEXPORT jobject JNICALL Java_org_hornetq_core_libaio_Native_init
std::string fileName = convertJavaString(env, jstrFileName);
controller = new AIOController(fileName, (int) maxIO);
controller->done = env->GetMethodID(controllerClazz,"callbackDone","(Lorg/hornetq/core/asyncio/AIOCallback;JLjava/nio/ByteBuffer;)V");
controller->done = env->GetMethodID(controllerClazz,"callbackDone","(Lorg.apache.activemq6/core/asyncio/AIOCallback;JLjava/nio/ByteBuffer;)V");
if (!controller->done)
{
throwException (env, -1, "can't get callbackDone method");
return 0;
}
controller->error = env->GetMethodID(controllerClazz, "callbackError", "(Lorg/hornetq/core/asyncio/AIOCallback;JLjava/nio/ByteBuffer;ILjava/lang/String;)V");
controller->error = env->GetMethodID(controllerClazz, "callbackError", "(Lorg.apache.activemq6/core/asyncio/AIOCallback;JLjava/nio/ByteBuffer;ILjava/lang/String;)V");
if (!controller->done)
{
throwException (env, -1, "can't get callbackError method");
@ -133,7 +133,7 @@ JNIEXPORT jobject JNICALL Java_org_hornetq_core_libaio_Native_init
* objThis here is passed as a parameter at the java layer. It used to be a JNI this and now it's a java static method
where the intended reference is now passed as an argument
*/
JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_read
JNIEXPORT void JNICALL Java_org.apache.activemq6_core_libaio_Native_read
(JNIEnv *env, jclass, jobject objThis, jobject controllerAddress, jlong position, jlong size, jobject jbuffer, jobject callback)
{
try
@ -165,7 +165,7 @@ JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_read
// Fast memset on buffer
JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_resetBuffer
JNIEXPORT void JNICALL Java_org.apache.activemq6_core_libaio_Native_resetBuffer
(JNIEnv *env, jclass, jobject jbuffer, jint size)
{
void * buffer = env->GetDirectBufferAddress(jbuffer);
@ -180,7 +180,7 @@ JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_resetBuffer
}
JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_destroyBuffer
JNIEXPORT void JNICALL Java_org.apache.activemq6_core_libaio_Native_destroyBuffer
(JNIEnv * env, jclass, jobject jbuffer)
{
if (jbuffer == 0)
@ -192,7 +192,7 @@ JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_destroyBuffer
free(buffer);
}
JNIEXPORT jobject JNICALL Java_org_hornetq_core_libaio_Native_newNativeBuffer
JNIEXPORT jobject JNICALL Java_org.apache.activemq6_core_libaio_Native_newNativeBuffer
(JNIEnv * env, jclass, jlong size)
{
try
@ -230,7 +230,7 @@ JNIEXPORT jobject JNICALL Java_org_hornetq_core_libaio_Native_newNativeBuffer
* objThis here is passed as a parameter at the java layer. It used to be a JNI this and now it's a java static method
where the intended reference is now passed as an argument
*/
JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_write
JNIEXPORT void JNICALL Java_org.apache.activemq6_core_libaio_Native_write
(JNIEnv *env, jclass, jobject objThis, jobject controllerAddress, jlong sequence, jlong position, jlong size, jobject jbuffer, jobject callback)
{
try
@ -255,7 +255,7 @@ JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_write
}
}
JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_writeInternal
JNIEXPORT void JNICALL Java_org.apache.activemq6_core_libaio_Native_writeInternal
(JNIEnv * env, jclass, jobject controllerAddress, jlong positionToWrite, jlong size, jobject jbuffer)
{
try
@ -278,7 +278,7 @@ JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_writeInternal
}
JNIEXPORT void Java_org_hornetq_core_libaio_Native_internalPollEvents
JNIEXPORT void Java_org.apache.activemq6_core_libaio_Native_internalPollEvents
(JNIEnv *env, jclass, jobject controllerAddress)
{
try
@ -292,7 +292,7 @@ JNIEXPORT void Java_org_hornetq_core_libaio_Native_internalPollEvents
}
}
JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_stopPoller
JNIEXPORT void JNICALL Java_org.apache.activemq6_core_libaio_Native_stopPoller
(JNIEnv *env, jclass, jobject controllerAddress)
{
try
@ -306,7 +306,7 @@ JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_stopPoller
}
}
JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_closeInternal
JNIEXPORT void JNICALL Java_org.apache.activemq6_core_libaio_Native_closeInternal
(JNIEnv *env, jclass, jobject controllerAddress)
{
try
@ -322,7 +322,7 @@ JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_closeInternal
}
JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_fill
JNIEXPORT void JNICALL Java_org.apache.activemq6_core_libaio_Native_fill
(JNIEnv * env, jclass, jobject controllerAddress, jlong position, jint blocks, jlong size, jbyte fillChar)
{
try
@ -341,7 +341,7 @@ JNIEXPORT void JNICALL Java_org_hornetq_core_libaio_Native_fill
/** It does nothing... just return true to make sure it has all the binary dependencies */
JNIEXPORT jint JNICALL Java_org_hornetq_core_libaio_Native_getNativeVersion
JNIEXPORT jint JNICALL Java_org.apache.activemq6_core_libaio_Native_getNativeVersion
(JNIEnv *, jclass)
{
@ -349,7 +349,7 @@ JNIEXPORT jint JNICALL Java_org_hornetq_core_libaio_Native_getNativeVersion
}
JNIEXPORT jlong JNICALL Java_org_hornetq_core_libaio_Native_size0
JNIEXPORT jlong JNICALL Java_org.apache.activemq6_core_libaio_Native_size0
(JNIEnv * env, jclass, jobject controllerAddress)
{
try

2
activemq6-native/src/main/c/JavaUtilities.cpp
View File

@ -26,7 +26,7 @@ void throwRuntimeException(JNIEnv * env, const char * message)
void throwException(JNIEnv * env, const int code, const char * message)
{
jclass exceptionClass = env->FindClass("org/hornetq/api/core/HornetQException");
jclass exceptionClass = env->FindClass("org.apache.activemq6/api/core/HornetQException");
if (exceptionClass==NULL)
{
std::cerr << "Couldn't throw exception message:= " << message << "\n";

2
activemq6-native/src/main/c/Version.h
View File

@ -1,7 +1,7 @@
#ifndef _VERSION_NATIVE_AIO
// This definition needs to match org.hornetq.core.asyncio.impl.AsynchronousFileImpl.EXPECTED_NATIVE_VERSION
// This definition needs to match org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl.EXPECTED_NATIVE_VERSION
// Or else the native module won't be loaded because of version mismatches
#define _VERSION_NATIVE_AIO 52
#endif

2
activemq6-protocols/activemq6-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory
View File

@ -1 +1 @@
org.hornetq.core.protocol.proton.ProtonProtocolManagerFactory
org.apache.activemq6.core.protocol.proton.ProtonProtocolManagerFactory

2
activemq6-protocols/activemq6-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory
View File

@ -1 +1 @@
org.hornetq.core.protocol.openwire.OpenWireProtocolManagerFactory
org.apache.activemq6.core.protocol.openwire.OpenWireProtocolManagerFactory

2
activemq6-protocols/activemq6-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory
View File

@ -1 +1 @@
org.hornetq.core.protocol.stomp.StompProtocolManagerFactory
org.apache.activemq6.core.protocol.stomp.StompProtocolManagerFactory

2
activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAProperties.java
View File

@ -59,7 +59,7 @@ public class HornetQRAProperties extends ConnectionFactoryProperties implements
* Class used to locate the Transaction Manager.
* Using JBoss5 as the default locator
*/
private String transactionManagerLocatorClass = "org.apache.activemq6.integration.jboss.tm.JBoss5TransactionManagerLocator;org.hornetq.integration.jboss.tm.JBoss4TransactionManagerLocator";
private String transactionManagerLocatorClass = "org.apache.activemq6.integration.jboss.tm.JBoss5TransactionManagerLocator;org.apache.activemq6.integration.jboss.tm.JBoss4TransactionManagerLocator";
/**
* Method used to locate the TM

4
activemq6-rest/src/test/resources/hornetq-configuration.xml
View File

@ -7,13 +7,13 @@
<connectors>
<connector name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
</connector>
</connectors>
<acceptors>
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
</acceptor>
</acceptors>

2
activemq6-selector/pom.xml
View File

@ -53,7 +53,7 @@
<maxmemory>512m</maxmemory>
<quiet>false</quiet>
<aggregate>true</aggregate>
<excludePackageNames>org.hornetq.core:org.hornetq.utils</excludePackageNames>
<excludePackageNames>org.apache.activemq6.core:org.apache.activemq6.utils</excludePackageNames>
</configuration>
<executions>
<execution>

2
activemq6-server/pom.xml
View File

@ -88,7 +88,7 @@
<maxmemory>512m</maxmemory>
<quiet>false</quiet>
<aggregate>true</aggregate>
<excludePackageNames>org.hornetq.core:org.hornetq.utils</excludePackageNames>
<excludePackageNames>org.apache.activemq6.core:org.apache.activemq6.utils</excludePackageNames>
</configuration>
<executions>
<execution>

2
activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingManager.java
View File

@ -22,7 +22,7 @@ import org.apache.activemq6.core.settings.HierarchicalRepositoryChangeListener;
* <PRE>
*
* +--------------+ 1 +----------------+ N +--------------+ N +--------+ 1 +-------------------+
* | {@link org.apache.activemq6.core.postoffice.PostOffice} |-------&gt; |{@link PagingManager}|-------&gt; |{@link PagingStore} | ------&gt; | {@link org.hornetq.core.paging.impl.Page} | ------&gt; | {@link org.hornetq.core.journal.SequentialFile} |
* | {@link org.apache.activemq6.core.postoffice.PostOffice} |-------&gt; |{@link PagingManager}|-------&gt; |{@link PagingStore} | ------&gt; | {@link org.apache.activemq6.core.paging.impl.Page} | ------&gt; | {@link org.apache.activemq6.core.journal.SequentialFile} |
* +--------------+ +----------------+ +--------------+ +--------+ +-------------------+
* | 1 ^
* | |

2
activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PageTransactionInfoImpl.java
View File

@ -160,7 +160,7 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo
/*
* This is to be used after paging. We will update the PageTransactions until they get all the messages delivered. On that case we will delete the page TX
* (non-Javadoc)
* @see org.apache.activemq6.core.paging.PageTransactionInfo#storeUpdate(org.hornetq.core.persistence.StorageManager, org.hornetq.core.transaction.Transaction, int)
* @see org.apache.activemq6.core.paging.PageTransactionInfo#storeUpdate(org.apache.activemq6.core.persistence.StorageManager, org.apache.activemq6.core.transaction.Transaction, int)
*/
public void storeUpdate(final StorageManager storageManager, final PagingManager pagingManager, final Transaction tx) throws Exception
{

2
activemq6-server/src/main/java/org/apache/activemq6/core/persistence/StorageManager.java
View File

@ -342,7 +342,7 @@ public interface StorageManager extends IDGenerator, HornetQComponent
Journal getMessageJournal();
/**
* @see org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager#startReplication(org.hornetq.core.replication.ReplicationManager, org.hornetq.core.paging.PagingManager, String, boolean)
* @see org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager#startReplication(org.apache.activemq6.core.replication.ReplicationManager, org.apache.activemq6.core.paging.PagingManager, String, boolean)
*/
void startReplication(ReplicationManager replicationManager, PagingManager pagingManager, String nodeID,
boolean autoFailBack) throws Exception;

12
activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/JournalStorageManager.java
View File

@ -3110,7 +3110,7 @@ public class JournalStorageManager implements StorageManager
}
/* (non-Javadoc)
* @see org.apache.activemq6.core.journal.EncodingSupport#decode(org.hornetq.spi.core.remoting.HornetQBuffer)
* @see org.apache.activemq6.core.journal.EncodingSupport#decode(org.apache.activemq6.spi.core.remoting.HornetQBuffer)
*/
public void decode(final HornetQBuffer buffer)
{
@ -3118,7 +3118,7 @@ public class JournalStorageManager implements StorageManager
}
/* (non-Javadoc)
* @see org.apache.activemq6.core.journal.EncodingSupport#encode(org.hornetq.spi.core.remoting.HornetQBuffer)
* @see org.apache.activemq6.core.journal.EncodingSupport#encode(org.apache.activemq6.spi.core.remoting.HornetQBuffer)
*/
public void encode(final HornetQBuffer buffer)
{
@ -3149,7 +3149,7 @@ public class JournalStorageManager implements StorageManager
}
/* (non-Javadoc)
* @see org.apache.activemq6.core.journal.EncodingSupport#decode(org.hornetq.spi.core.remoting.HornetQBuffer)
* @see org.apache.activemq6.core.journal.EncodingSupport#decode(org.apache.activemq6.spi.core.remoting.HornetQBuffer)
*/
public void decode(final HornetQBuffer buffer)
{
@ -3157,7 +3157,7 @@ public class JournalStorageManager implements StorageManager
}
/* (non-Javadoc)
* @see org.apache.activemq6.core.journal.EncodingSupport#encode(org.hornetq.spi.core.remoting.HornetQBuffer)
* @see org.apache.activemq6.core.journal.EncodingSupport#encode(org.apache.activemq6.spi.core.remoting.HornetQBuffer)
*/
public void encode(final HornetQBuffer buffer)
{
@ -3283,7 +3283,7 @@ public class JournalStorageManager implements StorageManager
}
/* (non-Javadoc)
* @see org.apache.activemq6.core.journal.EncodingSupport#encode(org.hornetq.api.core.HornetQBuffer)
* @see org.apache.activemq6.core.journal.EncodingSupport#encode(org.apache.activemq6.api.core.HornetQBuffer)
*/
@Override
public void encode(HornetQBuffer buffer)
@ -3293,7 +3293,7 @@ public class JournalStorageManager implements StorageManager
}
/* (non-Javadoc)
* @see org.apache.activemq6.core.journal.EncodingSupport#decode(org.hornetq.api.core.HornetQBuffer)
* @see org.apache.activemq6.core.journal.EncodingSupport#decode(org.apache.activemq6.api.core.HornetQBuffer)
*/
@Override
public void decode(HornetQBuffer buffer)

16
activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicatedJournal.java
View File

@ -91,7 +91,7 @@ public class ReplicatedJournal implements Journal
* @param record
* @param sync
* @throws Exception
* @see org.apache.activemq6.core.journal.Journal#appendAddRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean)
* @see org.apache.activemq6.core.journal.Journal#appendAddRecord(long, byte, org.apache.activemq6.core.journal.EncodingSupport, boolean)
*/
public void appendAddRecord(final long id,
final byte recordType,
@ -126,7 +126,7 @@ public class ReplicatedJournal implements Journal
* @param recordType
* @param record
* @throws Exception
* @see org.apache.activemq6.core.journal.Journal#appendAddRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport)
* @see org.apache.activemq6.core.journal.Journal#appendAddRecordTransactional(long, long, byte, org.apache.activemq6.core.journal.EncodingSupport)
*/
public void appendAddRecordTransactional(final long txID,
final long id,
@ -223,7 +223,7 @@ public class ReplicatedJournal implements Journal
* @param id
* @param record
* @throws Exception
* @see org.apache.activemq6.core.journal.Journal#appendDeleteRecordTransactional(long, long, org.hornetq.core.journal.EncodingSupport)
* @see org.apache.activemq6.core.journal.Journal#appendDeleteRecordTransactional(long, long, org.apache.activemq6.core.journal.EncodingSupport)
*/
public void appendDeleteRecordTransactional(final long txID, final long id, final EncodingSupport record) throws Exception
{
@ -268,7 +268,7 @@ public class ReplicatedJournal implements Journal
* @param transactionData
* @param sync
* @throws Exception
* @see org.apache.activemq6.core.journal.Journal#appendPrepareRecord(long, org.hornetq.core.journal.EncodingSupport, boolean)
* @see org.apache.activemq6.core.journal.Journal#appendPrepareRecord(long, org.apache.activemq6.core.journal.EncodingSupport, boolean)
*/
public void appendPrepareRecord(final long txID, final EncodingSupport transactionData, final boolean sync) throws Exception
{
@ -339,7 +339,7 @@ public class ReplicatedJournal implements Journal
* @param record
* @param sync
* @throws Exception
* @see org.apache.activemq6.core.journal.Journal#appendUpdateRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean)
* @see org.apache.activemq6.core.journal.Journal#appendUpdateRecord(long, byte, org.apache.activemq6.core.journal.EncodingSupport, boolean)
*/
@Override
public void appendUpdateRecord(final long id, final byte recordType, final EncodingSupport record, final boolean sync) throws Exception
@ -387,7 +387,7 @@ public class ReplicatedJournal implements Journal
* @param recordType
* @param record
* @throws Exception
* @see org.apache.activemq6.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport)
* @see org.apache.activemq6.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, org.apache.activemq6.core.journal.EncodingSupport)
*/
public void appendUpdateRecordTransactional(final long txID, final long id, final byte recordType,
final EncodingSupport record) throws Exception
@ -407,7 +407,7 @@ public class ReplicatedJournal implements Journal
* @param transactionFailure
*
* @throws Exception
* @see org.apache.activemq6.core.journal.Journal#load(java.util.List, java.util.List, org.hornetq.core.journal.TransactionFailureCallback)
* @see org.apache.activemq6.core.journal.Journal#load(java.util.List, java.util.List, org.apache.activemq6.core.journal.TransactionFailureCallback)
*/
public JournalLoadInformation load(final List<RecordInfo> committedRecords,
final List<PreparedTransactionInfo> preparedTransactions,
@ -420,7 +420,7 @@ public class ReplicatedJournal implements Journal
* @param reloadManager
*
* @throws Exception
* @see org.apache.activemq6.core.journal.Journal#load(org.hornetq.core.journal.LoaderCallback)
* @see org.apache.activemq6.core.journal.Journal#load(org.apache.activemq6.core.journal.LoaderCallback)
*/
public JournalLoadInformation load(final LoaderCallback reloadManager) throws Exception
{

2
activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/InVMNodeManager.java
View File

@ -28,7 +28,7 @@ import org.apache.activemq6.utils.UUIDGenerator;
/**
* NodeManager used to run multiple servers in the same VM.
* <p/>
* We use the {@link org.apache.activemq6.core.server.impl.InVMNodeManager} instead of {@link org.hornetq.core.server.impl.FileLockNodeManager} when
* We use the {@link org.apache.activemq6.core.server.impl.InVMNodeManager} instead of {@link org.apache.activemq6.core.server.impl.FileLockNodeManager} when
* multiple servers are run inside the same VM and File Locks can not be shared in the
* same VM (it would cause a shared lock violation).
*

2
activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LastValueQueue.java
View File

@ -275,7 +275,7 @@ public class LastValueQueue extends QueueImpl
}
/* (non-Javadoc)
* @see org.apache.activemq6.core.server.MessageReference#acknowledge(org.hornetq.core.server.MessageReference)
* @see org.apache.activemq6.core.server.MessageReference#acknowledge(org.apache.activemq6.core.server.MessageReference)
*/
@Override
public void acknowledge() throws Exception

2
activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ReplicationError.java
View File

@ -30,7 +30,7 @@ import org.apache.activemq6.spi.core.protocol.RemotingConnection;
* Stops the backup in case of an error at the start of Replication.
* <p>
* Using an interceptor for the task to avoid a server reference inside of the 'basic' channel-0
* handler at {@link org.apache.activemq6.core.protocol.core.impl.HornetQClientProtocolManager.Channel0Handler}. As {@link org.hornetq.core.protocol.core.impl.HornetQClientProtocolManager}
* handler at {@link org.apache.activemq6.core.protocol.core.impl.HornetQClientProtocolManager.Channel0Handler}. As {@link org.apache.activemq6.core.protocol.core.impl.HornetQClientProtocolManager}
* is also shipped in the HQ-client JAR (which does not include {@link HornetQServer}).
*/
final class ReplicationError implements Interceptor

2
activemq6-server/src/main/resources/META-INF/services/org/apache/activemq6/security/basic-security
View File

@ -10,4 +10,4 @@
## implied. See the License for the specific language governing
## permissions and limitations under the License.
## ---------------------------------------------------------------------------
class=org.hornetq.spi.core.security.HornetQSecurityManagerImpl
class=org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl

6
activemq6-server/src/main/resources/schema/hornetq-configuration.xsd
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="urn:hornetq" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:hq="urn:org.hornetq"
<xsd:schema xmlns="urn:hornetq" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:hq="urn:org.apache.activemq6"
xmlns:csd="http://www.w3.org/2001/XMLSchema"
attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:hornetq"
version="1.0">
@ -189,7 +189,7 @@
</xsd:element>
<xsd:element name="password-codec" type="xsd:string"
default="org.hornetq.utils.DefaultSensitiveStringCodec" maxOccurs="1" minOccurs="0">
default="org.apache.activemq6.utils.DefaultSensitiveStringCodec" maxOccurs="1" minOccurs="0">
<xsd:annotation hq:linkend="configuration.masked-password">
<xsd:documentation>
Class name and its parameters for the Decoder used to decode the masked password. Ignored if
@ -225,7 +225,7 @@
</xsd:annotation>
</xsd:element>
<xsd:element name="jmx-domain" type="xsd:string" default="org.hornetq" maxOccurs="1" minOccurs="0">
<xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq6" maxOccurs="1" minOccurs="0">
<xsd:annotation hq:linkend="management.jmx.configuration" hq:field_name="DEFAULT_JMX_DOMAIN">
<xsd:documentation>
the JMX domain used to registered HornetQ MBeans in the MBeanServer

14
activemq6-server/src/test/resources/ConfigurationTest-full-config.xml
View File

@ -21,7 +21,7 @@
<replication-clustername>cluster-connection1</replication-clustername>
<scale-down-clustername>cluster-connection2</scale-down-clustername>
<max-saved-replicated-journals-size>5</max-saved-replicated-journals-size>
<password-codec>org.hornetq.utils.DefaultSensitiveStringCodec</password-codec>
<password-codec>org.apache.activemq6.utils.DefaultSensitiveStringCodec</password-codec>
<mask-password>true</mask-password>
<log-delegate-factory-class-name>com.foo</log-delegate-factory-class-name>
<jmx-management-enabled>false</jmx-management-enabled>
@ -38,8 +38,8 @@
<id-cache-size>127</id-cache-size>
<persist-id-cache>true</persist-id-cache>
<remoting-interceptors>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor2</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name>
</remoting-interceptors>
<backup>true</backup>
<allow-failback>true</allow-failback>
@ -52,26 +52,26 @@
<persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery>
<connectors>
<connector name="connector1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<param key="a1" value="v1"/>
<param key="a2" value="123"/>
<param key="a3" value="345"/>
<param key="a4" value="v4"/>
</connector>
<connector name="connector2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<param key="b1" value="w1"/>
<param key="b2" value="234"/>
</connector>
</connectors>
<acceptors>
<acceptor name="acceptor1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<param key="d1" value="y1"/>
<param key="d2" value="456"/>
</acceptor>
<acceptor name="acceptor2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<param key="e1" value="z1"/>
<param key="e2" value="567"/>
</acceptor>

12
activemq6-server/src/test/resources/InvalidConfigurationTest0.xml
View File

@ -52,32 +52,32 @@
<memory-measure-interval>54321</memory-measure-interval>
<remoting-interceptors>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor2</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name>
</remoting-interceptors>
<connectors>
<connector name="connector1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<param key="a1" value="v1"/>
<param key="a2" value="123"/>
<param key="a3" value="345"/>
<param key="a4" value="v4"/>
</connector>
<connector name="connector2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<param key="b1" value="w1"/>
<param key="b2" value="234"/>
</connector>
</connectors>
<acceptors>
<acceptor name="acceptor1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<param key="d1" value="y1"/>
<param key="d2" value="456"/>
</acceptor>
<acceptor name="acceptor2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<param key="e1" value="z1"/>
<param key="e2" value="567"/>
</acceptor>

12
activemq6-server/src/test/resources/InvalidConfigurationTest1.xml
View File

@ -52,32 +52,32 @@
<memory-measure-interval>54321</memory-measure-interval>
<remoting-interceptors>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor2</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name>
</remoting-interceptors>
<connectors>
<connector name="connector1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<param key="a1" value="v1"/>
<param key="a2" value="123"/>
<param key="a3" value="345"/>
<param key="a4" value="v4"/>
</connector>
<connector name="connector2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<param key="b1" value="w1"/>
<param key="b2" value="234"/>
</connector>
</connectors>
<acceptors>
<acceptor name="acceptor1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<param key="d1" value="y1"/>
<param key="d2" value="456"/>
</acceptor>
<acceptor name="acceptor2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<param key="e1" value="z1"/>
<param key="e2" value="567"/>
</acceptor>

12
activemq6-server/src/test/resources/InvalidConfigurationTest2.xml
View File

@ -52,32 +52,32 @@
<memory-measure-interval>54321</memory-measure-interval>
<remoting-interceptors>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor2</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name>
</remoting-interceptors>
<connectors>
<connector name="connector1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<param key="a1" value="v1"/>
<param key="a2" value="123"/>
<param key="a3" value="345"/>
<param key="a4" value="v4"/>
</connector>
<connector name="connector2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<param key="b1" value="w1"/>
<param key="b2" value="234"/>
</connector>
</connectors>
<acceptors>
<acceptor name="acceptor1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<param key="d1" value="y1"/>
<param key="d2" value="456"/>
</acceptor>
<acceptor name="acceptor2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<param key="e1" value="z1"/>
<param key="e2" value="567"/>
</acceptor>

12
activemq6-server/src/test/resources/InvalidConfigurationTest3.xml
View File

@ -52,32 +52,32 @@
<memory-measure-interval>54321</memory-measure-interval>
<remoting-interceptors>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor2</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name>
</remoting-interceptors>
<connectors>
<connector name="connector1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<param key="a1" value="v1"/>
<param key="a2" value="123"/>
<param key="a3" value="345"/>
<param key="a4" value="v4"/>
</connector>
<connector name="connector2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<param key="b1" value="w1"/>
<param key="b2" value="234"/>
</connector>
</connectors>
<acceptors>
<acceptor name="acceptor1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<param key="d1" value="y1"/>
<param key="d2" value="456"/>
</acceptor>
<acceptor name="acceptor2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<param key="e1" value="z1"/>
<param key="e2" value="567"/>
</acceptor>

12
activemq6-server/src/test/resources/InvalidConfigurationTest4.xml
View File

@ -52,32 +52,32 @@
<memory-measure-interval>54321</memory-measure-interval>
<remoting-interceptors>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor2</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name>
</remoting-interceptors>
<connectors>
<connector name="connector1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<param key="a1" value="v1"/>
<param key="a2" value="123"/>
<param key="a3" value="345"/>
<param key="a4" value="v4"/>
</connector>
<connector name="connector2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<param key="b1" value="w1"/>
<param key="b2" value="234"/>
</connector>
</connectors>
<acceptors>
<acceptor name="acceptor1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<param key="d1" value="y1"/>
<param key="d2" value="456"/>
</acceptor>
<acceptor name="acceptor2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<param key="e1" value="z1"/>
<param key="e2" value="567"/>
</acceptor>

12
activemq6-server/src/test/resources/InvalidConfigurationTest5.xml
View File

@ -52,32 +52,32 @@
<memory-measure-interval>54321</memory-measure-interval>
<remoting-interceptors>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.hornetq.tests.unit.core.config.impl.TestInterceptor2</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name>
</remoting-interceptors>
<connectors>
<connector name="connector1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<param key="a1" value="v1"/>
<param key="a2" value="123"/>
<param key="a3" value="345"/>
<param key="a4" value="v4"/>
</connector>
<connector name="connector2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<param key="b1" value="w1"/>
<param key="b2" value="234"/>
</connector>
</connectors>
<acceptors>
<acceptor name="acceptor1">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<param key="d1" value="y1"/>
<param key="d2" value="456"/>
</acceptor>
<acceptor name="acceptor2">
<factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<param key="e1" value="z1"/>
<param key="e2" value="567"/>
</acceptor>

8
activemq6-server/src/test/resources/divertRoutingNameNotRequired.xml
View File

@ -17,14 +17,14 @@
<connectors>
<connector name="netty-connector">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<!-- This connector corresponds to the New York server -->
<connector name="newyork-connector">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
</connectors>
@ -33,7 +33,7 @@
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
</acceptors>
@ -59,7 +59,7 @@
<address>jms.topic.priceUpdates</address>
<forwarding-address>jms.queue.priceForwarding</forwarding-address>
<filter string="office='New York'"/>
<transformer-class-name>org.hornetq.jms.example.AddForwardingTimeTransformer</transformer-class-name>
<transformer-class-name>org.apache.activemq6.jms.example.AddForwardingTimeTransformer</transformer-class-name>
<exclusive>true</exclusive>
</divert>
</diverts>

6
activemq6-server/src/test/resources/logging.properties
View File

@ -22,11 +22,11 @@
# Additional logger names to configure (root logger is always configured)
# Root logger option
loggers=org.jboss.logging,org.hornetq.core.server
loggers=org.jboss.logging,org.apache.activemq6.core.server
# Dump system environment at boot by default
logger.org.jboss.logging=TRACE
logger.org.hornetq.core.server=TRACE
logger.org.apache.activemq6.core.server=TRACE
# Root logger level
logger.level=INFO
@ -50,7 +50,7 @@ handler.FILE.formatter=PATTERN
# Console handler configuration
handler.TEST=org.hornetq.tests.logging.AssertionLoggerHandler
handler.TEST=org.apache.activemq6.tests.logging.AssertionLoggerHandler
handler.TEST.level=TRACE
handler.TEST.formatter=PATTERN

2
activemq6-tools/pom.xml
View File

@ -44,7 +44,7 @@
<configuration>
<archive>
<manifest>
<mainClass>org.hornetq.tools.Main</mainClass>
<mainClass>org.apache.activemq6.tools.Main</mainClass>
</manifest>
</archive>
<descriptorRefs>

2
distribution/activemq6/src/main/resources/bin/hornetq
View File

@ -84,4 +84,4 @@ done
JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Dhornetq.home=$HORNETQ_HOME -Ddata.dir=$HORNETQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:$HORNETQ_HOME/config/logging.properties -Djava.library.path=$HORNETQ_HOME/bin/lib/linux-i686:$HORNETQ_HOME/bin/lib/linux-x86_64"
#JAVA_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"
exec "$JAVACMD" $JAVA_ARGS -classpath $CLASSPATH org.hornetq.cli.HornetQ $@
exec "$JAVACMD" $JAVA_ARGS -classpath $CLASSPATH org.apache.activemq6.cli.HornetQ $@

2
distribution/activemq6/src/main/resources/bin/hornetq.cmd
View File

@ -49,7 +49,7 @@ rem set JMX_OPTS=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.j
set JVM_FLAGS=%JVM_FLAGS% %JMX_OPTS% -Dhornetq.home="%HORNETQ_HOME%" -classpath "%HORNETQ_HOME%\lib\*"
"%_JAVACMD%" %JVM_FLAGS% org.hornetq.cli.HornetQ %*
"%_JAVACMD%" %JVM_FLAGS% org.apache.activemq6.cli.HornetQ %*
:END
endlocal

8
distribution/activemq6/src/main/resources/config/clustered/hornetq-configuration.xml
View File

@ -14,13 +14,13 @@
<connectors>
<connector name="netty">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</connector>
<connector name="netty-throughput">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
@ -29,13 +29,13 @@
<acceptors>
<acceptor name="netty">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</acceptor>
<acceptor name="netty-throughput">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>

12
distribution/activemq6/src/main/resources/config/logging.properties
View File

@ -22,16 +22,16 @@
# Additional logger names to configure (root logger is always configured)
# Root logger option
loggers=org.jboss.logging,org.hornetq.core.server,org.hornetq.utils,org.hornetq.journal,org.hornetq.jms.server,org.hornetq.integration.bootstrap
loggers=org.jboss.logging,org.apache.activemq6.core.server,org.apache.activemq6.utils,org.apache.activemq6.journal,org.apache.activemq6.jms.server,org.apache.activemq6.integration.bootstrap
# Root logger level
logger.level=INFO
# HornetQ logger levels
logger.org.hornetq.core.server.level=INFO
logger.org.hornetq.journal.level=INFO
logger.org.hornetq.utils.level=INFO
logger.org.hornetq.jms.level=INFO
logger.org.hornetq.integration.bootstrap.level=INFO
logger.org.apache.activemq6.core.server.level=INFO
logger.org.apache.activemq6.journal.level=INFO
logger.org.apache.activemq6.utils.level=INFO
logger.org.apache.activemq6.jms.level=INFO
logger.org.apache.activemq6.integration.bootstrap.level=INFO
# Root logger handlers
logger.handlers=FILE,CONSOLE

8
distribution/activemq6/src/main/resources/config/non-clustered/hornetq-configuration.xml
View File

@ -14,13 +14,13 @@
<connectors>
<connector name="netty">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</connector>
<connector name="netty-throughput">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
@ -29,13 +29,13 @@
<acceptors>
<acceptor name="netty">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</acceptor>
<acceptor name="netty-throughput">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>

8
distribution/activemq6/src/main/resources/config/replicated/hornetq-configuration.xml
View File

@ -18,13 +18,13 @@
<connectors>
<connector name="netty">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</connector>
<connector name="netty-throughput">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
@ -33,13 +33,13 @@
<acceptors>
<acceptor name="netty">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</acceptor>
<acceptor name="netty-throughput">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>

8
distribution/activemq6/src/main/resources/config/shared-store/hornetq-configuration.xml
View File

@ -18,13 +18,13 @@
<connectors>
<connector name="netty">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</connector>
<connector name="netty-throughput">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
@ -33,13 +33,13 @@
<acceptors>
<acceptor name="netty">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</acceptor>
<acceptor name="netty-throughput">
<factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>

2
distribution/activemq6/src/main/resources/licenses/base64.txt
View File

@ -1,4 +1,4 @@
For org.hornetq.utils.Base64
For org.apache.activemq6.utils.Base64
I am placing this code in the Public Domain. Do with it as you will.
This software comes with no guarantees or warranties but with

2
distribution/activemq6/src/main/resources/licenses/json.txt
View File

@ -1,4 +1,4 @@
For classes org.hornetq.utils.json.*
For classes org.apache.activemq6.utils.json.*
Copyright (c) 2002 JSON.org

20
docs/eap-manual/en/clusters.xml
View File

@ -221,14 +221,14 @@
&lt;deployment xmlns="urn:jboss:bean-deployer:2.0">
&lt;!-- The core configuration -->
&lt;bean name="BackupConfiguration" class="org.hornetq.core.config.impl.FileConfiguration">
&lt;bean name="BackupConfiguration" class="org.apache.activemq6.core.config.impl.FileConfiguration">
&lt;property
name="configurationUrl">${jboss.server.home.url}/deploy/hornetq-backup1/hornetq-configuration.xml&lt;/property>
&lt;/bean>
&lt;!-- The core server -->
&lt;bean name="BackupHornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
&lt;bean name="BackupHornetQServer" class="org.apache.activemq6.core.server.impl.HornetQServerImpl">
&lt;constructor>
&lt;parameter>
&lt;inject bean="BackupConfiguration"/>
@ -245,7 +245,7 @@
&lt;/bean>
&lt;!-- The JMS server -->
&lt;bean name="BackupJMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
&lt;bean name="BackupJMSServerManager" class="org.apache.activemq6.jms.server.impl.JMSServerManagerImpl">
&lt;constructor>
&lt;parameter>
&lt;inject bean="BackupHornetQServer"/>
@ -288,7 +288,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
&lt;jmx-domain>org.hornetq.backup1&lt;/jmx-domain>
&lt;jmx-domain>org.apache.activemq6.backup1&lt;/jmx-domain>
&lt;clustered>true&lt;/clustered>
@ -310,13 +310,13 @@
&lt;connectors>
&lt;connector name="netty-connector">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
&lt;param key="host" value="${jboss.bind.address:localhost}"/>
&lt;param key="port" value="${hornetq.remoting.backup.netty.port:5446}"/>
&lt;/connector>
&lt;connector name="in-vm">
&lt;factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory&lt;/factory-class>
&lt;param key="server-id" value="${hornetq.server-id:0}"/>
&lt;/connector>
@ -324,7 +324,7 @@
&lt;acceptors>
&lt;acceptor name="netty">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;param key="host" value="${jboss.bind.address:localhost}"/>
&lt;param key="port" value="${hornetq.remoting.backup.netty.port:5446}"/>
&lt;/acceptor>
@ -387,7 +387,7 @@
<literal>jmx-domain</literal>
attribute, this is used when
adding objects, such as the HornetQ server and JMS server to jmx, we change this from the default
<literal>org.hornetq</literal>
<literal>org.apache.activemq6</literal>
to avoid naming clashes with the live server
</para>
<para>
@ -529,7 +529,7 @@
as in the last diagram. Then simply edit the <literal>jms-ds.xml</literal> and change the following lines to
</para>
<programlisting>
&lt;config-property name="ConnectorClassName" type="java.lang.String">org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property>
&lt;config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property>
&lt;config-property name="ConnectionParameters" type="java.lang.String">host=127.0.0.1;port=5446&lt;/config-property>
</programlisting>
<para>
@ -541,7 +541,7 @@
&lt;description>The transport type&lt;/description>
&lt;config-property-name>ConnectorClassName&lt;/config-property-name>
&lt;config-property-type>java.lang.String&lt;/config-property-type>
&lt;config-property-value>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property-value>
&lt;config-property-value>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property-value>
&lt;/config-property>
&lt;config-property>
&lt;description>The transport configuration. These values must be in the form of key=val;key=val;&lt;/description>

66
docs/quickstart-guide/en/examples.xml
View File

@ -100,35 +100,35 @@
[INFO] &lt;&lt;&lt; maven-source-plugin:2.2.1:jar (default) @ hornetq-jms-queue-example &lt;&lt;&lt;
[INFO]
[INFO] --- maven-source-plugin:2.2.1:jar (default) @ hornetq-jms-queue-example ---
[WARNING] Artifact org.hornetq.examples.jms:hornetq-jms-queue-example:java-source:sources:2.3.0.BETA-SNAPSHOT already attached to project, ignoring duplicate
[WARNING] Artifact org.apache.activemq6.examples.jms:hornetq-jms-queue-example:java-source:sources:2.3.0.BETA-SNAPSHOT already attached to project, ignoring duplicate
[INFO]
[INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:start (start) @ hornetq-jms-queue-example ---
[file:/home/andy/projects/hornetq-master/examples/jms/queue/target/classes/hornetq/server0/]
Apr 17, 2013 10:51:01 AM org.hornetq.core.deployers.impl.FileConfigurationParser parseMainConfig
Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.deployers.impl.FileConfigurationParser parseMainConfig
WARN: HQ222018: AIO was not located on this platform, it will fall back to using pure Java NIO. If your platform is Linux, install LibAIO to enable the AIO journal
Apr 17, 2013 10:51:01 AM org.hornetq.core.server.impl.HornetQServerImpl start
Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.server.impl.HornetQServerImpl start
INFO: HQ221000: live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/journal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/bindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/largemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/paging)
Apr 17, 2013 10:51:01 AM org.hornetq.core.server.impl.HornetQServerImpl$SharedStoreLiveActivation run
Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.server.impl.HornetQServerImpl$SharedStoreLiveActivation run
INFO: HQ221006: Waiting to obtain live lock
Apr 17, 2013 10:51:01 AM org.hornetq.core.persistence.impl.journal.JournalStorageManager &lt;init>
Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager &lt;init>
INFO: HQ221013: Using NIO Journal
Apr 17, 2013 10:51:01 AM org.hornetq.core.server.impl.HornetQServerImpl initialisePart1
Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.server.impl.HornetQServerImpl initialisePart1
WARN: HQ222007: Security risk! HornetQ is running with the default cluster admin user and default password. Please see the HornetQ user guide, cluster chapter, for instructions on how to change this.
Apr 17, 2013 10:51:01 AM org.hornetq.core.server.impl.FileLockNodeManager startLiveNode
Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.server.impl.FileLockNodeManager startLiveNode
INFO: HQ221034: Waiting to obtain live lock
Apr 17, 2013 10:51:01 AM org.hornetq.core.server.impl.FileLockNodeManager startLiveNode
Apr 17, 2013 10:51:01 AM org.apache.activemq6.core.server.impl.FileLockNodeManager startLiveNode
INFO: HQ221035: Live Server Obtained live lock
Apr 17, 2013 10:51:02 AM org.hornetq.core.server.impl.HornetQServerImpl deployQueue
Apr 17, 2013 10:51:02 AM org.apache.activemq6.core.server.impl.HornetQServerImpl deployQueue
INFO: HQ221003: trying to deploy queue jms.queue.exampleQueue
Apr 17, 2013 10:51:02 AM org.hornetq.core.remoting.impl.netty.NettyAcceptor start
Apr 17, 2013 10:51:02 AM org.apache.activemq6.core.remoting.impl.netty.NettyAcceptor start
INFO: HQ221020: Started Netty Acceptor version 3.6.2.Final-c0d783c localhost:5445 for CORE protocol
Apr 17, 2013 10:51:02 AM org.hornetq.core.server.impl.HornetQServerImpl$SharedStoreLiveActivation run
Apr 17, 2013 10:51:02 AM org.apache.activemq6.core.server.impl.HornetQServerImpl$SharedStoreLiveActivation run
INFO: HQ221007: Server is now live
Apr 17, 2013 10:51:02 AM org.hornetq.core.server.impl.HornetQServerImpl start
Apr 17, 2013 10:51:02 AM org.apache.activemq6.core.server.impl.HornetQServerImpl start
INFO: HQ221001: HornetQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7]
[INFO]
[INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:runClient (runClient) @ hornetq-jms-queue-example ---
Apr 17, 2013 10:51:02 AM org.hornetq.common.example.HornetQExample getContext
Apr 17, 2013 10:51:02 AM org.apache.activemq6.common.example.HornetQExample getContext
INFO: using jnp://localhost:1099 for jndi
Sent message: This is a text message
Received message: This is a text message
@ -139,9 +139,9 @@ example complete
#####################
[INFO]
[INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:stop (stop) @ hornetq-jms-queue-example ---
Apr 17, 2013 10:51:03 AM org.hornetq.core.server.management.impl.ManagementServiceImpl stop
Apr 17, 2013 10:51:03 AM org.apache.activemq6.core.server.management.impl.ManagementServiceImpl stop
WARN: HQ222113: On ManagementService stop, there are 1 unexpected registered MBeans: [core.acceptor.netty-acceptor]
Apr 17, 2013 10:51:03 AM org.hornetq.core.server.impl.HornetQServerImpl stop
Apr 17, 2013 10:51:03 AM org.apache.activemq6.core.server.impl.HornetQServerImpl stop
INFO: HQ221002: HornetQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] stopped
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
@ -201,7 +201,7 @@ INFO: HQ221002: HornetQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57
-------------------------------------------------------
T E S T S
-------------------------------------------------------
Running org.hornetq.javaee.example.server.ExampleRunnerTest
Running org.apache.activemq6.javaee.example.server.ExampleRunnerTest
log4j:WARN No appenders could be found for logger (org.jboss.logging).
log4j:WARN Please initialize the log4j system properly.
log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for more info.
@ -235,28 +235,28 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo
10:58:05,831 INFO [org.jboss.ws.common.management.AbstractServerConfig] (MSC service thread 1-4) JBoss Web Services - Stack CXF Server 4.0.2.GA
10:58:05,943 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-6) Starting Coyote HTTP/1.1 on http-localhost.localdomain-127.0.0.1-8080
10:58:05,966 INFO [org.jboss.as.jacorb] (MSC service thread 1-2) JBAS016330: CORBA ORB Service started
10:58:05,988 INFO [org.hornetq.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingpaging)
10:58:05,996 INFO [org.hornetq.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) Waiting to obtain live lock
10:58:06,037 INFO [org.hornetq.core.persistence.impl.journal.JournalStorageManager] (MSC service thread 1-11) Using AIO Journal
10:58:05,988 INFO [org.apache.activemq6.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingpaging)
10:58:05,996 INFO [org.apache.activemq6.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) Waiting to obtain live lock
10:58:06,037 INFO [org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager] (MSC service thread 1-11) Using AIO Journal
10:58:06,122 INFO [org.jboss.as.jacorb] (MSC service thread 1-14) JBAS016328: CORBA Naming Service started
10:58:06,184 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-7) JBAS010400: Bound data source [java:jboss/datasources/ExampleDS]
10:58:06,204 INFO [org.hornetq.core.server.impl.AIOFileLockNodeManager] (MSC service thread 1-11) Waiting to obtain live lock
10:58:06,205 INFO [org.hornetq.core.server.impl.AIOFileLockNodeManager] (MSC service thread 1-11) Live Server Obtained live lock
10:58:06,204 INFO [org.apache.activemq6.core.server.impl.AIOFileLockNodeManager] (MSC service thread 1-11) Waiting to obtain live lock
10:58:06,205 INFO [org.apache.activemq6.core.server.impl.AIOFileLockNodeManager] (MSC service thread 1-11) Live Server Obtained live lock
10:58:06,434 INFO [org.jboss.as.remoting] (MSC service thread 1-2) JBAS017100: Listening on localhost.localdomain/127.0.0.1:4447
10:58:06,434 INFO [org.jboss.as.remoting] (MSC service thread 1-15) JBAS017100: Listening on /127.0.0.1:9999
10:58:06,436 INFO [org.jboss.as.server.deployment.scanner] (MSC service thread 1-16) JBAS015012: Started FileSystemDeploymentService for directory /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/deployments
10:58:08,790 INFO [org.hornetq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5445 for CORE protocol
10:58:08,793 INFO [org.hornetq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5455 for CORE protocol
10:58:08,795 INFO [org.hornetq.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) Server is now live
10:58:08,797 INFO [org.hornetq.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) HornetQ Server version 2.2.13.Final (HQ_2_2_13_FINAL_AS7, 122) [5c499e88-9c63-11e2-bfa3-fe5400591699]) started
10:58:08,790 INFO [org.apache.activemq6.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5445 for CORE protocol
10:58:08,793 INFO [org.apache.activemq6.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5455 for CORE protocol
10:58:08,795 INFO [org.apache.activemq6.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) Server is now live
10:58:08,797 INFO [org.apache.activemq6.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) HornetQ Server version 2.2.13.Final (HQ_2_2_13_FINAL_AS7, 122) [5c499e88-9c63-11e2-bfa3-fe5400591699]) started
10:58:08,822 INFO [org.jboss.as.messaging] (MSC service thread 1-4) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/RemoteConnectionFactory
10:58:08,824 INFO [org.jboss.as.messaging] (MSC service thread 1-4) JBAS011601: Bound messaging object to jndi name java:/RemoteConnectionFactory
10:58:08,825 INFO [org.jboss.as.messaging] (MSC service thread 1-10) JBAS011601: Bound messaging object to jndi name java:/ConnectionFactory
10:58:08,830 INFO [org.hornetq.core.server.impl.HornetQServerImpl] (MSC service thread 1-3) trying to deploy queue jms.queue.testQueue
10:58:08,830 INFO [org.apache.activemq6.core.server.impl.HornetQServerImpl] (MSC service thread 1-3) trying to deploy queue jms.queue.testQueue
10:58:08,836 INFO [org.jboss.as.messaging] (MSC service thread 1-3) JBAS011601: Bound messaging object to jndi name java:/queue/test
10:58:08,840 INFO [org.jboss.as.messaging] (MSC service thread 1-3) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/queues/testQueue
10:58:08,859 INFO [org.jboss.as.deployment.connector] (MSC service thread 1-9) JBAS010406: Registered connection factory java:/JmsXA
10:58:08,866 INFO [org.hornetq.ra.HornetQResourceAdapter] (MSC service thread 1-9) HornetQ resource adaptor started
10:58:08,866 INFO [org.apache.activemq6.ra.HornetQResourceAdapter] (MSC service thread 1-9) HornetQ resource adaptor started
10:58:08,867 INFO [org.jboss.as.connector.services.ResourceAdapterActivatorService$ResourceAdapterActivator] (MSC service thread 1-9) IJ020002: Deployed: file://RaActivatorhornetq-ra
10:58:08,870 INFO [org.jboss.as.deployment.connector] (MSC service thread 1-5) JBAS010401: Bound JCA ConnectionFactory [java:/JmsXA]
10:58:08,898 INFO [org.jboss.as.server.deployment] (MSC service thread 1-10) JBAS015876: Starting deployment of "ONT001-1.0.war"
@ -283,11 +283,11 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo
10:58:09,979 INFO [org.jboss.as.server] (DeploymentScanner-threads - 2) JBAS018559: Deployed "ONT001-1.0.war"
mdb.jar:
/org/
/org/hornetq/
/org/hornetq/javaee/
/org/hornetq/javaee/example/
/org/hornetq/javaee/example/server/
/org/hornetq/javaee/example/server/MDB_BMTExample.class
/org.apache.activemq6/
/org.apache.activemq6/javaee/
/org.apache.activemq6/javaee/example/
/org.apache.activemq6/javaee/example/server/
/org.apache.activemq6/javaee/example/server/MDB_BMTExample.class
10:58:11,612 INFO [org.jboss.as.repository] (management-handler-thread - 2) JBAS014900: Content added at location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/f0/e2d589ab9490193e109c8bc833f725c87defae/content
10:58:11,620 INFO [org.jboss.as.server.deployment] (MSC service thread 1-8) JBAS015876: Starting deployment of "arquillian-service"
10:58:11,811 WARN [org.jboss.as.dependency.private] (MSC service thread 1-1) JBAS018567: Deployment "deployment.arquillian-service" is using a private module ("org.jboss.as.jmx:main") which may be changed or removed in future versions without notice.
@ -298,7 +298,7 @@ mdb.jar:
10:58:11,953 INFO [org.jboss.as.server] (management-handler-thread - 2) JBAS018559: Deployed "arquillian-service"
10:58:12,328 INFO [org.jboss.as.repository] (management-handler-thread - 3) JBAS014900: Content added at location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/59/7dcdb0f420ed57aea638b2599f7a86eecf6c85/content
10:58:12,333 INFO [org.jboss.as.server.deployment] (MSC service thread 1-7) JBAS015876: Starting deployment of "mdb.jar"
10:58:12,401 INFO [org.jboss.as.arquillian] (MSC service thread 1-14) Arquillian deployment detected: ArquillianConfig[service=jboss.arquillian.config."mdb.jar",unit=mdb.jar,tests=[org.hornetq.javaee.example.server.ExampleRunnerTest]]
10:58:12,401 INFO [org.jboss.as.arquillian] (MSC service thread 1-14) Arquillian deployment detected: ArquillianConfig[service=jboss.arquillian.config."mdb.jar",unit=mdb.jar,tests=[org.apache.activemq6.javaee.example.server.ExampleRunnerTest]]
10:58:12,418 INFO [org.jboss.as.ejb3] (MSC service thread 1-15) JBAS014142: Started message driven bean 'MDB_BMTExample' with 'hornetq-ra' resource adapter
10:58:12,562 INFO [org.jboss.as.server] (management-handler-thread - 3) JBAS018559: Deployed "mdb.jar"
Sent message: This is a text message

34
docs/quickstart-guide/en/running.xml
View File

@ -31,9 +31,9 @@
<programlisting>
bin$ ./hornetq run
11:05:06,589 INFO [org.hornetq.integration.bootstrap] HQ101000: Starting HornetQ Server
11:05:06,589 INFO [org.apache.activemq6.integration.bootstrap] HQ101000: Starting HornetQ Server
...
11:05:10,848 INFO [org.hornetq.core.server] HQ221001: HornetQ Server version 2.5.0.SNAPSHOT (Wild Hornet, 125) [e32ae252-52ee-11e4-a716-7785dc3013a3]
11:05:10,848 INFO [org.apache.activemq6.core.server] HQ221001: HornetQ Server version 2.5.0.SNAPSHOT (Wild Hornet, 125) [e32ae252-52ee-11e4-a716-7785dc3013a3]
</programlisting>
<para>HornetQ is now running.</para>
<para>Both the run and the stop scripts use the config under <literal
@ -89,30 +89,30 @@
14:47:42,471 INFO [org.wildfly.extension.undertow] (MSC service thread 1-7) JBAS017519: Undertow HTTP listener default listening on /127.0.0.1:8080
14:47:42,823 INFO [org.jboss.as.server.deployment.scanner] (MSC service thread 1-10) JBAS015012: Started FileSystemDeploymentService for directory /home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/deployments
14:47:42,882 INFO [org.jboss.as.remoting] (MSC service thread 1-16) JBAS017100: Listening on 127.0.0.1:9999
14:47:43,037 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ221000: live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingpaging)
14:47:43,062 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ221006: Waiting to obtain live lock
14:47:43,103 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ221012: Using AIO Journal
14:47:43,313 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support CORE
14:47:43,037 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221000: live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingpaging)
14:47:43,062 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221006: Waiting to obtain live lock
14:47:43,103 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221012: Using AIO Journal
14:47:43,313 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support CORE
14:47:43,426 INFO [org.jboss.ws.common.management] (MSC service thread 1-3) JBWS022052: Starting JBoss Web Services - Stack CXF Server 4.2.1.Final
14:47:43,448 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support AMQP
14:47:43,451 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support STOMP
14:47:43,453 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support STOMP_WS
14:47:43,567 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ221034: Waiting to obtain live lock
14:47:43,567 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ221035: Live Server Obtained live lock
14:47:43,448 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support AMQP
14:47:43,451 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support STOMP
14:47:43,453 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support STOMP_WS
14:47:43,567 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221034: Waiting to obtain live lock
14:47:43,567 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221035: Live Server Obtained live lock
14:47:43,777 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-8) JBAS010400: Bound data source [java:jboss/datasources/ExampleDS]
14:47:43,781 INFO [org.jboss.as.jacorb] (MSC service thread 1-1) JBAS016330: CORBA ORB Service started
14:47:44,115 INFO [org.jboss.as.jacorb] (MSC service thread 1-13) JBAS016328: CORBA Naming Service started
14:47:44,345 INFO [org.wildfly.extension.undertow] (MSC service thread 1-3) JBAS018210: Register web context: /hornetq-server
14:47:44,361 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5455 for CORE protocol
14:47:44,362 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5445 for CORE protocol
14:47:44,364 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 org.hornetq.default.servlet:5445 for CORE protocol
14:47:44,366 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ221007: Server is now live
14:47:44,366 INFO [org.hornetq.core.server] (ServerService Thread Pool -- 58) HQ221001: HornetQ Server version 2.4.0.Beta2 (Andromedian Flyer, 123) [bcc1cd10-2bfb-11e3-ad5f-9f88840f9e1a]
14:47:44,361 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5455 for CORE protocol
14:47:44,362 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5445 for CORE protocol
14:47:44,364 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 org.apache.activemq6.default.servlet:5445 for CORE protocol
14:47:44,366 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221007: Server is now live
14:47:44,366 INFO [org.apache.activemq6.core.server] (ServerService Thread Pool -- 58) HQ221001: HornetQ Server version 2.4.0.Beta2 (Andromedian Flyer, 123) [bcc1cd10-2bfb-11e3-ad5f-9f88840f9e1a]
14:47:44,435 INFO [org.jboss.as.messaging] (ServerService Thread Pool -- 58) JBAS011601: Bound messaging object to jndi name java:/ConnectionFactory
14:47:44,437 INFO [org.jboss.as.messaging] (ServerService Thread Pool -- 59) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/ServletConnectionFactory
14:47:44,439 INFO [org.jboss.as.messaging] (ServerService Thread Pool -- 60) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/RemoteConnectionFactory
14:47:44,462 INFO [org.jboss.as.connector.deployment] (MSC service thread 1-3) JBAS010406: Registered connection factory java:/JmsXA
14:47:44,531 INFO [org.hornetq.ra] (MSC service thread 1-3) HornetQ resource adaptor started
14:47:44,531 INFO [org.apache.activemq6.ra] (MSC service thread 1-3) HornetQ resource adaptor started
14:47:44,532 INFO [org.jboss.as.connector.services.resourceadapters.ResourceAdapterActivatorService$ResourceAdapterActivator] (MSC service thread 1-3) IJ020002: Deployed: file://RaActivatorhornetq-ra
14:47:44,535 INFO [org.jboss.as.connector.deployment] (MSC service thread 1-12) JBAS010401: Bound JCA ConnectionFactory [java:/JmsXA]
14:47:44,536 INFO [org.jboss.as.messaging] (MSC service thread 1-15) JBAS011601: Bound messaging object to jndi name java:jboss/DefaultJMSConnectionFactory

24
docs/quickstart-guide/zh/examples.xml
View File

@ -70,31 +70,31 @@ runExample:
seParallelGC,-XX:+AggressiveOpts,-XX:+UseFastAccessorMethods,-Djava.util.logging.config.
file=/home/andy/projects/hornetq/trunk/examples/jms/common/../../../src/config/stand-alone/no
n-clustered/logging.properties
[java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:08,437 INFO @main [Journal
[java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:08,437 INFO @main [Journal
StorageManager] AIO journal selected
[java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:08,437 WARN @main [Journal
[java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:08,437 WARN @main [Journal
StorageManager] AIO wasn't located on this platform, it will fall back to using pure Jav
a NIO. If your platform is Linux, install LibAIO to enable the AIO journal
[java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:08,437 WARN @main [Securit
[java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:08,437 WARN @main [Securit
yStoreImpl] It has been detected that the cluster admin password which is used to replic
ate management operation from one node to the other has not had its password changed fro
m the installation default. Please see the HornetQ user guide for instructions o
n how to do this.
[java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:10,941 INFO @main [HornetQCo
[java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:10,941 INFO @main [HornetQCo
nnectionFactory] read only is false
[java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:10,941 INFO @main [HornetQCo
[java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:10,941 INFO @main [HornetQCo
nnectionFactory] read only is false
[java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:10,941 INFO @main [HornetQCo
[java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:10,941 INFO @main [HornetQCo
nnectionFactory] read only is false
[java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:10,991 WARN @main [JMSServ
[java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:10,991 WARN @main [JMSServ
erManagerImpl] Binding for java:/ConnectionFactory already exists
[java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:10,991 WARN @main [JMSServ
[java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:10,991 WARN @main [JMSServ
erManagerImpl] Binding for java:/XAConnectionFactory already exists
[java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:11,241 INFO @main [Messagi
[java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:11,241 INFO @main [Messagi
ngServerImpl] HornetQ Server version 2.0.0.BETA5 (buzz-buzz, 107) started
[java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:11,241 INFO @main [HornetQBoot
[java] org.apache.activemq6.jms.example.SpawnedJMSServer out:10:41:11,241 INFO @main [HornetQBoot
strapServer] HornetQ server started
[java] org.hornetq.jms.example.SpawnedJMSServer out:STARTED::
[java] org.apache.activemq6.jms.example.SpawnedJMSServer out:STARTED::
[java] 10:41:11,276 INFO @main [JMSExample] using server0/client-jndi.properties f
or jndi
[java] Sent message: This is a text message
@ -155,7 +155,7 @@ deploy-ear:
[exec] 16:01:04,607 INFO [JBossASKernel] Added bean(jboss.j2ee:ear=mdb-example.ear,
jar=mdb-example.jar,name=MessageMDBExample,service=EJB3) to KernelDeployment of:
mdb-example.jar
[exec] 16:01:04,702 INFO [EJBContainer] STARTED EJB: org.hornetq.javaee.example.server
[exec] 16:01:04,702 INFO [EJBContainer] STARTED EJB: org.apache.activemq6.javaee.example.server
.MDBExample ejbName: MessageMDBExample
[exec] 16:01:09,496 INFO [TomcatDeployment] deploy, ctxPath=/mdb-example
[exec] 16:01:09,812 WARNING [config] Unable to process deployment descriptor for cont

2
docs/user-manual/en/aerogear-integration.xml
View File

@ -31,7 +31,7 @@
<para>AeroGear Connector services are configured in the connector-services configuration:</para>
<programlisting>
&lt;connector-service name="aerogear-connector">
&lt;factory-class>org.hornetq.integration.aerogear.AeroGearConnectorServiceFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.integration.aerogear.AeroGearConnectorServiceFactory&lt;/factory-class>
&lt;param key="endpoint" value="endpoint"/>
&lt;param key="queue" value="jms.queue.aerogearQueue"/>
&lt;param key="application-id" value="an applicationid"/>

66
docs/user-manual/en/appserver-integration.xml
View File

@ -325,13 +325,13 @@ public class MyMDB implements MessageListener
<para>The configuration will look something like the following:</para>
<programlisting>
&lt;resourceadapter>
&lt;resourceadapter-class>org.hornetq.ra.HornetQResourceAdapter&lt;/resourceadapter-class>
&lt;resourceadapter-class>org.apache.activemq6.ra.HornetQResourceAdapter&lt;/resourceadapter-class>
&lt;config-property>
&lt;description>The transport type. Multiple connectors can be configured by using a comma separated list,
i.e. org.hornetq.core.remoting.impl.invm.InVMConnectorFactory,org.hornetq.core.remoting.impl.invm.InVMConnectorFactory.&lt;/description>
i.e. org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory.&lt;/description>
&lt;config-property-name>ConnectorClassName&lt;/config-property-name>
&lt;config-property-type>java.lang.String&lt;/config-property-type>
&lt;config-property-value>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory&lt;/config-property-value>
&lt;config-property-value>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory&lt;/config-property-value>
&lt;/config-property>
&lt;config-property>
&lt;description>The transport configuration. These values must be in the form of key=val;key=val;,
@ -344,7 +344,7 @@ public class MyMDB implements MessageListener
&lt;outbound-resourceadapter>
&lt;connection-definition>
&lt;managedconnectionfactory-class>org.hornetq.ra.HornetQRAManagedConnection
&lt;managedconnectionfactory-class>org.apache.activemq6.ra.HornetQRAManagedConnection
Factory&lt;/managedconnectionfactory-class>
&lt;config-property>
@ -361,12 +361,12 @@ public class MyMDB implements MessageListener
&lt;config-property-value>0&lt;/config-property-value>
&lt;/config-property>
&lt;connectionfactory-interface>org.hornetq.ra.HornetQRAConnectionFactory
&lt;connectionfactory-interface>org.apache.activemq6.ra.HornetQRAConnectionFactory
&lt;/connectionfactory-interface>
&lt;connectionfactororg.hornetq.ra.HornetQConnectionFactoryImplonFactoryImpl
&lt;connectionfactororg.apache.activemq6.ra.HornetQConnectionFactoryImplonFactoryImpl
&lt;/connectionfactory-impl-class>
&lt;connection-interface>javax.jms.Session&lt;/connection-interface>
&lt;connection-impl-class>org.hornetq.ra.HornetQRASession
&lt;connection-impl-class>org.apache.activemq6.ra.HornetQRASession
&lt;/connection-impl-class>
&lt;/connection-definition>
&lt;transaction-support>XATransaction&lt;/transaction-support>
@ -384,7 +384,7 @@ public class MyMDB implements MessageListener
&lt;messagelistener>
&lt;messagelistener-type>javax.jms.MessageListener&lt;/messagelistener-type>
&lt;activationspec>
&lt;activationspec-class>org.hornetq.ra.inflow.HornetQActivationSpec
&lt;activationspec-class>org.apache.activemq6.ra.inflow.HornetQActivationSpec
&lt;/activationspec-class>
&lt;required-config-property>
&lt;config-property-name>destination&lt;/config-property-name>
@ -714,11 +714,11 @@ public class MyMDB implements MessageListener
&lt;jndi-name>RemoteJmsXA&lt;/jndi-name>
&lt;xa-transaction/>
&lt;rar-name>jms-ra.rar&lt;/rar-name>
&lt;connection-definition>org.hornetq.ra.HornetQRAConnectionFactory
&lt;connection-definition>org.apache.activemq6.ra.HornetQRAConnectionFactory
&lt;/connection-definition>
&lt;config-property name="SessionDefaultType" type="String">javax.jms.Topic&lt;/config-property>
&lt;config-property name="ConnectorClassName" type="String">
org.hornetq.core.remoting.impl.netty.NettyConnectorFactory
org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory
&lt;/config-property>
&lt;config-property name="ConnectionParameters" type="String">
port=5445&lt;/config-property>
@ -902,12 +902,12 @@ private ConnectionFactory connectionFactory;</programlisting>
Heres an example of what this would look like:
</para>
<programlisting>
&lt;resourceadapter-class>org.hornetq.ra.HornetQResourceAdapter&lt;/resourceadapter-class>
&lt;resourceadapter-class>org.apache.activemq6.ra.HornetQResourceAdapter&lt;/resourceadapter-class>
&lt;config-property>
&lt;description>The transport type&lt;/description>
&lt;config-property-name>ConnectorClassName&lt;/config-property-name>
&lt;config-property-type>java.lang.String&lt;/config-property-type>
&lt;config-property-value>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property-value>
&lt;config-property-value>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property-value>
&lt;/config-property>
&lt;config-property>
&lt;description>The transport configuration. These values must be in the form of key=val;key=val;&lt;/description>
@ -921,12 +921,12 @@ private ConnectionFactory connectionFactory;</programlisting>
</para>
<programlisting>
&lt;resourceadapter-class>org.hornetq.ra.HornetQResourceAdapter&lt;/resourceadapter-class>
&lt;resourceadapter-class>org.apache.activemq6.ra.HornetQResourceAdapter&lt;/resourceadapter-class>
&lt;config-property>
&lt;description>The transport type&lt;/description>
&lt;config-property-name>ConnectorClassName&lt;/config-property-name>
&lt;config-property-type>java.lang.String&lt;/config-property-type>
&lt;config-property-value>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property-value>
&lt;config-property-value>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory,org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property-value>
&lt;/config-property>
&lt;config-property>
&lt;description>The transport configuration. These values must be in the form of key=val;key=val;&lt;/description>
@ -961,9 +961,9 @@ private ConnectionFactory connectionFactory;</programlisting>
&lt;jndi-name>RemoteJmsXA&lt;/jndi-name>
&lt;xa-transaction/>
&lt;rar-name>hornetq-ra.rar&lt;/rar-name>
&lt;connection-definition>org.hornetq.ra.HornetQRAConnectionFactory&lt;/connection-definition>
&lt;connection-definition>org.apache.activemq6.ra.HornetQRAConnectionFactory&lt;/connection-definition>
&lt;config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic&lt;/config-property>
&lt;config-property name="ConnectorClassName" type="java.lang.String">org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property>
&lt;config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property>
&lt;config-property name="ConnectionParameters" type="java.lang.String">host=127.0.0.1;port=5446&lt;/config-property>
&lt;max-pool-size>20&lt;/max-pool-size>
&lt;/tx-connection-factory></programlisting>
@ -1092,12 +1092,12 @@ Copyright 2009 Red Hat, Inc.
&lt;/license>
&lt;resourceadapter>
&lt;resourceadapter-class>org.hornetq.ra.HornetQResourceAdapter&lt;/resourceadapter-class>
&lt;resourceadapter-class>org.apache.activemq6.ra.HornetQResourceAdapter&lt;/resourceadapter-class>
&lt;config-property>
&lt;description>The transport type&lt;/description>
&lt;config-property-name>ConnectorClassName&lt;/config-property-name>
&lt;config-property-type>java.lang.String&lt;/config-property-type>
&lt;config-property-value>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property-value>
&lt;config-property-value>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property-value>
&lt;/config-property>
&lt;config-property>
&lt;description>The transport configuration. These values must be in the form of key=val;key=val;&lt;/description>
@ -1108,7 +1108,7 @@ Copyright 2009 Red Hat, Inc.
&lt;outbound-resourceadapter>
&lt;connection-definition>
&lt;managedconnectionfactory-class>org.hornetq.ra.HornetQRAManagedConnectionFactory&lt;/managedconnectionfactory-class>
&lt;managedconnectionfactory-class>org.apache.activemq6.ra.HornetQRAManagedConnectionFactory&lt;/managedconnectionfactory-class>
&lt;config-property>
&lt;description>The default session type&lt;/description>
@ -1123,10 +1123,10 @@ Copyright 2009 Red Hat, Inc.
&lt;config-property-value>0&lt;/config-property-value>
&lt;/config-property>
&lt;connectionfactory-interface>org.hornetq.ra.HornetQRAConnectionFactory&lt;/connectionfactory-interface>
&lt;connectionfactory-impl-class>org.hornetq.ra.HornetQRAConnectionFactoryImpl&lt;/connectionfactory-impl-class>
&lt;connectionfactory-interface>org.apache.activemq6.ra.HornetQRAConnectionFactory&lt;/connectionfactory-interface>
&lt;connectionfactory-impl-class>org.apache.activemq6.ra.HornetQRAConnectionFactoryImpl&lt;/connectionfactory-impl-class>
&lt;connection-interface>javax.jms.Session&lt;/connection-interface>
&lt;connection-impl-class>org.hornetq.ra.HornetQRASession&lt;/connection-impl-class>
&lt;connection-impl-class>org.apache.activemq6.ra.HornetQRASession&lt;/connection-impl-class>
&lt;/connection-definition>
&lt;transaction-support>XATransaction&lt;/transaction-support>
&lt;authentication-mechanism>
@ -1141,7 +1141,7 @@ Copyright 2009 Red Hat, Inc.
&lt;messagelistener>
&lt;messagelistener-type>javax.jms.MessageListener&lt;/messagelistener-type>
&lt;activationspec>
&lt;activationspec-class>org.hornetq.ra.inflow.HornetQActivationSpec&lt;/activationspec-class>
&lt;activationspec-class>org.apache.activemq6.ra.inflow.HornetQActivationSpec&lt;/activationspec-class>
&lt;required-config-property>
&lt;config-property-name>destination&lt;/config-property-name>
&lt;/required-config-property>
@ -1178,9 +1178,9 @@ Copyright 2009 Red Hat, Inc.
&lt;jndi-name>RemoteJmsXA&lt;/jndi-name>
&lt;xa-transaction/>
&lt;rar-name>hornetq-ra.rar&lt;/rar-name>
&lt;connection-definition>org.hornetq.ra.HornetQRAConnectionFactory&lt;/connection-definition>
&lt;connection-definition>org.apache.activemq6.ra.HornetQRAConnectionFactory&lt;/connection-definition>
&lt;config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic&lt;/config-property>
&lt;config-property name="ConnectorClassName" type="java.lang.String">org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property>
&lt;config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property>
&lt;config-property name="ConnectionParameters" type="java.lang.String">host=127.0.0.1;port=5445&lt;/config-property>
&lt;max-pool-size>20&lt;/max-pool-size>
&lt;/tx-connection-factory>
@ -1260,7 +1260,7 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
...
&lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HornetQ1"
value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;[connection configuration]"/>
value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;[connection configuration]"/>
&lt;property name="com.arjuna.ats.jta.xaRecoveryNode" value="1"/>
&lt;/properties></programlisting>
<para>The <literal>[connection configuration]</literal> contains all the information
@ -1271,9 +1271,9 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
<para><literal>[connector factory class name]</literal> corresponds to the name
of the <literal>ConnectorFactory</literal> used to connect to HornetQ.
Values can be <literal
>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</literal> or
>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</literal> or
<literal
>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</literal></para>
>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</literal></para>
</listitem>
<listitem>
<para><literal>[user name]</literal> is the user name to create a client
@ -1302,24 +1302,24 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
<para>If HornetQ is configured with a default in-vm acceptor:</para>
<programlisting>
&lt;acceptor name="in-vm">
&lt;factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory&lt;/factory-class>
&lt;/acceptor></programlisting>
<para>the corresponding configuration in <literal
>conf/jbossts-properties.xml</literal> is:</para>
<programlisting>
&lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/></programlisting>
value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory"/></programlisting>
<para>If it is now configured with a netty acceptor on a non-default port:</para>
<programlisting>
&lt;acceptor name="netty">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;param key="port" value="8888"/>
&lt;/acceptor></programlisting>
<para>the corresponding configuration in <literal
>conf/jbossts-properties.xml</literal> is:</para>
<programlisting>
&lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory, , , port=8888"/></programlisting>
value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory, , , port=8888"/></programlisting>
<note>
<para>Note the additional commas to skip the user and password before connector
parameters</para>
@ -1328,7 +1328,7 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
configuration would have been:</para>
<programlisting>
&lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory, admin, adminpass, port=8888"/></programlisting>
value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory, admin, adminpass, port=8888"/></programlisting>
<para>Configuring HornetQ with an invm acceptor and configuring the Recovery Manager
with an invm connector is the recommended way to enable XA Recovery.</para>
</section>

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

@ -806,31 +806,31 @@ ClientSession session = factory.createSession();</programlisting>
subsequent node is chosen sequentially in the same order.</para>
<para>For example nodes might be chosen in the order B, C, D, A, B, C, D, A, B or D,
A, B, C, D, A, B, C, D or C, D, A, B, C, D, A, B, C.</para>
<para>Use <literal>org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>
<para>Use <literal>org.apache.activemq6.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>
as the <literal>&lt;connection-load-balancing-policy-class-name></literal>.</para>
</listitem>
<listitem>
<para>Random. With this policy each node is chosen randomly.</para>
<para>Use <literal>org.hornetq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy</literal>
<para>Use <literal>org.apache.activemq6.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy</literal>
as the <literal>&lt;connection-load-balancing-policy-class-name></literal>.</para>
</listitem>
<listitem>
<para>Random Sticky. With this policy the first node is chosen randomly and then re-used for subsequent
connections.</para>
<para>Use <literal>org.hornetq.api.core.client.loadbalance.RandomStickyConnectionLoadBalancingPolicy</literal>
<para>Use <literal>org.apache.activemq6.api.core.client.loadbalance.RandomStickyConnectionLoadBalancingPolicy</literal>
as the <literal>&lt;connection-load-balancing-policy-class-name></literal>.</para>
</listitem>
<listitem>
<para>First Element. With this policy the "first" (i.e. 0th) node is always returned.</para>
<para>Use <literal>org.hornetq.api.core.client.loadbalance.FirstElementConnectionLoadBalancingPolicy</literal>
<para>Use <literal>org.apache.activemq6.api.core.client.loadbalance.FirstElementConnectionLoadBalancingPolicy</literal>
as the <literal>&lt;connection-load-balancing-policy-class-name></literal>.</para>
</listitem>
</itemizedlist>
<para>You can also implement your own policy by implementing the interface <literal
>org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy</literal></para>
>org.apache.activemq6.api.core.client.loadbalance.ConnectionLoadBalancingPolicy</literal></para>
<para>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 <literal
>org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>.</para>
>org.apache.activemq6.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>.</para>
<para>If you're using JMS, and you're using JNDI on the server to put your JMS connection
factories into JNDI, then you can specify the load balancing policy directly in the
<literal>hornetq-jms.xml</literal> configuration file on the server as follows:</para>
@ -841,7 +841,7 @@ ClientSession session = factory.createSession();</programlisting>
&lt;entry name="ConnectionFactory"/>
&lt;/entries>
&lt;connection-load-balancing-policy-class-name>
org.hornetq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy
org.apache.activemq6.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy
&lt;/connection-load-balancing-policy-class-name>
&lt;/connection-factory></programlisting>
<para>The above example would deploy a JMS connection factory that uses the random connection load

10
docs/user-manual/en/configuration-index.xml
View File

@ -207,7 +207,7 @@
</entry>
<entry>String</entry>
<entry>the name of the load balancing class</entry>
<entry>org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</entry>
<entry>org.apache.activemq6.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</entry>
</row>
<row>
<entry id="configuration.connection-factory.connection-ttl">
@ -608,7 +608,7 @@
<programlisting>
&lt;mask-password>true&lt;/mask-password>
&lt;password-codec>org.hornetq.utils.DefaultSensitiveStringCodec;key=hello world&lt;/password-codec></programlisting>
&lt;password-codec>org.apache.activemq6.utils.DefaultSensitiveStringCodec;key=hello world&lt;/password-codec></programlisting>
<para>When so configured, the HornetQ security manager will initialize a DefaultSensitiveStringCodec with the parameters
"key"->"hello world", then use it to decode all the masked passwords in this configuration file.</para>
@ -626,12 +626,12 @@
<section><title>The built-in Decoder</title>
<para>Whenever no decoder is specified in the configuration file, the built-in decoder is used. The class name for the built-in
decoder is org.hornetq.utils.DefaultSensitiveStringCodec. It has both encoding and decoding capabilities. It uses java.crypto.Cipher
decoder is org.apache.activemq6.utils.DefaultSensitiveStringCodec. It has both encoding and decoding capabilities. It uses java.crypto.Cipher
utilities to encrypt (encode) a plaintext password and decrypt a mask string using same algorithm. Using this decoder/encoder is
pretty straightforward. To get a mask for a password, just run the following in command line:</para>
<programlisting>
java org.hornetq.utils.DefaultSensitiveStringCodec "your plaintext password"</programlisting>
java org.apache.activemq6.utils.DefaultSensitiveStringCodec "your plaintext password"</programlisting>
<para>Make sure the classpath is correct. You'll get something like</para>
@ -668,7 +668,7 @@ Encoded password: 80cf731af62c290</programlisting>
<section><title>Implementing your own codecs</title>
<para>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 <literal>org.hornetq.utils.SensitiveDataCodec&lt;T></literal> interface:</para>
All decoders must implement the <literal>org.apache.activemq6.utils.SensitiveDataCodec&lt;T></literal> interface:</para>
<programlisting>
public interface SensitiveDataCodec&lt;T>

22
docs/user-manual/en/configuring-transports.xml
View File

@ -38,7 +38,7 @@
&lt;acceptors>
&lt;acceptor name="netty">
&lt;factory-class>
org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory
org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory
&lt;/factory-class>
&lt;param key="port" value="5446"/>
&lt;/acceptor>
@ -78,7 +78,7 @@
&lt;connectors>
&lt;connector name="netty">
&lt;factory-class>
org.hornetq.core.remoting.impl.netty.NettyConnectorFactory
org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory
&lt;/factory-class>
&lt;param key="port" value="5446"/>
&lt;/connector>
@ -135,12 +135,12 @@
<programlisting>
Map&lt;String, Object> connectionParams = new HashMap&lt;String, Object>();
connectionParams.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME,
connectionParams.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME,
5446);
TransportConfiguration transportConfiguration =
new TransportConfiguration(
"org.hornetq.core.remoting.impl.netty.NettyConnectorFactory",
"org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory",
connectionParams);
ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(transportConfiguration);
@ -156,11 +156,11 @@ etc</programlisting>
<programlisting>
Map&lt;String, Object> connectionParams = new HashMap&lt;String, Object>();
connectionParams.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 5446);
connectionParams.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 5446);
TransportConfiguration transportConfiguration =
new TransportConfiguration(
"org.hornetq.core.remoting.impl.netty.NettyConnectorFactory",
"org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory",
connectionParams);
ConnectionFactory connectionFactory = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, transportConfiguration);
@ -205,7 +205,7 @@ etc</programlisting>
with firewall policies that typically only allow connections to be initiated in one
direction.</para>
<para>All the valid Netty transport keys are defined in the class <literal
>org.hornetq.core.remoting.impl.netty.TransportConstants</literal>. Most
>org.apache.activemq6.core.remoting.impl.netty.TransportConstants</literal>. Most
parameters can be used either with acceptors or connectors, some only work with
acceptors. The following parameters can be used to configure Netty for simple
TCP:</para>
@ -342,7 +342,7 @@ buffer_size = bandwidth * RTT.</programlisting>
downloaded and used by the client. If the client needs to use a different path
from that set on the server then it can override the server-side setting by either
using the customary "javax.net.ssl.keyStore" system property or the HornetQ-specific
"org.hornetq.ssl.keyStore" system property. The HornetQ-specific system property
"org.apache.activemq6.ssl.keyStore" system property. The HornetQ-specific system property
is useful if another component on client is already making use of the standard, Java
system property.</para>
</listitem>
@ -356,7 +356,7 @@ buffer_size = bandwidth * RTT.</programlisting>
be configured on the server, it is downloaded and used by the client. If the client
needs to use a different password from that set on the server then it can override
the server-side setting by either using the customary "javax.net.ssl.keyStorePassword"
system property or the HornetQ-specific "org.hornetq.ssl.keyStorePassword" system
system property or the HornetQ-specific "org.apache.activemq6.ssl.keyStorePassword" system
property. The HornetQ-specific system property is useful if another component on client
is already making use of the standard, Java system property.</para>
</listitem>
@ -372,7 +372,7 @@ buffer_size = bandwidth * RTT.</programlisting>
used by the client. If the client needs to use a different path
from that set on the server then it can override the server-side setting by either
using the customary "javax.net.ssl.trustStore" system property or the HornetQ-specific
"org.hornetq.ssl.trustStore" system property. The HornetQ-specific system property
"org.apache.activemq6.ssl.trustStore" system property. The HornetQ-specific system property
is useful if another component on client is already making use of the standard, Java
system property.</para>
</listitem>
@ -386,7 +386,7 @@ buffer_size = bandwidth * RTT.</programlisting>
downloaded and used by the client. If the client
needs to use a different password from that set on the server then it can override
the server-side setting by either using the customary "javax.net.ssl.trustStorePassword"
system property or the HornetQ-specific "org.hornetq.ssl.trustStorePassword" system
system property or the HornetQ-specific "org.apache.activemq6.ssl.trustStorePassword" system
property. The HornetQ-specific system property is useful if another component on client
is already making use of the standard, Java system property.</para>
</listitem>

18
docs/user-manual/en/connection-ttl.xml
View File

@ -128,11 +128,11 @@ finally
a warning similar to the following in the logs (If you are using JMS the warning
will involve a JMS connection not a client session):</para>
<programlisting>
[Finalizer] 20:14:43,244 WARNING [org.hornetq.core.client.impl.DelegatingSession] I'm closing a ClientSession you left open. Please make sure you close all ClientSessions explicitly before let
[Finalizer] 20:14:43,244 WARNING [org.apache.activemq6.core.client.impl.DelegatingSession] I'm closing a ClientSession you left open. Please make sure you close all ClientSessions explicitly before let
ting them go out of scope!
[Finalizer] 20:14:43,244 WARNING [org.hornetq.core.client.impl.DelegatingSession] The session you didn't close was created here:
[Finalizer] 20:14:43,244 WARNING [org.apache.activemq6.core.client.impl.DelegatingSession] The session you didn't close was created here:
java.lang.Exception
at org.hornetq.core.client.impl.DelegatingSession.&lt;init>(DelegatingSession.java:83)
at org.apache.activemq6.core.client.impl.DelegatingSession.&lt;init>(DelegatingSession.java:83)
at org.acme.yourproject.YourClass (YourClass.java:666)</programlisting>
<para>HornetQ will then close the connection / client session for you.</para>
<para>Note that the log will also tell you the exact line of your user code where you
@ -177,22 +177,22 @@ java.lang.Exception
are:</para>
<itemizedlist>
<listitem>
<para><literal>org.hornetq.core.protocol.core.impl.wireformat.RollbackMessage</literal></para>
<para><literal>org.apache.activemq6.core.protocol.core.impl.wireformat.RollbackMessage</literal></para>
</listitem>
<listitem>
<para><literal>org.hornetq.core.protocol.core.impl.wireformat.SessionCloseMessage</literal></para>
<para><literal>org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCloseMessage</literal></para>
</listitem>
<listitem>
<para><literal>org.hornetq.core.protocol.core.impl.wireformat.SessionCommitMessage</literal></para>
<para><literal>org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCommitMessage</literal></para>
</listitem>
<listitem>
<para><literal>org.hornetq.core.protocol.core.impl.wireformat.SessionXACommitMessage</literal></para>
<para><literal>org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXACommitMessage</literal></para>
</listitem>
<listitem>
<para><literal>org.hornetq.core.protocol.core.impl.wireformat.SessionXAPrepareMessage</literal></para>
<para><literal>org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAPrepareMessage</literal></para>
</listitem>
<listitem>
<para><literal>org.hornetq.core.protocol.core.impl.wireformat.SessionXARollbackMessage</literal></para>
<para><literal>org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXARollbackMessage</literal></para>
</listitem>
</itemizedlist>
<para>To disable asynchronous connection execution, set the parameter

4
docs/user-manual/en/core-bridges.xml
View File

@ -57,7 +57,7 @@
&lt;forwarding-address>jms.queue.mincing-machine&lt;/forwarding-address>
&lt;filter-string="name='aardvark'"/>
&lt;transformer-class-name>
org.hornetq.jms.example.HatColourChangeTransformer
org.apache.activemq6.jms.example.HatColourChangeTransformer
&lt;/transformer-class-name>
&lt;retry-interval>1000&lt;/retry-interval>
&lt;ha>true&lt;/ha>
@ -114,7 +114,7 @@
<listitem>
<para><literal>transformer-class-name</literal>. An optional transformer-class-name
can be specified. This is the name of a user-defined class which implements the
<literal>org.hornetq.core.server.cluster.Transformer</literal>
<literal>org.apache.activemq6.core.server.cluster.Transformer</literal>
interface.</para>
<para>If this is specified then the transformer's <literal>transform()</literal>
method will be invoked with the message before it is forwarded. This gives you

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

@ -67,7 +67,7 @@
&lt;forwarding-address>jms.queue.priceForwarding&lt;/forwarding-address>
&lt;filter string="office='New York'"/>
&lt;transformer-class-name>
org.hornetq.jms.example.AddForwardingTimeTransformer
org.apache.activemq6.jms.example.AddForwardingTimeTransformer
&lt;/transformer-class-name>
&lt;exclusive>true&lt;/exclusive>
&lt;/divert></programlisting>

4
docs/user-manual/en/duplicate-detection.xml
View File

@ -69,7 +69,7 @@
set it once in the transaction. If the server detects a duplicate message for any
message in the transaction, then it will ignore the entire transaction.</para>
<para>The name of the property that you set is given by the value of <literal
>org.hornetq.api.core.Message.HDR_DUPLICATE_DETECTION_ID</literal>, which
>org.apache.activemq6.api.core.Message.HDR_DUPLICATE_DETECTION_ID</literal>, which
is <literal>_HQ_DUPL_ID</literal></para>
<para>The value of the property can be of type <literal>byte[]</literal> or <literal
>SimpleString</literal> if you're using the core API. If you're using JMS it must be
@ -101,7 +101,7 @@ message.setStringProperty(HDR_DUPLICATE_DETECTION_ID.toString(), myUniqueID);
<section id="duplicate.id.cache">
<title>Configuring the Duplicate ID Cache</title>
<para>The server maintains caches of received values of the <literal
>org.hornetq.core.message.impl.HDR_DUPLICATE_DETECTION_ID</literal> property
>org.apache.activemq6.core.message.impl.HDR_DUPLICATE_DETECTION_ID</literal> property
sent to each address. Each address has its own distinct cache.</para>
<para>The cache is a circular fixed size cache. If the cache has a maximum size of <literal
>n</literal> elements, then the <literal>n + 1</literal>th id stored will overwrite

18
docs/user-manual/en/embedding-hornetq.xml
View File

@ -58,7 +58,7 @@
<literal>hornetq-configuration.xml</literal> in your
classpath:</para>
<programlisting>
import org.hornetq.core.server.embedded.EmbeddedHornetQ;
import org.apache.activemq6.core.server.embedded.EmbeddedHornetQ;
...
@ -109,7 +109,7 @@ session.close();</programlisting>
<literal>hornetq-jms.xml</literal> config file.</para>
<programlisting>
import org.hornetq.jms.server.embedded.EmbeddedJMS;
import org.apache.activemq6.jms.server.embedded.EmbeddedJMS;
...
@ -149,8 +149,8 @@ Destination destination = jms.lookup("/example/queue");
would through the main configuration file.</para>
<programlisting>
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.apache.activemq6.core.config.Configuration;
import org.apache.activemq6.core.config.impl.ConfigurationImpl;
...
@ -163,12 +163,12 @@ transports.add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
config.setAcceptorConfigurations(transports);</programlisting>
<para>You need to instantiate an instance of
<literal>org.hornetq.api.core.server.embedded.EmbeddedHornetQ</literal>
<literal>org.apache.activemq6.api.core.server.embedded.EmbeddedHornetQ</literal>
and add the configuration object to it.</para>
<programlisting>
import org.hornetq.api.core.server.HornetQ;
import org.hornetq.core.server.embedded.EmbeddedHornetQ;
import org.apache.activemq6.api.core.server.HornetQ;
import org.apache.activemq6.core.server.embedded.EmbeddedHornetQ;
...
@ -247,12 +247,12 @@ jmsServer.start();</programlisting>
&lt;deployment xmlns="urn:jboss:bean-deployer:2.0">
&lt;!-- The core configuration -->
&lt;bean name="Configuration"
class="org.hornetq.core.config.impl.FileConfiguration">
class="org.apache.activemq6.core.config.impl.FileConfiguration">
&lt;/bean>
&lt;!-- The core server -->
&lt;bean name="HornetQServer"
class="org.hornetq.core.server.impl.HornetQServerImpl">
class="org.apache.activemq6.core.server.impl.HornetQServerImpl">
&lt;constructor>
&lt;parameter>
&lt;inject bean="Configuration"/>

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

@ -35,7 +35,7 @@
<title>Implementing The Interceptors</title>
<para>An interceptor must implement the <literal>Interceptor interface</literal>:</para>
<programlisting>
package org.hornetq.api.core.interceptor;
package org.apache.activemq6.api.core.interceptor;
public interface Interceptor
{
@ -58,13 +58,13 @@ public interface Interceptor
<literal>hornetq-configuration.xml</literal>:</para>
<programlisting>
&lt;remoting-incoming-interceptors>
&lt;class-name>org.hornetq.jms.example.LoginInterceptor&lt;/class-name>
&lt;class-name>org.hornetq.jms.example.AdditionalPropertyInterceptor&lt;/class-name>
&lt;class-name>org.apache.activemq6.jms.example.LoginInterceptor&lt;/class-name>
&lt;class-name>org.apache.activemq6.jms.example.AdditionalPropertyInterceptor&lt;/class-name>
&lt;/remoting-incoming-interceptors></programlisting>
<programlisting>
&lt;remoting-outgoing-interceptors>
&lt;class-name>org.hornetq.jms.example.LogoutInterceptor&lt;/class-name>
&lt;class-name>org.hornetq.jms.example.AdditionalPropertyInterceptor&lt;/class-name>
&lt;class-name>org.apache.activemq6.jms.example.LogoutInterceptor&lt;/class-name>
&lt;class-name>org.apache.activemq6.jms.example.AdditionalPropertyInterceptor&lt;/class-name>
&lt;/remoting-outgoing-interceptors></programlisting>
<para>The interceptors classes (and their dependencies) must be added to the server classpath
to be properly instantiated and called.</para>

14
docs/user-manual/en/interoperability.xml
View File

@ -36,7 +36,7 @@
parameter set to have <literal>stomp</literal>:</para>
<programlisting>
&lt;acceptor name="stomp-acceptor">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;param key="protocols" value="STOMP"/>
&lt;param key="port" value="61613"/>
&lt;/acceptor></programlisting>
@ -90,7 +90,7 @@
</para>
<programlisting>
&lt;acceptor name="stomp-acceptor">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;param key="protocols" value="STOMP"/>
&lt;param key="port" value="61613"/>
&lt;param key="connection-ttl" value="20000"/>
@ -156,7 +156,7 @@ destination:jms.topic.stocks
just set the <literal>stomp-enable-message-id</literal> to true. For example:</para>
<programlisting>
&lt;acceptor name="stomp-acceptor">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;param key="protocols" value="STOMP"/>
&lt;param key="port" value="61613"/>
&lt;param key="stomp-enable-message-id" value="true"/>
@ -178,7 +178,7 @@ hq-message-id : STOMP12345</programlisting>
This attribute can be configured inside a stomp acceptor, as a parameter. For example: </para>
<programlisting>
&lt;acceptor name="stomp-acceptor">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;param key="protocols" value="STOMP"/>
&lt;param key="port" value="61613"/>
&lt;param key="stomp-min-large-message-size" value="10240"/>
@ -203,7 +203,7 @@ hq-message-id : STOMP12345</programlisting>
parameter set to <literal>stomp_ws</literal>:</para>
<programlisting>
&lt;acceptor name="stomp-ws-acceptor">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;param key="protocols" value="STOMP_WS"/>
&lt;param key="port" value="61614"/>
&lt;/acceptor></programlisting>
@ -248,7 +248,7 @@ java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces</programlisting
specification. To enable AMQP you must configure a Netty Acceptor to receive AMQP clients, like so:</para>
<programlisting>
&lt;acceptor name="stomp-acceptor">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;param key="protocols" value="AMQP"/>
&lt;param key="port" value="5672"/>
&lt;/acceptor>
@ -292,7 +292,7 @@ java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces</programlisting
you must configure a Netty Acceptor, like so:</para>
<programlisting>
&lt;acceptor name="openwire-acceptor">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;param key="protocols" value="OPENWIRE"/>
&lt;param key="port" value="61616"/>
&lt;/acceptor>

16
docs/user-manual/en/jms-bridge.xml
View File

@ -55,7 +55,7 @@
<programlisting>
&lt;?xml version="1.0" encoding="UTF-8"?>
&lt;deployment xmlns="urn:jboss:bean-deployer:2.0">
&lt;bean name="JMSBridge" class="org.hornetq.api.jms.bridge.impl.JMSBridgeImpl">
&lt;bean name="JMSBridge" class="org.apache.activemq6.api.jms.bridge.impl.JMSBridgeImpl">
&lt;!-- HornetQ must be started before the bridge -->
&lt;depends>HornetQServer&lt;/depends>
&lt;constructor>
@ -105,7 +105,7 @@
&lt;parameter>
&lt;inject bean="MBeanServer"/>
&lt;/parameter>
&lt;parameter>org.hornetq:service=JMSBridge&lt;/parameter>
&lt;parameter>org.apache.activemq6:service=JMSBridge&lt;/parameter>
&lt;/constructor>
&lt;property name="transactionManager">
&lt;inject bean="RealTransactionManager"/>
@ -114,7 +114,7 @@
&lt;!-- SourceCFF describes the ConnectionFactory used to connect to the source destination -->
&lt;bean name="SourceCFF"
class="org.hornetq.api.jms.bridge.impl.JNDIConnectionFactoryFactory">
class="org.apache.activemq6.api.jms.bridge.impl.JNDIConnectionFactoryFactory">
&lt;constructor>
&lt;parameter>
&lt;inject bean="JNDI" />
@ -125,7 +125,7 @@
&lt;!-- TargetCFF describes the ConnectionFactory used to connect to the target destination -->
&lt;bean name="TargetCFF"
class="org.hornetq.api.jms.bridge.impl.JNDIConnectionFactoryFactory">
class="org.apache.activemq6.api.jms.bridge.impl.JNDIConnectionFactoryFactory">
&lt;constructor>
&lt;parameter>
&lt;inject bean="JNDI" />
@ -135,7 +135,7 @@
&lt;/bean>
&lt;!-- SourceDestinationFactory describes the Destination used as the source -->
&lt;bean name="SourceDestinationFactory" class="org.hornetq.api.jms.bridge.impl.JNDIDestinationFactory">
&lt;bean name="SourceDestinationFactory" class="org.apache.activemq6.api.jms.bridge.impl.JNDIDestinationFactory">
&lt;constructor>
&lt;parameter>
&lt;inject bean="JNDI" />
@ -145,7 +145,7 @@
&lt;/bean>
&lt;!-- TargetDestinationFactory describes the Destination used as the target -->
&lt;bean name="TargetDestinationFactory" class="org.hornetq.api.jms.bridge.impl.JNDIDestinationFactory">
&lt;bean name="TargetDestinationFactory" class="org.apache.activemq6.api.jms.bridge.impl.JNDIDestinationFactory">
&lt;constructor>
&lt;parameter>
&lt;inject bean="JNDI" />
@ -359,7 +359,7 @@
HornetQ 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 <literal
>org.hornetq.jms.bridge.ConnectionFactoryFactory</literal>.</para>
>org.apache.activemq6.jms.bridge.ConnectionFactoryFactory</literal>.</para>
</section>
<section>
<title>Source and Target Destination Factories</title>
@ -367,7 +367,7 @@
<para>In the configuration example above, we have used the default provided by HornetQ
that looks up the destination using JNDI.</para>
<para>A new implementation can be provided by implementing <literal
>org.hornetq.jms.bridge.DestinationFactory</literal> interface.</para>
>org.apache.activemq6.jms.bridge.DestinationFactory</literal> interface.</para>
</section>
<section id="quality-of-service">
<title>Quality Of Service</title>

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

@ -160,7 +160,7 @@ ClientSessionFactory factory = HornetQClient.createClientSessionFactory();</prog
>ClientMessage</literal> which are also available through JMS by the use of
object properties.</para>
<table frame="topbot" id="large-messages.ClientMessageAPI">
<title>org.hornetq.api.core.client.ClientMessage API</title>
<title>org.apache.activemq6.api.core.client.ClientMessage API</title>
<tgroup cols="3">
<colspec colname="Name" colnum="1"/>
<colspec colname="Descr" colnum="2"/>

20
docs/user-manual/en/logging.xml
View File

@ -43,23 +43,23 @@
<entry>Logs any calls not handled by the HornetQ loggers</entry>
</row>
<row>
<entry>org.hornetq.core.server</entry>
<entry>org.apache.activemq6.core.server</entry>
<entry>Logs the core server</entry>
</row>
<row>
<entry>org.hornetq.utils</entry>
<entry>org.apache.activemq6.utils</entry>
<entry>Logs utility calls</entry>
</row>
<row>
<entry>org.hornetq.journal</entry>
<entry>org.apache.activemq6.journal</entry>
<entry>Logs Journal calls</entry>
</row>
<row>
<entry>org.hornetq.jms</entry>
<entry>org.apache.activemq6.jms</entry>
<entry>Logs JMS calls</entry>
</row>
<row>
<entry>org.hornetq.integration.bootstrap</entry>
<entry>org.apache.activemq6.integration.bootstrap</entry>
<entry>Logs bootstrap calls</entry>
</row>
</tbody>
@ -91,7 +91,7 @@
&lt;version>1.3.1.Final&lt;/version>
&lt;/dependency>
&lt;dependency>
&lt;groupId>org.hornetq&lt;/groupId>
&lt;groupId>org.apache.activemq6&lt;/groupId>
&lt;artifactId>hornetq-core-client&lt;/artifactId>
&lt;version>2.3.0.Final&lt;/version>
&lt;/dependency></programlisting>
@ -112,14 +112,14 @@
The following is a typical <literal>logging.properties for a client</literal>
<programlisting>
# Root logger option
loggers=org.jboss.logging,org.hornetq.core.server,org.hornetq.utils,org.hornetq.journal,org.hornetq.jms,org.hornetq.ra
loggers=org.jboss.logging,org.apache.activemq6.core.server,org.apache.activemq6.utils,org.apache.activemq6.journal,org.apache.activemq6.jms,org.apache.activemq6.ra
# Root logger level
logger.level=INFO
# HornetQ logger levels
logger.org.hornetq.core.server.level=INFO
logger.org.hornetq.utils.level=INFO
logger.org.hornetq.jms.level=DEBUG
logger.org.apache.activemq6.core.server.level=INFO
logger.org.apache.activemq6.utils.level=INFO
logger.org.apache.activemq6.jms.level=DEBUG
# Root logger handlers
logger.handlers=FILE,CONSOLE

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

@ -57,11 +57,11 @@
<itemizedlist>
<listitem>
<para><emphasis>Core</emphasis> resources are located in the <literal
>org.hornetq.api.core.management</literal> package</para>
>org.apache.activemq6.api.core.management</literal> package</para>
</listitem>
<listitem>
<para><emphasis>JMS</emphasis> resources are located in the <literal
>org.hornetq.api.jms.management</literal> package</para>
>org.apache.activemq6.api.jms.management</literal> package</para>
</listitem>
</itemizedlist>
<para>The way to invoke a <emphasis>management operations</emphasis> depends whether JMX, core
@ -87,7 +87,7 @@
<literal>createQueue()</literal> or <literal>deployQueue()</literal> or
<literal>destroyQueue()</literal>)on the <literal
>HornetQServerControl</literal> (with the ObjectName <literal
>org.hornetq:module=Core,type=Server</literal> or the resource name <literal
>org.apache.activemq6:module=Core,type=Server</literal> or the resource name <literal
>core.server</literal>)</para>
<para><literal>createQueue</literal> will fail if the queue already exists while
<literal>deployQueue</literal> will do nothing.</para>
@ -144,14 +144,14 @@
<literal>createBridge()</literal> and <literal>destroyBridge()</literal>
(resp. <literal>createDivert()</literal> and <literal>destroyDivert()</literal>) on the <literal
>HornetQServerControl</literal> (with the ObjectName <literal
>org.hornetq:module=Core,type=Server</literal> or the resource name <literal
>org.apache.activemq6:module=Core,type=Server</literal> or the resource name <literal
>core.server</literal>).</para>
</listitem>
<listitem>
<para>It is possible to stop the server and force failover to occur with any currently attached clients.</para>
<para>to do this use the <literal>forceFailover()</literal> on the <literal
>HornetQServerControl</literal> (with the ObjectName <literal
>org.hornetq:module=Core,type=Server</literal> or the resource name <literal
>org.apache.activemq6:module=Core,type=Server</literal> or the resource name <literal
>core.server</literal>) </para>
<note>
<para>Since this method actually stops the server you will probably receive some sort of error
@ -164,7 +164,7 @@
<section>
<title>Core Address Management</title>
<para>Core addresses can be managed using the <literal>AddressControl</literal> class
(with the ObjectName <literal>org.hornetq:module=Core,type=Address,name="&lt;the
(with the ObjectName <literal>org.apache.activemq6:module=Core,type=Address,name="&lt;the
address name>"</literal> or the resource name <literal>core.address.&lt;the
address name></literal>). </para>
<itemizedlist>
@ -181,7 +181,7 @@
<title>Core Queue Management</title>
<para>The bulk of the core management API deals with core queues. The <literal
>QueueControl</literal> class defines the Core queue management operations (with
the ObjectName <literal>org.hornetq:module=Core,type=Queue,address="&lt;the bound
the ObjectName <literal>org.apache.activemq6:module=Core,type=Queue,address="&lt;the bound
address>",name="&lt;the queue name>"</literal> or the resource name <literal
>core.queue.&lt;the queue name></literal>).</para>
<para>Most of the management operations on queues take either a single message ID (e.g.
@ -268,7 +268,7 @@
<para>They can be started or stopped using the <literal>start()</literal> or.
<literal>stop()</literal> method on the <literal>AcceptorControl</literal>
class (with the ObjectName <literal
>org.hornetq:module=Core,type=Acceptor,name="&lt;the acceptor
>org.apache.activemq6:module=Core,type=Acceptor,name="&lt;the acceptor
name>"</literal> or the resource name <literal>core.acceptor.&lt;the
address name></literal>). The acceptors parameters can be retrieved using
the <literal>AcceptorControl</literal> attributes (see <xref
@ -279,7 +279,7 @@
<para>They can be started or stopped using the <literal>start()</literal> or
<literal>stop()</literal> method on the <literal>DivertControl</literal>
class (with the ObjectName <literal
>org.hornetq:module=Core,type=Divert,name=&lt;the divert name></literal>
>org.apache.activemq6:module=Core,type=Divert,name=&lt;the divert name></literal>
or the resource name <literal>core.divert.&lt;the divert name></literal>).
Diverts parameters can be retrieved using the <literal>DivertControl</literal>
attributes (see <xref linkend="diverts"/>)</para>
@ -289,7 +289,7 @@
<para>They can be started or stopped using the <literal>start()</literal> (resp.
<literal>stop()</literal>) method on the <literal>BridgeControl</literal>
class (with the ObjectName <literal
>org.hornetq:module=Core,type=Bridge,name="&lt;the bridge
>org.apache.activemq6:module=Core,type=Bridge,name="&lt;the bridge
name>"</literal> or the resource name <literal>core.bridge.&lt;the bridge
name></literal>). Bridges parameters can be retrieved using the <literal
>BridgeControl</literal> attributes (see <xref linkend="core-bridges"
@ -300,7 +300,7 @@
<para>They can be started or stopped using the <literal>start()</literal> or
<literal>stop()</literal> method on the <literal
>BroadcastGroupControl</literal> class (with the ObjectName <literal
>org.hornetq:module=Core,type=BroadcastGroup,name="&lt;the broadcast group
>org.apache.activemq6:module=Core,type=BroadcastGroup,name="&lt;the broadcast group
name>"</literal> or the resource name <literal
>core.broadcastgroup.&lt;the broadcast group name></literal>). Broadcast
groups parameters can be retrieved using the <literal
@ -312,7 +312,7 @@
<para>They can be started or stopped using the <literal>start()</literal> or
<literal>stop()</literal> method on the <literal
>DiscoveryGroupControl</literal> class (with the ObjectName <literal
>org.hornetq:module=Core,type=DiscoveryGroup,name="&lt;the discovery group
>org.apache.activemq6:module=Core,type=DiscoveryGroup,name="&lt;the discovery group
name>"</literal> or the resource name <literal>core.discovery.&lt;the
discovery group name></literal>). Discovery groups parameters can be
retrieved using the <literal>DiscoveryGroupControl</literal> attributes (see
@ -323,7 +323,7 @@
<para>They can be started or stopped using the <literal>start()</literal> or
<literal>stop()</literal> method on the <literal
>ClusterConnectionControl</literal> class (with the ObjectName <literal
>org.hornetq:module=Core,type=ClusterConnection,name="&lt;the cluster
>org.apache.activemq6:module=Core,type=ClusterConnection,name="&lt;the cluster
connection name>"</literal> or the resource name <literal
>core.clusterconnection.&lt;the cluster connection name></literal>).
Cluster connections parameters can be retrieved using the <literal
@ -341,7 +341,7 @@
<title>JMS Server Management</title>
<para>JMS Resources (connection factories and destinations) can be created using the
<literal>JMSServerControl</literal> class (with the ObjectName <literal
>org.hornetq:module=JMS,type=Server</literal> or the resource name <literal
>org.apache.activemq6:module=JMS,type=Server</literal> or the resource name <literal
>jms.server</literal>).</para>
<itemizedlist>
<listitem>
@ -395,7 +395,7 @@
<title>JMS ConnectionFactory Management</title>
<para>JMS Connection Factories can be managed using the <literal
>ConnectionFactoryControl</literal> class (with the ObjectName <literal
>org.hornetq:module=JMS,type=ConnectionFactory,name="&lt;the connection factory
>org.apache.activemq6:module=JMS,type=ConnectionFactory,name="&lt;the connection factory
name>"</literal> or the resource name <literal>jms.connectionfactory.&lt;the
connection factory name></literal>).</para>
<itemizedlist>
@ -413,7 +413,7 @@
<section>
<title>JMS Queue Management</title>
<para>JMS queues can be managed using the <literal>JMSQueueControl</literal> class (with
the ObjectName <literal>org.hornetq:module=JMS,type=Queue,name="&lt;the queue
the ObjectName <literal>org.apache.activemq6:module=JMS,type=Queue,name="&lt;the queue
name>"</literal> or the resource name <literal>jms.queue.&lt;the queue
name></literal>). </para>
<para><emphasis>The management operations on a JMS queue are very similar to the
@ -488,7 +488,7 @@
<section>
<title>JMS Topic Management</title>
<para>JMS Topics can be managed using the <literal>TopicControl</literal> class (with
the ObjectName <literal>org.hornetq:module=JMS,type=Topic,name="&lt;the topic
the ObjectName <literal>org.apache.activemq6:module=JMS,type=Topic,name="&lt;the topic
name>"</literal> or the resource name <literal>jms.topic.&lt;the topic
name></literal>).</para>
<itemizedlist>
@ -524,16 +524,16 @@
url="http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html"
>JMX</ulink>. </para>
<para>The management API is exposed by HornetQ using MBeans interfaces. HornetQ registers its
resources with the domain <literal>org.hornetq</literal>.</para>
resources with the domain <literal>org.apache.activemq6</literal>.</para>
<para>For example, the <literal>ObjectName</literal> to manage a JMS Queue <literal
>exampleQueue</literal> is:</para>
<programlisting>
org.hornetq:module=JMS,type=Queue,name="exampleQueue"</programlisting>
org.apache.activemq6:module=JMS,type=Queue,name="exampleQueue"</programlisting>
<para>and the MBean is:</para>
<programlisting>
org.hornetq.api.jms.management.JMSQueueControl</programlisting>
org.apache.activemq6.api.jms.management.JMSQueueControl</programlisting>
<para>The MBean's <literal>ObjectName</literal> are built using the helper class <literal
>org.hornetq.api.core.management.ObjectNameBuilder</literal>. You can also use <literal
>org.apache.activemq6.api.core.management.ObjectNameBuilder</literal>. You can also use <literal
>jconsole</literal> to find the <literal>ObjectName</literal> of the MBeans you want to
manage. </para>
<para>Managing HornetQ using JMX is identical to management of any Java Applications using
@ -554,13 +554,13 @@ org.hornetq.api.jms.management.JMSQueueControl</programlisting>
properties must be set in <literal>run.sh</literal> or <literal>run.bat</literal>
scripts).</para>
</note>
<para>By default, HornetQ server uses the JMX domain "org.hornetq". To manage several
<para>By default, HornetQ server uses the JMX domain "org.apache.activemq6". To manage several
HornetQ servers from the <emphasis>same</emphasis> MBeanServer, the JMX domain can be
configured for each individual HornetQ server by setting <literal>jmx-domain</literal>
in <literal>hornetq-configuration.xml</literal>: </para>
<programlisting>
&lt;!-- use a specific JMX domain for HornetQ MBeans -->
&lt;jmx-domain>my.org.hornetq&lt;/jmx-domain></programlisting>
&lt;jmx-domain>my.org.apache.activemq6&lt;/jmx-domain></programlisting>
<section>
<title>MBeanServer configuration</title>
<para>When HornetQ is run in standalone, it uses the Java Virtual Machine's <literal
@ -613,7 +613,7 @@ org.hornetq.api.jms.management.JMSQueueControl</programlisting>
<para>A <literal>ClientConsumer</literal> 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 <ulink url="http://json.org">JSON</ulink> String rather than Java
Serialization (the <literal>org.hornetq.api.core.management.ManagementHelper</literal> can
Serialization (the <literal>org.apache.activemq6.api.core.management.ManagementHelper</literal> can
be used to convert the JSON string to Java objects).</para>
<para>These steps can be simplified to make it easier to invoke management operations using
Core messages:</para>
@ -627,7 +627,7 @@ org.hornetq.api.jms.management.JMSQueueControl</programlisting>
</listitem>
<listitem>
<para>Use the helper class <literal
>org.hornetq.api.core.management.ManagementHelper</literal> to fill the message
>org.apache.activemq6.api.core.management.ManagementHelper</literal> to fill the message
with the management properties</para>
</listitem>
<listitem>
@ -635,7 +635,7 @@ org.hornetq.api.jms.management.JMSQueueControl</programlisting>
</listitem>
<listitem>
<para>Use the helper class <literal
>org.hornetq.api.core.management.ManagementHelper</literal> to retrieve the
>org.apache.activemq6.api.core.management.ManagementHelper</literal> to retrieve the
operation result from the management reply</para>
</listitem>
</orderedlist>
@ -653,7 +653,7 @@ System.out.println("There are " + count + " messages in exampleQueue");</program
<para>Management operation name and parameters must conform to the Java interfaces defined in
the <literal>management</literal> packages.</para>
<para>Names of the resources are built using the helper class <literal
>org.hornetq.api.core.management.ResourceNames</literal> and are straightforward
>org.apache.activemq6.api.core.management.ResourceNames</literal> and are straightforward
(<literal>core.queue.exampleQueue</literal> for the Core Queue <literal
>exampleQueue</literal>, <literal>jms.topic.exampleTopic</literal> for the JMS Topic
<literal>exampleTopic</literal>, etc.).</para>
@ -697,7 +697,7 @@ Queue managementQueue = HornetQJMSClient.createQueue("hornetq.management");</pro
</listitem>
<listitem>
<para>use the helper class <literal
>org.hornetq.api.jms.management.JMSManagementHelper</literal> to fill the message
>org.apache.activemq6.api.jms.management.JMSManagementHelper</literal> to fill the message
with the management properties</para>
</listitem>
<listitem>
@ -705,7 +705,7 @@ Queue managementQueue = HornetQJMSClient.createQueue("hornetq.management");</pro
</listitem>
<listitem>
<para>use the helper class <literal
>org.hornetq.api.jms.management.JMSManagementHelper</literal> to retrieve the
>org.apache.activemq6.api.jms.management.JMSManagementHelper</literal> to retrieve the
operation result from the management reply</para>
</listitem>
</orderedlist>
@ -756,11 +756,11 @@ System.out.println("There are " + count + " messages in exampleQueue");</program
notifications can be received by subscribing to 2 MBeans:</para>
<itemizedlist>
<listitem>
<para><literal>org.hornetq:module=Core,type=Server</literal> for notifications on
<para><literal>org.apache.activemq6:module=Core,type=Server</literal> for notifications on
<emphasis>Core</emphasis> resources</para>
</listitem>
<listitem>
<para><literal>org.hornetq:module=JMS,type=Server</literal> for notifications on
<para><literal>org.apache.activemq6:module=JMS,type=Server</literal> for notifications on
<emphasis>JMS</emphasis> resources</para>
</listitem>
</itemizedlist>

4
docs/user-manual/en/persistence.xml
View File

@ -324,12 +324,12 @@
HornetQ, and you can use the export/import tool for that purpose. The export/import are
classes located at the hornetq-core.jar, you can export the journal as a text file by
using this command:</para>
<para><literal>java -cp hornetq-core.jar org.hornetq.core.journal.impl.ExportJournal
<para><literal>java -cp hornetq-core.jar org.apache.activemq6.core.journal.impl.ExportJournal
&lt;JournalDirectory> &lt;JournalPrefix> &lt;FileExtension> &lt;FileSize>
&lt;FileOutput></literal></para>
<para>To import the file as binary data on the journal (Notice you also require
netty.jar):</para>
<para><literal>java -cp hornetq-core.jar:netty.jar org.hornetq.core.journal.impl.ImportJournal
<para><literal>java -cp hornetq-core.jar:netty.jar org.apache.activemq6.core.journal.impl.ImportJournal
&lt;JournalDirectory> &lt;JournalPrefix> &lt;FileExtension> &lt;FileSize>
&lt;FileInput></literal></para>
<itemizedlist>

2
docs/user-manual/en/project-info.xml
View File

@ -86,6 +86,6 @@
</itemizedlist></para>
<para> And many thanks to all our contributors, both old and new who helped create HornetQ,
for a full list of the people who made it happen, take a look at our <ulink
url="http://jboss.org/hornetq/community/team.html">team page</ulink>. </para>
url="http://jboss.org.apache.activemq6/community/team.html">team page</ulink>. </para>
</section>
</chapter>

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

@ -83,7 +83,7 @@
<title>Using the API</title>
<para>Queues can also be created using the core API or the management API.</para>
<para>For the core API, queues can be created via the <literal
>org.hornetq.api.core.client.ClientSession</literal> interface. There are multiple
>org.apache.activemq6.api.core.client.ClientSession</literal> interface. There are multiple
<literal>createQueue</literal> methods that support setting all of the previously
mentioned attributes. There is one extra attribute that can be set via this API which is
<literal>temporary</literal>. setting this to true means that the queue will be

24
docs/user-manual/en/rest.xml
View File

@ -128,7 +128,7 @@ Content-Type: application/xml
&lt;listener>
&lt;listener-class>
org.hornetq.rest.integration.RestMessagingBootstrapListener
org.apache.activemq6.rest.integration.RestMessagingBootstrapListener
&lt;/listener-class>
&lt;/listener>
@ -185,7 +185,7 @@ Content-Type: application/xml
&lt;dependencies>
&lt;dependency>
&lt;groupId>org.hornetq.rest&lt;/groupId>
&lt;groupId>org.apache.activemq6.rest&lt;/groupId>
&lt;artifactId>hornetq-rest&lt;/artifactId>
&lt;version>2.3.0-SNAPSHOT&lt;/version>
&lt;/dependency>
@ -196,7 +196,7 @@ Content-Type: application/xml
<para>JBoss AS 7 loads classes differently than previous versions.
To work properly in AS 7 the WAR will need this in its MANIFEST.MF:
</para>
<programlisting>Dependencies: org.hornetq, org.jboss.netty</programlisting>
<programlisting>Dependencies: org.apache.activemq6, org.jboss.netty</programlisting>
<para>You can add this to the<literal>&lt;plugins></literal>
section of the pom.xml to create this entry automatically:
</para>
@ -207,7 +207,7 @@ Content-Type: application/xml
&lt;configuration>
&lt;archive>
&lt;manifestEntries>
&lt;Dependencies>org.hornetq, org.jboss.netty&lt;/Dependencies>
&lt;Dependencies>org.apache.activemq6, org.jboss.netty&lt;/Dependencies>
&lt;/manifestEntries>
&lt;/archive>
&lt;/configuration>
@ -252,13 +252,13 @@ Content-Type: application/xml
&lt;listener>
&lt;listener-class>
org.hornetq.rest.integration.HornetqBootstrapListener
org.apache.activemq6.rest.integration.HornetqBootstrapListener
&lt;/listener-class>
&lt;/listener>
&lt;listener>
&lt;listener-class>
org.hornetq.rest.integration.RestMessagingBootstrapListener
org.apache.activemq6.rest.integration.RestMessagingBootstrapListener
&lt;/listener-class>
&lt;/listener>
@ -312,7 +312,7 @@ Content-Type: application/xml
&lt;/build>
&lt;dependencies>
&lt;dependency>
&lt;groupId>org.hornetq&lt;/groupId>
&lt;groupId>org.apache.activemq6&lt;/groupId>
&lt;artifactId>hornetq-core&lt;/artifactId>
&lt;version>2.3.0-SNAPSHOT&lt;/version>
&lt;/dependency>
@ -322,7 +322,7 @@ Content-Type: application/xml
&lt;version>3.4.5.Final&lt;/version>
&lt;/dependency>
&lt;dependency>
&lt;groupId>org.hornetq&lt;/groupId>
&lt;groupId>org.apache.activemq6&lt;/groupId>
&lt;artifactId>hornetq-jms&lt;/artifactId>
&lt;version>2.3.0-SNAPSHOT&lt;/version>
&lt;/dependency>
@ -332,7 +332,7 @@ Content-Type: application/xml
&lt;version>1.0.0.Final&lt;/version>
&lt;/dependency>
&lt;dependency>
&lt;groupId>org.hornetq.rest&lt;/groupId>
&lt;groupId>org.apache.activemq6.rest&lt;/groupId>
&lt;artifactId>hornetq-rest&lt;/artifactId>
&lt;version>2.3.0-SNAPSHOT&lt;/version>
&lt;/dependency>
@ -844,7 +844,7 @@ msg-create-next: http://example.com/queues/jms.queue.bar/create/13582001787374</
like this on the server:
</para>
<programlisting>
WARN [org.hornetq.core.server] (Thread-3 (HornetQ-remoting-threads-HornetQServerImpl::serverUUID=8d6be6f8-5e8b-11e2-80db-51bbde66f473-26319292-267207)) HQ112098: Duplicate message detected - message will not be routed. Message information:
WARN [org.apache.activemq6.core.server] (Thread-3 (HornetQ-remoting-threads-HornetQServerImpl::serverUUID=8d6be6f8-5e8b-11e2-80db-51bbde66f473-26319292-267207)) HQ112098: Duplicate message detected - message will not be routed. Message information:
ServerMessage[messageID=20,priority=4, bodySize=1500,expiration=0, durable=true, address=jms.queue.bar,properties=TypedProperties[{http_content$type=application/x-www-form-urlencoded, http_content$length=3, postedAsHttpMessage=true, _HQ_DUPL_ID=42}]]@12835058</programlisting>
<para>An alternative to this approach is to use the <literal>msg-create-with-id</literal>
@ -2113,7 +2113,7 @@ Location: http://example.com/topics/jms.topic.testTopic</programlisting>
<programlisting>
ObjectMessage message = session.createObjectMessage();
message.setStringProperty(org.hornetq.rest.HttpHeaderProperty.CONTENT_TYPE, "application/xml");</programlisting>
message.setStringProperty(org.apache.activemq6.rest.HttpHeaderProperty.CONTENT_TYPE, "application/xml");</programlisting>
<para>If the JMS producer does not set the content-type, then this
information must be obtained from the REST consumer. If it is a pull
@ -2136,7 +2136,7 @@ message.setStringProperty(org.hornetq.rest.HttpHeaderProperty.CONTENT_TYPE, "app
<programlisting>
public void onMessage(Message message)
{
MyType obj = org.hornetq.rest.Jms.getEntity(message, MyType.class);
MyType obj = org.apache.activemq6.rest.Jms.getEntity(message, MyType.class);
}</programlisting>
<para>The way the <literal>getEntity()</literal> method works is that if

12
docs/user-manual/en/security.xml
View File

@ -190,16 +190,16 @@
changing the class for the <literal>HornetQSecurityManager</literal> bean.</para>
<para>Let's take a look at a snippet from the default beans file:</para>
<programlisting>
&lt;bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
&lt;bean name="HornetQSecurityManager" class="org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl">
&lt;start ignored="true"/>
&lt;stop ignored="true"/>
&lt;/bean></programlisting>
<para>The class <literal>org.hornetq.spi.core.security.HornetQSecurityManagerImpl</literal>
<para>The class <literal>org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl</literal>
is the default security manager that is used by the standalone server.</para>
<para>HornetQ ships with two other security manager implementations you can use
off-the-shelf; one a JAAS security manager and another for integrating with JBoss
Application Sever security, alternatively you could write your own implementation by
implementing the <literal>org.hornetq.spi.core.security.HornetQSecurityManager</literal>
implementing the <literal>org.apache.activemq6.spi.core.security.HornetQSecurityManager</literal>
interface, and specifying the classname of your implementation in the file <literal
>hornetq-beans.xml</literal> (or <literal>hornetq-jboss-beans.xml</literal> if
you're running JBoss Application Server).</para>
@ -214,11 +214,11 @@
you need to specify the security manager as a <literal>JAASSecurityManager</literal> in
the beans file. Here's an example:</para>
<programlisting>
&lt;bean name="HornetQSecurityManager" class="org.hornetq.integration.jboss.security.JAASSecurityManager">
&lt;bean name="HornetQSecurityManager" class="org.apache.activemq6.integration.jboss.security.JAASSecurityManager">
&lt;start ignored="true"/>
&lt;stop ignored="true"/>
&lt;property name="ConfigurationName">org.hornetq.jms.example.ExampleLoginModule&lt;/property>
&lt;property name="ConfigurationName">org.apache.activemq6.jms.example.ExampleLoginModule&lt;/property>
&lt;property name="Configuration">
&lt;inject bean="ExampleConfiguration"/>
&lt;/property>
@ -253,7 +253,7 @@
Application server. This allows tight integration with the JBoss Application Server's
security model.</para>
<para>The class name of this security manager is <literal
>org.hornetq.integration.jboss.security.JBossASSecurityManager</literal></para>
>org.apache.activemq6.integration.jboss.security.JBossASSecurityManager</literal></para>
<para>Take a look at one of the default <literal>hornetq-jboss-beans.xml</literal> files for
JBoss Application Server that are bundled in the distribution for an example of how this
is configured.</para>

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

@ -137,7 +137,7 @@
<section>
<title>Asynchronous Send Acknowledgements</title>
<para>To use the feature using the core API, you implement the interface <literal
>org.hornetq.api.core.client.SendAcknowledgementHandler</literal> and set a handler
>org.apache.activemq6.api.core.client.SendAcknowledgementHandler</literal> and set a handler
instance on your <literal>ClientSession</literal>.</para>
<para>Then, you just send messages as normal using your <literal
>ClientSession</literal>, and as messages reach the server, the server will send

6
docs/user-manual/en/spring-integration.xml
View File

@ -27,7 +27,7 @@
<title>Spring Integration</title>
<para>HornetQ provides a simple bootstrap class,
<literal>org.hornetq.integration.spring.SpringJmsBootstrap</literal>, for
<literal>org.apache.activemq6.integration.spring.SpringJmsBootstrap</literal>, for
integration with Spring. To use it, you configure HornetQ as you always
would, through its various configuration files like
<literal>hornetq-configuration.xml</literal>,
@ -70,9 +70,9 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
&lt;bean id="EmbeddedJms" class="org.hornetq.integration.spring.SpringJmsBootstrap" init-method="start"/>
&lt;bean id="EmbeddedJms" class="org.apache.activemq6.integration.spring.SpringJmsBootstrap" init-method="start"/>
&lt;bean id="listener" class="org.hornetq.tests.integration.spring.ExampleListener"/>
&lt;bean id="listener" class="org.apache.activemq6.tests.integration.spring.ExampleListener"/>
&lt;bean id="listenerContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer">
&lt;property name="connectionFactory" ref="ConnectionFactory"/>

2
docs/user-manual/en/using-jms.xml
View File

@ -187,7 +187,7 @@ java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces</programlisting
<literal>hornetq-beans.xml</literal> by setting properties on the <literal
>JNDIServer</literal> bean:</para>
<programlisting>
&lt;bean name="StandaloneServer" class="org.hornetq.jms.server.impl.StandaloneNamingServer">
&lt;bean name="StandaloneServer" class="org.apache.activemq6.jms.server.impl.StandaloneNamingServer">
&lt;constructor>
&lt;parameter>
&lt;inject bean="HornetQServer"/>

2
docs/user-manual/en/using-server.xml
View File

@ -143,7 +143,7 @@
this with a connector configuration:</para>
<programlisting>
&lt;connector name="netty">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
&lt;param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
&lt;param key="port" value="${hornetq.remoting.netty.port:5445}"/>
&lt;/connector></programlisting>

8
docs/user-manual/en/vertx-integration.xml
View File

@ -36,7 +36,7 @@
Such a service can be configured as follows:</para>
<programlisting>
&lt;connector-service name="vertx-incoming-connector">
&lt;factory-class>org.hornetq.integration.vertx.VertxIncomingConnectorServiceFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.integration.vertx.VertxIncomingConnectorServiceFactory&lt;/factory-class>
&lt;param key="host" value="127.0.0.1"/>
&lt;param key="port" value="0"/>
&lt;param key="queue" value="jms.queue.vertxQueue"/>
@ -64,7 +64,7 @@
<para><literal>ha-group</literal>. The name of the ha-group of target vertx instance. Default is <literal>hornetq</literal>.</para>
</listitem>
<listitem>
<para><literal>vertx-address</literal>. The vertx address to listen to. default is org.hornetq.</para>
<para><literal>vertx-address</literal>. The vertx address to listen to. default is org.apache.activemq6.</para>
</listitem>
</itemizedlist>
</section>
@ -75,7 +75,7 @@
Such a service can be configured as follows:</para>
<programlisting>
&lt;connector-service name="vertx-outgoing-connector">
&lt;factory-class>org.hornetq.integration.vertx.VertxOutgoingConnectorServiceFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.integration.vertx.VertxOutgoingConnectorServiceFactory&lt;/factory-class>
&lt;param key="host" value="127.0.0.1"/>
&lt;param key="port" value="0"/>
&lt;param key="queue" value="jms.queue.vertxQueue"/>
@ -104,7 +104,7 @@
<para><literal>ha-group</literal>. The name of the ha-group of target vertx instance. Default is <literal>hornetq</literal>.</para>
</listitem>
<listitem>
<para><literal>vertx-address</literal>. The vertx address to put messages to. default is org.hornetq.</para>
<para><literal>vertx-address</literal>. The vertx address to put messages to. default is org.apache.activemq6.</para>
</listitem>
<listitem>
<para><literal>publish</literal>. How messages is sent to vertx event bus. "true" means using publish style.

2
docs/user-manual/src/main/resources/schemaToTable.xsl
View File

@ -3,7 +3,7 @@
<xsl:stylesheet version="2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:hq="urn:org.hornetq"
xmlns:hq="urn:org.apache.activemq6"
xmlns:fn="http://www.w3.org/2005/xpath-functions">
<!--

42
docs/user-manual/zh/appserver-integration.xml
View File

@ -275,12 +275,12 @@ public class MyMDB implements MessageListener
<literal>META-INF/ra.xml</literal>。</para>
<para>下面是它的具体配置内容：</para>
<programlisting>&lt;resourceadapter>
&lt;resourceadapter-class>org.hornetq.ra.HornetQResourceAdapter&lt;/resourceadapter-class>
&lt;resourceadapter-class>org.apache.activemq6.ra.HornetQResourceAdapter&lt;/resourceadapter-class>
&lt;config-property>
&lt;description>The transport type&lt;/description>
&lt;config-property-name>ConnectorClassName&lt;/config-property-name>
&lt;config-property-type>java.lang.String&lt;/config-property-type>
&lt;config-property-value>org.hornetq.core.remoting.impl.invm.InVMConnectorF
&lt;config-property-value>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorF
actory&lt;/config-property-value>
&lt;/config-property>
&lt;config-property>
@ -292,7 +292,7 @@ public class MyMDB implements MessageListener
&lt;outbound-resourceadapter>
&lt;connection-definition>
&lt;managedconnectionfactory-class>org.hornetq.ra.HornetQRAManagedConnection
&lt;managedconnectionfactory-class>org.apache.activemq6.ra.HornetQRAManagedConnection
Factory&lt;/managedconnectionfactory-class>
&lt;config-property>
@ -309,12 +309,12 @@ public class MyMDB implements MessageListener
&lt;config-property-value>0&lt;/config-property-value>
&lt;/config-property>
&lt;connectionfactory-interface>org.hornetq.ra.HornetQRAConnectionFactory
&lt;connectionfactory-interface>org.apache.activemq6.ra.HornetQRAConnectionFactory
&lt;/connectionfactory-interface>
&lt;connectionfactororg.hornetq.ra.HornetQConnectionFactoryImplonFactoryImpl
&lt;connectionfactororg.apache.activemq6.ra.HornetQConnectionFactoryImplonFactoryImpl
&lt;/connectionfactory-impl-class>
&lt;connection-interface>javax.jms.Session&lt;/connection-interface>
&lt;connection-impl-class>org.hornetq.ra.HornetQRASession
&lt;connection-impl-class>org.apache.activemq6.ra.HornetQRASession
&lt;/connection-impl-class>
&lt;/connection-definition>
&lt;transaction-support>XATransaction&lt;/transaction-support>
@ -332,7 +332,7 @@ public class MyMDB implements MessageListener
&lt;messagelistener>
&lt;messagelistener-type>javax.jms.MessageListener&lt;/messagelistener-type>
&lt;activationspec>
&lt;activationspec-class>org.hornetq.ra.inflow.HornetQActivationSpec
&lt;activationspec-class>org.apache.activemq6.ra.inflow.HornetQActivationSpec
&lt;/activationspec-class>
&lt;required-config-property>
&lt;config-property-name>destination&lt;/config-property-name>
@ -657,12 +657,12 @@ public class MyMDB implements MessageListener
&lt;jndi-name>RemoteJmsXA&lt;/jndi-name>
&lt;xa-transaction/>
&lt;rar-name>jms-ra.rar&lt;/rar-name>
&lt;connection-definition>org.hornetq.ra.HornetQRAConnectionFactory
&lt;connection-definition>org.apache.activemq6.ra.HornetQRAConnectionFactory
&lt;/connection-definition>
&lt;config-property name="SessionDefaultType" type="String">javax.jms.Topic
&lt;/config-property>
&lt;config-property name="ConnectorClassName" type="String">
org.hornetq.core.remoting.impl.netty.NettyConnectorFactory
org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory
&lt;/config-property>
&lt;config-property name="ConnectionParameters" type="String">
port=5445&lt;/config-property>
@ -806,12 +806,12 @@ private ConnectionFactory connectionFactory;</programlisting>
</para>
<programlisting>
&lt;resourceadapter-class&gt;org.hornetq.ra.HornetQResourceAdapter&lt;/resourceadapter-class&gt;
&lt;resourceadapter-class&gt;org.apache.activemq6.ra.HornetQResourceAdapter&lt;/resourceadapter-class&gt;
&lt;config-property&gt;
&lt;description&gt;The transport type&lt;/description&gt;
&lt;config-property-name&gt;ConnectorClassName&lt;/config-property-name&gt;
&lt;config-property-type&gt;java.lang.String&lt;/config-property-type&gt;
&lt;config-property-value&gt;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property-value&gt;
&lt;config-property-value&gt;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property-value&gt;
&lt;/config-property&gt;
&lt;config-property&gt;
&lt;description&gt;The transport configuration. These values must be in the form of key=val;key=val;&lt;/description&gt;
@ -836,9 +836,9 @@ private ConnectionFactory connectionFactory;</programlisting>
&lt;jndi-name&gt;RemoteJmsXA&lt;/jndi-name&gt;
&lt;xa-transaction/&gt;
&lt;rar-name&gt;hornetq-ra.rar&lt;/rar-name&gt;
&lt;connection-definition&gt;org.hornetq.ra.HornetQRAConnectionFactory&lt;/connection-definition&gt;
&lt;connection-definition&gt;org.apache.activemq6.ra.HornetQRAConnectionFactory&lt;/connection-definition&gt;
&lt;config-property name="SessionDefaultType" type="java.lang.String"&gt;javax.jms.Topic&lt;/config-property&gt;
&lt;config-property name="ConnectorClassName" type="java.lang.String"&gt;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property&gt;
&lt;config-property name="ConnectorClassName" type="java.lang.String"&gt;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property&gt;
&lt;config-property name="ConnectionParameters" type="java.lang.String"&gt;host=127.0.0.1;port=5446&lt;/config-property&gt;
&lt;max-pool-size&gt;20&lt;/max-pool-size&gt;
&lt;/tx-connection-factory&gt;
@ -926,7 +926,7 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
...
&lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HornetQ1"
value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;[连接配置]"/&gt;
value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;[连接配置]"/&gt;
&lt;/properties&gt;
</programlisting>
<para>其中<literal>[连接配置]</literal>包括连接HornetQ节点所必需的信息。
@ -935,9 +935,9 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
<listitem>
<para><literal>[连接工厂类名]</literal>指的是<literal>ConnectorFactory</literal>
的类名，用来连接HornetQ服务器。其值可以是<literal
>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</literal> 或
>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</literal> 或
<literal
>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</literal></para>
>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</literal></para>
</listitem>
<listitem>
<para><literal>[用户名]</literal>是用于创建客户会话的用户名。是可选项。</para>
@ -958,19 +958,19 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
<para>如果HornetQ配置了一个默认的in-vm接受器：</para>
<programlisting>
&lt;acceptor name="in-vm">
&lt;factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory&lt;/factory-class>
&lt;/acceptor>
</programlisting>
<para>相应地在 <literal
>conf/jbossts-properties.xml</literal>文件中：</para>
<programlisting>
&lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/>
value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory"/>
</programlisting>
<para>如果配置了一个netty接受器，并且端口不是默认的：</para>
<programlisting>
&lt;acceptor name="netty">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
&lt;param key="port" value="8888"/>
&lt;/acceptor>
</programlisting>
@ -978,7 +978,7 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
>conf/jbossts-properties.xml</literal>文件中：</para>
<programlisting>
&lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory, , , port=8888"/>
value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory, , , port=8888"/>
</programlisting>
<note>
<para>注意在没有用户名和密码时，逗号是不能省略的。</para>
@ -987,7 +987,7 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
应为如下所示：</para>
<programlisting>
&lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory, admin, adminpass, port=8888"/>
value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory, admin, adminpass, port=8888"/>
</programlisting>
<para>推荐在XA恢复中，将HornetQ配置一个invm接受器，并配置恢复管理器使用invm连接器。</para>
</section>

6
docs/user-manual/zh/clusters.xml
View File

@ -340,9 +340,9 @@ Connection jmsConnection2 = jmsConnectionFactory.createConnection();</programlis
</listitem>
</itemizedlist>
<para>你可以实现自己的策略。只需要实现接口<literal
>org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy</literal>即可。</para>
>org.apache.activemq6.api.core.client.loadbalance.ConnectionLoadBalancingPolicy</literal>即可。</para>
<para>根据你使用的是JMS还是核心接口，指定负载均衡的方法是有所不同的。如果你不指定策略，默认的策略是<literal
>org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>.</para>
>org.apache.activemq6.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>.</para>
<para>如果使用的是JMS，并且JMS连接工厂注册到JNDI，则你需要在<literal>hornetq-jms.xml</literal>文件中定义策略，如：
<programlisting>
&lt;connection-factory name="ConnectionFactory"&gt;
@ -351,7 +351,7 @@ Connection jmsConnection2 = jmsConnectionFactory.createConnection();</programlis
&lt;entry name="ConnectionFactory"/&gt;
&lt;/entries&gt;
&lt;connection-load-balancing-policy-class-name&gt;
org.hornetq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy
org.apache.activemq6.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy
&lt;/connection-load-balancing-policy-class-name&gt;
&lt;/connection-factory&gt;
</programlisting>上面的配置将部署一个连接工厂，它的连接负载均衡策略是随机策略。</para>

4
docs/user-manual/zh/configuration-index.xml
View File

@ -195,7 +195,7 @@
>jmx-domain</link></entry>
<entry>String</entry>
<entry>用于HornetQ MBean注册到MBeanServer的JMX域名</entry>
<entry>org.hornetq</entry>
<entry>org.apache.activemq6</entry>
</row>
<row>
<entry><link linkend="large.message.configuring"
@ -1068,7 +1068,7 @@
</entry>
<entry>String</entry>
<entry>负载均衡类名</entry>
<entry>org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</entry>
<entry>org.apache.activemq6.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</entry>
</row>
<row>
<entry id="configuration.connection-factory.connection-ttl">

24
docs/user-manual/zh/configuring-transports.xml
View File

@ -28,7 +28,7 @@
&lt;acceptors&gt;
&lt;acceptor name="netty"&gt;
&lt;factory-class&gt;
org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory
org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory
&lt;/factory-class&gt;
&lt;param key="port" value="5446"/&gt;
&lt;/acceptor&gt;
@ -54,7 +54,7 @@ org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory
&lt;connectors&gt;
&lt;connector name="netty"&gt;
&lt;factory-class&gt;
org.hornetq.core.remoting.impl.netty.NettyConnectorFactory
org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory
&lt;/factory-class&gt;
&lt;param key="port" value="5446"/&gt;
&lt;/connector&gt;
@ -103,12 +103,12 @@ org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory
<programlisting>
Map&lt;String, Object&gt; connectionParams = new HashMap&lt;String, Object&gt;();
connectionParams.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME,
connectionParams.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME,
5446);
TransportConfiguration transportConfiguration =
new TransportConfiguration(
"org.hornetq.core.remoting.impl.netty.NettyConnectorFactory",
"org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory",
connectionParams);
ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(transportConfiguration);
@ -122,11 +122,11 @@ etc
<programlisting>
Map&lt;String, Object&gt; connectionParams = new HashMap&lt;String, Object&gt;();
connectionParams.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 5446);
connectionParams.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 5446);
TransportConfiguration transportConfiguration =
new TransportConfiguration(
"org.hornetq.core.remoting.impl.netty.NettyConnectorFactory",
"org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory",
connectionParams);
ConnectionFactory connectionFactory = HornetQJMSClient.createConnectionFactory(transportConfiguration);
@ -151,7 +151,7 @@ etc
<para>如果你的应用是运行在不信任的网络上，你应该选择使用SSL或HTTPS。</para>
<para>Netty TCP的所有连接都是从客户端发起的。服务器端不向客户端发起任何连接。在有防火墙的环境中，这种方式
是比较适合的。因为防火墙只允许单方向的连接。</para>
<para>在<literal>org.hornetq.core.remoting.impl.netty.TransportConstants</literal>类中定义了所
<para>在<literal>org.apache.activemq6.core.remoting.impl.netty.TransportConstants</literal>类中定义了所
有的配置参数的名称（key）。它们当中绝大多娄既用于配置接收器也用于配置连接器，有一些只适用于接收器。
下面列出的参数用以配置一个简单的Netty TCP：</para>
<itemizedlist>
@ -296,7 +296,7 @@ etc
&lt;servlet-class>org.jboss.netty.channel.socket.http.HttpTunnelingServlet&lt;/servlet-class>
&lt;init-param>
&lt;param-name>endpoint&lt;/param-name>
&lt;param-value>local:org.hornetq&lt;/param-value>
&lt;param-value>local:org.apache.activemq6&lt;/param-value>
&lt;/init-param>
&lt;load-on-startup>1&lt;/load-on-startup>
&lt;/servlet>
@ -317,10 +317,10 @@ etc
&lt;acceptor name="netty-invm">
&lt;factory-class>
org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory
org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory
&lt;/factory-class>
&lt;param key="use-invm" value="true"/>
&lt;param key="host" value="org.hornetq"/>
&lt;param key="host" value="org.apache.activemq6"/>
&lt;/acceptor>
&lt;/acceptors>
@ -332,7 +332,7 @@ etc
&lt;connector name="netty-servlet">
&lt;factory-class>
org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory
org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory
&lt;/factory-class>
&lt;param key="host" value="localhost"/>
&lt;param key="port" value="8080"/>
@ -353,7 +353,7 @@ etc
<para>在<literal>web.xml</literal>中定义的servlet的URL形式与在连接器配置文件中定义的
<literal>servlet-path</literal>值应该相匹配。</para>
<para>servlet可以与SSL一起使用。只需要在连接器配置中加上下面的配置即可：<programlisting> &lt;connector name="netty-servlet">
&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;param key="host" value="localhost"/>
&lt;param key="port" value="8443"/>
&lt;param key="use-servlet" value="true"/>

6
docs/user-manual/zh/connection-ttl.xml
View File

@ -97,13 +97,13 @@ finally
是相应的JMS连接）：</para>
<programlisting>
[Finalizer] 20:14:43,244 WARNING [org.hornetq.core.client.impl.DelegatingSession] I'm closin
[Finalizer] 20:14:43,244 WARNING [org.apache.activemq6.core.client.impl.DelegatingSession] I'm closin
g a ClientSession you left open. Please make sure you close all ClientSessions explicitly before let
ting them go out of scope!
[Finalizer] 20:14:43,244 WARNING [org.hornetq.core.client.impl.DelegatingSession] The sessi
[Finalizer] 20:14:43,244 WARNING [org.apache.activemq6.core.client.impl.DelegatingSession] The sessi
on you didn't close was created here:
java.lang.Exception
at org.hornetq.core.client.impl.DelegatingSession.&lt;init&gt;(DelegatingSession.java:83)
at org.apache.activemq6.core.client.impl.DelegatingSession.&lt;init&gt;(DelegatingSession.java:83)
at org.acme.yourproject.YourClass (YourClass.java:666)
</programlisting>

4
docs/user-manual/zh/core-bridges.xml
View File

@ -43,7 +43,7 @@
&lt;forwarding-address&gt;jms.queue.mincing-machine&lt;/forwarding-address&gt;
&lt;filter-string="name='aardvark'"/&gt;
&lt;transformer-class-name&gt;
org.hornetq.jms.example.HatColourChangeTransformer
org.apache.activemq6.jms.example.HatColourChangeTransformer
&lt;/transformer-class-name&gt;
&lt;retry-interval&gt;1000&lt;/retry-interval&gt;
&lt;retry-interval-multiplier&gt;1.0&lt;/retry-interval-multiplier&gt;
@ -87,7 +87,7 @@
</listitem>
<listitem>
<para><literal>transformer-class-name</literal>。可选的转换器类名。这是一个用户定义的
类，它需要实现接口<literal>org.hornetq.core.server.cluster.Transformer</literal>
类，它需要实现接口<literal>org.apache.activemq6.core.server.cluster.Transformer</literal>
。</para>
<para>如果指定了这个类，每当一个消息被转发之前，它的<literal>transform()</literal>方法
就会被调用。用户利用这个机会可以对消息本身或消息头信息进行修改。</para>

2
docs/user-manual/zh/diverts.xml
View File

@ -47,7 +47,7 @@
&lt;forwarding-address&gt;jms.queue.priceForwarding&lt;/forwarding-address&gt;
&lt;filter string="office='New York'"/&gt;
&lt;transformer-class-name&gt;
org.hornetq.jms.example.AddForwardingTimeTransformer
org.apache.activemq6.jms.example.AddForwardingTimeTransformer
&lt;/transformer-class-name&gt;
&lt;exclusive&gt;true&lt;/exclusive&gt;
&lt;/divert&gt;

4
docs/user-manual/zh/duplicate-detection.xml
View File

@ -46,7 +46,7 @@
<para>如果是在一个事务中发送消息，则只需要设置其中一个消息的属性值。在服务器端如果服务器检测到一个事务中某一个
消息重复，则会忽略整个事务。</para>
<para>这个属性的名称由<literal
>org.hornetq.api.core.HDR_DUPLICATE_DETECTION_ID</literal>定义，即：
>org.apache.activemq6.api.core.HDR_DUPLICATE_DETECTION_ID</literal>定义，即：
<literal>_HQ_DUPL_ID</literal>。</para>
<para>该属性的值可以是<literal>byte[]</literal>类型或<literal
>SimpleString</literal>类型（核心接口）。如果使用JMS，它必须是<literal>String</literal>
@ -79,7 +79,7 @@ message.setStringProperty(HDR_DUPLICATE_DETECTION_ID.toString(), myUniqueID);
<section id="duplicate.id.cache">
<title>配置重复ID缓存</title>
<para>服务器缓存中保存接收到的消息的<literal
>org.hornetq.core.message.impl.HDR_DUPLICATE_DETECTION_ID</literal>属性值。每个地址有
>org.apache.activemq6.core.message.impl.HDR_DUPLICATE_DETECTION_ID</literal>属性值。每个地址有
单独的缓存。</para>
<para>缓存的大小是固定的，循环使用。如果缓存的最大可以存放<literal
>n</literal>条记录，那么<literal>n + 1</literal>条记录将会覆盖缓存中的第<literal>0</literal>

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