http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/configuration-index.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/configuration-index.xml b/docs/user-manual/en/configuration-index.xml index 48304ea..3d1a9ad 100644 --- a/docs/user-manual/en/configuration-index.xml +++ b/docs/user-manual/en/configuration-index.xml @@ -207,7 +207,7 @@ </entry> <entry>String</entry> <entry>the name of the load balancing class</entry> - <entry>org.apache.activemq6.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</entry> + <entry>org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</entry> </row> <row> <entry id="configuration.connection-factory.connection-ttl"> @@ -608,7 +608,7 @@ <programlisting> <mask-password>true</mask-password> -<password-codec>org.apache.activemq6.utils.DefaultSensitiveStringCodec;key=hello world</password-codec></programlisting> +<password-codec>org.apache.activemq.utils.DefaultSensitiveStringCodec;key=hello world</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.apache.activemq6.utils.DefaultSensitiveStringCodec. It has both encoding and decoding capabilities. It uses java.crypto.Cipher + decoder is org.apache.activemq.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.apache.activemq6.utils.DefaultSensitiveStringCodec "your plaintext password"</programlisting> +java org.apache.activemq.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.apache.activemq6.utils.SensitiveDataCodec<T></literal> interface:</para> + All decoders must implement the <literal>org.apache.activemq.utils.SensitiveDataCodec<T></literal> interface:</para> <programlisting> public interface SensitiveDataCodec<T>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/configuring-transports.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/configuring-transports.xml b/docs/user-manual/en/configuring-transports.xml index bb45f01..b3919c3 100644 --- a/docs/user-manual/en/configuring-transports.xml +++ b/docs/user-manual/en/configuring-transports.xml @@ -38,7 +38,7 @@ <acceptors> <acceptor name="netty"> <factory-class> - org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory </factory-class> <param key="port" value="5446"/> </acceptor> @@ -78,7 +78,7 @@ <connectors> <connector name="netty"> <factory-class> - org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory </factory-class> <param key="port" value="5446"/> </connector> @@ -135,12 +135,12 @@ <programlisting> Map<String, Object> connectionParams = new HashMap<String, Object>(); -connectionParams.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, +connectionParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 5446); TransportConfiguration transportConfiguration = new TransportConfiguration( - "org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory", + "org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory", connectionParams); ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(transportConfiguration); @@ -156,11 +156,11 @@ etc</programlisting> <programlisting> Map<String, Object> connectionParams = new HashMap<String, Object>(); -connectionParams.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 5446); +connectionParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 5446); TransportConfiguration transportConfiguration = new TransportConfiguration( - "org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory", + "org.apache.activemq.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.apache.activemq6.core.remoting.impl.netty.TransportConstants</literal>. Most + >org.apache.activemq.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.apache.activemq6.ssl.keyStore" system property. The HornetQ-specific system property + "org.apache.activemq.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.apache.activemq6.ssl.keyStorePassword" system + system property or the HornetQ-specific "org.apache.activemq.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.apache.activemq6.ssl.trustStore" system property. The HornetQ-specific system property + "org.apache.activemq.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.apache.activemq6.ssl.trustStorePassword" system + system property or the HornetQ-specific "org.apache.activemq.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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/connection-ttl.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/connection-ttl.xml b/docs/user-manual/en/connection-ttl.xml index 3102792..42359e6 100644 --- a/docs/user-manual/en/connection-ttl.xml +++ b/docs/user-manual/en/connection-ttl.xml @@ -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.apache.activemq6.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.activemq.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.apache.activemq6.core.client.impl.DelegatingSession] The session you didn't close was created here: +[Finalizer] 20:14:43,244 WARNING [org.apache.activemq.core.client.impl.DelegatingSession] The session you didn't close was created here: java.lang.Exception - at org.apache.activemq6.core.client.impl.DelegatingSession.<init>(DelegatingSession.java:83) + at org.apache.activemq.core.client.impl.DelegatingSession.<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.apache.activemq6.core.protocol.core.impl.wireformat.RollbackMessage</literal></para> + <para><literal>org.apache.activemq.core.protocol.core.impl.wireformat.RollbackMessage</literal></para> </listitem> <listitem> - <para><literal>org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCloseMessage</literal></para> + <para><literal>org.apache.activemq.core.protocol.core.impl.wireformat.SessionCloseMessage</literal></para> </listitem> <listitem> - <para><literal>org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCommitMessage</literal></para> + <para><literal>org.apache.activemq.core.protocol.core.impl.wireformat.SessionCommitMessage</literal></para> </listitem> <listitem> - <para><literal>org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXACommitMessage</literal></para> + <para><literal>org.apache.activemq.core.protocol.core.impl.wireformat.SessionXACommitMessage</literal></para> </listitem> <listitem> - <para><literal>org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAPrepareMessage</literal></para> + <para><literal>org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAPrepareMessage</literal></para> </listitem> <listitem> - <para><literal>org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXARollbackMessage</literal></para> + <para><literal>org.apache.activemq.core.protocol.core.impl.wireformat.SessionXARollbackMessage</literal></para> </listitem> </itemizedlist> <para>To disable asynchronous connection execution, set the parameter http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/core-bridges.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/core-bridges.xml b/docs/user-manual/en/core-bridges.xml index c18416a..408de02 100644 --- a/docs/user-manual/en/core-bridges.xml +++ b/docs/user-manual/en/core-bridges.xml @@ -57,7 +57,7 @@ <forwarding-address>jms.queue.mincing-machine</forwarding-address> <filter-string="name='aardvark'"/> <transformer-class-name> - org.apache.activemq6.jms.example.HatColourChangeTransformer + org.apache.activemq.jms.example.HatColourChangeTransformer </transformer-class-name> <retry-interval>1000</retry-interval> <ha>true</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.apache.activemq6.core.server.cluster.Transformer</literal> + <literal>org.apache.activemq.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 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/diverts.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/diverts.xml b/docs/user-manual/en/diverts.xml index 9e407e9..8d81568 100644 --- a/docs/user-manual/en/diverts.xml +++ b/docs/user-manual/en/diverts.xml @@ -67,7 +67,7 @@ <forwarding-address>jms.queue.priceForwarding</forwarding-address> <filter string="office='New York'"/> <transformer-class-name> - org.apache.activemq6.jms.example.AddForwardingTimeTransformer + org.apache.activemq.jms.example.AddForwardingTimeTransformer </transformer-class-name> <exclusive>true</exclusive> </divert></programlisting> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/duplicate-detection.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/duplicate-detection.xml b/docs/user-manual/en/duplicate-detection.xml index cbed3df..97c7a64 100644 --- a/docs/user-manual/en/duplicate-detection.xml +++ b/docs/user-manual/en/duplicate-detection.xml @@ -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.apache.activemq6.api.core.Message.HDR_DUPLICATE_DETECTION_ID</literal>, which + >org.apache.activemq.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.apache.activemq6.core.message.impl.HDR_DUPLICATE_DETECTION_ID</literal> property + >org.apache.activemq.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 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/embedding-hornetq.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/embedding-hornetq.xml b/docs/user-manual/en/embedding-hornetq.xml index 5852885..3b8e421 100644 --- a/docs/user-manual/en/embedding-hornetq.xml +++ b/docs/user-manual/en/embedding-hornetq.xml @@ -58,7 +58,7 @@ <literal>hornetq-configuration.xml</literal> in your classpath:</para> <programlisting> -import org.apache.activemq6.core.server.embedded.EmbeddedHornetQ; +import org.apache.activemq.core.server.embedded.EmbeddedHornetQ; ... @@ -109,7 +109,7 @@ session.close();</programlisting> <literal>hornetq-jms.xml</literal> config file.</para> <programlisting> -import org.apache.activemq6.jms.server.embedded.EmbeddedJMS; +import org.apache.activemq.jms.server.embedded.EmbeddedJMS; ... @@ -149,8 +149,8 @@ Destination destination = jms.lookup("/example/queue"); would through the main configuration file.</para> <programlisting> -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.impl.ConfigurationImpl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.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.apache.activemq6.api.core.server.embedded.EmbeddedHornetQ</literal> + <literal>org.apache.activemq.api.core.server.embedded.EmbeddedHornetQ</literal> and add the configuration object to it.</para> <programlisting> -import org.apache.activemq6.api.core.server.HornetQ; -import org.apache.activemq6.core.server.embedded.EmbeddedHornetQ; +import org.apache.activemq.api.core.server.HornetQ; +import org.apache.activemq.core.server.embedded.EmbeddedHornetQ; ... @@ -247,12 +247,12 @@ jmsServer.start();</programlisting> <deployment xmlns="urn:jboss:bean-deployer:2.0"> <!-- The core configuration --> <bean name="Configuration" - class="org.apache.activemq6.core.config.impl.FileConfiguration"> + class="org.apache.activemq.core.config.impl.FileConfiguration"> </bean> <!-- The core server --> <bean name="HornetQServer" - class="org.apache.activemq6.core.server.impl.HornetQServerImpl"> + class="org.apache.activemq.core.server.impl.HornetQServerImpl"> <constructor> <parameter> <inject bean="Configuration"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/intercepting-operations.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/intercepting-operations.xml b/docs/user-manual/en/intercepting-operations.xml index 5e182cb..e09cd3c 100644 --- a/docs/user-manual/en/intercepting-operations.xml +++ b/docs/user-manual/en/intercepting-operations.xml @@ -35,7 +35,7 @@ <title>Implementing The Interceptors</title> <para>An interceptor must implement the <literal>Interceptor interface</literal>:</para> <programlisting> -package org.apache.activemq6.api.core.interceptor; +package org.apache.activemq.api.core.interceptor; public interface Interceptor { @@ -58,13 +58,13 @@ public interface Interceptor <literal>hornetq-configuration.xml</literal>:</para> <programlisting> <remoting-incoming-interceptors> - <class-name>org.apache.activemq6.jms.example.LoginInterceptor</class-name> - <class-name>org.apache.activemq6.jms.example.AdditionalPropertyInterceptor</class-name> + <class-name>org.apache.activemq.jms.example.LoginInterceptor</class-name> + <class-name>org.apache.activemq.jms.example.AdditionalPropertyInterceptor</class-name> </remoting-incoming-interceptors></programlisting> <programlisting> <remoting-outgoing-interceptors> - <class-name>org.apache.activemq6.jms.example.LogoutInterceptor</class-name> - <class-name>org.apache.activemq6.jms.example.AdditionalPropertyInterceptor</class-name> + <class-name>org.apache.activemq.jms.example.LogoutInterceptor</class-name> + <class-name>org.apache.activemq.jms.example.AdditionalPropertyInterceptor</class-name> </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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/interoperability.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/interoperability.xml b/docs/user-manual/en/interoperability.xml index 6d0f53f..86dadc1 100644 --- a/docs/user-manual/en/interoperability.xml +++ b/docs/user-manual/en/interoperability.xml @@ -36,7 +36,7 @@ parameter set to have <literal>stomp</literal>:</para> <programlisting> <acceptor name="stomp-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="protocols" value="STOMP"/> <param key="port" value="61613"/> </acceptor></programlisting> @@ -90,7 +90,7 @@ </para> <programlisting> <acceptor name="stomp-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="protocols" value="STOMP"/> <param key="port" value="61613"/> <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> <acceptor name="stomp-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="protocols" value="STOMP"/> <param key="port" value="61613"/> <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> <acceptor name="stomp-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="protocols" value="STOMP"/> <param key="port" value="61613"/> <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> <acceptor name="stomp-ws-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="protocols" value="STOMP_WS"/> <param key="port" value="61614"/> </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> <acceptor name="stomp-acceptor"> -<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> +<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="protocols" value="AMQP"/> <param key="port" value="5672"/> </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> <acceptor name="openwire-acceptor"> -<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> +<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="protocols" value="OPENWIRE"/> <param key="port" value="61616"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/jms-bridge.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/jms-bridge.xml b/docs/user-manual/en/jms-bridge.xml index c31ec70..13d5fb3 100644 --- a/docs/user-manual/en/jms-bridge.xml +++ b/docs/user-manual/en/jms-bridge.xml @@ -55,7 +55,7 @@ <programlisting> <?xml version="1.0" encoding="UTF-8"?> <deployment xmlns="urn:jboss:bean-deployer:2.0"> - <bean name="JMSBridge" class="org.apache.activemq6.api.jms.bridge.impl.JMSBridgeImpl"> + <bean name="JMSBridge" class="org.apache.activemq.api.jms.bridge.impl.JMSBridgeImpl"> <!-- HornetQ must be started before the bridge --> <depends>HornetQServer</depends> <constructor> @@ -105,7 +105,7 @@ <parameter> <inject bean="MBeanServer"/> </parameter> - <parameter>org.apache.activemq6:service=JMSBridge</parameter> + <parameter>org.apache.activemq:service=JMSBridge</parameter> </constructor> <property name="transactionManager"> <inject bean="RealTransactionManager"/> @@ -114,7 +114,7 @@ <!-- SourceCFF describes the ConnectionFactory used to connect to the source destination --> <bean name="SourceCFF" - class="org.apache.activemq6.api.jms.bridge.impl.JNDIConnectionFactoryFactory"> + class="org.apache.activemq.api.jms.bridge.impl.JNDIConnectionFactoryFactory"> <constructor> <parameter> <inject bean="JNDI" /> @@ -125,7 +125,7 @@ <!-- TargetCFF describes the ConnectionFactory used to connect to the target destination --> <bean name="TargetCFF" - class="org.apache.activemq6.api.jms.bridge.impl.JNDIConnectionFactoryFactory"> + class="org.apache.activemq.api.jms.bridge.impl.JNDIConnectionFactoryFactory"> <constructor> <parameter> <inject bean="JNDI" /> @@ -135,7 +135,7 @@ </bean> <!-- SourceDestinationFactory describes the Destination used as the source --> - <bean name="SourceDestinationFactory" class="org.apache.activemq6.api.jms.bridge.impl.JNDIDestinationFactory"> + <bean name="SourceDestinationFactory" class="org.apache.activemq.api.jms.bridge.impl.JNDIDestinationFactory"> <constructor> <parameter> <inject bean="JNDI" /> @@ -145,7 +145,7 @@ </bean> <!-- TargetDestinationFactory describes the Destination used as the target --> - <bean name="TargetDestinationFactory" class="org.apache.activemq6.api.jms.bridge.impl.JNDIDestinationFactory"> + <bean name="TargetDestinationFactory" class="org.apache.activemq.api.jms.bridge.impl.JNDIDestinationFactory"> <constructor> <parameter> <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.apache.activemq6.jms.bridge.ConnectionFactoryFactory</literal>.</para> + >org.apache.activemq.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.apache.activemq6.jms.bridge.DestinationFactory</literal> interface.</para> + >org.apache.activemq.jms.bridge.DestinationFactory</literal> interface.</para> </section> <section id="quality-of-service"> <title>Quality Of Service</title> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/large-messages.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/large-messages.xml b/docs/user-manual/en/large-messages.xml index d04bcf2..5346c41 100644 --- a/docs/user-manual/en/large-messages.xml +++ b/docs/user-manual/en/large-messages.xml @@ -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.apache.activemq6.api.core.client.ClientMessage API</title> + <title>org.apache.activemq.api.core.client.ClientMessage API</title> <tgroup cols="3"> <colspec colname="Name" colnum="1"/> <colspec colname="Descr" colnum="2"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/logging.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/logging.xml b/docs/user-manual/en/logging.xml index 400362f..c65f3e8 100644 --- a/docs/user-manual/en/logging.xml +++ b/docs/user-manual/en/logging.xml @@ -43,23 +43,23 @@ <entry>Logs any calls not handled by the HornetQ loggers</entry> </row> <row> - <entry>org.apache.activemq6.core.server</entry> + <entry>org.apache.activemq.core.server</entry> <entry>Logs the core server</entry> </row> <row> - <entry>org.apache.activemq6.utils</entry> + <entry>org.apache.activemq.utils</entry> <entry>Logs utility calls</entry> </row> <row> - <entry>org.apache.activemq6.journal</entry> + <entry>org.apache.activemq.journal</entry> <entry>Logs Journal calls</entry> </row> <row> - <entry>org.apache.activemq6.jms</entry> + <entry>org.apache.activemq.jms</entry> <entry>Logs JMS calls</entry> </row> <row> - <entry>org.apache.activemq6.integration.bootstrap</entry> + <entry>org.apache.activemq.integration.bootstrap</entry> <entry>Logs bootstrap calls</entry> </row> </tbody> @@ -91,7 +91,7 @@ <version>1.3.1.Final</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> + <groupId>org.apache.activemq</groupId> <artifactId>hornetq-core-client</artifactId> <version>2.3.0.Final</version> </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.apache.activemq6.core.server,org.apache.activemq6.utils,org.apache.activemq6.journal,org.apache.activemq6.jms,org.apache.activemq6.ra +loggers=org.jboss.logging,org.apache.activemq.core.server,org.apache.activemq.utils,org.apache.activemq.journal,org.apache.activemq.jms,org.apache.activemq.ra # Root logger level logger.level=INFO # HornetQ logger levels -logger.org.apache.activemq6.core.server.level=INFO -logger.org.apache.activemq6.utils.level=INFO -logger.org.apache.activemq6.jms.level=DEBUG +logger.org.apache.activemq.core.server.level=INFO +logger.org.apache.activemq.utils.level=INFO +logger.org.apache.activemq.jms.level=DEBUG # Root logger handlers logger.handlers=FILE,CONSOLE http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/management.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/management.xml b/docs/user-manual/en/management.xml index 6403623..b9576a0 100644 --- a/docs/user-manual/en/management.xml +++ b/docs/user-manual/en/management.xml @@ -57,11 +57,11 @@ <itemizedlist> <listitem> <para><emphasis>Core</emphasis> resources are located in the <literal - >org.apache.activemq6.api.core.management</literal> package</para> + >org.apache.activemq.api.core.management</literal> package</para> </listitem> <listitem> <para><emphasis>JMS</emphasis> resources are located in the <literal - >org.apache.activemq6.api.jms.management</literal> package</para> + >org.apache.activemq.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.apache.activemq6:module=Core,type=Server</literal> or the resource name <literal + >org.apache.activemq: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.apache.activemq6:module=Core,type=Server</literal> or the resource name <literal + >org.apache.activemq: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.apache.activemq6:module=Core,type=Server</literal> or the resource name <literal + >org.apache.activemq: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.apache.activemq6:module=Core,type=Address,name="<the + (with the ObjectName <literal>org.apache.activemq:module=Core,type=Address,name="<the address name>"</literal> or the resource name <literal>core.address.<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.apache.activemq6:module=Core,type=Queue,address="<the bound + the ObjectName <literal>org.apache.activemq:module=Core,type=Queue,address="<the bound address>",name="<the queue name>"</literal> or the resource name <literal >core.queue.<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.apache.activemq6:module=Core,type=Acceptor,name="<the acceptor + >org.apache.activemq:module=Core,type=Acceptor,name="<the acceptor name>"</literal> or the resource name <literal>core.acceptor.<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.apache.activemq6:module=Core,type=Divert,name=<the divert name></literal> + >org.apache.activemq:module=Core,type=Divert,name=<the divert name></literal> or the resource name <literal>core.divert.<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.apache.activemq6:module=Core,type=Bridge,name="<the bridge + >org.apache.activemq:module=Core,type=Bridge,name="<the bridge name>"</literal> or the resource name <literal>core.bridge.<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.apache.activemq6:module=Core,type=BroadcastGroup,name="<the broadcast group + >org.apache.activemq:module=Core,type=BroadcastGroup,name="<the broadcast group name>"</literal> or the resource name <literal >core.broadcastgroup.<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.apache.activemq6:module=Core,type=DiscoveryGroup,name="<the discovery group + >org.apache.activemq:module=Core,type=DiscoveryGroup,name="<the discovery group name>"</literal> or the resource name <literal>core.discovery.<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.apache.activemq6:module=Core,type=ClusterConnection,name="<the cluster + >org.apache.activemq:module=Core,type=ClusterConnection,name="<the cluster connection name>"</literal> or the resource name <literal >core.clusterconnection.<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.apache.activemq6:module=JMS,type=Server</literal> or the resource name <literal + >org.apache.activemq: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.apache.activemq6:module=JMS,type=ConnectionFactory,name="<the connection factory + >org.apache.activemq:module=JMS,type=ConnectionFactory,name="<the connection factory name>"</literal> or the resource name <literal>jms.connectionfactory.<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.apache.activemq6:module=JMS,type=Queue,name="<the queue + the ObjectName <literal>org.apache.activemq:module=JMS,type=Queue,name="<the queue name>"</literal> or the resource name <literal>jms.queue.<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.apache.activemq6:module=JMS,type=Topic,name="<the topic + the ObjectName <literal>org.apache.activemq:module=JMS,type=Topic,name="<the topic name>"</literal> or the resource name <literal>jms.topic.<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.apache.activemq6</literal>.</para> + resources with the domain <literal>org.apache.activemq</literal>.</para> <para>For example, the <literal>ObjectName</literal> to manage a JMS Queue <literal >exampleQueue</literal> is:</para> <programlisting> -org.apache.activemq6:module=JMS,type=Queue,name="exampleQueue"</programlisting> +org.apache.activemq:module=JMS,type=Queue,name="exampleQueue"</programlisting> <para>and the MBean is:</para> <programlisting> -org.apache.activemq6.api.jms.management.JMSQueueControl</programlisting> +org.apache.activemq.api.jms.management.JMSQueueControl</programlisting> <para>The MBean's <literal>ObjectName</literal> are built using the helper class <literal - >org.apache.activemq6.api.core.management.ObjectNameBuilder</literal>. You can also use <literal + >org.apache.activemq.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.apache.activemq6.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.apache.activemq6". To manage several + <para>By default, HornetQ server uses the JMX domain "org.apache.activemq". 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> <!-- use a specific JMX domain for HornetQ MBeans --> -<jmx-domain>my.org.apache.activemq6</jmx-domain></programlisting> +<jmx-domain>my.org.apache.activemq</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.apache.activemq6.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.apache.activemq6.api.core.management.ManagementHelper</literal> can + Serialization (the <literal>org.apache.activemq.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.apache.activemq6.api.jms.management.JMSQueueControl</programlisting> </listitem> <listitem> <para>Use the helper class <literal - >org.apache.activemq6.api.core.management.ManagementHelper</literal> to fill the message + >org.apache.activemq.api.core.management.ManagementHelper</literal> to fill the message with the management properties</para> </listitem> <listitem> @@ -635,7 +635,7 @@ org.apache.activemq6.api.jms.management.JMSQueueControl</programlisting> </listitem> <listitem> <para>Use the helper class <literal - >org.apache.activemq6.api.core.management.ManagementHelper</literal> to retrieve the + >org.apache.activemq.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.apache.activemq6.api.core.management.ResourceNames</literal> and are straightforward + >org.apache.activemq.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.apache.activemq6.api.jms.management.JMSManagementHelper</literal> to fill the message + >org.apache.activemq.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.apache.activemq6.api.jms.management.JMSManagementHelper</literal> to retrieve the + >org.apache.activemq.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.apache.activemq6:module=Core,type=Server</literal> for notifications on + <para><literal>org.apache.activemq:module=Core,type=Server</literal> for notifications on <emphasis>Core</emphasis> resources</para> </listitem> <listitem> - <para><literal>org.apache.activemq6:module=JMS,type=Server</literal> for notifications on + <para><literal>org.apache.activemq:module=JMS,type=Server</literal> for notifications on <emphasis>JMS</emphasis> resources</para> </listitem> </itemizedlist> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/persistence.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/persistence.xml b/docs/user-manual/en/persistence.xml index e512bae..14d1078 100644 --- a/docs/user-manual/en/persistence.xml +++ b/docs/user-manual/en/persistence.xml @@ -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.apache.activemq6.core.journal.impl.ExportJournal + <para><literal>java -cp hornetq-core.jar org.apache.activemq.core.journal.impl.ExportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <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.apache.activemq6.core.journal.impl.ImportJournal + <para><literal>java -cp hornetq-core.jar:netty.jar org.apache.activemq.core.journal.impl.ImportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileInput></literal></para> <itemizedlist> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/project-info.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/project-info.xml b/docs/user-manual/en/project-info.xml index e3d50f5..7e3ca97 100644 --- a/docs/user-manual/en/project-info.xml +++ b/docs/user-manual/en/project-info.xml @@ -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.apache.activemq6/community/team.html";>team page</ulink>. </para> + url="http://jboss.org.apache.activemq/community/team.html";>team page</ulink>. </para> </section> </chapter> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/queue-attributes.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/queue-attributes.xml b/docs/user-manual/en/queue-attributes.xml index 46f82ed..1c12bef 100644 --- a/docs/user-manual/en/queue-attributes.xml +++ b/docs/user-manual/en/queue-attributes.xml @@ -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.apache.activemq6.api.core.client.ClientSession</literal> interface. There are multiple + >org.apache.activemq.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 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/rest.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/rest.xml b/docs/user-manual/en/rest.xml index 3da87b5..712cfcd 100644 --- a/docs/user-manual/en/rest.xml +++ b/docs/user-manual/en/rest.xml @@ -128,7 +128,7 @@ Content-Type: application/xml <listener> <listener-class> - org.apache.activemq6.rest.integration.RestMessagingBootstrapListener + org.apache.activemq.rest.integration.RestMessagingBootstrapListener </listener-class> </listener> @@ -185,7 +185,7 @@ Content-Type: application/xml <dependencies> <dependency> - <groupId>org.apache.activemq6.rest</groupId> + <groupId>org.apache.activemq.rest</groupId> <artifactId>hornetq-rest</artifactId> <version>2.3.0-SNAPSHOT</version> </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.apache.activemq6, org.jboss.netty</programlisting> + <programlisting>Dependencies: org.apache.activemq, org.jboss.netty</programlisting> <para>You can add this to the<literal><plugins></literal> section of the pom.xml to create this entry automatically: </para> @@ -207,7 +207,7 @@ Content-Type: application/xml <configuration> <archive> <manifestEntries> - <Dependencies>org.apache.activemq6, org.jboss.netty</Dependencies> + <Dependencies>org.apache.activemq, org.jboss.netty</Dependencies> </manifestEntries> </archive> </configuration> @@ -252,13 +252,13 @@ Content-Type: application/xml <listener> <listener-class> - org.apache.activemq6.rest.integration.HornetqBootstrapListener + org.apache.activemq.rest.integration.HornetqBootstrapListener </listener-class> </listener> <listener> <listener-class> - org.apache.activemq6.rest.integration.RestMessagingBootstrapListener + org.apache.activemq.rest.integration.RestMessagingBootstrapListener </listener-class> </listener> @@ -312,7 +312,7 @@ Content-Type: application/xml </build> <dependencies> <dependency> - <groupId>org.apache.activemq6</groupId> + <groupId>org.apache.activemq</groupId> <artifactId>hornetq-core</artifactId> <version>2.3.0-SNAPSHOT</version> </dependency> @@ -322,7 +322,7 @@ Content-Type: application/xml <version>3.4.5.Final</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> + <groupId>org.apache.activemq</groupId> <artifactId>hornetq-jms</artifactId> <version>2.3.0-SNAPSHOT</version> </dependency> @@ -332,7 +332,7 @@ Content-Type: application/xml <version>1.0.0.Final</version> </dependency> <dependency> - <groupId>org.apache.activemq6.rest</groupId> + <groupId>org.apache.activemq.rest</groupId> <artifactId>hornetq-rest</artifactId> <version>2.3.0-SNAPSHOT</version> </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.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: +WARN [org.apache.activemq.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.apache.activemq6.rest.HttpHeaderProperty.CONTENT_TYPE, "application/xml");</programlisting> +message.setStringProperty(org.apache.activemq.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.apache.activemq6.rest.HttpHeaderProperty.CONTENT_T <programlisting> public void onMessage(Message message) { - MyType obj = org.apache.activemq6.rest.Jms.getEntity(message, MyType.class); + MyType obj = org.apache.activemq.rest.Jms.getEntity(message, MyType.class); }</programlisting> <para>The way the <literal>getEntity()</literal> method works is that if http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/security.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/security.xml b/docs/user-manual/en/security.xml index b5fe4e0..4680c3c 100644 --- a/docs/user-manual/en/security.xml +++ b/docs/user-manual/en/security.xml @@ -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> -<bean name="HornetQSecurityManager" class="org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl"> +<bean name="HornetQSecurityManager" class="org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl"> <start ignored="true"/> <stop ignored="true"/> </bean></programlisting> - <para>The class <literal>org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl</literal> + <para>The class <literal>org.apache.activemq.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.apache.activemq6.spi.core.security.HornetQSecurityManager</literal> + implementing the <literal>org.apache.activemq.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> -<bean name="HornetQSecurityManager" class="org.apache.activemq6.integration.jboss.security.JAASSecurityManager"> +<bean name="HornetQSecurityManager" class="org.apache.activemq.integration.jboss.security.JAASSecurityManager"> <start ignored="true"/> <stop ignored="true"/> - <property name="ConfigurationName">org.apache.activemq6.jms.example.ExampleLoginModule</property> + <property name="ConfigurationName">org.apache.activemq.jms.example.ExampleLoginModule</property> <property name="Configuration"> <inject bean="ExampleConfiguration"/> </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.apache.activemq6.integration.jboss.security.JBossASSecurityManager</literal></para> + >org.apache.activemq.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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/send-guarantees.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/send-guarantees.xml b/docs/user-manual/en/send-guarantees.xml index 051bf35..a89d646 100644 --- a/docs/user-manual/en/send-guarantees.xml +++ b/docs/user-manual/en/send-guarantees.xml @@ -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.apache.activemq6.api.core.client.SendAcknowledgementHandler</literal> and set a handler + >org.apache.activemq.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 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/spring-integration.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/spring-integration.xml b/docs/user-manual/en/spring-integration.xml index 1e6018b..900c975 100644 --- a/docs/user-manual/en/spring-integration.xml +++ b/docs/user-manual/en/spring-integration.xml @@ -27,7 +27,7 @@ <title>Spring Integration</title> <para>HornetQ provides a simple bootstrap class, - <literal>org.apache.activemq6.integration.spring.SpringJmsBootstrap</literal>, for + <literal>org.apache.activemq.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";> - <bean id="EmbeddedJms" class="org.apache.activemq6.integration.spring.SpringJmsBootstrap" init-method="start"/> + <bean id="EmbeddedJms" class="org.apache.activemq.integration.spring.SpringJmsBootstrap" init-method="start"/> - <bean id="listener" class="org.apache.activemq6.tests.integration.spring.ExampleListener"/> + <bean id="listener" class="org.apache.activemq.tests.integration.spring.ExampleListener"/> <bean id="listenerContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer"> <property name="connectionFactory" ref="ConnectionFactory"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/using-jms.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/using-jms.xml b/docs/user-manual/en/using-jms.xml index dfe9d5d..b7414fb 100644 --- a/docs/user-manual/en/using-jms.xml +++ b/docs/user-manual/en/using-jms.xml @@ -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> -<bean name="StandaloneServer" class="org.apache.activemq6.jms.server.impl.StandaloneNamingServer"> +<bean name="StandaloneServer" class="org.apache.activemq.jms.server.impl.StandaloneNamingServer"> <constructor> <parameter> <inject bean="HornetQServer"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/using-server.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/using-server.xml b/docs/user-manual/en/using-server.xml index 673283d..4f202bc 100644 --- a/docs/user-manual/en/using-server.xml +++ b/docs/user-manual/en/using-server.xml @@ -143,7 +143,7 @@ this with a connector configuration:</para> <programlisting> <connector name="netty"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.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></programlisting> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/en/vertx-integration.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/vertx-integration.xml b/docs/user-manual/en/vertx-integration.xml index 92fd8ac..5a9ef9a 100644 --- a/docs/user-manual/en/vertx-integration.xml +++ b/docs/user-manual/en/vertx-integration.xml @@ -36,7 +36,7 @@ Such a service can be configured as follows:</para> <programlisting> <connector-service name="vertx-incoming-connector"> - <factory-class>org.apache.activemq6.integration.vertx.VertxIncomingConnectorServiceFactory</factory-class> + <factory-class>org.apache.activemq.integration.vertx.VertxIncomingConnectorServiceFactory</factory-class> <param key="host" value="127.0.0.1"/> <param key="port" value="0"/> <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.apache.activemq6.</para> + <para><literal>vertx-address</literal>. The vertx address to listen to. default is org.apache.activemq.</para> </listitem> </itemizedlist> </section> @@ -75,7 +75,7 @@ Such a service can be configured as follows:</para> <programlisting> <connector-service name="vertx-outgoing-connector"> - <factory-class>org.apache.activemq6.integration.vertx.VertxOutgoingConnectorServiceFactory</factory-class> + <factory-class>org.apache.activemq.integration.vertx.VertxOutgoingConnectorServiceFactory</factory-class> <param key="host" value="127.0.0.1"/> <param key="port" value="0"/> <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.apache.activemq6.</para> + <para><literal>vertx-address</literal>. The vertx address to put messages to. default is org.apache.activemq.</para> </listitem> <listitem> <para><literal>publish</literal>. How messages is sent to vertx event bus. "true" means using publish style. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/pom.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/pom.xml b/docs/user-manual/pom.xml index 5cba1f9..070ab32 100644 --- a/docs/user-manual/pom.xml +++ b/docs/user-manual/pom.xml @@ -19,12 +19,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.docs</groupId> - <artifactId>activemq6-docs</artifactId> + <groupId>org.apache.activemq.docs</groupId> + <artifactId>activemq-docs</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <groupId>org.apache.activemq6.docs</groupId> + <groupId>org.apache.activemq.docs</groupId> <artifactId>user-manual</artifactId> <version>1.0</version> <packaging>jdocbook</packaging> @@ -275,7 +275,7 @@ <transformerFactory>net.sf.saxon.TransformerFactoryImpl</transformerFactory> <transformationSets> <transformationSet> - <dir>../../activemq6-server/src/main/resources/schema</dir> + <dir>../../activemq-server/src/main/resources/schema</dir> <stylesheet>./src/main/resources/schemaToTable.xsl</stylesheet> <includes> <include>hornetq-configuration.xsd</include> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/src/main/resources/schemaToTable.xsl ---------------------------------------------------------------------- diff --git a/docs/user-manual/src/main/resources/schemaToTable.xsl b/docs/user-manual/src/main/resources/schemaToTable.xsl index dfdea65..a49cfb3 100644 --- a/docs/user-manual/src/main/resources/schemaToTable.xsl +++ b/docs/user-manual/src/main/resources/schemaToTable.xsl @@ -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.apache.activemq6" + xmlns:hq="urn:org.apache.activemq" xmlns:fn="http://www.w3.org/2005/xpath-functions";> <!-- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/appserver-integration.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/appserver-integration.xml b/docs/user-manual/zh/appserver-integration.xml index edacef3..7d28305 100644 --- a/docs/user-manual/zh/appserver-integration.xml +++ b/docs/user-manual/zh/appserver-integration.xml @@ -275,12 +275,12 @@ public class MyMDB implements MessageListener <literal>META-INF/ra.xml</literal>ã</para> <para>ä¸é¢æ¯å®çå ·ä½é ç½®å 容ï¼</para> <programlisting><resourceadapter> - <resourceadapter-class>org.apache.activemq6.ra.HornetQResourceAdapter</resourceadapter-class> + <resourceadapter-class>org.apache.activemq.ra.HornetQResourceAdapter</resourceadapter-class> <config-property> <description>The transport type</description> <config-property-name>ConnectorClassName</config-property-name> <config-property-type>java.lang.String</config-property-type> - <config-property-value>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorF + <config-property-value>org.apache.activemq.core.remoting.impl.invm.InVMConnectorF actory</config-property-value> </config-property> <config-property> @@ -292,7 +292,7 @@ public class MyMDB implements MessageListener <outbound-resourceadapter> <connection-definition> - <managedconnectionfactory-class>org.apache.activemq6.ra.HornetQRAManagedConnection + <managedconnectionfactory-class>org.apache.activemq.ra.HornetQRAManagedConnection Factory</managedconnectionfactory-class> <config-property> @@ -309,12 +309,12 @@ public class MyMDB implements MessageListener <config-property-value>0</config-property-value> </config-property> - <connectionfactory-interface>org.apache.activemq6.ra.HornetQRAConnectionFactory + <connectionfactory-interface>org.apache.activemq.ra.HornetQRAConnectionFactory </connectionfactory-interface> - <connectionfactororg.apache.activemq6.ra.HornetQConnectionFactoryImplonFactoryImpl + <connectionfactororg.apache.activemq.ra.HornetQConnectionFactoryImplonFactoryImpl </connectionfactory-impl-class> <connection-interface>javax.jms.Session</connection-interface> - <connection-impl-class>org.apache.activemq6.ra.HornetQRASession + <connection-impl-class>org.apache.activemq.ra.HornetQRASession </connection-impl-class> </connection-definition> <transaction-support>XATransaction</transaction-support> @@ -332,7 +332,7 @@ public class MyMDB implements MessageListener <messagelistener> <messagelistener-type>javax.jms.MessageListener</messagelistener-type> <activationspec> - <activationspec-class>org.apache.activemq6.ra.inflow.HornetQActivationSpec + <activationspec-class>org.apache.activemq.ra.inflow.HornetQActivationSpec </activationspec-class> <required-config-property> <config-property-name>destination</config-property-name> @@ -657,12 +657,12 @@ public class MyMDB implements MessageListener <jndi-name>RemoteJmsXA</jndi-name> <xa-transaction/> <rar-name>jms-ra.rar</rar-name> - <connection-definition>org.apache.activemq6.ra.HornetQRAConnectionFactory + <connection-definition>org.apache.activemq.ra.HornetQRAConnectionFactory </connection-definition> <config-property name="SessionDefaultType" type="String">javax.jms.Topic </config-property> <config-property name="ConnectorClassName" type="String"> - org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory </config-property> <config-property name="ConnectionParameters" type="String"> port=5445</config-property> @@ -806,12 +806,12 @@ private ConnectionFactory connectionFactory;</programlisting> </para> <programlisting> - <resourceadapter-class>org.apache.activemq6.ra.HornetQResourceAdapter</resourceadapter-class> + <resourceadapter-class>org.apache.activemq.ra.HornetQResourceAdapter</resourceadapter-class> <config-property> <description>The transport type</description> <config-property-name>ConnectorClassName</config-property-name> <config-property-type>java.lang.String</config-property-type> - <config-property-value>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> + <config-property-value>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> </config-property> <config-property> <description>The transport configuration. These values must be in the form of key=val;key=val;</description> @@ -836,9 +836,9 @@ private ConnectionFactory connectionFactory;</programlisting> <jndi-name>RemoteJmsXA</jndi-name> <xa-transaction/> <rar-name>hornetq-ra.rar</rar-name> - <connection-definition>org.apache.activemq6.ra.HornetQRAConnectionFactory</connection-definition> + <connection-definition>org.apache.activemq.ra.HornetQRAConnectionFactory</connection-definition> <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property> - <config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</config-property> + <config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</config-property> <config-property name="ConnectionParameters" type="java.lang.String">host=127.0.0.1;port=5446</config-property> <max-pool-size>20</max-pool-size> </tx-connection-factory> @@ -926,7 +926,7 @@ initialContext = new InitialContext(jndiParameters);</programlisting> ... <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HornetQ1" - value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;[è¿æ¥é ç½®]"/> + value="org.apache.activemq.jms.server.recovery.HornetQXAResourceRecovery;[è¿æ¥é ç½®]"/> </properties> </programlisting> <para>å ¶ä¸<literal>[è¿æ¥é ç½®]</literal>å æ¬è¿æ¥HornetQèç¹æå¿ éçä¿¡æ¯ã @@ -935,9 +935,9 @@ initialContext = new InitialContext(jndiParameters);</programlisting> <listitem> <para><literal>[è¿æ¥å·¥åç±»å]</literal>æçæ¯<literal>ConnectorFactory</literal> çç±»åï¼ç¨æ¥è¿æ¥HornetQæå¡å¨ãå ¶å¼å¯ä»¥æ¯<literal - >org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</literal> æ + >org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</literal> æ <literal - >org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</literal></para> + >org.apache.activemq.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> <acceptor name="in-vm"> - <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> </acceptor> </programlisting> <para>ç¸åºå°å¨ <literal >conf/jbossts-properties.xml</literal>æ件ä¸ï¼</para> <programlisting> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" - value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory"/> + value="org.apache.activemq.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"/> </programlisting> <para>å¦æé ç½®äºä¸ä¸ªnettyæ¥åå¨ï¼å¹¶ä¸ç«¯å£ä¸æ¯é»è®¤çï¼</para> <programlisting> <acceptor name="netty"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="8888"/> </acceptor> </programlisting> @@ -978,7 +978,7 @@ initialContext = new InitialContext(jndiParameters);</programlisting> >conf/jbossts-properties.xml</literal>æ件ä¸ï¼</para> <programlisting> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" - value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory, , , port=8888"/> + value="org.apache.activemq.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory, , , port=8888"/> </programlisting> <note> <para>注æå¨æ²¡æç¨æ·ååå¯ç æ¶ï¼éå·æ¯ä¸è½çç¥çã</para> @@ -987,7 +987,7 @@ initialContext = new InitialContext(jndiParameters);</programlisting> åºä¸ºå¦ä¸æ示ï¼</para> <programlisting> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" - value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory, admin, adminpass, port=8888"/> + value="org.apache.activemq.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory, admin, adminpass, port=8888"/> </programlisting> <para>æ¨èå¨XAæ¢å¤ä¸ï¼å°HornetQé ç½®ä¸ä¸ªinvmæ¥åå¨ï¼å¹¶é ç½®æ¢å¤ç®¡çå¨ä½¿ç¨invmè¿æ¥å¨ã</para> </section> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/clusters.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/clusters.xml b/docs/user-manual/zh/clusters.xml index 356ed0b..32367a8 100644 --- a/docs/user-manual/zh/clusters.xml +++ b/docs/user-manual/zh/clusters.xml @@ -340,9 +340,9 @@ Connection jmsConnection2 = jmsConnectionFactory.createConnection();</programlis </listitem> </itemizedlist> <para>ä½ å¯ä»¥å®ç°èªå·±ççç¥ãåªéè¦å®ç°æ¥å£<literal - >org.apache.activemq6.api.core.client.loadbalance.ConnectionLoadBalancingPolicy</literal>å³å¯ã</para> + >org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy</literal>å³å¯ã</para> <para>æ ¹æ®ä½ 使ç¨çæ¯JMSè¿æ¯æ ¸å¿æ¥å£ï¼æå®è´è½½åè¡¡çæ¹æ³æ¯ææä¸åçãå¦æä½ ä¸æå®çç¥ï¼é»è®¤ççç¥æ¯<literal - >org.apache.activemq6.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>.</para> + >org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>.</para> <para>å¦æ使ç¨çæ¯JMSï¼å¹¶ä¸JMSè¿æ¥å·¥å注åå°JNDIï¼åä½ éè¦å¨<literal>hornetq-jms.xml</literal>æ件ä¸å®ä¹çç¥ï¼å¦ï¼ <programlisting> <connection-factory name="ConnectionFactory"> @@ -351,7 +351,7 @@ Connection jmsConnection2 = jmsConnectionFactory.createConnection();</programlis <entry name="ConnectionFactory"/> </entries> <connection-load-balancing-policy-class-name> - org.apache.activemq6.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy + org.apache.activemq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy </connection-load-balancing-policy-class-name> </connection-factory> </programlisting>ä¸é¢çé ç½®å°é¨ç½²ä¸ä¸ªè¿æ¥å·¥åï¼å®çè¿æ¥è´è½½åè¡¡çç¥æ¯éæºçç¥ã</para>
