http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/configuration-index.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/configuration-index.xml b/docs/user-manual/zh/configuration-index.xml index 538be7e..a5f3b08 100644 --- a/docs/user-manual/zh/configuration-index.xml +++ b/docs/user-manual/zh/configuration-index.xml @@ -195,7 +195,7 @@ >jmx-domain</link></entry> <entry>String</entry> <entry>ç¨äºHornetQ MBean注åå°MBeanServerçJMXåå</entry> - <entry>org.apache.activemq6</entry> + <entry>org.apache.activemq</entry> </row> <row> <entry><link linkend="large.message.configuring" @@ -1068,7 +1068,7 @@ </entry> <entry>String</entry> <entry>è´è½½åè¡¡ç±»å</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">
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/configuring-transports.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/configuring-transports.xml b/docs/user-manual/zh/configuring-transports.xml index a3b82ad..6b04a77 100644 --- a/docs/user-manual/zh/configuring-transports.xml +++ b/docs/user-manual/zh/configuring-transports.xml @@ -28,7 +28,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> @@ -54,7 +54,7 @@ org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory <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> @@ -103,12 +103,12 @@ org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory <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); ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(transportConfiguration); @@ -122,11 +122,11 @@ etc <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.createConnectionFactory(transportConfiguration); @@ -151,7 +151,7 @@ etc <para>å¦æä½ çåºç¨æ¯è¿è¡å¨ä¸ä¿¡ä»»çç½ç»ä¸ï¼ä½ åºè¯¥éæ©ä½¿ç¨SSLæHTTPSã</para> <para>Netty TCPçææè¿æ¥é½æ¯ä»å®¢æ·ç«¯åèµ·çãæå¡å¨ç«¯ä¸å客æ·ç«¯åèµ·ä»»ä½è¿æ¥ãå¨æé²ç«å¢çç¯å¢ä¸ï¼è¿ç§æ¹å¼ æ¯æ¯è¾éåçãå 为é²ç«å¢åªå 许åæ¹åçè¿æ¥ã</para> - <para>å¨<literal>org.apache.activemq6.core.remoting.impl.netty.TransportConstants</literal>ç±»ä¸å®ä¹äºæ + <para>å¨<literal>org.apache.activemq.core.remoting.impl.netty.TransportConstants</literal>ç±»ä¸å®ä¹äºæ æçé ç½®åæ°çå称ï¼keyï¼ãå®ä»¬å½ä¸ç»å¤§å¤å¨æ¢ç¨äºé ç½®æ¥æ¶å¨ä¹ç¨äºé ç½®è¿æ¥å¨ï¼æä¸äºåªéç¨äºæ¥æ¶å¨ã ä¸é¢ååºçåæ°ç¨ä»¥é ç½®ä¸ä¸ªç®åçNetty TCPï¼</para> <itemizedlist> @@ -296,7 +296,7 @@ etc <servlet-class>org.jboss.netty.channel.socket.http.HttpTunnelingServlet</servlet-class> <init-param> <param-name>endpoint</param-name> - <param-value>local:org.apache.activemq6</param-value> + <param-value>local:org.apache.activemq</param-value> </init-param> <load-on-startup>1</load-on-startup> </servlet> @@ -317,10 +317,10 @@ etc <acceptor name="netty-invm"> <factory-class> - org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory </factory-class> <param key="use-invm" value="true"/> - <param key="host" value="org.apache.activemq6"/> + <param key="host" value="org.apache.activemq"/> </acceptor> </acceptors> @@ -332,7 +332,7 @@ etc <connector name="netty-servlet"> <factory-class> - org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory </factory-class> <param key="host" value="localhost"/> <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> <connector name="netty-servlet"> - <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="host" value="localhost"/> <param key="port" value="8443"/> <param key="use-servlet" value="true"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/connection-ttl.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/connection-ttl.xml b/docs/user-manual/zh/connection-ttl.xml index 11fda07..4311e3c 100644 --- a/docs/user-manual/zh/connection-ttl.xml +++ b/docs/user-manual/zh/connection-ttl.xml @@ -97,13 +97,13 @@ finally æ¯ç¸åºçJMSè¿æ¥ï¼ï¼</para> <programlisting> -[Finalizer] 20:14:43,244 WARNING [org.apache.activemq6.core.client.impl.DelegatingSession] I'm closin +[Finalizer] 20:14:43,244 WARNING [org.apache.activemq.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.apache.activemq6.core.client.impl.DelegatingSession] The sessi +[Finalizer] 20:14:43,244 WARNING [org.apache.activemq.core.client.impl.DelegatingSession] The sessi on 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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/core-bridges.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/core-bridges.xml b/docs/user-manual/zh/core-bridges.xml index cdea000..2ff8964 100644 --- a/docs/user-manual/zh/core-bridges.xml +++ b/docs/user-manual/zh/core-bridges.xml @@ -43,7 +43,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> <retry-interval-multiplier>1.0</retry-interval-multiplier> @@ -87,7 +87,7 @@ </listitem> <listitem> <para><literal>transformer-class-name</literal>ãå¯éç转æ¢å¨ç±»åãè¿æ¯ä¸ä¸ªç¨æ·å®ä¹ç - ç±»ï¼å®éè¦å®ç°æ¥å£<literal>org.apache.activemq6.core.server.cluster.Transformer</literal> + ç±»ï¼å®éè¦å®ç°æ¥å£<literal>org.apache.activemq.core.server.cluster.Transformer</literal> ã</para> <para>å¦ææå®äºè¿ä¸ªç±»ï¼æ¯å½ä¸ä¸ªæ¶æ¯è¢«è½¬åä¹åï¼å®ç<literal>transform()</literal>æ¹æ³ å°±ä¼è¢«è°ç¨ãç¨æ·å©ç¨è¿ä¸ªæºä¼å¯ä»¥å¯¹æ¶æ¯æ¬èº«ææ¶æ¯å¤´ä¿¡æ¯è¿è¡ä¿®æ¹ã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/diverts.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/diverts.xml b/docs/user-manual/zh/diverts.xml index 8637d93..024d6c7 100644 --- a/docs/user-manual/zh/diverts.xml +++ b/docs/user-manual/zh/diverts.xml @@ -47,7 +47,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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/duplicate-detection.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/duplicate-detection.xml b/docs/user-manual/zh/duplicate-detection.xml index aa6e636..013c0a0 100644 --- a/docs/user-manual/zh/duplicate-detection.xml +++ b/docs/user-manual/zh/duplicate-detection.xml @@ -46,7 +46,7 @@ <para>å¦ææ¯å¨ä¸ä¸ªäºå¡ä¸åéæ¶æ¯ï¼ååªéè¦è®¾ç½®å ¶ä¸ä¸ä¸ªæ¶æ¯çå±æ§å¼ãå¨æå¡å¨ç«¯å¦ææå¡å¨æ£æµå°ä¸ä¸ªäºå¡ä¸æä¸ä¸ª æ¶æ¯éå¤ï¼åä¼å¿½ç¥æ´ä¸ªäºå¡ã</para> <para>è¿ä¸ªå±æ§çå称ç±<literal - >org.apache.activemq6.api.core.HDR_DUPLICATE_DETECTION_ID</literal>å®ä¹ï¼å³ï¼ + >org.apache.activemq.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.apache.activemq6.core.message.impl.HDR_DUPLICATE_DETECTION_ID</literal>å±æ§å¼ãæ¯ä¸ªå°åæ + >org.apache.activemq.core.message.impl.HDR_DUPLICATE_DETECTION_ID</literal>å±æ§å¼ãæ¯ä¸ªå°åæ åç¬çç¼åã</para> <para>ç¼åç大å°æ¯åºå®çï¼å¾ªç¯ä½¿ç¨ãå¦æç¼åçæ大å¯ä»¥åæ¾<literal >n</literal>æ¡è®°å½ï¼é£ä¹<literal>n + 1</literal>æ¡è®°å½å°ä¼è¦çç¼åä¸ç第<literal>0</literal> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/embedding-hornetq.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/embedding-hornetq.xml b/docs/user-manual/zh/embedding-hornetq.xml index 3474946..ec213bc 100644 --- a/docs/user-manual/zh/embedding-hornetq.xml +++ b/docs/user-manual/zh/embedding-hornetq.xml @@ -31,8 +31,8 @@ <para>æç §ä»¥ä¸æ¥éª¤å»åï¼</para> <para>å建é 置对象ï¼ï¼è¿ä¸ªå¯¹è±¡å è£ äºHornetQçé 置信æ¯ãå¦æä½ æ³ä½¿ç¨é ç½®æ件ï¼å使ç¨<literal >FileConfigurationImpl</literal>ã</para> - <programlisting>import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.impl.FileConfiguration; + <programlisting>import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.impl.FileConfiguration; ... @@ -44,8 +44,8 @@ config.start();</programlisting> å³å¯ãå¦æ·»å éå½çæ¥æ¶å¨ã</para> <para><literal>ConfigurationImpl</literal>ç¨æ¥é ç½®æ¥æ¶å¨ãå主è¦é ç½®æ件ç¸ä¼¼ï¼åªéè¦æ·»å <literal>NettyAcceptorFactory</literal>å³å¯ã</para> - <programlisting>import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.impl.ConfigurationImpl; + <programlisting>import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.impl.ConfigurationImpl; ... @@ -57,9 +57,9 @@ transports.add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); config.setAcceptorConfigurations(transports);</programlisting> <para>æ¥çå°±éè¦åå§å并å¯å¨HornetQæå¡ã<literal - >org.apache.activemq6.api.core.server.HornetQ</literal>ç±»æä¸äºéææ¹æ³å¯ç¨æ¥å建HornetQæå¡å¨ã</para> - <programlisting>import org.apache.activemq6.api.core.server.HornetQ; -import org.apache.activemq6.core.server.HornetQServer; + >org.apache.activemq.api.core.server.HornetQ</literal>ç±»æä¸äºéææ¹æ³å¯ç¨æ¥å建HornetQæå¡å¨ã</para> + <programlisting>import org.apache.activemq.api.core.server.HornetQ; +import org.apache.activemq.core.server.HornetQServer; ... @@ -88,12 +88,12 @@ server.start();</programlisting> <!-- 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/zh/ha.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/ha.xml b/docs/user-manual/zh/ha.xml index 3d4ebd0..ec954bb 100644 --- a/docs/user-manual/zh/ha.xml +++ b/docs/user-manual/zh/ha.xml @@ -60,7 +60,7 @@ <!-- è¿ä¸ªè¿æ¥å¨ç¨äºè¿æ¥å¤ä»½æå¡ååå¡ --> <!-- å¤ä»½æå¡å¨å¨ä¸»æº"192.168.0.11"ä¸ï¼ç«¯å£"5445" --> <connector name="backup-connector"> - <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="192.168.0.11"/> <param key="port" value="5445"/> </connector> @@ -74,7 +74,7 @@ <acceptors> <acceptor name="acceptor"> - <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="192.168.0.11"/> <param key="port" value="5445"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/intercepting-operations.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/intercepting-operations.xml b/docs/user-manual/zh/intercepting-operations.xml index 933ebd5..04e5750 100644 --- a/docs/user-manual/zh/intercepting-operations.xml +++ b/docs/user-manual/zh/intercepting-operations.xml @@ -27,7 +27,7 @@ <title>å®ç°æ¦æªå¨</title> <para>æ¦æªå¨å¿ é¡»è¦å®ç°<literal>Interceptoræ¥å£</literal>ï¼</para> <programlisting> -package org.apache.activemq6.api.core.interceptor; +package org.apache.activemq.api.core.interceptor; public interface Interceptor { @@ -51,8 +51,8 @@ public interface Interceptor <para>æ¦æªå¨çé ç½®å¨<literal>hornetq-configuration.xml</literal>æ件ä¸ï¼</para> <programlisting> <remoting-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-interceptors> </programlisting> <para>æ¦æªå¨çç±»ï¼ä»¥åå®ä»¬ä¾èµçç±»ï¼å¿ é¡»è¦å¨æå¡å¨çclasspathä¸ï¼å¦åä¸è½è¢«æ£å¸¸åå§ååè°ç¨ã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/interoperability.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/interoperability.xml b/docs/user-manual/zh/interoperability.xml index db008c1..7fcee0b 100644 --- a/docs/user-manual/zh/interoperability.xml +++ b/docs/user-manual/zh/interoperability.xml @@ -30,7 +30,7 @@ å ¶ä¸ç<literal>protocol</literal>åæ°å¼åºè®¾ä¸º<literal>stomp</literal>ï¼</para> <programlisting> <acceptor name="stomp-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="protocol" value="stomp"/> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="protocol" value="stomp"/> <param key="port" value="61613"/> </acceptor> </programlisting> @@ -103,7 +103,7 @@ hello queue orders çå¼ä¸º<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="protocol" value="stomp_ws"/> <param key="port" value="61614"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/jms-bridge.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/jms-bridge.xml b/docs/user-manual/zh/jms-bridge.xml index 794030d..b451bec 100644 --- a/docs/user-manual/zh/jms-bridge.xml +++ b/docs/user-manual/zh/jms-bridge.xml @@ -41,7 +41,7 @@ <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> @@ -91,7 +91,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"/> @@ -101,7 +101,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" /> @@ -113,7 +113,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" /> @@ -124,7 +124,7 @@ <!-- SourceDestinationFactory describes the Destination used as the source --> <bean name="SourceDestinationFactory" - class="org.apache.activemq6.api.jms.bridge.impl.JNDIDestinationFactory"> + class="org.apache.activemq.api.jms.bridge.impl.JNDIDestinationFactory"> <constructor> <parameter> <inject bean="JNDI" /> @@ -135,7 +135,7 @@ <!-- TargetDestinationFactory describes the Destination used as the target --> <bean name="TargetDestinationFactory" - class="org.apache.activemq6.api.jms.bridge.impl.JNDIDestinationFactory"> + class="org.apache.activemq.api.jms.bridge.impl.JNDIDestinationFactory"> <constructor> <parameter> <inject bean="JNDI" /> @@ -313,14 +313,14 @@ <para>æºå·¥ç®ççè¿æ¥å·¥ååå«ç¨äºå建å°æºåå°ç®ççè¿æ¥ã</para> <para>ä¸é¢çé ç½®ä¾åä¸ä½¿ç¨çæ¯HornetQæä¾çé»è®¤å®ç°ãå®ä½¿ç¨JNDIæ¥æ¾è¿æ¥å·¥åã对äºå ¶å®çåºç¨æå¡å¨ æJMSæä¾è ï¼éè¦å®ç°ç¸åºçå®ç°ï¼å³å®ç°<literal - >org.apache.activemq6.jms.bridge.ConnectionFactoryFactory</literal>æ¥å£ã</para> + >org.apache.activemq.jms.bridge.ConnectionFactoryFactory</literal>æ¥å£ã</para> </section> <section> <title>æºåç®ççç®æ å·¥å</title> <para>å®ä»¬ç¨æ¥å建ææ¥æ¾ç¸åºçç®æ ã</para> <para>ä¸é¢ä¾åä¸ï¼æ们使ç¨äºHornetQçé»è®¤å®ç°ï¼ä»JNDIä¸æ¥æ¾ç¸åºç对象ã</para> <para>è¦æä¾æ°çå®ç°ï¼åªè¦å®ç°æ¥å£<literal - >org.apache.activemq6.jms.bridge.DestinationFactory</literal>å³å¯ã</para> + >org.apache.activemq.jms.bridge.DestinationFactory</literal>å³å¯ã</para> </section> <section id="quality-of-service"> <title>æå¡è´¨é</title> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/large-messages.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/large-messages.xml b/docs/user-manual/zh/large-messages.xml index c1d7d1e..890958f 100644 --- a/docs/user-manual/zh/large-messages.xml +++ b/docs/user-manual/zh/large-messages.xml @@ -99,7 +99,7 @@ factory.setMinLargeMessageSize(25 * 1024);</programlisting> <para>ä¸è¡¨ååºäº<literal>ClientMessage</literal>ä¸å¯ä»¥ä½¿ç¨çæ¹æ³ã éè¿ç¸åºç对象å±æ§ä¹å¯ä»¥å¨JMSä¸åºç¨ã</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/zh/logging.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/logging.xml b/docs/user-manual/zh/logging.xml index 49980aa..c26c796 100644 --- a/docs/user-manual/zh/logging.xml +++ b/docs/user-manual/zh/logging.xml @@ -26,15 +26,15 @@ æ¹æ³ï¼å°æ¥å¿è¾åºå°å±å¹ç»ç«¯ï¼Consoleï¼åæ件ä¸ã请访é®Sunå ¬å¸çç¸å ³ç½åæ¥è¿ä¸æ¥äºè§£å¦ä½é 置使ç¨JULã</para> <para>ä½ å¯ä»¥éè¿ç¼ç¨æå®ä¹ç³»ç»åéçæ¹æ³æ¥é ç½®ä¸åçæ¥å¿ä»£çï¼Logging Delegateï¼ã</para> <para>éç¨ç¼ç¨æ¹æ³ï¼åªéè¦è°ç¨æ¹æ³ï¼ - <programlisting>org.apache.activemq6.core.logging.Logger.setDelegateFactory(new Log4jLogDelegateFactory())</programlisting></para> + <programlisting>org.apache.activemq.core.logging.Logger.setDelegateFactory(new Log4jLogDelegateFactory())</programlisting></para> <para>å ¶ä¸<literal>Log4jLogDelegateFactory</literal>å®ç°äº<literal - >org.apache.activemq6.spi.core.logging.LogDelegateFactory </literal>æ¥å£ã</para> + >org.apache.activemq.spi.core.logging.LogDelegateFactory </literal>æ¥å£ã</para> <para>å¦æè¦ä½¿ç¨ç³»ç»åéæ¹æ³ï¼åéè¦è®¾ç½®åé<literal - >org.apache.activemq6.logger-delegate-factory-class-name</literal>为ç¸åºç代çå·¥åï¼å³ - <programlisting>-Dorg.apache.activemq6.logger-delegate-factory-class-name=org.apache.activemq6.integration.logging.Log4jLogDelegateFactory</programlisting></para> + >org.apache.activemq.logger-delegate-factory-class-name</literal>为ç¸åºç代çå·¥åï¼å³ + <programlisting>-Dorg.apache.activemq.logger-delegate-factory-class-name=org.apache.activemq.integration.logging.Log4jLogDelegateFactory</programlisting></para> <para>ä¸é¢çä¾åå¯ä»¥çåºHornetQæä¾äºä¸äºä»£çå·¥å以æ¹ä¾¿ç¨æ·ä½¿ç¨ï¼å®ä»¬æ¯ï¼<orderedlist - ><listitem><para>org.apache.activemq6.core.logging.impl.JULLogDelegateFactory - é»è®¤çJULæ¥å¿ä»£çå·¥åã</para> - </listitem><listitem><para>org.apache.activemq6.integration.logging.Log4jLogDelegateFactory + ><listitem><para>org.apache.activemq.core.logging.impl.JULLogDelegateFactory - é»è®¤çJULæ¥å¿ä»£çå·¥åã</para> + </listitem><listitem><para>org.apache.activemq.integration.logging.Log4jLogDelegateFactory - Log4Jçæ¥å¿ä»£çå·¥åã</para></listitem></orderedlist></para> <para>å¦æå¨å®¢æ·ç«¯ä½¿ç¨JUL代çï¼æ³¨æè¦æä¾<literal>logging.properties</literal>æ件ï¼å¹¶ä¸å¨å®¢æ·ç«¯å¯å¨ä¹å设置<literal >java.util.logging.config.file</literal>å±æ§ã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/management.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/management.xml b/docs/user-manual/zh/management.xml index f24bd04..636ccfd 100644 --- a/docs/user-manual/zh/management.xml +++ b/docs/user-manual/zh/management.xml @@ -44,11 +44,11 @@ <itemizedlist> <listitem> <para><emphasis>æ ¸å¿</emphasis>èµæºç管çæ¥å£å¨ <literal - >org.apache.activemq6.api.core.management</literal>å ä¸ã</para> + >org.apache.activemq.api.core.management</literal>å ä¸ã</para> </listitem> <listitem> <para><emphasis>JMS</emphasis>èµæºç管çæ¥å£å¨ <literal - >org.apache.activemq6.api.jms.management</literal>å ä¸ã</para> + >org.apache.activemq.api.jms.management</literal>å ä¸ã</para> </listitem> </itemizedlist> <para>è°ç¨<emphasis>管çæä½</emphasis>çæ¹æ³ç±æ使ç¨æ¯æ¹å¼æ¯JMXãæ ¸å¿æ¶æ¯è¿æ¯JMS @@ -69,7 +69,7 @@ <para>éåçå表ãå建ãé¨ç½²ä¸å é¤</para> <para><literal>getQueueNames()</literal> methodæ¹æ³ç¨æ¥ååºææå·²ç»é¨ç½²çéåã</para> <para>å¨<literal>HornetQServerControl</literal> ï¼ObjectName <literal - >org.apache.activemq6:module=Core,type=Server</literal>æèµæºå<literal + >org.apache.activemq:module=Core,type=Server</literal>æèµæºå<literal >core.server</literal>ï¼ä¸æéåå建æå é¤çæ¹æ³ï¼å®ä»¬æ¯ <literal>createQueue()</literal>ã<literal>deployQueue()</literal>å <literal>destroyQueue()</literal>ã</para> @@ -118,7 +118,7 @@ <para>使ç¨<literal>getBridgeNames()</literal>å¯ä»¥ååºé¨ç½²çæ ¸å¿æ¡¥ã 使ç¨<literal>getDivertNames()</literal>å¯ä»¥ååºé¨ç½²ç转åå¨ã</para> <para>使ç¨<literal>HornetQServerControl</literal> (ObjectName <literal - >org.apache.activemq6:module=Core,type=Server</literal> æèµæºå <literal + >org.apache.activemq:module=Core,type=Server</literal> æèµæºå <literal >core.server</literal>)çæ¹æ³<literal>createBridge()</literal> ããããããããããããã å<literal>destroyBridge()</literal>å¯ä»¥å建åå é¤æ ¸å¿æ¡¥ã éè¿<literal>createDivert()</literal>å<literal>destroyDivert()</literal> @@ -129,7 +129,7 @@ <section> <title>æ ¸å¿å°åç管ç</title> <para>æ ¸å¿å°åå¯ä»¥éè¿<literal>AddressControl</literal>ç±»è¿è¡è®¿é®ï¼ObjectName - æ¯ <literal>org.apache.activemq6:module=Core,type=Address,name="<the + æ¯ <literal>org.apache.activemq:module=Core,type=Address,name="<the address name>"</literal>æè èµæºå <literal>core.address.<the address name></literal>ï¼ã</para> <itemizedlist> @@ -143,7 +143,7 @@ <section> <title>æ ¸å¿éåç管ç</title> <para>管çæ¥å£ä¸çä¸å¤§é¨åæ¯ç®¡çæ ¸å¿éåçã<literal>QueueControl</literal>ç±»å®ä¹äºæ ¸å¿éåç管ç - æ¥å£ï¼ObjectName <literal>org.apache.activemq6:module=Core,type=Queue,address="<ç»å®å°å + æ¥å£ï¼ObjectName <literal>org.apache.activemq:module=Core,type=Queue,address="<ç»å®å°å address>",name="<éåå>"</literal> æèµæºå <literal >core.queue.<éåå></literal>ï¼ã</para> <para>ç»å¤§é¨åçéå管çæ¹æ³éè¦ä¸ä¸ªæ¶æ¯IDåæ°ï¼å¦å é¤ä¸ä¸ªæ¶æ¯ï¼æä¸ä¸ªè¿æ»¤å¨åæ°ï¼å¦å°å ·ææ个 @@ -209,7 +209,7 @@ <listitem> <para>æ¥æ¶å¨</para> <para>ç¨<literal>AcceptorControl</literal>ç±»ï¼ObjectName <literal - >org.apache.activemq6:module=Core,type=Acceptor,name="<æ¥æ¶å¨å + >org.apache.activemq:module=Core,type=Acceptor,name="<æ¥æ¶å¨å >"</literal> æèµæºå <literal>core.acceptor.<å°åå ></literal>ï¼ç<literal>start()</literal>æ¹æ³å¯å¨ï¼ç¨<literal> stop()</literal>æ¹æ³åæ¢ãæ¥æ¶å¨çåæ°å¯ä»¥éè¿<literal>AcceptorControl</literal> @@ -219,7 +219,7 @@ <listitem> <para>转åå¨</para> <para>ç¨<literal>DivertControl</literal>ï¼ObjectNameæ¯ <literal - >org.apache.activemq6:module=Core,type=Divert,name=<转åå¨å></literal> + >org.apache.activemq:module=Core,type=Divert,name=<转åå¨å></literal> æèµæºå<literal>core.divert.<转åå¨></literal>ï¼ç±»ç <literal>start()</literal>æ¹æ³å¯ä»¥å¯å¨ï¼ç¨<literal>stop()</literal>æ¹æ³å¯ä»¥åæ¢ã éè¿<literal>DivertControl</literal>è¿å¯ä»¥è·å¾è½¬åå¨çåç§å±æ§ãï¼åè§ <xref @@ -228,7 +228,7 @@ <listitem> <para>æ¡¥</para> <para>æ¡¥å¯ä»¥éè¿<literal>BridgeControl</literal>ç±»ï¼ObjectName <literal - >org.apache.activemq6:module=Core,type=Bridge,name="<æ¡¥çåå + >org.apache.activemq:module=Core,type=Bridge,name="<æ¡¥çåå >"</literal> æèµæºå <literal>core.bridge.<æ¡¥çåå ></literal>ï¼ç<literal>start()</literal> æ¹æ³å¯å¨ï¼ç¨<literal>stop()</literal>æ¹æ³åæ¢ãå®çå±æ§å¯ä»¥éè¿ @@ -238,7 +238,7 @@ <listitem> <para>广æç»</para> <para>广æç»å¯ä»¥éè¿<literal>BroadcastGroupControl</literal>ç±»ï¼ObjectName <literal - >org.apache.activemq6:module=Core,type=BroadcastGroup,name="<广æç»å + >org.apache.activemq:module=Core,type=BroadcastGroup,name="<广æç»å >"</literal> æè èµæºå <literal >core.broadcastgroup.<广æç»å></literal>)ç<literal> start()</literal>æ¹æ³å¯å¨ï¼ç¨<literal>stop()</literal>æ¹æ³åæ¢ã @@ -249,7 +249,7 @@ <listitem> <para>åç°ç»</para> <para>åç°ç»å¯ä»¥éè¿<literal>DiscoveryGroupControl</literal>ç±» - ï¼ObjectName <literal>org.apache.activemq6:module=Core,type=DiscoveryGroup, + ï¼ObjectName <literal>org.apache.activemq:module=Core,type=DiscoveryGroup, name="<åç°ç»å>"</literal> æèµæºå<literal>core.discovery.< åç°ç»å></literal>ï¼ç <literal>start()</literal>æ¹æ³å¯å¨ï¼ç¨<literal>stop()</literal>æ¹æ³åæ¢ã @@ -260,7 +260,7 @@ <para>é群è¿æ¥</para> <para>é群è¿æ¥å¯ä»¥éè¿<literal>ClusterConnectionControl</literal>ç±»ï¼ ObjectName <literal - >org.apache.activemq6:module=Core,type=ClusterConnection,name="<é群è¿æ¥å + >org.apache.activemq:module=Core,type=ClusterConnection,name="<é群è¿æ¥å >"</literal> æèµæºå <literal >core.clusterconnection.<é群è¿æ¥å></literal>ï¼ç<literal> start()</literal>æ¹æ³å¯å¨ï¼ç¨<literal>stop()</literal>æ¹æ³åæ¢ã @@ -278,7 +278,7 @@ <section> <title>JMSæå¡å¨ç®¡ç</title> <para><literal>JMSServerControl</literal>ç±»ï¼ObjectName <literal - >org.apache.activemq6:module=JMS,type=Server</literal> æèµæºå<literal + >org.apache.activemq:module=JMS,type=Server</literal> æèµæºå<literal >jms.server</literal>ï¼ç¨æ¥å建JMSèµæºï¼è¿æ¥å·¥ååç®æ ï¼ã</para> <itemizedlist> <listitem> @@ -316,7 +316,7 @@ </section> <section> <title>JMSè¿æ¥å·¥åç管ç</title> - <para>使ç¨ç±»ï¼ObjectName <literal>org.apache.activemq6:module=JMS,type=ConnectionFactory, + <para>使ç¨ç±»ï¼ObjectName <literal>org.apache.activemq:module=JMS,type=ConnectionFactory, name="<è¿æ¥å·¥åå>"</literal>æè èµæºå<literal>jms.connectionfactory.< è¿æ¥å·¥åå></literal>ï¼å¯ä»¥ç®¡çJMSçè¿æ¥å·¥åã</para> <itemizedlist> @@ -331,7 +331,7 @@ </section> <section> <title>JMSéå管ç</title> - <para>使ç¨<literal>JMSQueueControl</literal>ç±»ï¼ObjectName <literal>org.apache.activemq6:module=JMS, + <para>使ç¨<literal>JMSQueueControl</literal>ç±»ï¼ObjectName <literal>org.apache.activemq:module=JMS, type=Queue,name="<éåå>"</literal>æèµæºå <literal>jms.queue.<éåå ></literal>å¯ä»¥ç®¡çJMSéåã</para> <para><emphasis>JMSéåç管çæä½ä¸æ ¸å¿éåç管çååç¸ä¼¼ã</emphasis></para> @@ -387,7 +387,7 @@ <section> <title>JMSè¯é¢ï¼Topicï¼ç管ç</title> <para>JMSè¯é¢ç管çæ¯éè¿<literal>TopicControl</literal>ç±»ï¼ - the ObjectName <literal>org.apache.activemq6:module=JMS,type=Topic,name="<è¯é¢å>"</literal> + the ObjectName <literal>org.apache.activemq:module=JMS,type=Topic,name="<è¯é¢å>"</literal> æèµæºå <literal>jms.topic.<è¯é¢å></literal>ï¼ã</para> <itemizedlist> <listitem> @@ -417,17 +417,17 @@ <para>HornetQæä¾äº<ulink url="http://java.sun.com/javase/technologies/core/mntr-mgmt/javamanagement/"; >JMX</ulink>ã</para> - <para>HornetQéè¿MBeançæ¥å£æ´é²å ¶JMX管çæä½ãå®å°èªå·±çèµæºæ³¨åå°<literal>org.apache.activemq6</literal>åã</para> + <para>HornetQéè¿MBeançæ¥å£æ´é²å ¶JMX管çæä½ãå®å°èªå·±çèµæºæ³¨åå°<literal>org.apache.activemq</literal>åã</para> <para>æ¯å¦ï¼ç¨æ¥ç®¡çä¸ä¸ªå为<literal>exampleQueue</literal>JMSéåç<literal>ObjectName</literal>æ¯ï¼</para> <programlisting> - org.apache.activemq6:module=JMS,type=Queue,name="exampleQueue" + org.apache.activemq:module=JMS,type=Queue,name="exampleQueue" </programlisting> <para>MBean为ï¼</para> <programlisting> - org.apache.activemq6.api.jms.management.JMSQueueControl + org.apache.activemq.api.jms.management.JMSQueueControl </programlisting> <para>MBeanç<literal>ObjectName</literal>ç¨ <literal - >org.apache.activemq6.api.core.management.ObjectNameBuilder</literal>æ¥äº§çåºæ¥çãä½ ä¹å¯ä»¥ä½¿ç¨<literal + >org.apache.activemq.api.core.management.ObjectNameBuilder</literal>æ¥äº§çåºæ¥çãä½ ä¹å¯ä»¥ä½¿ç¨<literal >jconsole</literal>æ¥æ¥æ¾ä½ æ³è¦çMBeanç<literal>ObjectName</literal>ã</para> <para>使ç¨JMXæ¥ç®¡çHornetQä¸ç¨JMX管çå ¶å®Javaåºç¨ç¨åºæ²¡æä»ä¹ä¸åãä½ å¯ä»¥ä½¿ç¨åå°æè å建MBean代ççæ¹æ³ã</para> <section id="management.jmx.configuration"> @@ -444,11 +444,11 @@ <para>åºäºå®å ¨èèï¼é»è®¤æ åµä¸JMXè¿ç¨è¿æ¥æ¯å ³éçãåè§<ulink url="http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html#remote"; >Java管çæå</ulink>æ¥é ç½®æå¡å¨çè¿ç¨ç®¡çï¼ç³»ç»åéå¿ é¡»å¨<literal>run.sh</literal>æ<literal>run.bat</literal>ä¸å®ä¹ï¼ã</para> </note> - <para>HornetQé»è®¤ä½¿ç¨JMXåå"org.apache.activemq6"ãå¦æè¦ç¨ä¸ä¸ªMBeanServer管çå¤ä¸ªHornetQæå¡å¨ï¼å¯ä»¥å°æ¯ä¸ªHornetQ + <para>HornetQé»è®¤ä½¿ç¨JMXåå"org.apache.activemq"ãå¦æè¦ç¨ä¸ä¸ªMBeanServer管çå¤ä¸ªHornetQæå¡å¨ï¼å¯ä»¥å°æ¯ä¸ªHornetQ æå¡å¨é ç½®æä¸åçJMXåãæ¹æ³å°±æ¯å¨<literal>hornetq-configuration.xml</literal>æ件ä¸è®¾ç½®<literal>jmx-domain</literal>ï¼</para> <programlisting> <!-- use a specific JMX domain for HornetQ MBeans --> -<jmx-domain>my.org.apache.activemq6</jmx-domain> +<jmx-domain>my.org.apache.activemq</jmx-domain> </programlisting> <section> <title>MBeanServerçé ç½®</title> @@ -495,7 +495,7 @@ </literal>å®ä¹ï¼åéä¸ä¸ª<emphasis>管çåç</emphasis>ã</para> <para>ä¸ä¸ª<literal>ClientConsumer</literal>ç¨æ¥æ¥æ¶ç®¡çåç并æååºå ¶ä¸çæä½ççµæï¼å¦ææçè¯ï¼ã èèå°å¯ç§»æ¤æ§ï¼è¿åççµæéç¨çæ¯æ ¼å¼çå符串ï¼è没æéç¨Javaçåºååææ¯ - ï¼<literal>org.apache.activemq6.api.core.management.ManagementHelper</literal>å¯ä»¥ç¨æ¥å°JSONå符串 + ï¼<literal>org.apache.activemq.api.core.management.ManagementHelper</literal>å¯ä»¥ç¨æ¥å°JSONå符串 转æ¢æJava对象ï¼ã</para> <para>使ç¨ä»¥ä¸æ¥éª¤å¯ä»¥ç®å使ç¨æ ¸å¿æ¶æ¯è°ç¨ç®¡çæä½ï¼</para> <orderedlist> @@ -507,14 +507,14 @@ </listitem> <listitem> <para>使ç¨<literal - >org.apache.activemq6.api.core.management.ManagementHelper</literal>ç±»æ¥å¸®å©è®¾ç½®æ¶æ¯ç管çåæ°ã</para> + >org.apache.activemq.api.core.management.ManagementHelper</literal>ç±»æ¥å¸®å©è®¾ç½®æ¶æ¯ç管çåæ°ã</para> </listitem> <listitem> <para>éè¿<literal>ClientRequestor</literal>å°æ¶æ¯åé</para> </listitem> <listitem> <para>ä½¿ç¨ <literal - >org.apache.activemq6.api.core.management.ManagementHelper</literal>ç±»ä»ç®¡çæä½çµæä¸æåè¿åå¼ã</para> + >org.apache.activemq.api.core.management.ManagementHelper</literal>ç±»ä»ç®¡çæä½çµæä¸æåè¿åå¼ã</para> </listitem> </orderedlist> <para>ä¾å¦ï¼è¦å¾å°æ ¸å¿éå<literal>exampleQueue</literal>ä¸æ¶æ¯çæ°éï¼</para> @@ -528,7 +528,7 @@ System.out.println("There are " + count + " messages in exampleQueue"); </programlisting> <para>管çæä½ååå ¶åæ°å¿ é¡»å<literal>management</literal>å ä¸å®ä¹çJavaæ¥å£ä¸è´ã</para> - <para>èµæºçå称æ¯ç¨<literal>org.apache.activemq6.api.core.management.ResourceNames</literal>ç±»æ¥çæçï¼ + <para>èµæºçå称æ¯ç¨<literal>org.apache.activemq.api.core.management.ResourceNames</literal>ç±»æ¥çæçï¼ å½åé½é常ç´è§ï¼å¦æ ¸å¿éå<literal>exampleQueue</literal>çå称为<literal>core.queue.exampleQueue</literal>ï¼ JMS Topic <literal>exampleTopic</literal>çå称为<literal>jms.topic.exampleTopic</literal>ï¼ççï¼ã </para> @@ -569,13 +569,13 @@ <para>å建ä¸ä¸ª<literal>æ¶æ¯</literal></para> </listitem> <listitem> - <para>ä½¿ç¨ <literal>org.apache.activemq6.api.jms.management.JMSManagementHelper</literal>ç±»åæ¶æ¯ä¸è®¾ç½®ç®¡çåæ°ã</para> + <para>ä½¿ç¨ <literal>org.apache.activemq.api.jms.management.JMSManagementHelper</literal>ç±»åæ¶æ¯ä¸è®¾ç½®ç®¡çåæ°ã</para> </listitem> <listitem> <para>å使ç¨<literal>QueueRequestor</literal>åéæ¶æ¯ã</para> </listitem> <listitem> - <para>使ç¨<literal>org.apache.activemq6.api.jms.management.JMSManagementHelper</literal>æ¥ä»åçä¸æåè¿åçµæã</para> + <para>使ç¨<literal>org.apache.activemq.api.jms.management.JMSManagementHelper</literal>æ¥ä»åçä¸æåè¿åçµæã</para> </listitem> </orderedlist> <para>ä¾å¦ï¼è¦å¾å°ä¸ä¸ªJMSéå<literal>exampleQueue</literal>ä¸æå¤å°æ¶æ¯ï¼</para> @@ -622,11 +622,11 @@ 两个MBeanæ¥è·å¾éç¥ï¼</para> <itemizedlist> <listitem> - <para><literal>org.apache.activemq6:module=Core,type=Server</literal> å¯ä»¥è·å¾æå ³ + <para><literal>org.apache.activemq:module=Core,type=Server</literal> å¯ä»¥è·å¾æå ³ <emphasis>æ ¸å¿</emphasis>èµæºçéç¥</para> </listitem> <listitem> - <para><literal>org.apache.activemq6:module=JMS,type=Server</literal>å¯ä»¥è·å¾æå ³ + <para><literal>org.apache.activemq:module=JMS,type=Server</literal>å¯ä»¥è·å¾æå ³ <emphasis>JMS</emphasis>èµæºçéç¥</para> </listitem> </itemizedlist> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/persistence.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/persistence.xml b/docs/user-manual/zh/persistence.xml index 1e30d97..28c42bf 100644 --- a/docs/user-manual/zh/persistence.xml +++ b/docs/user-manual/zh/persistence.xml @@ -233,11 +233,11 @@ <title>å¯¼å ¥å ¥/导åºæ¥å¿æ°æ®</title> <para>ææ¶ä½ éè¦ä½¿ç¨å¯¼å ¥ï¼å¯¼åºå·¥å ·æ¥æ¥çæ¥å¿æ件çè®°å½ãè¿ä¸ªå¯¼å ¥ï¼å¯¼åºå·¥å ·ç±»å¨hornetq-core.jaræ件ä¸ã ããã 使ç¨ä»¥ä¸å½ä»¤å¯ä»¥å°æ¥å¿æ件导åºä¸ºææ¬æ件ï¼</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>è¦å°æ¥å¿æä»¶å¯¼å ¥ï¼ä½¿ç¨ä¸é¢çå½ä»¤ï¼æ³¨æä½ éè¦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/zh/project-info.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/project-info.xml b/docs/user-manual/zh/project-info.xml index cafaa8d..d318795 100644 --- a/docs/user-manual/zh/project-info.xml +++ b/docs/user-manual/zh/project-info.xml @@ -84,6 +84,6 @@ </listitem> </itemizedlist></para> <para> å¦å¤æ们è¿æé¿æçååå å ¥çä¸äºè´¡ç®è ï¼é常æè¬ä»ä»¬ç帮å©ãåè§<ulink - url="http://jboss.org.apache.activemq6/community/team.html";>å®æ´çè´¡ç®è åå</ulink>ã </para> + url="http://jboss.org.apache.activemq/community/team.html";>å®æ´çè´¡ç®è åå</ulink>ã </para> </section> </chapter> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/queue-attributes.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/queue-attributes.xml b/docs/user-manual/zh/queue-attributes.xml index 5335e82..c57e212 100644 --- a/docs/user-manual/zh/queue-attributes.xml +++ b/docs/user-manual/zh/queue-attributes.xml @@ -65,7 +65,7 @@ <section> <title>使ç¨æ¥å£ï¼APIï¼å建éå</title> <para>éåè¿å¯ä»¥ä½¿ç¨æ ¸å¿æ¥å£æ管çæ¥å£æ¥å建ã</para> - <para>æ ¸å¿æ¥å£ç<literal>org.apache.activemq6.api.core.client.ClientSession</literal>æ¥å£å¯ä»¥ç¨æ¥ + <para>æ ¸å¿æ¥å£ç<literal>org.apache.activemq.api.core.client.ClientSession</literal>æ¥å£å¯ä»¥ç¨æ¥ å建éåãå®æå 个<literal>createQueue</literal>æ¹æ³ï¼å¯ä»¥å¨å建éåæ¶å¯¹ä¸è¿°çå±æ§è¿è¡è®¾ç½®ã é¤æ¤ä¹å¤ï¼è¿æä¸ä¸ªé¢å¤çå±æ§<literal>temporary</literal>å¯ä»¥è®¾ç½®ãå¦æå°å ¶è®¾ä¸ºtrueï¼ é£ä¹éåå¨ä¼è¯æå¼æ¶å°è¢«å é¤ã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/security.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/security.xml b/docs/user-manual/zh/security.xml index 773ed7e..4b82ce6 100644 --- a/docs/user-manual/zh/security.xml +++ b/docs/user-manual/zh/security.xml @@ -153,16 +153,16 @@ <para>让æ们çä¸æ®µé»è®¤beanæ件çå 容ï¼</para> <programlisting> <bean name="HornetQSecurityManager" - class="org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl"> + class="org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl"> <start ignored="true"/> <stop ignored="true"/> </bean> </programlisting> - <para><literal>org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl</literal> + <para><literal>org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl</literal> 类就æ¯HornetQæå¡å¨çå¨ç¬ç«è¿è¡æ¶çé»è®¤çå®å ¨ç®¡çå¨ã</para> <para>HornetQèªå¸¦æå¦å¤ä¸¤ä¸ªå®å ¨ç®¡çå¨å¯ä¾ä½¿ç¨ãä¸ä¸ªæ¯JAASå®å ¨ç®¡çå¨ï¼å¦ä¸ä¸ªæ¯ç¨æ¥ä¸JBossåºç¨æå¡ å¨éæçå®å ¨ç®¡çå¨ãæ¤å¤ï¼ä½ è¿å¯ä»¥ç¼åå®ç°ä½ èªå·±çå®å ¨ç®¡çå¨ãé¦å è¦å®ç° - <literal>org.apache.activemq6.core.security.SecurityManager</literal>æ¥å£ï¼åå°ä½ çå®ç° + <literal>org.apache.activemq.core.security.SecurityManager</literal>æ¥å£ï¼åå°ä½ çå®ç° ç±»å®ä¹å°<literal>hornetq-beans.xml</literal>æ件ä¸å³å¯ï¼æè å¨JBossåºç¨æå¡å¨ä¸ 使ç¨<literal>hornetq-jboss-beans.xml</literal>æ件ï¼ã</para> <para>以ä¸åå«ä»ç»è¿ä¸¤å±å®å ¨ç®¡çå¨</para> @@ -175,11 +175,11 @@ ä¸é¢æ¯ä¸ä¸ªä¾åï¼</para> <programlisting><