Repository: activemq-6 Updated Branches: refs/heads/master 3d749a431 -> 2fbd5d735
ACTIVEMQ6-4 Fixing tests after package and classes renames https://issues.apache.org/jira/browse/ACTIVEMQ6-4 this will include a few fixes for the tests including hornetq-version renaming to activemq-version Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/cd31652d Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/cd31652d Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/cd31652d Branch: refs/heads/master Commit: cd31652ddc7e79d44c82e1ac296f0c65132a9a79 Parents: 3d749a4 Author: Clebert Suconic <[email protected]> Authored: Tue Nov 18 09:52:57 2014 -0500 Committer: Clebert Suconic <[email protected]> Committed: Tue Nov 18 23:04:34 2014 -0500 ---------------------------------------------------------------------- .../core/impl/ActiveMQSessionContext.java | 2 +- .../main/resources/activemq-version.properties | 1 - activemq-rest/pom.xml | 6 ++--- .../src/test/resources/activemq-rest.xml | 3 +++ .../src/test/resources/hornetq-rest.xml | 3 --- .../WrongRoleFileConfigurationParserTest.java | 4 +-- .../config/clustered/activemq-users.xml | 2 +- .../config/non-clustered/activemq-users.xml | 2 +- .../config/replicated/activemq-users.xml | 2 +- .../config/shared-store/activemq-users.xml | 2 +- docs/eap-manual/en/clusters.xml | 16 ++++++------ docs/quickstart-guide/zh/examples.xml | 2 +- docs/user-manual/zh/clusters.xml | 26 ++++++++++---------- docs/user-manual/zh/configuration-index.xml | 2 +- docs/user-manual/zh/configuring-transports.xml | 10 ++++---- docs/user-manual/zh/connection-ttl.xml | 2 +- docs/user-manual/zh/core-bridges.xml | 12 ++++----- docs/user-manual/zh/diverts.xml | 2 +- docs/user-manual/zh/duplicate-detection.xml | 8 +++--- docs/user-manual/zh/filter-expressions.xml | 2 +- docs/user-manual/zh/ha.xml | 6 ++--- docs/user-manual/zh/intercepting-operations.xml | 2 +- docs/user-manual/zh/management.xml | 12 ++++----- docs/user-manual/zh/message-expiry.xml | 2 +- docs/user-manual/zh/message-grouping.xml | 2 +- docs/user-manual/zh/paging.xml | 4 +-- docs/user-manual/zh/perf-tuning.xml | 10 ++++---- docs/user-manual/zh/persistence.xml | 4 +-- docs/user-manual/zh/queue-attributes.xml | 4 +-- docs/user-manual/zh/security.xml | 8 +++--- docs/user-manual/zh/send-guarantees.xml | 2 +- docs/user-manual/zh/thread-pooling.xml | 4 +-- docs/user-manual/zh/transaction-config.xml | 2 +- docs/user-manual/zh/undelivered-messages.xml | 2 +- docs/user-manual/zh/using-jms.xml | 2 +- docs/user-manual/zh/using-server.xml | 16 ++++++------ docs/user-manual/zh/wildcard-routing.xml | 2 +- .../resources/restricted-security-client.policy | 2 +- tests/jms-tests/pom.xml | 11 +++++---- .../test/resources/activemq-configuration.xml | 2 +- .../src/test/resources/activemq-jms.xml | 2 +- .../src/test/resources/activemq-queues.xml | 16 ++++++++++++ .../src/test/resources/activemq-users.xml | 2 +- .../src/test/resources/hornetq-queues.xml | 16 ------------ .../tests/unit/jms/misc/ManifestTest.java | 2 -- .../ra/ActiveMQResourceAdapterConfigTest.java | 4 +-- 46 files changed, 124 insertions(+), 126 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java index 4e3d34c..1427247 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java @@ -679,7 +679,7 @@ public class ActiveMQSessionContext extends SessionContext ClientSession.QueueQuery queueInfo = consumerInternal.getQueueInfo(); // We try and recreate any non durable queues, since they probably won't be there unless - // they are defined in hornetq-configuration.xml + // they are defined in activemq-configuration.xml // This allows e.g. JMS non durable subs and temporary queues to continue to be used after failover if (!queueInfo.isDurable()) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/activemq-core-client/src/main/resources/activemq-version.properties ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/resources/activemq-version.properties b/activemq-core-client/src/main/resources/activemq-version.properties index 860a573..58c2a0a 100644 --- a/activemq-core-client/src/main/resources/activemq-version.properties +++ b/activemq-core-client/src/main/resources/activemq-version.properties @@ -5,5 +5,4 @@ activemq.version.microVersion=${activemq.version.microVersion} activemq.version.incrementingVersion=${activemq.version.incrementingVersion} activemq.version.versionSuffix=${activemq.version.versionSuffix} activemq.version.versionTag=${activemq.version.versionTag} -activemq.netty.version=${netty.version.string} activemq.version.compatibleVersionList=121,122,123,124,125 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/activemq-rest/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml index 9016595..f54aebd 100644 --- a/activemq-rest/pom.xml +++ b/activemq-rest/pom.xml @@ -14,7 +14,7 @@ <packaging>jar</packaging> <properties> - <hornetq.version>${project.version}</hornetq.version> + <activemq.version>${project.version}</activemq.version> <hornetq.basedir>${project.basedir}/..</hornetq.basedir> </properties> @@ -67,12 +67,12 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-server</artifactId> - <version>${hornetq.version}</version> + <version>${activemq.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-jms-server</artifactId> - <version>${hornetq.version}</version> + <version>${activemq.version}</version> </dependency> <dependency> <groupId>org.jboss.spec.javax.jms</groupId> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/activemq-rest/src/test/resources/activemq-rest.xml ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/resources/activemq-rest.xml b/activemq-rest/src/test/resources/activemq-rest.xml new file mode 100644 index 0000000..80b2be7 --- /dev/null +++ b/activemq-rest/src/test/resources/activemq-rest.xml @@ -0,0 +1,3 @@ +<rest-messaging> + <use-link-headers>true</use-link-headers> +</rest-messaging> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/activemq-rest/src/test/resources/hornetq-rest.xml ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/resources/hornetq-rest.xml b/activemq-rest/src/test/resources/hornetq-rest.xml deleted file mode 100644 index 80b2be7..0000000 --- a/activemq-rest/src/test/resources/hornetq-rest.xml +++ /dev/null @@ -1,3 +0,0 @@ -<rest-messaging> - <use-link-headers>true</use-link-headers> -</rest-messaging> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java index 219d816..e4f988f 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java @@ -49,8 +49,8 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase parser.parseMainConfig(input); // Using the code only because I don't want a test failing just for someone editing Log text - assertTrue(AssertionLoggerHandler.findText("HQ222177", "create-durable-queue")); - assertTrue(AssertionLoggerHandler.findText("HQ222177", "delete-durable-queue")); + assertTrue(AssertionLoggerHandler.findText("AMQ222177", "create-durable-queue")); + assertTrue(AssertionLoggerHandler.findText("AMQ222177", "delete-durable-queue")); } @AfterClass http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml index 8187c91..ae30546 100644 --- a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml +++ b/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml @@ -1,5 +1,5 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> + xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> <!-- the default user. this is used where username is null--> <defaultuser name="guest" password="guest"> <role name="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml index 8187c91..ae30546 100644 --- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml +++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml @@ -1,5 +1,5 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> + xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> <!-- the default user. this is used where username is null--> <defaultuser name="guest" password="guest"> <role name="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml index 8187c91..ae30546 100644 --- a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml +++ b/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml @@ -1,5 +1,5 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> + xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> <!-- the default user. this is used where username is null--> <defaultuser name="guest" password="guest"> <role name="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml index 8187c91..ae30546 100644 --- a/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml +++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml @@ -1,5 +1,5 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> + xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> <!-- the default user. this is used where username is null--> <defaultuser name="guest" password="guest"> <role name="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/eap-manual/en/clusters.xml ---------------------------------------------------------------------- diff --git a/docs/eap-manual/en/clusters.xml b/docs/eap-manual/en/clusters.xml index b5eaa4e..ed85215 100644 --- a/docs/eap-manual/en/clusters.xml +++ b/docs/eap-manual/en/clusters.xml @@ -81,7 +81,7 @@ First let's start with the configuration of the live server, we will use the EAP 'all' configuration as our starting point. Since this version only supports shared store for failover we need to configure this in the - <literal>hornetq-configuration.xml</literal> + <literal>activemq-configuration.xml</literal> file like so: </para> <programlisting> @@ -92,7 +92,7 @@ where where this lives backup can access. You may change the lives configuration in - <literal>hornetq-configuration.xml</literal> + <literal>activemq-configuration.xml</literal> to something like: </para> @@ -117,7 +117,7 @@ <para>If you want clients to failover on a normal server shutdown the you must configure the <literal>failover-on-shutdown</literal> flag to true in the - <literal>hornetq-configuration.xml</literal> + <literal>activemq-configuration.xml</literal> file like so: </para> <programlisting> @@ -202,7 +202,7 @@ </para> <para> The first thing to mention is that the backup only needs a <literal>hornetq-jboss-beans.xml</literal> - and a <literal>hornetq-configuration.xml</literal> configuration file. This is because any JMS components + and a <literal>activemq-configuration.xml</literal> configuration file. This is because any JMS components are created from the Journal when the backup server becomes live. </para> <para> @@ -223,7 +223,7 @@ <!-- The core configuration --> <bean name="BackupConfiguration" class="org.apache.activemq.core.config.impl.FileConfiguration"> <property - name="configurationUrl">${jboss.server.home.url}/deploy/hornetq-backup1/hornetq-configuration.xml</property> + name="configurationUrl">${jboss.server.home.url}/deploy/hornetq-backup1/activemq-configuration.xml</property> </bean> @@ -278,7 +278,7 @@ </note> <para> Now let's add the server configuration in - <literal>hornetq-configuration.xml</literal> + <literal>activemq-configuration.xml</literal> and add it to the same directory <literal>deploy/hornetq-backup1</literal> and configure it like so: @@ -515,10 +515,10 @@ is that there is no backup in the eap instance. </para> <para> - For the backup server the <literal>hornetq-configuration.xml</literal> is unchanged, however since there is + For the backup server the <literal>activemq-configuration.xml</literal> is unchanged, however since there is no live server we need to make sure that the <literal>hornetq-jboss-beans.xml</literal> instantiates all the beans needed. For this simply use the same configuration as in the live server changing only the - location of the <literal>hornetq-configuration.xml</literal> parameter for the <literal>Configuration</literal> + location of the <literal>activemq-configuration.xml</literal> parameter for the <literal>Configuration</literal> bean. </para> <para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/quickstart-guide/zh/examples.xml ---------------------------------------------------------------------- diff --git a/docs/quickstart-guide/zh/examples.xml b/docs/quickstart-guide/zh/examples.xml index e87cbb8..adb2846 100644 --- a/docs/quickstart-guide/zh/examples.xml +++ b/docs/quickstart-guide/zh/examples.xml @@ -200,7 +200,7 @@ undeploy-misc: [delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA /server/default-with-hornetq/deploy/mdb-example.ear [delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA - /server/default-with-hornetq/deploy/hornetq.sar/hornetq-queues.xml + /server/default-with-hornetq/deploy/hornetq.sar/activemq-queues.xml [delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA /server/default-with-hornetq/deploy/hornetq.sar/hornetq-jms.xml http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/clusters.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/clusters.xml b/docs/user-manual/zh/clusters.xml index 32367a8..824cd6b 100644 --- a/docs/user-manual/zh/clusters.xml +++ b/docs/user-manual/zh/clusters.xml @@ -22,9 +22,9 @@ <title>é群æ¦è¿°</title> <para>HornetQé群æ¯ç±ä¸ç»HornetQæå¡å¨ç»æçéåï¼å®ä»¬åååä½è¿è¡æ¶æ¯å¤çãé群ä¸æ¯ä¸ªä¸»èç¹å°±æ¯ä¸ä¸ª HornetQæå¡å¨ï¼å®ç®¡çèªå·±çè¿æ¥å¹¶å¤çèªå·±çæ¶æ¯ãè¦å°ä¸ä¸ªHornetQæå¡å¨é 置为é群æå¡å¨ï¼éè¦å°é ç½® - æ件<literal>hornetq-configuration.xml</literal>ä¸<literal>clustered</literal>çå¼è®¾ + æ件<literal>activemq-configuration.xml</literal>ä¸<literal>clustered</literal>çå¼è®¾ 为<literal>true</literal>ãé»è®¤å¼æ¯<literal>false</literal>ã</para> - <para>è¦ç»æä¸ä¸ªé群ï¼æ¯ä¸ªèç¹é½è¦å¨å ¶æ ¸å¿é ç½®æ件<literal>hornetq-configuration.xml</literal> + <para>è¦ç»æä¸ä¸ªé群ï¼æ¯ä¸ªèç¹é½è¦å¨å ¶æ ¸å¿é ç½®æ件<literal>activemq-configuration.xml</literal> ä¸å£°æ<emphasis>é群è¿æ¥</emphasis>ï¼ç¨æ¥å»ºç«ä¸é群ä¸å ¶å®èç¹çéè¿ ãæ¯ä¸¤ä¸ªèç¹é´é½æ¯éè¿å é¨çä¸ä¸ª <emphasis>æ ¸å¿æ¡¥</emphasis>ï¼åè§<xref linkend="core-bridges" />ï¼è¿æ¥çãè¿äºè¿æ¥ç建ç«æ¯ éæçï¼ï¼ä½ ä¸éè¦ä¸ºæ¯ä¸ªè¿æ¥æ¾å¼å°å£°æä¸ä¸ªæ¡¥ãé群è¿æ¥çä½ç¨æ¯å¨é群çå个èç¹é´è¿è¡è´è½½å¹³è¡¡ã</para> @@ -58,9 +58,9 @@ <para>广æç»å æ¬äºä¸ç³»åçè¿æ¥å¨å¯¹ãæ¯ä¸ªè¿æ¥å¨å¯¹ç±ä¸»æå¡å¨çè¿æ¥å¨åå¤ä»½ï¼å¯éï¼æå¡å¨è¿æ¥å¨ä¿¡æ¯ç»æã 广æç»è¿å®ä¹äºæ使ç¨çUDPçå¨åå端å£ä¿¡æ¯ã</para> <para>广æç»çé ç½®ä¸æå¡å¨é ç½®æ件<literal - >hornetq-configuration.xml</literal>ä¸ãä¸ä¸ªHornetQæå¡å¨å¯ä»¥æå¤ä¸ªå¹¿æç»ãææç广æç» + >activemq-configuration.xml</literal>ä¸ãä¸ä¸ªHornetQæå¡å¨å¯ä»¥æå¤ä¸ªå¹¿æç»ãææç广æç» å¿ éå®ä¹å¨<literal>broadcast-groups</literal>å ã</para> - <para>让æ们æ¥çä¸ä¸ª<literal>hornetq-configuration.xml</literal>æ件ä¸å¹¿æç»çä¾åï¼</para> + <para>让æ们æ¥çä¸ä¸ª<literal>activemq-configuration.xml</literal>æ件ä¸å¹¿æç»çä¾åï¼</para> <programlisting><broadcast-groups> <broadcast-group name="my-broadcast-group"> <local-bind-address>172.16.9.3</local-bind-address> @@ -127,7 +127,7 @@ </section> <section> <title>å¨æå¡å¨ç«¯å®ä¹åç°ç»ã</title> - <para>æå¡å¨ç«¯çåç°ç»å®ä¹å¨<literal>hornetq-configuration.xml</literal>é ç½®æ件ä¸ãææçåç°ç»é½å¿ é¡» + <para>æå¡å¨ç«¯çåç°ç»å®ä¹å¨<literal>activemq-configuration.xml</literal>é ç½®æ件ä¸ãææçåç°ç»é½å¿ é¡» å¨<literal>discovery-groups</literal>å å®ä¹ãåç°ç»å¯ä»¥å®ä¹å¤ä¸ªã请çä¸é¢çä¾åï¼</para> <programlisting><discovery-groups> <discovery-group name="my-discovery-group"> @@ -177,7 +177,7 @@ </entries> </connection-factory></programlisting> <para>å ¶ä¸<literal>discovery-group-ref</literal>çå¼æ¯å®ä¹å¨ - <literal>hornetq-configuration.xml</literal>æ件ä¸çä¸ä¸ªåç°ç»ã</para> + <literal>activemq-configuration.xml</literal>æ件ä¸çä¸ä¸ªåç°ç»ã</para> <para>å½è¿æ¥å·¥åä»JNDIä¸è½½å°å®¢æ·ç«¯æ¶ï¼ä½¿ç¨å®å建è¿æ¥å°±ä¼å¨å表ä¸çæå¡å¨é´è¿è¡è´è½½åè¡¡ã 客æ·ç«¯éè¿çå¬åç°ç»ä¸ç广æå°åå¯ä»¥ä¸ææ´æ°è¿ä¸ªæå¡å¨å表ã</para> <para>å¦æ使ç¨JMSä½æ¯ä¸ç¨JNDIï¼èæ¯ç´æ¥å®ä¾åJMSçè¿æ¥å·¥åçè¯ï¼å¯ä»¥ç¨éå½çæ¹æ³æ¥è®¾ç½®åç°ç»çå个 @@ -239,7 +239,7 @@ Connection jmsConnection2 = jmsConnectionFactory.createConnection();</programlis <section id="clusters.cluster-connections"> <title>é ç½®é群è¿æ¥</title> <para>é群è¿æ¥å°ä¸ç»æå¡å¨è¿æ¥æ为ä¸ä¸ªé群ï¼æ¶æ¯å¯ä»¥å¨é群çèç¹ä¹é´è¿è¡è´è½½åè¡¡ãé群è¿æ¥çé ç½®å¨ - <literal>hornetq-configuration.xml</literal>æ件ä¸ç + <literal>activemq-configuration.xml</literal>æ件ä¸ç <literal>cluster-connection</literal>å ãä¸ä¸ªHornetQæå¡å¨å¯ä»¥æé¶ä¸ªæå¤ä¸ªé群è¿æ¥ã ä¸é¢æ¯ä¸ä¸ªå ¸åçä¾åï¼</para> <programlisting> @@ -314,7 +314,7 @@ Connection jmsConnection2 = jmsConnectionFactory.createConnection();</programlis <title>é群ç¨æ·çå®å ¨ä¿¡æ¯</title> <para>å½é群ä¸ä¸¤ä¸ªèç¹å»ºç«è¿æ¥æ¶ï¼HornetQ使ç¨ä¸ä¸ªé群ç¨æ·åé群å¯ç ãå®ä»¬å®ä¹å¨ - <literal>hornetq-configuration.xml</literal>æ件ä¸ï¼</para> + <literal>activemq-configuration.xml</literal>æ件ä¸ï¼</para> <programlisting> <cluster-user>HORNETQ.CLUSTER.ADMIN.USER</cluster-user> <cluster-password>CHANGE ME!!</cluster-password> @@ -404,9 +404,9 @@ factory.setLoadBalancingPolicyClassName("com.acme.MyLoadBalancingPolicy"); <literal>connector-ref</literal>ãæ¯ä¸ª<literal>connector-ref</literal> é½æ¥æ<literal>connector-name</literal>å±æ§åä¸ä¸ªå¯éç<literal >backup-connector-name</literal>å±æ§ã<literal - >connector-name</literal> å±æ§æåçæ¯ä¸ä¸ªå¨<literal>hornetq-configuration.xml</literal> + >connector-name</literal> å±æ§æåçæ¯ä¸ä¸ªå¨<literal>activemq-configuration.xml</literal> æ件ä¸å®ä¹çè¿æ¥å¨ãè<literal>backup-connector-name</literal>å±æ§ä¹æ¯æåå¨ - <literal>hornetq-configuration.xml</literal>æ件ä¸å®ä¹çä¸ä¸ªè¿æ¥å¨ã + <literal>activemq-configuration.xml</literal>æ件ä¸å®ä¹çä¸ä¸ªè¿æ¥å¨ã æå ³è¿æ¥å¨æ´å¤çä¿¡æ¯åè§<xref linkend="configuring-transports" />ã</para> <para>è¿æ¥å·¥åè¿æ ·å°±ä¿åæä¸ç»[è¿æ¥å¨, å¤ä»½è¿æ¥å¨]对ï¼ç¨äºå®¢æ·ç«¯å¨å建è¿æ¥æ¶çè´è½½åè¡¡ã</para> <para>å¦æä½ ä½¿ç¨JMSï¼ä½ä¸ä½¿ç¨JNDIï¼ä½ å¯ä»¥ç´æ¥å建<literal>HornetQConnectionFactory</literal> @@ -476,9 +476,9 @@ ClientSession session2 = factory.createClientSession(...);</programlisting> æ¯ä¸ª<literal>connector-ref</literal>é½æä¸ä¸ª<literal>connector-name</literal>å±æ§å ä¸ä¸ªå¯éç<literal>backup-connector-name</literal>å±æ§ã<literal >connector-name</literal>å±æ§æåä¸ä¸ªå¨<literal - >hornetq-configuration.xml</literal>æ件ä¸å®ä¹çä¸ä¸ªè¿æ¥å¨ï¼å®æ¯ä¸»è¿æ¥å¨ãå¯éç + >activemq-configuration.xml</literal>æ件ä¸å®ä¹çä¸ä¸ªè¿æ¥å¨ï¼å®æ¯ä¸»è¿æ¥å¨ãå¯éç <literal>backup-connector-name</literal>æåçä¹æ¯å¨ - <literal>hornetq-configuration.xml</literal>æ件ä¸å®ä¹çä¸ä¸ªè¿æ¥å¨ã + <literal>activemq-configuration.xml</literal>æ件ä¸å®ä¹çä¸ä¸ªè¿æ¥å¨ã æå ³è¿æ¥å¨ç详ç»ä¿¡æ¯åè§<xref linkend="configuring-transports" />ã</para> <note> <para>ç±äºHornetQ 2.0.0çéå¶ï¼ä½¿ç¨éæèç¹å表çé群ä¸æ¯æ失æå¤æ´ï¼failoverï¼ãè¦æ³æ¯æ失æå¤æ´ï¼ @@ -499,7 +499,7 @@ ClientSession session2 = factory.createClientSession(...);</programlisting> å ³éçã</para> <para>æ¶æ¯ååé åè½å¯ä»¥åºäºå°åè¿è¡é ç½®ï¼å³å¨å°å设置ä¸æå®ååé ç延æ¶ãå ³äºå°å设置çæ´å¤ä¿¡æ¯ï¼è¯·åè§ <xref linkend="queue-attributes" />ã</para> - <para>ä¸é¢æ¯ä»<literal>hornetq-configuration.xml</literal>æ件ä¸æåçæ¶æ¯ååé çé ç½®ï¼</para> + <para>ä¸é¢æ¯ä»<literal>activemq-configuration.xml</literal>æ件ä¸æåçæ¶æ¯ååé çé ç½®ï¼</para> <programlisting><address-settings> <address-setting match="jms.#"> <redistribution-delay>0</redistribution-delay> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/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 a5f3b08..fb13391 100644 --- a/docs/user-manual/zh/configuration-index.xml +++ b/docs/user-manual/zh/configuration-index.xml @@ -22,7 +22,7 @@ <section id="server.configuration"> <title>æå¡å¨é ç½®</title> <section> - <title>hornetq-configuration.xml</title> + <title>activemq-configuration.xml</title> <para>HornetQ主è¦æ ¸å¿æå¡å¨é ç½®æ件</para> <table frame="topbot" border="2"> <title>æå¡å¨é ç½®</title> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/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 6b04a77..dd22d02 100644 --- a/docs/user-manual/zh/configuring-transports.xml +++ b/docs/user-manual/zh/configuring-transports.xml @@ -23,7 +23,7 @@ <section id="configuring-transports.acceptors"> <title>æ¥æ¶å¨ï¼Acceptorï¼</title> <para>æ¥æ¶å¨ï¼<emphasis>acceptor</emphasis>ï¼æ¯ HornetQ çä¼ è¾å±ä¸æ为éè¦çæ¦å¿µä¹ä¸ãé¦å - ä»ç»ä¸ä¸å¨æ件<literal>hornetq-configuration.xml</literal>ä¸æ¯ææ ·å®ä¹ä¸ä¸ªæ¥æ¶å¨çï¼</para> + ä»ç»ä¸ä¸å¨æ件<literal>activemq-configuration.xml</literal>ä¸æ¯ææ ·å®ä¹ä¸ä¸ªæ¥æ¶å¨çï¼</para> <programlisting> <acceptors> <acceptor name="netty"> @@ -49,7 +49,7 @@ org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory <section id="configuring-transports.connectors"> <title>è¿æ¥å¨ï¼Connectorsï¼</title> <para>æ¥æ¶å¨å®ä¹çæ¯å¦ä½å¨æå¡å¨ç«¯æ¥æ¶è¿æ¥ï¼èè¿æ¥å¨åæ¯å®ä¹å®¢æ·ç«¯å¦ä½è¿æ¥å°æå¡å¨ã</para> - <para>以ä¸æ¯<literal>hornetq-configuration.xml</literal>æ件ä¸ä¸ä¸ªè¿æ¥å¨é ç½®çä¾åã</para> + <para>以ä¸æ¯<literal>activemq-configuration.xml</literal>æ件ä¸ä¸ä¸ªè¿æ¥å¨é ç½®çä¾åã</para> <programlisting> <connectors> <connector name="netty"> @@ -77,7 +77,7 @@ org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory <para>è¿ä¸ä¿¡æ¯è¢«å®ä¹å¨é ç½®æ件<literal >hornetq-jms.xml</literal>ä¸ç<literal>connector-ref</literal>åå ä¸ãä¸é¢è¿æ®µé ç½® å°±æ¯ä»è¯¥é ç½®æ件ä¸æåçç¸å ³é¨åï¼å®å±ç¤ºäºJMSçè¿æ¥å·¥åæ¯å¦ä½å¼ç¨å®ä¹å¨é ç½®æ件<literal - >hornetq-configuration.xml</literal>ä¸çè¿æ¥å¨çï¼</para> + >activemq-configuration.xml</literal>ä¸çè¿æ¥å¨çï¼</para> <programlisting> <connection-factory name="ConnectionFactory"> <connectors> @@ -311,7 +311,7 @@ etc </listitem> <listitem> <para>æ们è¿éè¦å¨æå¡å¨ç«¯å ä¸ä¸ä¸ªç¹æ®çNetty invm æ¥æ¶å¨ã</para> - <para>ä¸é¢æ¯ä»<literal>hornetq-configuration.xml</literal>é ç½®æ件ä¸æåçå®ä¹æ¥æ¶å¨çé ç½®é¨åï¼</para> + <para>ä¸é¢æ¯ä»<literal>activemq-configuration.xml</literal>é ç½®æ件ä¸æåçå®ä¹æ¥æ¶å¨çé ç½®é¨åï¼</para> <programlisting> <acceptors> @@ -327,7 +327,7 @@ etc </programlisting> </listitem> <listitem> - <para>æåæ们éè¦å¨å®¢æ·ç«¯é ç½®è¿æ¥å¨ï¼ä¹æ¯å¨<literal>hornetq-configuration.xml</literal>æ件ä¸æ¥åãå¦ä¸æ示ï¼</para> + <para>æåæ们éè¦å¨å®¢æ·ç«¯é ç½®è¿æ¥å¨ï¼ä¹æ¯å¨<literal>activemq-configuration.xml</literal>æ件ä¸æ¥åãå¦ä¸æ示ï¼</para> <programlisting><connectors> <connector name="netty-servlet"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/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 4311e3c..bd79d0c 100644 --- a/docs/user-manual/zh/connection-ttl.xml +++ b/docs/user-manual/zh/connection-ttl.xml @@ -132,7 +132,7 @@ at org.acme.yourproject.YourClass (YourClass.java:666) <para>为äºé¿å è¿ç¨æ¨¡åç线ç¨è¢«é¿æ¶é´å ç¨ï¼æ°æ®å å¯ä»¥è½¬ç»å¦å¤çä¸ä¸ªçº¿ç¨æ± æ¥å¤çãè¦æ³¨æè¿æ ·åçå¢å äºä¸äºæ¶é´å»¶è¿ã å æ¤å¦ææ°æ®å å¤çèæ¶å¾å°ï¼è¿æ¯ç±è¿ç¨æ¨¡å线ç¨æ¥å¤çè¾å¥½ã - è¦é ç½®è¿æ ·çå¼æ¥è¿æ¥å¾è¡ä»»å¡ï¼å°<literal>hornetq-configuration.xml</literal>æ件ä¸ç + è¦é ç½®è¿æ ·çå¼æ¥è¿æ¥å¾è¡ä»»å¡ï¼å°<literal>activemq-configuration.xml</literal>æ件ä¸ç <literal>async-connection-execution-enabled</literal> åæ°è®¾ä¸º<literal>true</literal> ï¼é»è®¤å¼æ¯ <literal>true</literal>ï¼ã</para> </section> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/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 2ff8964..d72e64b 100644 --- a/docs/user-manual/zh/core-bridges.xml +++ b/docs/user-manual/zh/core-bridges.xml @@ -35,7 +35,7 @@ </note> <section> <title>æ¡¥çé ç½®</title> - <para>æ¡¥çé ç½®å¨<literal>hornetq-configuration.xml</literal>æ件ä¸ã让æ们å çä¸ä¸ªé ç½®çä¾å + <para>æ¡¥çé ç½®å¨<literal>activemq-configuration.xml</literal>æ件ä¸ã让æ们å çä¸ä¸ªé ç½®çä¾å ï¼å®å®é ä¸åºèªbridgeä¾åï¼ï¼</para> <programlisting> <bridge name="my-bridge"> @@ -71,7 +71,7 @@ <note> <para>å¦æ使ç¨JMSï¼JMSçé ç½®æ件<literal >hornetq-jms.xml</literal>å¨æ ¸å¿é ç½®æ件<literal> - hornetq-configuration.xml</literal>ä¹åè£ è½½ãæ以å¦æä½ çæ¡¥è¦ä»JMS + activemq-configuration.xml</literal>ä¹åè£ è½½ãæ以å¦æä½ çæ¡¥è¦ä»JMS éåæ¥æ¶æ¶æ¯ï¼å°±éè¦ä¿è¯JMSéååæ¶è¦ä½ä¸ºæ ¸å¿éåé¨ç½²ãå ·ä½æ¹æ³å¯ä»¥åè§ bridgeä¾åã</para> </note> @@ -151,12 +151,12 @@ <itemizedlist> <listitem> <para><literal>connector-name</literal>ãè¿ä¸ªæçæ¯æ ¸å¿é ç½®æ件<literal - >hornetq-configuration.xml</literal>ä¸å®ä¹çè¿æ¥å¨çååãæ¡¥ä½¿ç¨ + >activemq-configuration.xml</literal>ä¸å®ä¹çè¿æ¥å¨çååãæ¡¥ä½¿ç¨ è¿ä¸ªè¿æ¥å¨å建ä¸ç®çæå¡å¨çè¿æ¥ãè¿ä¸ªåæ°æ¯å¿ éæå®çã</para> </listitem> <listitem> <para><literal>backup-connector-name</literal>ãè¿ä¸ªå¯éåæ°åæ ·æå®ä¸ä¸ªå¨æ ¸å¿ - é ç½®æ件<literal>hornetq-configuration.xml</literal>ä¸å®ä¹çè¿æ¥å¨ååã + é ç½®æ件<literal>activemq-configuration.xml</literal>ä¸å®ä¹çè¿æ¥å¨ååã å½ç®çæå¡å¨åºç°æ éæ¶ï¼æè æ£å¸¸éåºä½æ¯åæ°<literal >failover-on-server-shutdown</literal>çå¼è®¾ä¸º<literal >true</literal>æ¶ï¼æ¡¥ä½¿ç¨è¿ä¸ªåæ°æå®çè¿æ¥å¨éè¿å¤±æå¤æ´ï¼failoverï¼è¿æ¥ @@ -166,12 +166,12 @@ </listitem> <listitem> <para><literal>user</literal>ãè¿ä¸ªå¯éåæ°æå®äºæ¡¥å¨å建ä¸è¿ç¨æå¡å¨è¿æ¥æ¶æç¨çç¨æ·åãå¦æ - 没ææå®ç¨æ·åï¼å¨é ç½®æ件<literal>hornetq-configuration.xml</literal>ä¸ + 没ææå®ç¨æ·åï¼å¨é ç½®æ件<literal>activemq-configuration.xml</literal>ä¸ <literal>cluster-user</literal>æå®ä¹çé»è®¤é群ç¨æ·åå°è¢«ä½¿ç¨ã </para> </listitem> <listitem> <para><literal>password</literal>ãè¿ä¸ªå¯éçåæ°ç»åºçæ¯æ¡¥å建ä¸è¿ç¨æå¡å¨è¿æ¥æ使ç¨çå¯ç ã - å¦æ没ææå®å¯ç ï¼å¨é ç½®æ件<literal>hornetq-configuration.xml</literal>ä¸ + å¦æ没ææå®å¯ç ï¼å¨é ç½®æ件<literal>activemq-configuration.xml</literal>ä¸ <literal>cluster-password</literal>æå®ä¹çé»è®¤é群å¯ç å°è¢«ä½¿ç¨ã</para> </listitem> </itemizedlist> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/diverts.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/diverts.xml b/docs/user-manual/zh/diverts.xml index 024d6c7..828af0f 100644 --- a/docs/user-manual/zh/diverts.xml +++ b/docs/user-manual/zh/diverts.xml @@ -34,7 +34,7 @@ å°åä¸ã</para> <para>ç±è½¬åå¨ä¸æ¡¥è¿è¡é åå¯ä»¥ç»æå¤æçè·¯ç±ç³»ç»ãå¨æå¡å¨ä¸ç±ä¸ç»è½¬åå¨å¯ä»¥å½¢æä¸ä¸ªæ¶æ¯è·¯ç±è¡¨ãå¦æå ä¸æ¡¥ï¼å°± å¯ä»¥è¿ä¸æ¥å½¢æä¸ä¸ªåå¸å¼çå¯é çæ¶æ¯è·¯ç±ç½ã</para> - <para>转åå¨çé ç½®å¨<literal>hornetq-configuration.xml</literal>ä¸å®ä¹ãå¯ä»¥é ç½®é¶ä¸ªæå¤ä¸ªè½¬åå¨ã</para> + <para>转åå¨çé ç½®å¨<literal>activemq-configuration.xml</literal>ä¸å®ä¹ãå¯ä»¥é ç½®é¶ä¸ªæå¤ä¸ªè½¬åå¨ã</para> <para>åè§è½¬åå¨çä¾å<xref linkend="divert-example" />ï¼å®å±ç¤ºäºå¦ä½é ç½®ä¸ä½¿ç¨è½¬åå¨ã</para> <para>让æ们çä¸äºè½¬åå¨çé ç½®ä¾åï¼</para> <section> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/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 013c0a0..a6c8ea9 100644 --- a/docs/user-manual/zh/duplicate-detection.xml +++ b/docs/user-manual/zh/duplicate-detection.xml @@ -84,9 +84,9 @@ message.setStringProperty(HDR_DUPLICATE_DETECTION_ID.toString(), myUniqueID); <para>ç¼åç大å°æ¯åºå®çï¼å¾ªç¯ä½¿ç¨ãå¦æç¼åçæ大å¯ä»¥åæ¾<literal >n</literal>æ¡è®°å½ï¼é£ä¹<literal>n + 1</literal>æ¡è®°å½å°ä¼è¦çç¼åä¸ç第<literal>0</literal> æ¡è®°å½ã</para> - <para>ç¼åçæ大容éå¨æ件<literal>hornetq-configuration.xml</literal>ä¸é ç½®ï¼åæ°æ¯<literal + <para>ç¼åçæ大容éå¨æ件<literal>activemq-configuration.xml</literal>ä¸é ç½®ï¼åæ°æ¯<literal >id-cache-size</literal>ãé»è®¤å¼æ¯<literal>2000</literal>æ¡è®°å½ã</para> - <para>å¨æ件<literal>hornetq-configuration.xml</literal>ä¸è¿å¯ä»¥é ç½®å°ç¼åæä¹ åå°ç£çãç¸åºçåæ° + <para>å¨æ件<literal>activemq-configuration.xml</literal>ä¸è¿å¯ä»¥é ç½®å°ç¼åæä¹ åå°ç£çãç¸åºçåæ° æ¯<literal>persist-id-cache</literal>ãå¦æ设为<literal>true</literal>ï¼åæ¯å å ¥ä¸ä¸ªidå°±å° å®åæ¶ä¿åå°ç£çä¸ãé»è®¤å¼æ¯<literal>true</literal>ã</para> <note> @@ -98,7 +98,7 @@ message.setStringProperty(HDR_DUPLICATE_DETECTION_ID.toString(), myUniqueID); <title>æ¡¥ä¸éå¤æ£æµ</title> <para>æ ¸å¿æ¡¥å¯ä»¥éè¿é ç½®å¨å°æ¶æ¯ååç®çæå¡å¨ä¹åèªå¨åæ¶æ¯ä¸æ·»å å¯ä¸çidï¼å¦ææ¶æ¯ä¸è¿æ²¡æçè¯ï¼ãè¿æ · å¦æç®çæå¡å¨åçæ éï¼æ ¸å¿æ¡¥å¨éæ°åéæ¶æ¯æ¶ï¼ç®çæå¡å¨å°±å¯ä»¥èªå¨æ£æµéå¤çæ¶æ¯ï¼åç°éå¤æ¶æ¯å³ä¸¢å¼ã</para> - <para>è¦é ç½®æ ¸å¿æ¡¥çèªå¨æ·»å idçåè½ï¼éè¦å¨<literal>hornetq-configuration.xml</literal>ä¸æ¡¥çé ç½® + <para>è¦é ç½®æ ¸å¿æ¡¥çèªå¨æ·»å idçåè½ï¼éè¦å¨<literal>activemq-configuration.xml</literal>ä¸æ¡¥çé ç½® éå°<parameter>use-duplicate-detection</parameter>åæ°è®¾ä¸º<literal>true</literal>ã</para> <para>è¿ä¸ªåæ°çé»è®¤å¼æ¯<literal>true</literal>ã</para> <para>å ³äºæ ¸å¿æ¡¥çé ç½®å使ç¨ï¼åè§<xref linkend="core-bridges" />ã</para> @@ -106,7 +106,7 @@ message.setStringProperty(HDR_DUPLICATE_DETECTION_ID.toString(), myUniqueID); <section> <title>éå¤æ£æµä¸é群è¿æ¥</title> <para>é群è¿æ¥å é¨ä½¿ç¨æ ¸å¿æ¡¥å¨èç¹é´å¯é å°ç§»å¨æ¶æ¯ï¼å æ¤å®ä»¬çæ ¸å¿æ¡¥ä¹å¯ä»¥é ç½®èªå¨æ·»å idçåè½ã</para> - <para>é ç½®çæ¹æ³æ¯å¨<literal>hornetq-configuration.xml</literal>æ件ä¸å°é群è¿æ¥ç + <para>é ç½®çæ¹æ³æ¯å¨<literal>activemq-configuration.xml</literal>æ件ä¸å°é群è¿æ¥ç <parameter>use-duplicate-detection</parameter>åæ°è®¾ä¸º<literal>true</literal>ã</para> <para>è¿ä¸ªåæ°çé»è®¤å¼æ¯<literal>true</literal>ã</para> <para>æå ³é群è¿æ¥é ç½®çæ´å¤ä¿¡æ¯ï¼è¯·åè§<xref linkend="clusters"/>ã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/filter-expressions.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/filter-expressions.xml b/docs/user-manual/zh/filter-expressions.xml index 8a3e560..ff1dbd8 100644 --- a/docs/user-manual/zh/filter-expressions.xml +++ b/docs/user-manual/zh/filter-expressions.xml @@ -29,7 +29,7 @@ <itemizedlist> <listitem> <para>é¢å®ä¹çéåãå½å¨<literal - >hornetq-configuration.xml</literal> æ <literal>hornetq-jms.xml</literal>å®ä¹ + >activemq-configuration.xml</literal> æ <literal>hornetq-jms.xml</literal>å®ä¹ éåæ¶ï¼å¯ä»¥ä½¿ç¨è¿æ»¤å¨ãåªæä¸è¿æ»¤å¨è¡¨è¾¾å¼ç¸å¹é çæ¶æ¯æè½è¾¾å°è¯¥éåä¸ã</para> </listitem> <listitem> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/ha.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/ha.xml b/docs/user-manual/zh/ha.xml index d86c8fc..5861c55 100644 --- a/docs/user-manual/zh/ha.xml +++ b/docs/user-manual/zh/ha.xml @@ -49,10 +49,10 @@ <graphic fileref="images/ha-replicated-store.png" align="center"/> <section id="configuring.live.backup"> <title>é ç½®</title> - <para>é¦å å¨ä¸»æå¡å¨ç <literal>hornetq-configuration.xml</literal>æ件ä¸é ç½®å¤ä»½æå¡å¨ã + <para>é¦å å¨ä¸»æå¡å¨ç <literal>activemq-configuration.xml</literal>æ件ä¸é ç½®å¤ä»½æå¡å¨ã é ç½®çåæ°æ¯<literal>backup-connector-ref</literal>ãè¿ä¸ªåæ°æåä¸ä¸ªè¿æ¥å¨ãè¿ä¸ªè¿æ¥å¨ ä¹å¨ä¸»æå¡å¨ä¸é ç½®ãå®å®ä¹äºå¦ä½ä¸å¤ä»½æå¡å¨å»ºç«è¿æ¥ã</para> - <para>ä¸é¢å°±æ¯ä¸ä¸ªå¨<literal>hornetq-configuration.xml</literal>æ件ä¸çä¾åï¼</para> + <para>ä¸é¢å°±æ¯ä¸ä¸ªå¨<literal>activemq-configuration.xml</literal>æ件ä¸çä¾åï¼</para> <programlisting> <backup-connector-ref connector-name="backup-connector"/> @@ -113,7 +113,7 @@ <graphic fileref="images/ha-shared-store.png" align="center"/> <section id="ha/mode.shared.configuration"> <title>é ç½®</title> - <para>è¦ä½¿ç¨åè´®å ±äº«æ¨¡å¼ï¼å¨ä¸¤ä¸ªæå¡å¨çé ç½®æ件<literal>hornetq-configuration.xml</literal> + <para>è¦ä½¿ç¨åè´®å ±äº«æ¨¡å¼ï¼å¨ä¸¤ä¸ªæå¡å¨çé ç½®æ件<literal>activemq-configuration.xml</literal> ä¸å°ä½å¦ä¸è®¾ç½®ï¼</para> <programlisting> <shared-store>true<shared-store> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/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 1878bc7..260dcd2 100644 --- a/docs/user-manual/zh/intercepting-operations.xml +++ b/docs/user-manual/zh/intercepting-operations.xml @@ -48,7 +48,7 @@ public interface Interceptor </section> <section> <title>é ç½®æ¦æªå¨</title> - <para>æ¦æªå¨çé ç½®å¨<literal>hornetq-configuration.xml</literal>æ件ä¸ï¼</para> + <para>æ¦æªå¨çé ç½®å¨<literal>activemq-configuration.xml</literal>æ件ä¸ï¼</para> <programlisting> <remoting-interceptors> <class-name>org.apache.activemq.jms.example.LoginInterceptor</class-name> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/management.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/management.xml b/docs/user-manual/zh/management.xml index 636ccfd..8fde10b 100644 --- a/docs/user-manual/zh/management.xml +++ b/docs/user-manual/zh/management.xml @@ -433,7 +433,7 @@ <section id="management.jmx.configuration"> <title>é ç½®JMX</title> <para>é»è®¤æ åµä¸HornetQçJMXæ¯æå¼çãå°<literal - >hornetq-configuration.xml</literal>æ件ä¸ç<literal + >activemq-configuration.xml</literal>æ件ä¸ç<literal >jmx-management-enabled</literal>设置为<literal>false</literal>å°±å¯ä»¥å ³éJMXï¼</para> <programlisting> <!-- false to disable JMX management for HornetQ --> @@ -445,7 +445,7 @@ >Java管çæå</ulink>æ¥é ç½®æå¡å¨çè¿ç¨ç®¡çï¼ç³»ç»åéå¿ é¡»å¨<literal>run.sh</literal>æ<literal>run.bat</literal>ä¸å®ä¹ï¼ã</para> </note> <para>HornetQé»è®¤ä½¿ç¨JMXåå"org.apache.activemq"ãå¦æè¦ç¨ä¸ä¸ªMBeanServer管çå¤ä¸ªHornetQæå¡å¨ï¼å¯ä»¥å°æ¯ä¸ªHornetQ - æå¡å¨é ç½®æä¸åçJMXåãæ¹æ³å°±æ¯å¨<literal>hornetq-configuration.xml</literal>æ件ä¸è®¾ç½®<literal>jmx-domain</literal>ï¼</para> + æå¡å¨é ç½®æä¸åçJMXåãæ¹æ³å°±æ¯å¨<literal>activemq-configuration.xml</literal>æ件ä¸è®¾ç½®<literal>jmx-domain</literal>ï¼</para> <programlisting> <!-- use a specific JMX domain for HornetQ MBeans --> <jmx-domain>my.org.apache.activemq</jmx-domain> @@ -535,7 +535,7 @@ <section id="management.core.configuration"> <title>é ç½®æ ¸å¿ç®¡ç</title> <para>管çå°åçé ç½®å¨æ件<literal - >hornetq-configuration.xml</literal>ä¸ï¼</para> + >activemq-configuration.xml</literal>ä¸ï¼</para> <programlisting> <management-address>jms.queue.hornetq.management</management-address> </programlisting> @@ -641,7 +641,7 @@ <para>ç±äºæ¯æ åçæ ¸å¿æ¶æ¯ï¼ä½¿ç¨éæ©å¨è¿è½å¤è¿æ»¤æä¸é¨åéç¥èåªæ¥æ¶æå ´è¶£çéç¥ã</para> <section id="management.notifications.core.configuration"> <title>é ç½®æ ¸å¿ç®¡çéç¥å°å</title> - <para>ç¨æ¥åé管çéç¥çå°åå¨æ件ä¸<literal>hornetq-configuration.xml</literal>é ç½®ï¼</para> + <para>ç¨æ¥åé管çéç¥çå°åå¨æ件ä¸<literal>activemq-configuration.xml</literal>é ç½®ï¼</para> <programlisting> <management-notification-address>hornetq.notifications</management-notification-address> </programlisting> @@ -733,12 +733,12 @@ <section id="configuring.message.counters"> <title>é ç½®æ¶æ¯è®¡æ°å¨</title> <para>é»è®¤çæ¶æ¯è®¡æ°å¨æ¯å ³éçï¼å 为å®éè¦å ç¨ä¸äºå åã</para> - <para>è¦æå¼æ¶æ¯è®¡æ°å¨ï¼ç¼è¾<literal>hornetq-configuration.xml</literal>æ件å°å ¶è®¾ä¸º<literal>true</literal>ï¼</para> + <para>è¦æå¼æ¶æ¯è®¡æ°å¨ï¼ç¼è¾<literal>activemq-configuration.xml</literal>æ件å°å ¶è®¾ä¸º<literal>true</literal>ï¼</para> <programlisting> <message-counter-enabled>true</message-counter-enabled> </programlisting> <para>æ¶æ¯è®¡æ°å¨ä¼ä¿åéåçåå²æ°æ®ï¼é»è®¤æ¯10天ï¼ãå®ä»¥ä¸å®é´éï¼é»è®¤10ç§ä¸æ¬¡ï¼å¯¹æ¯ä¸ªéåè¿è¡æ«æã - å¦ææ¶æ¯è®¡æ°å¨æå¼ï¼è¿äºåæ°å¯ä»¥å¨<literal>hornetq-configuration.xml</literal>æ件ä¸è¿è¡è°æ´ï¼</para> + å¦ææ¶æ¯è®¡æ°å¨æå¼ï¼è¿äºåæ°å¯ä»¥å¨<literal>activemq-configuration.xml</literal>æ件ä¸è¿è¡è°æ´ï¼</para> <programlisting> <!-- keep history for a week --> <message-counter-max-day-history>7</message-counter-max-day-history> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/message-expiry.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/message-expiry.xml b/docs/user-manual/zh/message-expiry.xml index 5feb6f2..ee13023 100644 --- a/docs/user-manual/zh/message-expiry.xml +++ b/docs/user-manual/zh/message-expiry.xml @@ -62,7 +62,7 @@ producer.setTimeToLive(5000); <section id="configuring.expiry.reaper"> <title>é ç½®è¿æåæ¶çº¿ç¨</title> <para>HornetQæä¸ä¸ªåæ¶çº¿ç¨å®æå°æ£æ¥éåä¸çæ¶æ¯ï¼ç®çæ¯åç°æ¯å¦ææ¶æ¯è¿æã</para> - <para>å¨<literal>hornetq-configuration.xml</literal>æ件ä¸å¯ä»¥å¯¹åæ¶çº¿ç¨è¿è¡é ç½®ï¼åæ°å¦ä¸ï¼</para> + <para>å¨<literal>activemq-configuration.xml</literal>æ件ä¸å¯ä»¥å¯¹åæ¶çº¿ç¨è¿è¡é ç½®ï¼åæ°å¦ä¸ï¼</para> <itemizedlist> <listitem> <para><literal>message-expiry-scan-period</literal></para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/message-grouping.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/message-grouping.xml b/docs/user-manual/zh/message-grouping.xml index c41341f..fb6271d 100644 --- a/docs/user-manual/zh/message-grouping.xml +++ b/docs/user-manual/zh/message-grouping.xml @@ -98,7 +98,7 @@ è¿äºèç¹çæ¶æ¯ç»å¤çå¨å°±ä¼ååä½åºå³å®è¯¥å¦ä½å¯¹è¿ä¸ªæ¶æ¯è¿è¡è·¯ç±ã</para> <para>æ¶æ¯ç»å¤çå¨æ两ç§ï¼æ¬å°æ¶æ¯ç»å¤çå¨åè¿ç¨æ¶æ¯ç»å¤çå¨ãå¨ä¸ä¸ªé群ä¸è¦éæ©ä¸ä¸ªèç¹ä½ä¸ºæ¬å°æ¶æ¯ç»å¤çå¨ç èç¹ï¼é群ä¸ææå ¶å®çèç¹é½ææè¿ç¨æ¶æ¯ç»å¤çå¨ãå¨é群ä¸ç±æ¬å°æ¶æ¯ç»å¤çå¨æçµå³å®æ¶æ¯ææ ·è·¯ç±ï¼å ¶å®çè¿ç¨ - å¤çå¨é åæ¬å°å¤çå¨å®æå³çãæ¶æ¯ç»å¤çå¨çé ç½®å¨<emphasis role="italic">hornetq-configuration.xml</emphasis> + å¤çå¨é åæ¬å°å¤çå¨å®æå³çãæ¶æ¯ç»å¤çå¨çé ç½®å¨<emphasis role="italic">activemq-configuration.xml</emphasis> æ件ä¸ï¼ä¸é¢å°±æ¯ä¸ä¸ªä¾åï¼ <programlisting> <grouping-handler name="my-grouping-handler"> <type>LOCAL</type> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/paging.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/paging.xml b/docs/user-manual/zh/paging.xml index fbe4a1f..8666de9 100644 --- a/docs/user-manual/zh/paging.xml +++ b/docs/user-manual/zh/paging.xml @@ -34,7 +34,7 @@ <section id="paging.main.config"> <title>é ç½®</title> <para>ä½ å¯ä»¥é ç½®å页转åæ件夹çä½ç½®ã</para> - <para>å¨ä¸»é ç½®æ件<literal>hornetq-configuration.xml</literal>)ä¸ + <para>å¨ä¸»é ç½®æ件<literal>activemq-configuration.xml</literal>)ä¸ å¯ä»¥å®ä¹å ¨å±çå页转ååæ°ã</para> <programlisting><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; @@ -79,7 +79,7 @@ </note> <section> <title>é ç½®</title> - <para>æå ³å页转åçé ç½®å¨ä¸»è¦é ç½®æ件ï¼<literal>hornetq-configuration.xml</literal>ï¼ + <para>æå ³å页转åçé ç½®å¨ä¸»è¦é ç½®æ件ï¼<literal>activemq-configuration.xml</literal>ï¼ çå°å设置çé¨åå ã</para> <programlisting> <address-settings> <address-setting match="jms.someaddress"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/perf-tuning.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/perf-tuning.xml b/docs/user-manual/zh/perf-tuning.xml index a6f43ea..5d4456e 100644 --- a/docs/user-manual/zh/perf-tuning.xml +++ b/docs/user-manual/zh/perf-tuning.xml @@ -101,21 +101,21 @@ <xref linkend="pre-acknowledge"/>ã</para> </listitem> <listitem> - <para>å ³éå®å ¨ãå°<literal>hornetq-configuration.xml</literal>æ件ä¸ç<literal>security-enabled</literal> + <para>å ³éå®å ¨ãå°<literal>activemq-configuration.xml</literal>æ件ä¸ç<literal>security-enabled</literal> åæ°è®¾ä¸º<literal>false</literal>ä»¥å ³éå®å ¨ãè¿å¯ä»¥å¸¦æ¥ä¸äºæ§è½çæé«ã</para> </listitem> <listitem> - <para>å ³éæä¹ åãå¦æä¸ä½ ä¸éè¦æ¶æ¯æä¹ åï¼å¯ä»¥å°<literal>hornetq-configuration.xml</literal> + <para>å ³éæä¹ åãå¦æä¸ä½ ä¸éè¦æ¶æ¯æä¹ åï¼å¯ä»¥å°<literal>activemq-configuration.xml</literal> æ件ä¸ç<literal>persistence-enabled</literal>åæ°è®¾ä¸ºfalseæ¥å®å ¨å ³éæä¹ åè½ã</para> </listitem> <listitem> - <para>éç¨å»¶è¿æ¹å¼äºå¡åæ¥ãå°<literal>hornetq-configuration.xml</literal>æ件ä¸ç<literal + <para>éç¨å»¶è¿æ¹å¼äºå¡åæ¥ãå°<literal>activemq-configuration.xml</literal>æ件ä¸ç<literal >journal-sync-transactional</literal>åæ°è®¾ä¸º<literal>false</literal>å¯ä»¥å¾å° æ´å¥½çäºå¡æä¹ åçæ§è½ãä½æ¯è¿æ ·åå¯è½ä¼é æå¨åçæ éæ¶äºå¡ç丢失ãæå ³è¯¦ç»ç说æåè§ <xref linkend="send-guarantees"/>ã</para> </listitem> <listitem> - <para>éç¨å»¶è¿æ¹å¼éäºå¡åæ¥ãå°<literal>hornetq-configuration.xml</literal>æ件ä¸ç<literal + <para>éç¨å»¶è¿æ¹å¼éäºå¡åæ¥ãå°<literal>activemq-configuration.xml</literal>æ件ä¸ç<literal >journal-sync-non-transactional</literal>åæ°è®¾ä¸º<literal>false</literal>å¯ä»¥å¾å° æ´å¥½çéäºå¡æä¹ åçæ§è½ãä½æ¯è¿æ ·åå¯è½ä¼é æå¨åçæ éæ¶æä¹ æ¶æ¯ç丢失ãæå ³è¯¦ç»ç说æåè§ <xref linkend="send-guarantees"/>ã</para> @@ -169,7 +169,7 @@ serveruser hard nofile 20000 </listitem> <listitem> <para>å©ç¨åæ°<literal>batch-delay</literal>并å°åæ°<literal>direct-deliver</literal> - 设为falseæ¥æé«å°æ¶æ¯çå¤çæçãHornetQå¨å ¶<literal>hornetq-configuration.xml</literal> + 设为falseæ¥æé«å°æ¶æ¯çå¤çæçãHornetQå¨å ¶<literal>activemq-configuration.xml</literal> ä¸é¢å é ç½®äºä¸ä¸ªè¿æ¥å¨ï¼æ¥åå¨å¯¹ï¼<literal>netty-throughput</literal>ï¼ï¼å¹¶ä¸å¨ <literal>hornetq-jms.xml</literal>ä¸é ç½®äºä¸ä¸ªJMSè¿æ¥å·¥åï¼ <literal>ThroughputConnectionFactory</literal>ï¼ãå®ä»¬å¯ä»¥ç¨å¨å°æ¶æ¯çå¤çåºç¨ä¸ä»¥æ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/persistence.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/persistence.xml b/docs/user-manual/zh/persistence.xml index 28c42bf..638382f 100644 --- a/docs/user-manual/zh/persistence.xml +++ b/docs/user-manual/zh/persistence.xml @@ -90,7 +90,7 @@ <section id="configuring.bindings.journal"> <title>é ç½®ç»å®æ¥å¿</title> <para>ç»å®æ¥å¿çé ç½®åæ°å¨ <literal - >hornetq-configuration.xml</literal>æ件ä¸ã</para> + >activemq-configuration.xml</literal>æ件ä¸ã</para> <itemizedlist> <listitem> <para><literal>bindings-directory</literal></para> @@ -225,7 +225,7 @@ <section id="persistence.enabled"> <title>é ç½®HornetQä¸ä½¿ç¨æä¹ å</title> <para>å¨ä¸äºæ åµä¸æ¶æ¯ç³»ç»å¹¶ä¸éè¦æä¹ åãè¿æ¶å¯ä»¥é ç½®HornetQä¸ä½¿ç¨æä¹ å±ãåªè¦å°<literal - >hornetq-configuration.xml</literal>æ件ä¸ç<literal>persistence-enabled</literal> + >activemq-configuration.xml</literal>æ件ä¸ç<literal>persistence-enabled</literal> åæ°è®¾ä¸º<literal>false</literal>å³å¯ã </para> <para>注æå¦æä½ å°è¯¥åæ°è®¾ä¸º falseæ¥å ³éæä¹ åï¼å°±æå³çææçç»å®æ°æ®ãæ¶æ¯æ°æ®ãè¶ å¤§æ¶æ¯æ°æ®ãéå¤IDç¼å²ä»¥å转移ï¼pagingï¼æ°æ®é½å°ä¸ä¼è¢«æä¹ ã</para> </section> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/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 c57e212..ca9697c 100644 --- a/docs/user-manual/zh/queue-attributes.xml +++ b/docs/user-manual/zh/queue-attributes.xml @@ -36,7 +36,7 @@ <para>selectoråå å®ä¹çæ¯éåçéæ©å¨ãå®ä¹äºéæ©å¨åï¼åªæä¸éæ©å¨ç¸å¹é çæ¶æ¯æè½è¢«å å°éåä¸ã è¿æ¯ä¸ä¸ªå¯é项ãå¦æ没æå®ä¹éæ©å¨ï¼éåå°é»è®¤æ²¡æéæ©å¨ã</para> <para>durableå®ä¹äºéåæ¯å¦æ¯ä¸ä¸ªå¯æä¹ çéåãè¿ä¹æ¯ä¸ä¸ªå¯é项ï¼é»è®¤å¼æ¯trueã</para> - <para>å¦æå¨æ ¸å¿å±å®ä¹éåï¼å使ç¨<literal>hornetq-configuration.xml</literal>æ件ã + <para>å¦æå¨æ ¸å¿å±å®ä¹éåï¼å使ç¨<literal>activemq-configuration.xml</literal>æ件ã ä¸é¢æ¯ä¸ä¸ªä¾åï¼</para> <programlisting><queues> <queue name="jms.queue.selectorQueue"> @@ -73,7 +73,7 @@ </section> <section id="queue-attributes.address-settings"> <title>éè¿å°å设置æ¥é ç½®éåå±æ§</title> - <para>æäºå±æ§çå®ä¹ä¸å°åå¯ä»¥ä½¿ç¨éé 符ãä¸é¢æ¯<literal>hornetq-configuration.xml</literal> + <para>æäºå±æ§çå®ä¹ä¸å°åå¯ä»¥ä½¿ç¨éé 符ãä¸é¢æ¯<literal>activemq-configuration.xml</literal> æ件ä¸çä¸ä¸ª<literal>address-setting</literal>çé ç½®ä¾åã</para> <programlisting><address-settings> <address-setting match="jms.queue.exampleQueue"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/security.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/security.xml b/docs/user-manual/zh/security.xml index db4ded5..200387b 100644 --- a/docs/user-manual/zh/security.xml +++ b/docs/user-manual/zh/security.xml @@ -18,7 +18,7 @@ <!-- ============================================================================= --> <chapter id="security"> <title>å®å ¨</title> - <para>æ¬ç« 讲述HornetQçå®å ¨æºå¶ä»¥åå¦ä½é ç½®å®ãè¦å®å ¨å ³éå®å ¨ï¼åªè¦å°<literal>hornetq-configuration.xml</literal> + <para>æ¬ç« 讲述HornetQçå®å ¨æºå¶ä»¥åå¦ä½é ç½®å®ãè¦å®å ¨å ³éå®å ¨ï¼åªè¦å°<literal>activemq-configuration.xml</literal> æ件ä¸ç<literal>security-enabled</literal>åæ°è®¾ä¸ºfalseå³å¯ã</para> <para>åºäºæ§è½çèèï¼å®å ¨å¨HornetQä¸è¢«ç¼åä¸å®çæ¶é´ãè¦æ¹åè¿ä¸ªæ¶é´ï¼éè¦è®¾ç½®åæ° <literal>security-invalidation-interval</literal>ï¼åä½æ¯æ¯«ç§ãé»è®¤å¼æ¯ @@ -55,8 +55,8 @@ </listitem> </itemizedlist> <para>æ¯ä¸ªæéæä¸ä¸ªè§è²è¡¨ãå¦æç¨æ·çè§è²å¨è¿ä¸ªè¡¨ä¸ï¼é£ä¹å®å°æ¥æè¿ä¸ªæéã</para> - <para>让æ们ç个ç®åçä¾åãä¸é¢æ¯ä»<literal>hornetq-configuration.xml</literal>æ件æ - <literal>hornetq-queues.xml</literal>æ件ä¸æåçå®å ¨è®¾ç½®ï¼</para> + <para>让æ们ç个ç®åçä¾åãä¸é¢æ¯ä»<literal>activemq-configuration.xml</literal>æ件æ + <literal>activemq-queues.xml</literal>æ件ä¸æåçå®å ¨è®¾ç½®ï¼</para> <programlisting> <security-setting match="globalqueues.europe.#"> <permission type="createDurableQueue" roles="admin"/> @@ -108,7 +108,7 @@ <section> <title>åºæ¬ç¨æ·èº«ä»½ä¿¡æ¯ï¼Credentialsï¼</title> <para>HornetQèªå¸¦ä¸ä¸ªå®å ¨ç®¡çå¨ï¼security managerï¼å¯ä»¥ä»xmlæ件ä¸è¯»åç¨æ·èº«ä»½ä¿¡æ¯ï¼å³ç¨æ·åã - å¯ç ãè§è²ä¿¡æ¯ã该xmlæ件å为<literal>hornetq-users.xml</literal>ï¼å®å¿ é¡»è¦å¨classpathä¸ã</para> + å¯ç ãè§è²ä¿¡æ¯ã该xmlæ件å为<literal>activemq-users.xml</literal>ï¼å®å¿ é¡»è¦å¨classpathä¸ã</para> <para>å¦æä½ è¦ä½¿ç¨è¿ä¸ªå®å ¨ç®¡çå¨ï¼å°±å°ç¨æ·åï¼å¯ç ï¼è§è²çä¿¡æ¯å å ¥å°è¿ä¸ªæ件ä¸ã</para> <para>让æ们çä¸ä¸ªä¾åï¼</para> <programlisting> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/send-guarantees.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/send-guarantees.xml b/docs/user-manual/zh/send-guarantees.xml index 0fd9b62..0c034c9 100644 --- a/docs/user-manual/zh/send-guarantees.xml +++ b/docs/user-manual/zh/send-guarantees.xml @@ -28,7 +28,7 @@ å½å®çå¼æ¯<literal>true</literal>æ¶ï¼æå¡å¨å°ä¿è¯å¨å客æ·ç«¯ååååºæ¶ï¼äºå¡çå¤çä¿¡æ¯ å·²ç»è¢«ä¿åå°äºç£çä¸ãé»è®¤å¼æ¯<literal>true</literal>ã</para> <para>æ¾ç¶å°è¿ä¸ªåæ°è®¾ä¸º<literal>false</literal>å¯ä»¥æé«æ§è½ï¼ä½æ¯è¦ä»¥çºç²äºå¡çæä¹ æ§ä¸ºä»£ä»·ã</para> - <para>è¿ä¸ªåæ°å¨ <literal>hornetq-configuration.xml</literal>æ件ä¸ã</para> + <para>è¿ä¸ªåæ°å¨ <literal>activemq-configuration.xml</literal>æ件ä¸ã</para> </section> <section id="non-transactional-sends"> <title>éäºå¡æ§æ¶æ¯åéçä¿è¯</title> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/thread-pooling.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/thread-pooling.xml b/docs/user-manual/zh/thread-pooling.xml index 8c21b18..7f38bf9 100644 --- a/docs/user-manual/zh/thread-pooling.xml +++ b/docs/user-manual/zh/thread-pooling.xml @@ -38,7 +38,7 @@ å®å é¨ä½¿ç¨çæ¯ä¸ä¸ª <literal >java.util.concurrent.ScheduledThreadPoolExecutor</literal>å®ä¾ã</para> <para>æ大线ç¨æ°å¯ä»¥å¨<literal - >hornetq-configuration.xml</literal>æ件ä¸è¿è¡é ç½®ï¼åæ°åæ¯<literal + >activemq-configuration.xml</literal>æ件ä¸è¿è¡é ç½®ï¼åæ°åæ¯<literal >scheduled-thread-pool-max-size</literal>ãé»è®¤å¼æ¯<literal>5</literal>ã é常è¿ä¸ªçº¿ç¨æ± ä¸éè¦å¾å¤§æ°éç线ç¨ã</para> </section> @@ -46,7 +46,7 @@ <title>æå¡å¨éç¨çº¿ç¨æ± </title> <para>æå¡å¨ç«¯ç»å¤§é¨åçå¼æ¥æä½é½æ¯ç±è¿ä¸ªçº¿ç¨æ± æ¥å®æçãå¨å®çå é¨ä½¿ç¨äºä¸ä¸ª<literal >java.util.concurrent.ThreadPoolExecutor</literal>çå®ä¾ã</para> - <para>è¿ä¸ªçº¿ç¨æ± çæ大线ç¨æ°å¨<literal>hornetq-configuration.xml</literal>æ件ä¸é ç½®ï¼ç¸åºçåæ°å为<literal + <para>è¿ä¸ªçº¿ç¨æ± çæ大线ç¨æ°å¨<literal>activemq-configuration.xml</literal>æ件ä¸é ç½®ï¼ç¸åºçåæ°å为<literal >thread-pool-max-size</literal>ã</para> <para>å¦æå°åæ°è®¾ä¸º<literal>-1</literal>å表示该线ç¨æ± 没æ线ç¨éå¶ãä¹å°±æ¯è¯´å½çº¿ç¨ä¸å¤ç¨æ¶ï¼çº¿ç¨æ± å°± ä¼å建æ°ç线ç¨ãå½ä»»å¡ä¸å¤æ¶ï¼ç©ºé²ç线ç¨å°ä¼è¶ æ¶å¹¶è¢«å ³éã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/transaction-config.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/transaction-config.xml b/docs/user-manual/zh/transaction-config.xml index 232d35c..c36817e 100644 --- a/docs/user-manual/zh/transaction-config.xml +++ b/docs/user-manual/zh/transaction-config.xml @@ -22,7 +22,7 @@ æçæ¶åä¸ä¸ªäºå¡å¼å§åï¼æçµè¢«å¿è®°ãææ¶å®¢æ·ç«¯å´©æºå¹¶ä¸åä¹ä¸è½æ¢å¤ï¼è¿æ ·çè¯è¯¥äºå¡å°±ä¸ç´åå¨ä¸å»ã</para> <para>为äºè§£å³è¿ä¸ªé®é¢ï¼å¯ä»¥é ç½®HornetQæ¥æ«æè¿æçäºå¡ï¼å¹¶ä¸å°å®ä»¬åæ»ãé»è®¤å¼æ¯3000000毫ç§ï¼5åéï¼ã å®è¡¨ç¤ºä»»ä½è¶ è¿5åéçäºå¡é½å°è¢«å é¤ãè¿ä¸ªè¶ æ¶å¯¹åºçåæ°æ¯<literal - >transaction-timeout</literal>ï¼å®å¨é ç½®æ件<literal>hornetq-configuration.xml</literal>ä¸ï¼åä½æ¯«ç§ï¼ã + >transaction-timeout</literal>ï¼å®å¨é ç½®æ件<literal>activemq-configuration.xml</literal>ä¸ï¼åä½æ¯«ç§ï¼ã åæ°<literal>transaction-timeout-scan-period</literal>å®ä¹äºHornetQæ«æè¿æäºå¡çé´éã</para> <para>注æHornetQä¸ä¼åæ¹é¢åæ»ä¸ä¸ªå·²ç»å¤äºåå¤ç¶æçXAäºå¡ãå¦æä½ è®¤ä¸ºè¿äºäºå¡æ°¸è¿ä¸ä¼è¢«äºå¡ç®¡çå¨ï¼transaction managerï¼ æ¥å¤ççè¯ï¼ä½ å¿ é¡»éè¿ç®¡çæ¥å£æ¥è¿è¡åæ»ã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/undelivered-messages.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/undelivered-messages.xml b/docs/user-manual/zh/undelivered-messages.xml index a5fb827..d099f92 100644 --- a/docs/user-manual/zh/undelivered-messages.xml +++ b/docs/user-manual/zh/undelivered-messages.xml @@ -109,7 +109,7 @@ <literal>false</literal>èä¸æ¯<literal>true</literal>ã </para> <para>è¿æ ·æ¯ä¸ç¬¦åä¸¥æ ¼çJMSè¦æ±çãå æ¤HornetQå 许å¨æ¶æ¯ä¼ éåæ´æ°ä¼ é计æ°ãä½æ¯é»è®¤ä¸è¿æ ·åï¼ç®çæ¯ä¼å èè äºå®å¯¹æ§è½çå½±åã</para> - <para>è¦æ³æå¼ä¼ é计æ°æ´æ°åè½ï¼å°<literal>hornetq-configuration.xml</literal>æ件ä¸ç + <para>è¦æ³æå¼ä¼ é计æ°æ´æ°åè½ï¼å°<literal>activemq-configuration.xml</literal>æ件ä¸ç <literal>persist-delivery-count-before-delivery</literal>设为<literal>true</literal>å³å¯ï¼</para> <programlisting> <persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/using-jms.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/using-jms.xml b/docs/user-manual/zh/using-jms.xml index 2de7b50..9075632 100644 --- a/docs/user-manual/zh/using-jms.xml +++ b/docs/user-manual/zh/using-jms.xml @@ -69,7 +69,7 @@ <note> <para>å¨JMS ConnectionFactoryçé ç½®ä¸å¼ç¨äºä¸ä¸ªå为 <literal>netty</literal>ç<literal>connector</literal>ã å®å®é ä¸æåçæ¯HornetQæ ¸å¿ä¸é¨ç½²çä¸ä¸ªè¿æ¥å¨ï¼connectorï¼ãå®çé ç½®å¨HornetQçæ ¸å¿é ç½®æ件 - <literal>hornetq-configuration.xml</literal> ä¸ãå®å®ä¹äºéç¨ä½ç§ä¼ è¾ä¸æå¡å¨è¿æ¥ã</para> + <literal>activemq-configuration.xml</literal> ä¸ãå®å®ä¹äºéç¨ä½ç§ä¼ è¾ä¸æå¡å¨è¿æ¥ã</para> </note> </section> <section id="using-jms.configure.factory.types"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/using-server.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/using-server.xml b/docs/user-manual/zh/using-server.xml index 76a1345..1f10a26 100644 --- a/docs/user-manual/zh/using-server.xml +++ b/docs/user-manual/zh/using-server.xml @@ -85,18 +85,18 @@ åç§beanï¼ä»¥åå®ä»¬ä¹é´çä¾èµå ³ç³»ãHornetQçbeané½æ¯ä¸äºPOJOãæ¯JBoss Microcontainerä¿è¯äºè¿äºbeançæ£ç¡®è£ è½½åè¿è¡ã</para> </listitem> <listitem> - <para><literal>hornetq-configuration.xml</literal>ãè¿ä¸ªæ¯HornetQç主è¦çé ç½®æ件ã + <para><literal>activemq-configuration.xml</literal>ãè¿ä¸ªæ¯HornetQç主è¦çé ç½®æ件ã å ¶ä¸çææåæ°å¨<xref linkend="configuration-index"/>ä¸ç»åºäºè§£é. å¨ <xref linkend="usingserver.mainconfig"/> ä¹ææ´å¤çç¸å ³ä¿¡æ¯ã</para> </listitem> <listitem> - <para><literal>hornetq-queues.xml</literal>ãè¿ä¸ªæ件éå å«äºé¢å®ä¹çqueue以åå®ä»¬çé ç½®ï¼å æ¬å®å ¨è®¾ç½®ã - è¿æ¯ä¸ä¸ªå¯éçæ件ï¼éé¢ææçå 容é½å¯ä»¥æ¾å¨ <literal>hornetq-configuration.xml</literal>æ件ä¸ã + <para><literal>activemq-queues.xml</literal>ãè¿ä¸ªæ件éå å«äºé¢å®ä¹çqueue以åå®ä»¬çé ç½®ï¼å æ¬å®å ¨è®¾ç½®ã + è¿æ¯ä¸ä¸ªå¯éçæ件ï¼éé¢ææçå 容é½å¯ä»¥æ¾å¨ <literal>activemq-configuration.xml</literal>æ件ä¸ã å¨é»è®¤çé ç½®æ件ç®å½ä¸å¹¶æ²¡æè¿ä¸ªæ件ãHornetQä¹æ以æä¾è¿ä¸ªæ件æ¯ä¸ºäºç¨æ·ä¾¿äºç®¡çä»ä»¬çqueueãå¨classpathä¸ - å 许å å«å¤ä¸ª <literal>hornetq-queues.xml</literal> æ件ãææçè¿äºæ件é½ä¼è¢«å è½½ã</para> + å 许å å«å¤ä¸ª <literal>activemq-queues.xml</literal> æ件ãææçè¿äºæ件é½ä¼è¢«å è½½ã</para> </listitem> <listitem> - <para><literal>hornetq-users.xml</literal>ãç¨æ·ä¿¡æ¯æ件ãHornetQæ¬èº«å®ç°äºä¸ä¸ªåºæ¬ç + <para><literal>activemq-users.xml</literal>ãç¨æ·ä¿¡æ¯æ件ãHornetQæ¬èº«å®ç°äºä¸ä¸ªåºæ¬ç å®å ¨ç®¡çå¨ï¼security managerï¼ï¼å®ä»è¿ä¸ªæ件å 读åç¨æ·çå®å ¨ä¿¡æ¯ï¼å¦ç¨æ·åï¼å¯ç åè§è²ã æ³äºè§£æ´å¤å ³äºå®å ¨çä¿¡æ¯ï¼åè§ <xref linkend="security"/>ã</para> </listitem> @@ -115,7 +115,7 @@ </listitem> </itemizedlist> <note> - <para>å¦æå¨<literal>hornetq-configuration.xml</literal>æ件ä¸å°<literal>file-deployment-enabled</literal> åæ° + <para>å¦æå¨<literal>activemq-configuration.xml</literal>æ件ä¸å°<literal>file-deployment-enabled</literal> åæ° å®ä¹ä¸ºfalseï¼åHornetQå°ä¸ä¼å è½½å ¶å®çé ç½®æ件ãè¿ä¸ªåæ°çé»è®¤å¼æ¯trueã</para> </note> <para>ææé ç½®æ件ä¸çåæ°é½å¯ä»¥ç¨ç³»ç»åéæ¥å®ä¹å ¶å¼ã以ä¸ç¨ä¸ä¸ªconnectorçé ç½®æ¥è¯´æï¼</para> @@ -222,7 +222,7 @@ é 置信æ¯ãæäºæ åµä¸ï¼å¦åµå ¥å¼HornetQï¼ä½ å¯ä»¥å°å®å®ä¹ä¸ºå ¶å®å¯¹è±¡ï¼ä»¥ä¾¿ç¨å ¶å®æ¹æ³è·å¾é 置信æ¯ã</para> </listitem> <listitem> - <para>Security Manager. å¯é ç½®çå®å ¨ç®¡çå¨ãé»è®¤çå®å ¨ç®¡çå¨ä½¿ç¨ <literal>hornetq-users.xml</literal> æ件ä¸çé 置信æ¯ã + <para>Security Manager. å¯é ç½®çå®å ¨ç®¡çå¨ãé»è®¤çå®å ¨ç®¡çå¨ä½¿ç¨ <literal>activemq-users.xml</literal> æ件ä¸çé 置信æ¯ã å®ä¹å¯ä»¥é 置为ä¸ä¸ªJAASçå®å ¨ç®¡çå¨ãå½HornetQè¿è¡äºJBossåºç¨æå¡å¨ä¸æ¶ï¼å®è¿å¯ä»¥é 置为JBossçå®å ¨ç®¡çå¨ï¼ä»¥è¾¾å°æ´ç´§å¯çéæã å¦æä¸éè¦å®å ¨ç®¡çï¼ä½ ä¹å¯ä»¥å°å®å é¤ã</para> </listitem> @@ -303,7 +303,7 @@ </section> <section id="usingserver.mainconfig"> <title>主é ç½®æ件</title> - <para>HornetQ æ ¸å¿æå¡çé ç½®ä¿åå¨ <literal>hornetq-configuration.xml</literal>æ件ä¸ã + <para>HornetQ æ ¸å¿æå¡çé ç½®ä¿åå¨ <literal>activemq-configuration.xml</literal>æ件ä¸ã ãããããããã FileConfiguration bean 读åè¿ä¸ªæ件æ¥å¯¹æ¶æ¯æå¡å¨è¿è¡é ç½®ã</para> <para>HornetQæå¾å¤çé ç½®åæ°ãéç¨é»è®¤çé ç½®å¨ç»å¤§å¤æ°æ åµä¸å¯ä»¥å¾å¥½çè¿è¡ãäºå®ä¸æ¯ä¸ä¸ªåæ°é½æé»è®¤çå¤çï¼å æ¤ä¸ä¸ªåªå å«æä¸ä¸ªç©º ç<literal>configuration</literal>çé ç½®æ件æ¯ä¸ä¸ªææçæ件ã对å个åæ°ç解é贯穿äºæ¬æåãä½ è¿å¯ååç § http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/docs/user-manual/zh/wildcard-routing.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/wildcard-routing.xml b/docs/user-manual/zh/wildcard-routing.xml index 1be8224..4e3b4be 100644 --- a/docs/user-manual/zh/wildcard-routing.xml +++ b/docs/user-manual/zh/wildcard-routing.xml @@ -30,7 +30,7 @@ <para>ç¨JMSçæ¯è¯æ¥è¯´ï¼è¿ä¸ªåè½å°±æ¯å 许å建âè¯é¢ç»âï¼topic hierarchyï¼ã</para> </note> <para>è¦ä½¿ç¨æ¬åè½éè¦å°<literal>wild-card-routing-enabled</literal>å±æ§è®¾ç½®ä¸º<literal>true</literal>ã - è¿ä¸ªå±æ§å¨ <literal>hornetq-configuration.xml</literal> æ件ä¸ãé»è®¤å¼æ¯<literal>true</literal>ã</para> + è¿ä¸ªå±æ§å¨ <literal>activemq-configuration.xml</literal> æ件ä¸ãé»è®¤å¼æ¯<literal>true</literal>ã</para> <para>å ³äºéé 符çè¯æ³åè§<xref linkend="wildcard-syntax" /> ç« å <xref linkend="topic-hierarchy-example" />ã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/tests/integration-tests/src/test/resources/restricted-security-client.policy ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/restricted-security-client.policy b/tests/integration-tests/src/test/resources/restricted-security-client.policy index c8bbfa6..8794b57 100644 --- a/tests/integration-tests/src/test/resources/restricted-security-client.policy +++ b/tests/integration-tests/src/test/resources/restricted-security-client.policy @@ -10,7 +10,7 @@ grant { // Note2: Which of the following two java.io.FilePermission is necessary depends on the exact Maven command permission java.io.FilePermission "${user.dir}/hornetq-core-client/target/classes/-", "read"; permission java.io.FilePermission "${user.dir}/hornetq-core-client/target/hornetq-core-client-${project.version}.jar", "read"; - permission java.util.PropertyPermission "hornetq.version.property.filename", "read"; + permission java.util.PropertyPermission "activemq.version.property.filename", "read"; permission java.util.PropertyPermission "io.netty.eventLoopThreads", "read"; permission java.util.PropertyPermission "io.netty.noUnsafe", "read"; permission java.util.PropertyPermission "io.netty.tryUnsafe", "read"; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/tests/jms-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml index 8e0e625..1388617 100644 --- a/tests/jms-tests/pom.xml +++ b/tests/jms-tests/pom.xml @@ -141,11 +141,12 @@ <configuration> <skipTests>${skipJmsTests}</skipTests> <excludes> - <exclude>org.apache.activemq/jms/tests/XARecoveryTest.java</exclude> - <exclude>org.apache.activemq/jms/tests/XAResourceRecoveryTest.java</exclude> - <exclude>org.apache.activemq/jms/tests/XATest.java</exclude> - <exclude>org.apache.activemq/jms/tests/stress/*.java</exclude> - <exclude>org.apache.activemq/jms/tests/manual/**</exclude> + <!-- TODO: Can we remove XATests? Can we remove them all? --> + <exclude>org/apache/activemq/jms/tests/XARecoveryTest.java</exclude> + <exclude>org/apache/activemq/jms/tests/XAResourceRecoveryTest.java</exclude> + <exclude>org/apache/activemq/jms/tests/XATest.java</exclude> + <exclude>org/apache/activemq/jms/tests/stress/*.java</exclude> + <exclude>org/apache/activemq/jms/tests/manual/**</exclude> </excludes> <argLine>${activemq-surefire-argline}</argLine> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/tests/jms-tests/src/test/resources/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/tests/jms-tests/src/test/resources/activemq-configuration.xml b/tests/jms-tests/src/test/resources/activemq-configuration.xml index 5083399..567a114 100644 --- a/tests/jms-tests/src/test/resources/activemq-configuration.xml +++ b/tests/jms-tests/src/test/resources/activemq-configuration.xml @@ -1,6 +1,6 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:hornetq ../../../src/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../src/schema/activemq-configuration.xsd"> <!-- Connectors --> <connectors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/tests/jms-tests/src/test/resources/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/tests/jms-tests/src/test/resources/activemq-jms.xml b/tests/jms-tests/src/test/resources/activemq-jms.xml index d7f5b18..8d32412 100644 --- a/tests/jms-tests/src/test/resources/activemq-jms.xml +++ b/tests/jms-tests/src/test/resources/activemq-jms.xml @@ -1,6 +1,6 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> + xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> <connection-factory name="ConnectionFactory"> <connectors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/tests/jms-tests/src/test/resources/activemq-queues.xml ---------------------------------------------------------------------- diff --git a/tests/jms-tests/src/test/resources/activemq-queues.xml b/tests/jms-tests/src/test/resources/activemq-queues.xml new file mode 100644 index 0000000..df9c1fc --- /dev/null +++ b/tests/jms-tests/src/test/resources/activemq-queues.xml @@ -0,0 +1,16 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="urn:activemq ../../../src/schemas/activemq-configuration.xsd "> + + <security-settings> + <security-setting match="#"> + <permission type="createDurableQueue" roles="guest,def"/> + <permission type="deleteDurableQueue" roles="guest,def"/> + <permission type="createNonDurableQueue" roles="guest,def"/> + <permission type="deleteNonDurableQueue" roles="guest,def"/> + <permission type="consume" roles="guest,def"/> + <permission type="send" roles="guest,def"/> + </security-setting> + </security-settings> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/tests/jms-tests/src/test/resources/activemq-users.xml ---------------------------------------------------------------------- diff --git a/tests/jms-tests/src/test/resources/activemq-users.xml b/tests/jms-tests/src/test/resources/activemq-users.xml index a58d65c..3d2b74d 100644 --- a/tests/jms-tests/src/test/resources/activemq-users.xml +++ b/tests/jms-tests/src/test/resources/activemq-users.xml @@ -1,5 +1,5 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> + xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> <!-- the default user. this is used where username is null--> <defaultuser name="guest" password="guest"> <role name="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/tests/jms-tests/src/test/resources/hornetq-queues.xml ---------------------------------------------------------------------- diff --git a/tests/jms-tests/src/test/resources/hornetq-queues.xml b/tests/jms-tests/src/test/resources/hornetq-queues.xml deleted file mode 100644 index 7cdda22..0000000 --- a/tests/jms-tests/src/test/resources/hornetq-queues.xml +++ /dev/null @@ -1,16 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:hornetq ../../../src/schemas/activemq-configuration.xsd "> - - <security-settings> - <security-setting match="#"> - <permission type="createDurableQueue" roles="guest,def"/> - <permission type="deleteDurableQueue" roles="guest,def"/> - <permission type="createNonDurableQueue" roles="guest,def"/> - <permission type="deleteNonDurableQueue" roles="guest,def"/> - <permission type="consume" roles="guest,def"/> - <permission type="send" roles="guest,def"/> - </security-setting> - </security-settings> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/misc/ManifestTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/misc/ManifestTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/misc/ManifestTest.java index bc1b2cf..b8ce94c 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/misc/ManifestTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/misc/ManifestTest.java @@ -75,8 +75,6 @@ public class ManifestTest extends UnitTestCase Attributes attrs = manifest.getMainAttributes(); Assert.assertEquals(meta.getProviderVersion(), attrs.getValue("ActiveMQ-Version")); - //TODO fix this - Assert.assertEquals("https://svn.jboss.org/repos/hornetq/branches/Branch_2_2_EAP";, attrs.getValue("HornetQ-SVN-URL")); } finally { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/cd31652d/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java index 020fd71..ea89315 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java @@ -298,7 +298,7 @@ public class ActiveMQResourceAdapterConfigTest extends UnitTestCase " <config-property>\n" + " <description>Add a new managed connection factory</description>\n" + " <config-property-name>ManagedConnectionFactory</config-property-name>\n" + - " <config-property-type>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</config-property-type>\n" + + " <config-property-type>org.apache.activemq.ra.ActiveMQRAManagedConnectionFactory</config-property-type>\n" + " <config-property-value></config-property-value>\n" + " </config-property>" + " <config-property>\n" + @@ -437,7 +437,7 @@ public class ActiveMQResourceAdapterConfigTest extends UnitTestCase assertEquals("setter " + configPropertyName + " has no type set", elementsByTagName.getLength(), 1); Node configPropertyTypeNode = elementsByTagName.item(0); String configPropertyTypeName = configPropertyTypeNode.getTextContent(); - assertEquals(c.getName(), configPropertyTypeName); + assertEquals(configPropertyTypeName, c.getName()); } if (!methodList.isEmpty()) {
