http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 8aac0f4..dc9a966 100644 --- a/docs/user-manual/zh/queue-attributes.xml +++ b/docs/user-manual/zh/queue-attributes.xml @@ -23,7 +23,7 @@ <section id="predefined.queues"> <title>é¢å®ä¹çéå</title> <para>éè¿é ç½®å¯ä»¥å®ä¹éåãéåçå®ä¹å¯ä»¥å¨æ ¸å¿å±å®ä¹ï¼ä¹å¯ä»¥å¨JMSå±æ¥å®ä¹ãé¦å æ们çä¸ä¸JMSå±ã</para> - <para>ä¸é¢å°±æ¯ä¸ä¸ªå¨<literal>hornetq-jms.xml</literal>ä¸å®ä¹çä¸ä¸ªéåçä¾åï¼</para> + <para>ä¸é¢å°±æ¯ä¸ä¸ªå¨<literal>activemq-jms.xml</literal>ä¸å®ä¹çä¸ä¸ªéåçä¾åï¼</para> <programlisting><queue name="selectorQueue"> <entry name="/queue/selectorQueue"/> <selector string="color='red'"/>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/security.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/security.xml b/docs/user-manual/zh/security.xml index b4db8fb..8015d9e 100644 --- a/docs/user-manual/zh/security.xml +++ b/docs/user-manual/zh/security.xml @@ -146,9 +146,9 @@ </section> <section id="change-security-manager"> <title>æ´æ¢å®å ¨ç®¡çå¨</title> - <para>å¦æä½ ä¸æ³ç¨é»è®¤çå®å ¨ç®¡çå¨ï¼å¯ä»¥éè¿ä¿®æ¹é ç½®æ件<literal>hornetq-beans.xml</literal> + <para>å¦æä½ ä¸æ³ç¨é»è®¤çå®å ¨ç®¡çå¨ï¼å¯ä»¥éè¿ä¿®æ¹é ç½®æ件<literal>activemq-beans.xml</literal> ï¼æè å¨è¿è¡JBossåºç¨æå¡å¨æ åµä¸<literal - >hornetq-jboss-beans.xml</literal>æ件ï¼æ¥æ´æ¢ãåæ¶è¦æ´æ¢ + >activemq-jboss-beans.xml</literal>æ件ï¼æ¥æ´æ¢ãåæ¶è¦æ´æ¢ <literal>ActiveMQSecurityManager</literal> bean çç±»ã</para> <para>让æ们çä¸æ®µé»è®¤beanæ件çå 容ï¼</para> <programlisting> @@ -163,8 +163,8 @@ <para>ActiveMQèªå¸¦æå¦å¤ä¸¤ä¸ªå®å ¨ç®¡çå¨å¯ä¾ä½¿ç¨ãä¸ä¸ªæ¯JAASå®å ¨ç®¡çå¨ï¼å¦ä¸ä¸ªæ¯ç¨æ¥ä¸JBossåºç¨æå¡ å¨éæçå®å ¨ç®¡çå¨ãæ¤å¤ï¼ä½ è¿å¯ä»¥ç¼åå®ç°ä½ èªå·±çå®å ¨ç®¡çå¨ãé¦å è¦å®ç° <literal>org.apache.activemq.core.security.SecurityManager</literal>æ¥å£ï¼åå°ä½ çå®ç° - ç±»å®ä¹å°<literal>hornetq-beans.xml</literal>æ件ä¸å³å¯ï¼æè å¨JBossåºç¨æå¡å¨ä¸ - 使ç¨<literal>hornetq-jboss-beans.xml</literal>æ件ï¼ã</para> + ç±»å®ä¹å°<literal>activemq-beans.xml</literal>æ件ä¸å³å¯ï¼æè å¨JBossåºç¨æå¡å¨ä¸ + 使ç¨<literal>activemq-jboss-beans.xml</literal>æ件ï¼ã</para> <para>以ä¸åå«ä»ç»è¿ä¸¤å±å®å ¨ç®¡çå¨</para> </section> <section> @@ -212,7 +212,7 @@ <para>æ¤å®å ¨ç®¡çå¨çç±»æ¯ <literal >org.apache.activemq.integration.jboss.security.JBossASSecurityManager</literal>ã</para> <para>è¦äºè§£å¦ä½é ç½®JBosså®å ¨ç®¡çå¨ï¼å¯ä»¥çä¸ç¼ActiveMQåå¸å ä¸ç¸å ³ä¾åä¸ç - <literal>hornetq-jboss-beans.xml</literal>æ件ã</para> + <literal>activemq-jboss-beans.xml</literal>æ件ã</para> <section> <title>é 置客æ·ç«¯ç»å½</title> <para>JBosså¯ä»¥é 置使ç¨å®¢æ·ç»å½ãJEEç模åå¦servletæEJBå¯ä»¥å°å®å ¨è®¤è¯ä¿¡æ¯è®¾ç½®å°å®å ¨ä¸ä¸æï¼security contextï¼ä¸ï¼ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 b16180e..7916326 100644 --- a/docs/user-manual/zh/send-guarantees.xml +++ b/docs/user-manual/zh/send-guarantees.xml @@ -53,7 +53,7 @@ <emphasis>å¼æ¥åééç¥åè½</emphasis>ãè¿ä¸åè½å¨<xref linkend="asynchronous-send-acknowledgements"/> è¿è¡äºæè¿°ã</para> <para>使ç¨JMSæ¶ï¼å¦æJMSçè¿æ¥å·¥åæ¯å¨æå¡å¨ç«¯è¢«æ³¨åå°JNDIæå¡ï¼ä½ éè¦é ç½® - <literal>hornetq-jms.xml</literal>æ件ä¸ç<literal>block-on-durable-send</literal> + <literal>activemq-jms.xml</literal>æ件ä¸ç<literal>block-on-durable-send</literal> å<literal>block-on-non-durable-send</literal>ãå¦æä¸ä½¿ç¨JNDIï¼å¯ä»¥è°ç¨ <literal>ActiveMQConnectionFactory</literal>ç¸åºç设置æ¹æ³è¿è¡é ç½®ã</para> <para>å¦æä½ ä½¿ç¨çæ¯å æ ¸æå¡ï¼ä½ å¯ä»¥ç´æ¥å¨<literal http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 98e565b..b99f9c9 100644 --- a/docs/user-manual/zh/thread-pooling.xml +++ b/docs/user-manual/zh/thread-pooling.xml @@ -91,7 +91,7 @@ myFactory.setThreadPoolMaxSize(-1); </programlisting> >ConnectionFactory</literal>çå®ä¾ãå¦ï¼</para> <programlisting>ConnectionFactory myConnectionFactory = ActiveMQJMSClient.createConnectionFactory(myFactory); </programlisting> <para>å¦æä½ ä½¿ç¨JNDIæ¥å建<literal>ActiveMQConnectionFactory</literal> - å®ä¾ï¼ä½ è¿å¯ä»¥å¨<literal>hornetq-jms.xml</literal>æ件ä¸è¿è¡é ç½®ãå¦ï¼</para> + å®ä¾ï¼ä½ è¿å¯ä»¥å¨<literal>activemq-jms.xml</literal>æ件ä¸è¿è¡é ç½®ãå¦ï¼</para> <programlisting><connection-factory name="ConnectionFactory"> <connectors> <connector-ref connector-name="netty"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 bbd4f97..ad5f598 100644 --- a/docs/user-manual/zh/using-jms.xml +++ b/docs/user-manual/zh/using-jms.xml @@ -37,7 +37,7 @@ </section> <section id="using-jms.server.configuration"> <title>JMSæå¡çé ç½®</title> - <para><literal>hornetq-jms.xml</literal>æ件å å«äºéè¦å建ä¸é¨ç½²çJMS Queueï¼TopicåConnectionFactory + <para><literal>activemq-jms.xml</literal>æ件å å«äºéè¦å建ä¸é¨ç½²çJMS Queueï¼TopicåConnectionFactory çå®ä¾ã该æä»¶å¿ é¡»è¦æå®å¨classpathä¸ãä»è¿ä¸ªæ件ä¸é¨ç½²å¥½ç对象é½å¯ä»¥ç¨JNDIæ¥æ¾å°ã</para> <para>JMS客æ·ç«¯å¯ä»¥å©ç¨JMS ConnectionFactory对象æ¥å建ä¸æå¡å¨çè¿æ¥ãConnectionFactoryä¸æå ³äºæå¡å¨å°åç ä¿¡æ¯ä»¥ååç§åæ°ãé常使ç¨è¿äºåæ°çé»è®¤å¼å³å¯ã</para> @@ -158,7 +158,7 @@ java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces </programlisting> <para>å ¶ä¸ç <literal>myhost</literal> æ¯ JNDI serverç主æºåæIPå°åã 1099æ¯ç«¯å£å·ï¼æ ¹æ®ä¸åçé ç½®ï¼ ç«¯å£å·ä¹å¯è½ä¸åã</para> - <para>å¨é»è®¤çåç¬æ¹å¼ï¼standaloneï¼é ç½®ä¸ï¼JNDIæå¡ç«¯å£çåæ°å®ä¹å¨<literal>hornetq-beans.xml</literal> + <para>å¨é»è®¤çåç¬æ¹å¼ï¼standaloneï¼é ç½®ä¸ï¼JNDIæå¡ç«¯å£çåæ°å®ä¹å¨<literal>activemq-beans.xml</literal> æ件ä¸ç <literal>JNDIServer</literal> beanä¸ï¼å¦ï¼</para> <programlisting> <bean name="JNDIServer" class="org.jnp.server.Main"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 01835f6..2cf70df 100644 --- a/docs/user-manual/zh/using-server.xml +++ b/docs/user-manual/zh/using-server.xml @@ -80,8 +80,8 @@ <para>é ç½®æ件çè·¯å¾å®ä¹å¨ <literal>run.sh</literal> å <literal>run.bat</literal> èæ¬ä¸çclasspathéã该路å¾ä¸å¯ä»¥å å«ä»¥ä¸æ件ï¼</para> <itemizedlist> <listitem> - <para><literal>hornetq-beans.xml</literal> ï¼å¦ææ¯è¿è¡å¨JBossåºç¨æå¡å¨å ï¼å为 <literal - >hornetq-jboss-beans.xml</literal>ï¼ãè¿æ¯JBoss Microcontainerçbeané ç½®æ件ãå ¶ä¸å®ä¹äºActiveMQç + <para><literal>activemq-beans.xml</literal> ï¼å¦ææ¯è¿è¡å¨JBossåºç¨æå¡å¨å ï¼å为 <literal + >activemq-jboss-beans.xml</literal>ï¼ãè¿æ¯JBoss Microcontainerçbeané ç½®æ件ãå ¶ä¸å®ä¹äºActiveMQç åç§beanï¼ä»¥åå®ä»¬ä¹é´çä¾èµå ³ç³»ãActiveMQçbeané½æ¯ä¸äºPOJOãæ¯JBoss Microcontainerä¿è¯äºè¿äºbeançæ£ç¡®è£ è½½åè¿è¡ã</para> </listitem> <listitem> @@ -101,7 +101,7 @@ æ³äºè§£æ´å¤å ³äºå®å ¨çä¿¡æ¯ï¼åè§ <xref linkend="security"/>ã</para> </listitem> <listitem> - <para><literal>hornetq-jms.xml</literal>ãè¿ä¸ªæ件å å«æJMS对象ãActiveMQçé»è®¤é ç½®ä¸å å«æJMSæå¡ï¼ + <para><literal>activemq-jms.xml</literal>ãè¿ä¸ªæ件å å«æJMS对象ãActiveMQçé»è®¤é ç½®ä¸å å«æJMSæå¡ï¼ å®ä»è¿ä¸ªæ件ä¸è¯»åJMS Queueï¼TopicåConnectionFactory并å°å®ä»¬é¨ç½²å°JNDIæå¡ä¸ãå¦æä½ ä¸ä½¿ç¨JMSï¼ æè ä½ ä¸éè¦é¨ç½²è¿äºJMS对象ï¼é£ä¹ä½ å°±ä¸éè¦è¿ä¸ªæ件ãæå ³JMSç使ç¨è¯¦è§<xref linkend="using-jms" />ã</para> @@ -122,12 +122,12 @@ <programlisting><connector name="netty"> <factory-class>org.apache.activemq.integration.transports.netty.NettyConnectorFactory </factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}" type="String"/> + <param key="port" value="${activemq.remoting.netty.port:5445}" type="Integer"/> </connector></programlisting> <para>å¨ä¸é¢çé ç½®ä¸æ们å®ä¹äºä¸¤ä¸ªç³»ç»åé <literal - >hornetq.remoting.netty.host</literal> å <literal - >hornetq.remoting.netty.port</literal>ãå®ä»¬çå¼ä¼è¢«ç¸åºçç³»ç»åéçå¼ï¼å¦æå®ä¹äºçè¯ï¼ææ¿ä»£ã + >activemq.remoting.netty.host</literal> å <literal + >activemq.remoting.netty.port</literal>ãå®ä»¬çå¼ä¼è¢«ç¸åºçç³»ç»åéçå¼ï¼å¦æå®ä¹äºçè¯ï¼ææ¿ä»£ã å¦æ没æå®ä¹è¿äºç³»ç»åéï¼å®ä»¬çé»è®¤å¼å°åå«ä¸º localhost å 5445ãä¹å¯ä»¥ä¸ç»åºé»è®¤å¼ï¼ä½å¦æè¿æ ·å°± <emphasis>å¿ é¡»</emphasis>è¦å®ä¹ç¸åºçç³»ç»åéã</para> </section> @@ -232,7 +232,7 @@ </listitem> <listitem id="bean-jmsservermanager"> <para>JMSServerManager</para> - <para>è¿ä¸ªå¯¹è±¡å°<literal>hornetq-jms.xml</literal>æ件ä¸å®ä¹çJMSç对象è¿è¡é¨ç½²ï¼æ¯å¦JMS Queues, Topics + <para>è¿ä¸ªå¯¹è±¡å°<literal>activemq-jms.xml</literal>æ件ä¸å®ä¹çJMSç对象è¿è¡é¨ç½²ï¼æ¯å¦JMS Queues, Topics 以åConnectionFactoryãå®è¿æä¾ä¸å¥ç®åç管çæ¥å£ä»¥æ¹ä¾¿å°å¯¹è¿äºJMS对象è¿è¡ç®¡çãé常å®åªæ¯å°å·¥ä½ä»£çç» æ ¸å¿æå¡å¨ãå¦æä½ ä¸éè¦å¨æå¡å¨ç«¯è¿è¡JMS对象çé¨ç½²ä¸ç®¡çï¼å¯ä»¥å°å®ä»é ç½®ä¸å»æã</para> </listitem> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/etc/checkstyle.xml ---------------------------------------------------------------------- diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml index 3f8da10..9301fd4 100644 --- a/etc/checkstyle.xml +++ b/etc/checkstyle.xml @@ -76,6 +76,7 @@ <property name="illegalPkgs" value="junit.framework"/> </module> + <!-- TODO: Where to place this now? --> <!-- developed at https://github.com/hornetq/hornetq-checkstyle-checks --> <module name="org.hornetq.checks.annotation.RequiredAnnotation"> <property name="annotationName" value="Parameters"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/etc/findbugs-exclude.xml ---------------------------------------------------------------------- diff --git a/etc/findbugs-exclude.xml b/etc/findbugs-exclude.xml index fb559ef..0541fcd 100644 --- a/etc/findbugs-exclude.xml +++ b/etc/findbugs-exclude.xml @@ -109,18 +109,18 @@ <Match> <!-- Generated by JavaCC: ignore naming convention violation --> - <Class name="~org\.hornetq\.core\.filter\.impl\.(FilterParser(|TokenManager|Constants)|TokenMgrError)"/> + <Class name="~org\.activemq\.core\.filter\.impl\.(FilterParser(|TokenManager|Constants)|TokenMgrError)"/> <bug pattern="NM_METHOD_NAMING_CONVENTION,SF_SWITCH_NO_DEFAULT,MS_PKGPROTECT,URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD,MS_OOI_PKGPROTECT"/> </Match> <Match> <!-- Files generated by JBoss Logging are ignored --> - <Class name="~org\.hornetq\..*\.ActiveMQ.*(Logger_\$logger|Bundle_\$bundle)"/> + <Class name="~org\.activemq\..*\.ActiveMQ.*(Logger_\$logger|Bundle_\$bundle)"/> </Match> <!-- Ignore checks on return values, example File.delete(), on samples/examples --> <Match> - <Class name="~org\.hornetq\.common\.example.*Example"/> + <Class name="~org\.activemq\.common\.example.*Example"/> <bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"/> </Match> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/core/embedded/readme.html ---------------------------------------------------------------------- diff --git a/examples/core/embedded/readme.html b/examples/core/embedded/readme.html index d003ffb..bf8c12c 100644 --- a/examples/core/embedded/readme.html +++ b/examples/core/embedded/readme.html @@ -12,7 +12,7 @@ <p>ActiveMQ was designed to use POJOs (Plain Old Java Objects), what makes embedding ActiveMQ as simple as instantiating a few objects.</p> <p>In this example, we are using two jars:</p> <ul> - <li>hornetq-server.jar</li> + <li>activemq-server.jar</li> <li>netty.jar</li> </ul> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml ---------------------------------------------------------------------- diff --git a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml index 42eb7eb..f742c35 100644 --- a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml +++ b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml @@ -26,10 +26,10 @@ <persistence-enabled>true</persistence-enabled> - <large-messages-directory>/hornetq-data/large-messages</large-messages-directory> - <bindings-directory>/hornetq-data/bindings</bindings-directory> - <journal-directory>/hornetq-data/journal</journal-directory> - <paging-directory>/hornetq-data/paging</paging-directory> + <large-messages-directory>/activemq-data/large-messages</large-messages-directory> + <bindings-directory>/activemq-data/bindings</bindings-directory> + <journal-directory>/activemq-data/journal</journal-directory> + <paging-directory>/activemq-data/paging</paging-directory> <queues> <queue name="perfQueue"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml b/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml index e2d45af..2bab47d 100644 --- a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml @@ -195,7 +195,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -309,7 +309,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -368,7 +368,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -386,7 +386,7 @@ <entry name="java:jboss/exported/jms/queues/testQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/jca-config/readme.html ---------------------------------------------------------------------- diff --git a/examples/javaee/jca-config/readme.html b/examples/javaee/jca-config/readme.html index 23be575..f303af3 100644 --- a/examples/javaee/jca-config/readme.html +++ b/examples/javaee/jca-config/readme.html @@ -99,7 +99,7 @@ public class MDBQueueA implements MessageListener @ActivationConfigProperty(propertyName = "destination", propertyValue = "B"), @ActivationConfigProperty(propertyName = "useJNDI", propertyValue = "false") }) -@ResourceAdapter("hornetq-ra-remote.rar") +@ResourceAdapter("activemq-ra-remote.rar") public class MDBQueueB implements MessageListener { public void onMessage(Message message)... http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml b/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml index fc15364..314ae8d 100644 --- a/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -355,7 +355,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -377,7 +377,7 @@ <entry name="java:jboss/exported/queues/B"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml b/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml index faf3f3f..109e61a 100644 --- a/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml +++ b/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -356,7 +356,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -367,7 +367,7 @@ <entry name="java:jboss/DefaultJMSConnectionFactory"/> </entries> </pooled-connection-factory> - <pooled-connection-factory name="hornetq-ra-remote"> + <pooled-connection-factory name="activemq-ra-remote"> <transaction mode="xa"/> <user>guest</user> <password>password</password> @@ -379,7 +379,7 @@ </entries> </pooled-connection-factory> </jms-connection-factories> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/jca-remote/readme.html ---------------------------------------------------------------------- diff --git a/examples/javaee/jca-remote/readme.html b/examples/javaee/jca-remote/readme.html index 54f7e0e..ddc2939 100644 --- a/examples/javaee/jca-remote/readme.html +++ b/examples/javaee/jca-remote/readme.html @@ -23,10 +23,10 @@ <li>via a pooled-connection-factory in the "messaging" subsystem</li> <li>via the activation configuration properties on the MDB set either via annotations or ejb-jar.xml</li> </ol> - <p>In this example the MDB is annotated with <code>@ResourceAdapter("hornetq-ra-remote.rar")</code> which refers to + <p>In this example the MDB is annotated with <code>@ResourceAdapter("activemq-ra-remote.rar")</code> which refers to this pooled-connection-factory:</p> <pre class="prettyprint"> - <pooled-connection-factory name="hornetq-ra-remote"> + <pooled-connection-factory name="activemq-ra-remote"> <transaction mode="xa"/> <user>guest</user> <password>password</password> @@ -44,7 +44,7 @@ <p>The same pooled-connection-factory used for JCA inflow also configures an outgoing JCA connection factory which Java EE components can use to send messages to the same remote ActiveMQ Server.</p> <pre class="prettyprint"> - <pooled-connection-factory name="hornetq-ra-remote"> + <pooled-connection-factory name="activemq-ra-remote"> <transaction mode="xa"/> <user>guest</user> <password>password</password> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml b/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml index f603810..8ed7aee 100644 --- a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -356,7 +356,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -367,7 +367,7 @@ <entry name="java:jboss/DefaultJMSConnectionFactory"/> </entries> </pooled-connection-factory> - <pooled-connection-factory name="hornetq-ra-remote"> + <pooled-connection-factory name="activemq-ra-remote"> <transaction mode="xa"/> <user>guest</user> <password>password</password> @@ -379,7 +379,7 @@ </entries> </pooled-connection-factory> </jms-connection-factories> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml b/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml index 2885355..e53a16b 100644 --- a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml +++ b/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -355,7 +355,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -377,7 +377,7 @@ <entry name="java:jboss/exported/queues/mdbReplyQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/jms-bridge/readme.html ---------------------------------------------------------------------- diff --git a/examples/javaee/jms-bridge/readme.html b/examples/javaee/jms-bridge/readme.html index a5c0b7b..5da08f1 100644 --- a/examples/javaee/jms-bridge/readme.html +++ b/examples/javaee/jms-bridge/readme.html @@ -25,7 +25,7 @@ <h3>JMS Bridge configuration</h3> <p>The JMS Bridge is configured in the "messaging" subsystem.<br /> - <p>The Bridge is deployed in the application server when you simply type <code>./build.sh deploy</code> (or <code>build.bat deploy</code> on windows) (it is copied to <code>${JBOSS_HOME}/server/default-with-hornetq/deploy/</code>).</p> + <p>The Bridge is deployed in the application server when you simply type <code>./build.sh deploy</code> (or <code>build.bat deploy</code> on windows) (it is copied to <code>${JBOSS_HOME}/server/default-with-activemq/deploy/</code>).</p> <h2>Example step-by-step</h2> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml b/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml index 2850f8c..9d8432d 100644 --- a/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -355,7 +355,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -377,7 +377,7 @@ <entry name="java:jboss/exported/jms/queues/targetQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> <jms-bridge name="myBridge"> <source> <connection-factory name="ConnectionFactory" /> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml b/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml index c64af5a..437418e 100644 --- a/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -355,7 +355,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -377,7 +377,7 @@ <entry name="java:jboss/exported/jms/queues/replyQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml index 740cfb6..be39676 100644 --- a/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -355,7 +355,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -373,7 +373,7 @@ <entry name="java:jboss/exported/jms/queues/testQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml index b1aa46e..02c2dae 100644 --- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -356,7 +356,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -378,7 +378,7 @@ <entry name="java:jboss/exported/jms/topics/testTopic"/> </jms-topic> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml index 740cfb6..be39676 100644 --- a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -355,7 +355,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -373,7 +373,7 @@ <entry name="java:jboss/exported/jms/queues/testQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml index 740cfb6..be39676 100644 --- a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -355,7 +355,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -373,7 +373,7 @@ <entry name="java:jboss/exported/jms/queues/testQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml index 740cfb6..be39676 100644 --- a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -355,7 +355,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -373,7 +373,7 @@ <entry name="java:jboss/exported/jms/queues/testQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml index c3203b9..58f07a7 100644 --- a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -355,7 +355,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -373,7 +373,7 @@ <entry name="java:jboss/exported/jms/queues/testQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml index c3203b9..58f07a7 100644 --- a/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -355,7 +355,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -373,7 +373,7 @@ <entry name="java:jboss/exported/jms/queues/testQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml index 2045cee..feee7da 100644 --- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml +++ b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <backup>true</backup> <shared-store>true</shared-store> <persistence-enabled>true</persistence-enabled> @@ -373,7 +373,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -395,7 +395,7 @@ <entry name="java:jboss/exported/queues/inQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml index 49aa8f5..5a27ce6 100644 --- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -365,7 +365,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -376,7 +376,7 @@ <entry name="java:jboss/DefaultJMSConnectionFactory"/> </entries> </pooled-connection-factory> - <pooled-connection-factory name="hornetq-remote-ra"> + <pooled-connection-factory name="activemq-remote-ra"> <transaction mode="xa"/> <user>guest</user> <password>password</password> @@ -391,7 +391,7 @@ </entries> </pooled-connection-factory> </jms-connection-factories> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml index bd25813..9d068f8 100644 --- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml +++ b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <failover-on-shutdown>true</failover-on-shutdown> <shared-store>true</shared-store> <persistence-enabled>true</persistence-enabled> @@ -375,7 +375,7 @@ <ha>true</ha> <reconnect-attempts>-1</reconnect-attempts> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -397,7 +397,7 @@ <entry name="java:jboss/exported/queues/outQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml index 15aa305..4e784d1 100644 --- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml +++ b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <backup>true</backup> <shared-store>true</shared-store> <persistence-enabled>true</persistence-enabled> @@ -381,7 +381,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -403,7 +403,7 @@ <entry name="java:jboss/exported/queues/inQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml index e924248..c08945d 100644 --- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -365,7 +365,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -376,7 +376,7 @@ <entry name="java:jboss/DefaultJMSConnectionFactory"/> </entries> </pooled-connection-factory> - <pooled-connection-factory name="hornetq-remote-ra"> + <pooled-connection-factory name="activemq-remote-ra"> <transaction mode="xa"/> <user>guest</user> <password>password</password> @@ -388,7 +388,7 @@ </entries> </pooled-connection-factory> </jms-connection-factories> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml index a5e67a3..987f8cb 100644 --- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml +++ b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <failover-on-shutdown>true</failover-on-shutdown> <shared-store>true</shared-store> <persistence-enabled>true</persistence-enabled> @@ -383,7 +383,7 @@ <ha>true</ha> <reconnect-attempts>-1</reconnect-attempts> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -405,7 +405,7 @@ <entry name="java:jboss/exported/queues/outQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml index ca44606..64bffce 100644 --- a/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -355,7 +355,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -377,7 +377,7 @@ <entry name="java:jboss/exported/jms/queues/replyQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/pom.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/pom.xml b/examples/javaee/pom.xml index 5f724f9..36acf34 100644 --- a/examples/javaee/pom.xml +++ b/examples/javaee/pom.xml @@ -24,7 +24,7 @@ <jboss.home>${env.JBOSS_HOME}</jboss.home> <!-- Note this must be consistent with the version in AS7 --> - <hornetq.client.version>6.0.0-SNAPSHOT</hornetq.client.version> + <activemq.client.version>6.0.0-SNAPSHOT</activemq.client.version> </properties> @@ -94,17 +94,17 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-core-client</artifactId> - <version>${hornetq.client.version}</version> + <version>${activemq.client.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-jms-client</artifactId> - <version>${hornetq.client.version}</version> + <version>${activemq.client.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-ra</artifactId> - <version>${hornetq.client.version}</version> + <version>${activemq.client.version}</version> </dependency> <dependency> <groupId>io.netty</groupId> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml ---------------------------------------------------------------------- diff --git a/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml b/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml index dbfde22..7b3e84c 100644 --- a/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ <singleton default-access-timeout="5000"/> </session-bean> <mdb> - <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> </mdb> <pools> @@ -296,7 +296,7 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - <hornetq-server> + <activemq-server> <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -355,7 +355,7 @@ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> - <pooled-connection-factory name="hornetq-ra"> + <pooled-connection-factory name="activemq-ra"> <transaction mode="xa"/> <connectors> <connector-ref connector-name="in-vm"/> @@ -373,7 +373,7 @@ <entry name="java:jboss/exported/jms/queues/testQueue"/> </jms-queue> </jms-destinations> - </hornetq-server> + </activemq-server> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:2.0"> <remote-naming/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/README.md ---------------------------------------------------------------------- diff --git a/examples/jms/README.md b/examples/jms/README.md index 9c9e0fb..c2f9c94 100644 --- a/examples/jms/README.md +++ b/examples/jms/README.md @@ -8,7 +8,7 @@ mvn verify ``` If you are running against an un released version, i.e. from master branch, you will have to run `mvn install` on the root -pom.xml and the example/hornetq-jms-examples-common/pom.xml first. +pom.xml and the example/activemq-jms-examples-common/pom.xml first. If you want to run all the examples (except those that need to be run standalone) you can run `mvn verify` in the examples directory but before you do you will need to up the memory used by running: http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/activemq-jms-examples-common/config/logging.properties ---------------------------------------------------------------------- diff --git a/examples/jms/activemq-jms-examples-common/config/logging.properties b/examples/jms/activemq-jms-examples-common/config/logging.properties index 754d138..32f5fc9 100644 --- a/examples/jms/activemq-jms-examples-common/config/logging.properties +++ b/examples/jms/activemq-jms-examples-common/config/logging.properties @@ -20,7 +20,7 @@ handlers=java.util.logging.ConsoleHandler java.util.logging.ConsoleHandler.formatter=org.apache.activemq6.integration.logging.ActiveMQLoggerFormatter java.util.logging.FileHandler.level=INFO java.util.logging.FileHandler.formatter=org.apache.activemq6.integration.logging.ActiveMQLoggerFormatter -java.util.logging.FileHandler.pattern=logs/hornetq.log +java.util.logging.FileHandler.pattern=logs/activemq.log # Default global logging level. # This specifies which kinds of events are logged across # all loggers. For any given facility this global level http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/aerogear/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/aerogear/pom.xml b/examples/jms/aerogear/pom.xml index 71c1d83..4ae12ea 100644 --- a/examples/jms/aerogear/pom.xml +++ b/examples/jms/aerogear/pom.xml @@ -130,7 +130,7 @@ </dependencies> <configuration> <waitOnStart>false</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/aerogear/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/aerogear/readme.html b/examples/jms/aerogear/readme.html index d29075d..cd3c15b 100644 --- a/examples/jms/aerogear/readme.html +++ b/examples/jms/aerogear/readme.html @@ -60,7 +60,7 @@ </ol> <p>And on your mobile app you should see a message from ActiveMQ</p> - <p>Now lets look a bit more closely at the configuration in hornetq-configuration.xml</p> + <p>Now lets look a bit more closely at the configuration in activemq-configuration.xml</p> <ol> <pre class="prettyprint"> <code> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/applet/applet.html ---------------------------------------------------------------------- diff --git a/examples/jms/applet/applet.html b/examples/jms/applet/applet.html index cb24c3d..0ac3f48 100644 --- a/examples/jms/applet/applet.html +++ b/examples/jms/applet/applet.html @@ -11,7 +11,7 @@ <applet code="org.apache.activemq.jms.example.AppletExample.class" codebase="build/classes/" - archive="hornetq-core-client.jar,hornetq-jms-client.jar,jboss-jms-api.jar,netty.jar" + archive="activemq-core-client.jar,activemq-jms-client.jar,jboss-jms-api.jar,netty.jar" width="640" height="480"></applet> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/applet/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/applet/pom.xml b/examples/jms/applet/pom.xml index 859103e..c99b2c7 100644 --- a/examples/jms/applet/pom.xml +++ b/examples/jms/applet/pom.xml @@ -40,7 +40,7 @@ <goal>start</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> </configuration> </execution> <execution> @@ -56,7 +56,7 @@ <systemProperties> <property> <name>exampleConfigDir</name> - <value>${basedir}/target/classes/hornetq</value> + <value>${basedir}/target/classes/activemq</value> </property> </systemProperties> </configuration> @@ -67,7 +67,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/application-layer-failover/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/application-layer-failover/pom.xml b/examples/jms/application-layer-failover/pom.xml index 5f9eaf1..0cfa2f7 100644 --- a/examples/jms/application-layer-failover/pom.xml +++ b/examples/jms/application-layer-failover/pom.xml @@ -36,7 +36,7 @@ <goal>start</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> </configuration> </execution> <execution> @@ -47,7 +47,7 @@ <configuration> <jndiPort>1199</jndiPort> <jndiRmiPort>1198</jndiRmiPort> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir> <serverStartString>INFO: HQ221034</serverStartString> <fork>true</fork> </configuration> @@ -66,7 +66,7 @@ <systemProperties> <property> <name>exampleConfigDir</name> - <value>${basedir}/target/classes/hornetq</value> + <value>${basedir}/target/classes/activemq</value> </property> </systemProperties> </configuration> @@ -77,7 +77,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> </configuration> </execution> <execution> @@ -86,7 +86,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir> </configuration> </execution> </executions> @@ -134,7 +134,7 @@ </dependencies> <configuration> <waitOnStart>false</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/bridge/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/bridge/pom.xml b/examples/jms/bridge/pom.xml index ee5dbc7..f57adef 100644 --- a/examples/jms/bridge/pom.xml +++ b/examples/jms/bridge/pom.xml @@ -41,7 +41,7 @@ <goal>start</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> </configuration> </execution> <execution> @@ -52,7 +52,7 @@ <configuration> <jndiPort>1199</jndiPort> <jndiRmiPort>1198</jndiRmiPort> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir> <fork>true</fork> </configuration> </execution> @@ -70,7 +70,7 @@ <systemProperties> <property> <name>exampleConfigDir</name> - <value>${basedir}/target/classes/hornetq</value> + <value>${basedir}/target/classes/activemq</value> </property> </systemProperties> </configuration> @@ -81,7 +81,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> </configuration> </execution> <execution> @@ -90,7 +90,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/bridge/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/bridge/readme.html b/examples/jms/bridge/readme.html index 7b3acdd..db6ecfd 100644 --- a/examples/jms/bridge/readme.html +++ b/examples/jms/bridge/readme.html @@ -35,7 +35,7 @@ want to reject those.</p> <p>Moreover it is known that Aardvarks normally wear blue hats, and it's important that we only make sausages using Aardvarks with green hats, so on the way we are going transform the property "hat" from "green" to "blue".</p> - <p>Here's a snippet from <code>hornetq-configuration.xml</code> showing the bridge configuration</p> + <p>Here's a snippet from <code>activemq-configuration.xml</code> showing the bridge configuration</p> <pre class="prettyprint"> <code> <bridge name="my-bridge"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/browser/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/browser/pom.xml b/examples/jms/browser/pom.xml index 9d23336..19d4284 100644 --- a/examples/jms/browser/pom.xml +++ b/examples/jms/browser/pom.xml @@ -99,7 +99,7 @@ </dependencies> <configuration> <waitOnStart>false</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> <systemProperties> <property> <name>build.directory</name> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/client-kickoff/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/client-kickoff/pom.xml b/examples/jms/client-kickoff/pom.xml index 7cc84d8..c254db9 100644 --- a/examples/jms/client-kickoff/pom.xml +++ b/examples/jms/client-kickoff/pom.xml @@ -130,7 +130,7 @@ </dependencies> <configuration> <waitOnStart>false</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/client-kickoff/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/client-kickoff/readme.html b/examples/jms/client-kickoff/readme.html index 4522c23..d34d5dc 100644 --- a/examples/jms/client-kickoff/readme.html +++ b/examples/jms/client-kickoff/readme.html @@ -33,7 +33,7 @@ <h2>Example step-by-step</h2> <p><em>To run the example, simply type <code>mvn verify</code> from this directory</em></p> <ol> - <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get its properties from <a href="src/main/resources/hornetq/server0/client-jndi.properties">client-jndi.properties</a></li> + <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get its properties from <a href="src/main/resources/activemq/server0/client-jndi.properties">client-jndi.properties</a></li> <pre class="prettyprint"> <code>InitialContext initialContext = getContext(0);</code> </pre>
