http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/send-acknowledgements/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/send-acknowledgements/pom.xml b/examples/jms/send-acknowledgements/pom.xml index cfc41c9..07485c6 100644 --- a/examples/jms/send-acknowledgements/pom.xml +++ b/examples/jms/send-acknowledgements/pom.xml @@ -107,7 +107,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/spring-integration/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/spring-integration/pom.xml b/examples/jms/spring-integration/pom.xml index eac214a..b0ec32c 100644 --- a/examples/jms/spring-integration/pom.xml +++ b/examples/jms/spring-integration/pom.xml @@ -96,7 +96,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/ssl-enabled/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/ssl-enabled/pom.xml b/examples/jms/ssl-enabled/pom.xml index d3b2095..8ff5d64 100644 --- a/examples/jms/ssl-enabled/pom.xml +++ b/examples/jms/ssl-enabled/pom.xml @@ -107,7 +107,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/ssl-enabled/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/ssl-enabled/readme.html b/examples/jms/ssl-enabled/readme.html index d128ce6..4b463e5 100644 --- a/examples/jms/ssl-enabled/readme.html +++ b/examples/jms/ssl-enabled/readme.html @@ -20,30 +20,30 @@ <connector name="netty-ssl-connector"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="localhost" type="String"/> - <param key="hornetq.remoting.netty.port" value="5500" type="Integer"/> - <param key="hornetq.remoting.netty.ssl-enabled" value="true" type="Boolean"/> - <param key="hornetq.remoting.netty.trust-store-path" value="server0/hornetq.example.truststore" type="String"/> - <param key="hornetq.remoting.netty.trust-store-password" value="hornetqexample" type="String"/> + <param key="activemq.remoting.netty.host" value="localhost" type="String"/> + <param key="activemq.remoting.netty.port" value="5500" type="Integer"/> + <param key="activemq.remoting.netty.ssl-enabled" value="true" type="Boolean"/> + <param key="activemq.remoting.netty.trust-store-path" value="server0/activemq.example.truststore" type="String"/> + <param key="activemq.remoting.netty.trust-store-password" value="hornetqexample" type="String"/> </connector> <!-- Acceptor --> <acceptor name="netty-ssl-acceptor"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="localhost" type="String"/> - <param key="hornetq.remoting.netty.port" value="5500" type="Integer"/> - <param key="hornetq.remoting.netty.ssl-enabled" value="true" type="Boolean"/> - <param key="hornetq.remoting.netty.key-store-path" value="hornetq.example.keystore" type="String"/> - <param key="hornetq.remoting.netty.key-store-password" value="hornetqexample" type="String"/> + <param key="activemq.remoting.netty.host" value="localhost" type="String"/> + <param key="activemq.remoting.netty.port" value="5500" type="Integer"/> + <param key="activemq.remoting.netty.ssl-enabled" value="true" type="Boolean"/> + <param key="activemq.remoting.netty.key-store-path" value="activemq.example.keystore" type="String"/> + <param key="activemq.remoting.netty.key-store-password" value="hornetqexample" type="String"/> </acceptor> </code> </pre> </p> - <p>In the configuration, the hornetq.example.keystore is the key store file holding the server's certificate. The hornetq.example.truststore - is the file holding the certificates which the client trusts (i.e. the server's certificate exported from hornetq.example.keystore). They are pre-generated for illustration purpose<a id="fnr1" href="readme.html#fn1"><sup>1</sup></a>.</p> + <p>In the configuration, the activemq.example.keystore is the key store file holding the server's certificate. The activemq.example.truststore + is the file holding the certificates which the client trusts (i.e. the server's certificate exported from activemq.example.keystore). They are pre-generated for illustration purpose<a id="fnr1" href="readme.html#fn1"><sup>1</sup></a>.</p> <h2>Example step-by-step</h2> @@ -127,9 +127,9 @@ <ol> <li><a id="fn1"/>The stores were generating using the following commands <a href="readme.html#fnr1">↩</a>: <ul> - <li>create the keystore: <code>keytool -genkey -keystore hornetq.example.keystore -storepass hornetqexample</code></li> - <li>export the certificate: <code>keytool -export -keystore hornetq.example.keystore -file hornetq.cer</code></li> - <li>create the truststore: <code>keytool -import -file hornetq.cer -keystore hornetq.example.truststore -storepass hornetqexample</code></li> + <li>create the keystore: <code>keytool -genkey -keystore activemq.example.keystore -storepass hornetqexample</code></li> + <li>export the certificate: <code>keytool -export -keystore activemq.example.keystore -file activemq.cer</code></li> + <li>create the truststore: <code>keytool -import -file activemq.cer -keystore activemq.example.truststore -storepass hornetqexample</code></li> </ul> </li> </ol> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml index 279d981..8c8c6c2 100644 --- a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml +++ b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -19,7 +19,7 @@ <param key="host" value="localhost"/> <param key="port" value="5500"/> <param key="ssl-enabled" value="true"/> - <param key="trust-store-path" value="hornetq/server0/hornetq.example.truststore"/> + <param key="trust-store-path" value="activemq/server0/activemq.example.truststore"/> <param key="trust-store-password" value="hornetqexample"/> </connector> </connectors> @@ -31,7 +31,7 @@ <param key="host" value="localhost"/> <param key="port" value="5500"/> <param key="ssl-enabled" value="true"/> - <param key="key-store-path" value="hornetq/server0/hornetq.example.keystore"/> + <param key="key-store-path" value="activemq/server0/activemq.example.keystore"/> <param key="key-store-password" value="hornetqexample"/> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/static-selector-jms/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/static-selector-jms/pom.xml b/examples/jms/static-selector-jms/pom.xml index 0742838..f687e76 100644 --- a/examples/jms/static-selector-jms/pom.xml +++ b/examples/jms/static-selector-jms/pom.xml @@ -107,7 +107,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/static-selector-jms/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/static-selector-jms/readme.html b/examples/jms/static-selector-jms/readme.html index efb6310..c16a9b5 100644 --- a/examples/jms/static-selector-jms/readme.html +++ b/examples/jms/static-selector-jms/readme.html @@ -12,7 +12,7 @@ <p>Static message selectors are ActiveMQ's extension to message selectors as defined in JMS spec 1.1. Rather than specifying the selector in the application code, static message selectors are defined in one of - ActiveMQ's configuration files, hornetq-jms.xml, as an element called 'selector' inside each JMS queue + ActiveMQ's configuration files, activemq-jms.xml, as an element called 'selector' inside each JMS queue definition:</p> <pre class="prettyprint"><code> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/static-selector/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/static-selector/pom.xml b/examples/jms/static-selector/pom.xml index fa21cf0..b8019cf 100644 --- a/examples/jms/static-selector/pom.xml +++ b/examples/jms/static-selector/pom.xml @@ -107,7 +107,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/static-selector/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/static-selector/readme.html b/examples/jms/static-selector/readme.html index b4846df..bf65656 100644 --- a/examples/jms/static-selector/readme.html +++ b/examples/jms/static-selector/readme.html @@ -14,7 +14,7 @@ <p>Static message selectors are ActiveMQ's extension to message selectors as defined in JMS spec 1.1. Rather than specifying the selector in the application code, static message selectors are defined in one of - ActiveMQ's configuration files, hornetq-configuration.xml, as an element called 'filter' inside each queue + ActiveMQ's configuration files, activemq-configuration.xml, as an element called 'filter' inside each queue definition, like</p> <pre class="prettyprint"><code> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/stomp-websockets/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stomp-websockets/pom.xml b/examples/jms/stomp-websockets/pom.xml index b88adf9..cae3206 100644 --- a/examples/jms/stomp-websockets/pom.xml +++ b/examples/jms/stomp-websockets/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> @@ -52,7 +52,7 @@ <systemProperties> <property> <name>exampleConfigDir</name> - <value>${basedir}/target/classes/hornetq</value> + <value>${basedir}/target/classes/activemq</value> </property> </systemProperties> </configuration> @@ -63,7 +63,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/stomp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stomp/pom.xml b/examples/jms/stomp/pom.xml index 74e77d4..61e4535 100644 --- a/examples/jms/stomp/pom.xml +++ b/examples/jms/stomp/pom.xml @@ -112,7 +112,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/stomp1.1/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stomp1.1/pom.xml b/examples/jms/stomp1.1/pom.xml index 51f5993..71ace4a 100644 --- a/examples/jms/stomp1.1/pom.xml +++ b/examples/jms/stomp1.1/pom.xml @@ -112,7 +112,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/stomp1.2/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stomp1.2/pom.xml b/examples/jms/stomp1.2/pom.xml index d7fb938..8e658eb 100644 --- a/examples/jms/stomp1.2/pom.xml +++ b/examples/jms/stomp1.2/pom.xml @@ -112,7 +112,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/stop-server-failover/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stop-server-failover/pom.xml b/examples/jms/stop-server-failover/pom.xml index f931dda..776da95 100644 --- a/examples/jms/stop-server-failover/pom.xml +++ b/examples/jms/stop-server-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> <systemProperties> <property> <name>build.directory</name> @@ -57,7 +57,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> <systemProperties> <property> @@ -85,7 +85,7 @@ <systemProperties> <property> <name>exampleConfigDir</name> - <value>${basedir}/target/classes/hornetq</value> + <value>${basedir}/target/classes/activemq</value> </property> </systemProperties> </configuration> @@ -96,7 +96,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> </configuration> </execution> <execution> @@ -105,7 +105,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/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml index fff0943..ec4de64 100644 --- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml +++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml index 0157ef7..b74f4ce 100644 --- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml +++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/symmetric-cluster/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/symmetric-cluster/pom.xml b/examples/jms/symmetric-cluster/pom.xml index 6d946aa..b1de2cf 100644 --- a/examples/jms/symmetric-cluster/pom.xml +++ b/examples/jms/symmetric-cluster/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> <systemProperties> <property> <name>build.directory</name> @@ -57,7 +57,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> <systemProperties> <property> @@ -79,7 +79,7 @@ <configuration> <jndiPort>1299</jndiPort> <jndiRmiPort>1298</jndiRmiPort> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server2</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir> <fork>true</fork> <systemProperties> <property> @@ -101,7 +101,7 @@ <configuration> <jndiPort>1399</jndiPort> <jndiRmiPort>1398</jndiRmiPort> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server3</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server3</hornetqConfigurationDir> <fork>true</fork> <systemProperties> <property> @@ -123,7 +123,7 @@ <configuration> <jndiPort>1499</jndiPort> <jndiRmiPort>1498</jndiRmiPort> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server4</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server4</hornetqConfigurationDir> <fork>true</fork> <systemProperties> <property> @@ -145,7 +145,7 @@ <configuration> <jndiPort>1599</jndiPort> <jndiRmiPort>1598</jndiRmiPort> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server5</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server5</hornetqConfigurationDir> <fork>true</fork> <systemProperties> <property> @@ -177,7 +177,7 @@ <systemProperties> <property> <name>exampleConfigDir</name> - <value>${basedir}/target/classes/hornetq</value> + <value>${basedir}/target/classes/activemq</value> </property> </systemProperties> </configuration> @@ -188,7 +188,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> </configuration> </execution> <execution> @@ -197,7 +197,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir> </configuration> </execution> <execution> @@ -206,7 +206,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server2</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir> </configuration> </execution> <execution> @@ -215,7 +215,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server3</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server3</hornetqConfigurationDir> </configuration> </execution> <execution> @@ -224,7 +224,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server4</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server4</hornetqConfigurationDir> </configuration> </execution> <execution> @@ -233,7 +233,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server5</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server5</hornetqConfigurationDir> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/symmetric-cluster/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/symmetric-cluster/readme.html b/examples/jms/symmetric-cluster/readme.html index d42b013..2d8621f 100644 --- a/examples/jms/symmetric-cluster/readme.html +++ b/examples/jms/symmetric-cluster/readme.html @@ -20,7 +20,7 @@ <p>The configuration used in this example is very similar to the configuration used by ActiveMQ when installed as a clustered profile in JBoss Application Server.</p> <p>To set up ActiveMQ to form a symmetric cluster we simply need to mark each server as <code>clustered</code> - and we need to define a <code>cluster-connection</code> in <code>hornetq-configuration.xml</code>.</p> + and we need to define a <code>cluster-connection</code> in <code>activemq-configuration.xml</code>.</p> <p>The <code>cluster-connection</code> tells the nodes what other nodes to make connections to. With a <code>cluster-connection</code> each node that we connect to can either be specified indivually, or we can use UDP discovery to find out what other nodes are in the cluster.</p> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/temp-queue/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/temp-queue/pom.xml b/examples/jms/temp-queue/pom.xml index d05d165..88ed4b9 100644 --- a/examples/jms/temp-queue/pom.xml +++ b/examples/jms/temp-queue/pom.xml @@ -107,7 +107,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/topic-hierarchies/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic-hierarchies/pom.xml b/examples/jms/topic-hierarchies/pom.xml index f997f3e..301caf3 100644 --- a/examples/jms/topic-hierarchies/pom.xml +++ b/examples/jms/topic-hierarchies/pom.xml @@ -107,7 +107,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/topic-hierarchies/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/topic-hierarchies/readme.html b/examples/jms/topic-hierarchies/readme.html index a0e81ee..11cf24c 100644 --- a/examples/jms/topic-hierarchies/readme.html +++ b/examples/jms/topic-hierarchies/readme.html @@ -18,7 +18,7 @@ <p>For more information on the wild-card syntax please consult the user manual.</p> <h2>Example step-by-step</h2> <p><i>To run the example, simply type <code>mvn verify</code> from this directory</i></p> - <p>In this example we will define a hierarchy of topics in the file <code>hornetq-jms.xml</code></p> + <p>In this example we will define a hierarchy of topics in the file <code>activemq-jms.xml</code></p> <pre class="prettyprint"> <code> <topic name="news"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/topic-selector-example1/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic-selector-example1/pom.xml b/examples/jms/topic-selector-example1/pom.xml index c5bb053..73782ab 100644 --- a/examples/jms/topic-selector-example1/pom.xml +++ b/examples/jms/topic-selector-example1/pom.xml @@ -107,7 +107,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/topic-selector-example2/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic-selector-example2/pom.xml b/examples/jms/topic-selector-example2/pom.xml index a49becc..7e9c9a1 100644 --- a/examples/jms/topic-selector-example2/pom.xml +++ b/examples/jms/topic-selector-example2/pom.xml @@ -107,7 +107,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/topic/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml index 4f71000..51368c8 100644 --- a/examples/jms/topic/pom.xml +++ b/examples/jms/topic/pom.xml @@ -107,7 +107,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/transaction-failover/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transaction-failover/pom.xml b/examples/jms/transaction-failover/pom.xml index 5fa5c9b..1e72729 100644 --- a/examples/jms/transaction-failover/pom.xml +++ b/examples/jms/transaction-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> <systemProperties> <property> <name>build.directory</name> @@ -57,7 +57,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> <systemProperties> <property> @@ -85,7 +85,7 @@ <systemProperties> <property> <name>exampleConfigDir</name> - <value>${basedir}/target/classes/hornetq</value> + <value>${basedir}/target/classes/activemq</value> </property> </systemProperties> </configuration> @@ -96,7 +96,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir> + <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> </configuration> </execution> <execution> @@ -105,7 +105,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/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml index 2d25a10..34a26c1 100644 --- a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml +++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml index e82484f..2e226bd 100644 --- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml +++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/transactional/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transactional/pom.xml b/examples/jms/transactional/pom.xml index bdbe4e1..f0925e0 100644 --- a/examples/jms/transactional/pom.xml +++ b/examples/jms/transactional/pom.xml @@ -107,7 +107,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/xa-heuristic/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml index 95c122f..64bb8a8 100644 --- a/examples/jms/xa-heuristic/pom.xml +++ b/examples/jms/xa-heuristic/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/xa-receive/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-receive/pom.xml b/examples/jms/xa-receive/pom.xml index 6250786..a5e45be 100644 --- a/examples/jms/xa-receive/pom.xml +++ b/examples/jms/xa-receive/pom.xml @@ -107,7 +107,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/xa-send/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-send/pom.xml b/examples/jms/xa-send/pom.xml index 08bfd5c..48e12eb 100644 --- a/examples/jms/xa-send/pom.xml +++ b/examples/jms/xa-send/pom.xml @@ -107,7 +107,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/xa-with-jta/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-with-jta/pom.xml b/examples/jms/xa-with-jta/pom.xml index 8753828..08c7f11 100644 --- a/examples/jms/xa-with-jta/pom.xml +++ b/examples/jms/xa-with-jta/pom.xml @@ -116,7 +116,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/soak/normal/README ---------------------------------------------------------------------- diff --git a/examples/soak/normal/README b/examples/soak/normal/README index 9f2361d..acbd2f7 100644 --- a/examples/soak/normal/README +++ b/examples/soak/normal/README @@ -27,15 +27,15 @@ settings. To run a server with the same configuration but on a different host. Check out this source on the host machine and change: -* hornetq.remoting.netty.host property in hornetq-configuration.xml -* bindAddress and rmiBindAddress properties in hornetq-beans.xml +* activemq.remoting.netty.host property in activemq-configuration.xml +* bindAddress and rmiBindAddress properties in activemq-beans.xml $ mvn verify -P server Configure Server Dump ===================== -The server can "dump" info at regular interval. In hornetq-configuration.xml, set +The server can "dump" info at regular interval. In activemq-configuration.xml, set <server-dump-interval>10000</server-dump-interval> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/soak/normal/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/soak/normal/server0/activemq-configuration.xml b/examples/soak/normal/server0/activemq-configuration.xml index 8ec646d..43d3297 100644 --- a/examples/soak/normal/server0/activemq-configuration.xml +++ b/examples/soak/normal/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <connectors> <connector name="netty-connector"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/hornetq_doap.rdf ---------------------------------------------------------------------- diff --git a/hornetq_doap.rdf b/hornetq_doap.rdf index 2dd7031..1591eb3 100644 --- a/hornetq_doap.rdf +++ b/hornetq_doap.rdf @@ -68,7 +68,7 @@ <foaf:OnlineAccount> <rdf:type rdf:resource="http://xmlns.com/foaf/0.1/OnlineChatAccount"; /> <foaf:accountServiceHomepage rdf:resource="http://twitter.com/"; /> - <foaf:accountName>hornetq</foaf:accountName> + <foaf:accountName>activemq</foaf:accountName> </foaf:OnlineAccount> </foaf:account> </Project> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/integration/activemq-aerogear-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/pom.xml b/integration/activemq-aerogear-integration/pom.xml index 1fe0b3d..4acd2a0 100644 --- a/integration/activemq-aerogear-integration/pom.xml +++ b/integration/activemq-aerogear-integration/pom.xml @@ -14,7 +14,7 @@ <name>ActiveMQ6 Aerogear Integration</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/integration/activemq-jboss-as-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-jboss-as-integration/pom.xml b/integration/activemq-jboss-as-integration/pom.xml index 1512c61..bb7eaa3 100644 --- a/integration/activemq-jboss-as-integration/pom.xml +++ b/integration/activemq-jboss-as-integration/pom.xml @@ -14,7 +14,7 @@ <name>ActiveMQ6 JBoss AS Integration</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/integration/activemq-spring-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml index c9df7c4..d3b9c1b 100644 --- a/integration/activemq-spring-integration/pom.xml +++ b/integration/activemq-spring-integration/pom.xml @@ -27,7 +27,7 @@ <name>ActiveMQ6 Spring Integration</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/integration/activemq-twitter-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-twitter-integration/pom.xml b/integration/activemq-twitter-integration/pom.xml index 42720f0..8248b0c 100644 --- a/integration/activemq-twitter-integration/pom.xml +++ b/integration/activemq-twitter-integration/pom.xml @@ -14,7 +14,7 @@ <name>ActiveMQ6 Twitter Integration</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/integration/activemq-vertx-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-vertx-integration/pom.xml b/integration/activemq-vertx-integration/pom.xml index 0624f96..e32d0e0 100644 --- a/integration/activemq-vertx-integration/pom.xml +++ b/integration/activemq-vertx-integration/pom.xml @@ -16,7 +16,7 @@ <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bef5a51..5ca41c3 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ </modules> <name>ActiveMQ6 Parent</name> - <url>http://hornetq.org</url> + <url>http://apache.org/activemq</url> <description> Putting the buzz in messaging </description> @@ -73,19 +73,19 @@ --> <activemq-surefire-argline>-Djava.util.logging.manager=org.jboss.logmanager.LogManager - -Dlogging.configuration=file:${hornetq.basedir}/tests/config/logging.properties - -Djava.library.path=${hornetq.basedir}/activemq-native/bin/ -Djgroups.bind_addr=localhost + -Dlogging.configuration=file:${activemq.basedir}/tests/config/logging.properties + -Djava.library.path=${activemq.basedir}/activemq-native/bin/ -Djgroups.bind_addr=localhost -Djava.net.preferIPv4Stack=true </activemq-surefire-argline> - <hornetq.basedir>${project.basedir}</hornetq.basedir> + <activemq.basedir>${project.basedir}</activemq.basedir> <skipLicenseCheck>false</skipLicenseCheck> <skipStyleCheck>false</skipStyleCheck> </properties> <scm> - <connection>scm:git:git://github.com/hornetq/hornetq.git</connection> - <developerConnection>scm:git://github.com/hornetq/hornetq.git</developerConnection> - <url>https://github.com/hornetq/hornetq</url> + <connection>scm:git:git://github.com/activemq/activemq.git</connection> + <developerConnection>scm:git://github.com/activemq/activemq.git</developerConnection> + <url>https://github.com/activemq/activemq</url> </scm> <distributionManagement> @@ -110,8 +110,8 @@ <developer> <id>clebertsuconic</id> <name>Clebert Suconic</name> - <email>[email protected]</email> - <url>http://hornetq.com</url> + <email>[email protected]</email> + <url>http://twitter.com/clebertsuconic</url> <roles> <role>project-owner</role> </roles> @@ -838,6 +838,7 @@ <!-- This was initially done to enforce name on Parameter annotation I've developed a customized check and I needed this jar to deploy the specialized checkstyle --> <dependency> + <!-- TODO Find a better home --> <groupId>org.hornetq</groupId> <artifactId>hornetq-checkstyle-checks</artifactId> <version>0.2</version> @@ -845,7 +846,7 @@ </dependencies> <configuration> <skip>${skipStyleCheck}</skip> - <configLocation>${hornetq.basedir}/etc/checkstyle.xml</configLocation> + <configLocation>${activemq.basedir}/etc/checkstyle.xml</configLocation> <failsOnError>false</failsOnError> <failOnViolation>true</failOnViolation> <consoleOutput>true</consoleOutput> @@ -879,7 +880,7 @@ <version>2.5</version> <configuration> <skip>${skipLicenseCheck}</skip> - <basedir>${hornetq.basedir}</basedir> + <basedir>${activemq.basedir}</basedir> <header>etc/license-header.txt</header> <properties> <copyrightYear>2005-2014</copyrightYear> @@ -933,7 +934,7 @@ <artifactId>maven-checkstyle-plugin</artifactId> <version>2.12</version> <configuration> - <configLocation>${hornetq.basedir}/etc/checkstyle.xml</configLocation> + <configLocation>${activemq.basedir}/etc/checkstyle.xml</configLocation> <failsOnError>false</failsOnError> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/scripts/replace-wildfly.sh ---------------------------------------------------------------------- diff --git a/scripts/replace-wildfly.sh b/scripts/replace-wildfly.sh deleted file mode 100755 index bc70bcd..0000000 --- a/scripts/replace-wildfly.sh +++ /dev/null @@ -1,34 +0,0 @@ - -#this script is useful to replace libraries on a wildfly master -# it assumes JBOSS_HOME pre defined -# run this from the project home - -export JBOSS_HOME=$1 - - -# fis the VERSION before running it -export VERSION="2.4.0-SNAPSHOT" -#replace jars -echo cp ./hornetq-core-client/target/hornetq-core-client-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-core-client*.jar -cp ./hornetq-core-client/target/hornetq-core-client-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-core-client*.jar -cp ./hornetq-server/target/hornetq-server-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-server*.jar -cp ./hornetq-commons/target/hornetq-commons-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-commons*.jar -cp ./hornetq-journal/target/hornetq-journal-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-journal*.jar -cp ./hornetq-jms-client/target/hornetq-jms-client-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-jms-client*.jar -cp ./hornetq-jms-server/target/hornetq-jms-server-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-jms-server*.jar -cp ./hornetq-ra/target/hornetq-ra-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/ra/main/hornetq-ra*.jar - -#update jboss-client.jar -rm -rf tmp -mkdir ./tmp -cd ./tmp -unzip $JBOSS_HOME/bin/client/jboss-client.jar -rm -rf ./org.apache.activemq -unzip -o ../hornetq-jms-client/target/hornetq-jms-client-$VERSION.jar -x META-INF\* -unzip -o ../hornetq-core-client/target/hornetq-core-client-$VERSION.jar -x \*META-INF\* -unzip -o ../hornetq-commons/target/hornetq-commons-$VERSION.jar -x \*META-INF\* -zip -r jboss-client.jar * -cp jboss-client.jar $JBOSS_HOME/bin/client/jboss-client.jar -cd .. -rm -rf tmp - http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/byteman-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/pom.xml b/tests/byteman-tests/pom.xml index 192f9a5..f6b848f 100644 --- a/tests/byteman-tests/pom.xml +++ b/tests/byteman-tests/pom.xml @@ -14,7 +14,7 @@ <properties> <tools.jar>${java.home}/../lib/tools.jar</tools.jar> <byteman.version>2.2.0</byteman.version> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/concurrent-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/concurrent-tests/pom.xml b/tests/concurrent-tests/pom.xml index 44cebc4..35e02cd 100644 --- a/tests/concurrent-tests/pom.xml +++ b/tests/concurrent-tests/pom.xml @@ -25,7 +25,7 @@ <name>ActiveMQ6 concurrent Tests</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/config/logging.properties ---------------------------------------------------------------------- diff --git a/tests/config/logging.properties b/tests/config/logging.properties index 25fdede..30d3b27 100644 --- a/tests/config/logging.properties +++ b/tests/config/logging.properties @@ -52,7 +52,7 @@ handler.FILE=org.jboss.logmanager.handlers.FileHandler handler.FILE.level=FINE handler.FILE.properties=autoFlush,fileName handler.FILE.autoFlush=true -handler.FILE.fileName=target/hornetq.log +handler.FILE.fileName=target/activemq.log handler.FILE.formatter=PATTERN # Console handler configuration http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/config/logging.properties.trace ---------------------------------------------------------------------- diff --git a/tests/config/logging.properties.trace b/tests/config/logging.properties.trace index 3197b3d..2bc32a7 100644 --- a/tests/config/logging.properties.trace +++ b/tests/config/logging.properties.trace @@ -54,7 +54,7 @@ handler.FILE=org.jboss.logmanager.handlers.FileHandler handler.FILE.level=FINE handler.FILE.properties=autoFlush,fileName handler.FILE.autoFlush=true -handler.FILE.fileName=target/hornetq.log +handler.FILE.fileName=target/activemq.log handler.FILE.formatter=PATTERN # Console handler configuration http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/config/server-start-stop-backup-config1.xml ---------------------------------------------------------------------- diff --git a/tests/config/server-start-stop-backup-config1.xml b/tests/config/server-start-stop-backup-config1.xml index 2b9a479..00d8dc2 100644 --- a/tests/config/server-start-stop-backup-config1.xml +++ b/tests/config/server-start-stop-backup-config1.xml @@ -5,7 +5,7 @@ <backup>true</backup> - <journal-directory>/tmp/hornetq-unit-test/start-stop-data-backup</journal-directory> + <journal-directory>/tmp/activemq-unit-test/start-stop-data-backup</journal-directory> <!-- Connectors --> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/config/server-start-stop-live-config1.xml ---------------------------------------------------------------------- diff --git a/tests/config/server-start-stop-live-config1.xml b/tests/config/server-start-stop-live-config1.xml index 5633166..92c8385 100644 --- a/tests/config/server-start-stop-live-config1.xml +++ b/tests/config/server-start-stop-live-config1.xml @@ -5,7 +5,7 @@ <backup-connector-ref connector-name="backup-connector"/> - <journal-directory>/tmp/hornetq-unit-test/start-stop-data-live</journal-directory> + <journal-directory>/tmp/activemq-unit-test/start-stop-data-live</journal-directory> <!-- Connectors --> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml index 5ab98b4..ab54fba 100644 --- a/tests/integration-tests/pom.xml +++ b/tests/integration-tests/pom.xml @@ -12,7 +12,7 @@ <name>ActiveMQ6 Integration Tests</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> <vertx.version>2.1.2</vertx.version> <vertx.testtools.version>2.0.3-final</vertx.testtools.version> </properties> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml index 7bfccde..260d4d2 100644 --- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml +++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml @@ -8,10 +8,10 @@ </connector> </connectors> - <paging-directory>/tmp/hornetq-unit-test/live1/paging</paging-directory> - <bindings-directory>/tmp/hornetq-unit-test/live1/binding</bindings-directory> - <journal-directory>/tmp/hornetq-unit-test/live1/journal</journal-directory> - <large-messages-directory>/tmp/hornetq-unit-test/live1/largemessages</large-messages-directory> + <paging-directory>/tmp/activemq-unit-test/live1/paging</paging-directory> + <bindings-directory>/tmp/activemq-unit-test/live1/binding</bindings-directory> + <journal-directory>/tmp/activemq-unit-test/live1/journal</journal-directory> + <large-messages-directory>/tmp/activemq-unit-test/live1/largemessages</large-messages-directory> <acceptors> <acceptor name="netty-acceptor"> @@ -50,10 +50,10 @@ <backup-servers> <backup-server name="myBackup" port-offset="100" inherit-configuration="true" backup-strategy="FULL"> <configuration> - <paging-directory>/tmp/hornetq-unit-test/live2/paging</paging-directory> - <bindings-directory>/tmp/hornetq-unit-test/live2/binding</bindings-directory> - <journal-directory>/tmp/hornetq-unit-test/live2/journal</journal-directory> - <large-messages-directory>/tmp/hornetq-unit-test/live2/largemessages</large-messages-directory> + <paging-directory>/tmp/activemq-unit-test/live2/paging</paging-directory> + <bindings-directory>/tmp/activemq-unit-test/live2/binding</bindings-directory> + <journal-directory>/tmp/activemq-unit-test/live2/journal</journal-directory> + <large-messages-directory>/tmp/activemq-unit-test/live2/largemessages</large-messages-directory> </configuration> </backup-server> </backup-servers> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml index 7eabd5b..d3e8aff 100644 --- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml +++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml @@ -9,10 +9,10 @@ </connector> </connectors> - <paging-directory>/tmp/hornetq-unit-test/live2/paging</paging-directory> - <bindings-directory>/tmp/hornetq-unit-test/live2/binding</bindings-directory> - <journal-directory>/tmp/hornetq-unit-test/live2/journal</journal-directory> - <large-messages-directory>/tmp/hornetq-unit-test/live2/largemessages</large-messages-directory> + <paging-directory>/tmp/activemq-unit-test/live2/paging</paging-directory> + <bindings-directory>/tmp/activemq-unit-test/live2/binding</bindings-directory> + <journal-directory>/tmp/activemq-unit-test/live2/journal</journal-directory> + <large-messages-directory>/tmp/activemq-unit-test/live2/largemessages</large-messages-directory> <acceptors> <acceptor name="netty-acceptor"> @@ -51,10 +51,10 @@ <backup-servers> <backup-server name="myBackup" port-offset="100" inherit-configuration="true" backup-strategy="FULL"> <configuration> - <paging-directory>/tmp/hornetq-unit-test/live1/paging</paging-directory> - <bindings-directory>/tmp/hornetq-unit-test/live1/binding</bindings-directory> - <journal-directory>/tmp/hornetq-unit-test/live1/journal</journal-directory> - <large-messages-directory>/tmp/hornetq-unit-test/live1/largemessages</large-messages-directory> + <paging-directory>/tmp/activemq-unit-test/live1/paging</paging-directory> + <bindings-directory>/tmp/activemq-unit-test/live1/binding</bindings-directory> + <journal-directory>/tmp/activemq-unit-test/live1/journal</journal-directory> + <large-messages-directory>/tmp/activemq-unit-test/live1/largemessages</large-messages-directory> </configuration> </backup-server> </backup-servers> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 8794b57..11e1fb1 100644 --- a/tests/integration-tests/src/test/resources/restricted-security-client.policy +++ b/tests/integration-tests/src/test/resources/restricted-security-client.policy @@ -8,8 +8,8 @@ grant { permission java.net.SocketPermission "*:1024-", "connect"; // Note1: normally, we don't need this permission since the applet allows reading jars loaded by the applet // 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.io.FilePermission "${user.dir}/activemq-core-client/target/classes/-", "read"; + permission java.io.FilePermission "${user.dir}/activemq-core-client/target/activemq-core-client-${project.version}.jar", "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"; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml index 578f9be..59378ae 100644 --- a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml +++ b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml @@ -8,7 +8,7 @@ </connector> </connectors> - <journal-directory>/tmp/hornetq-unit-test/start-stop-data</journal-directory> + <journal-directory>/tmp/activemq-unit-test/start-stop-data</journal-directory> <acceptors> <acceptor name="netty-acceptor"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/integration-tests/src/test/resources/spring-jms-beans.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/spring-jms-beans.xml b/tests/integration-tests/src/test/resources/spring-jms-beans.xml index 4f92b8c..7dee319 100644 --- a/tests/integration-tests/src/test/resources/spring-jms-beans.xml +++ b/tests/integration-tests/src/test/resources/spring-jms-beans.xml @@ -5,8 +5,8 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";> <bean id="EmbeddedJms" class="org.apache.activemq.integration.spring.SpringJmsBootstrap" init-method="start"> - <property name="configResourcePath" value="spring-hornetq-config.xml"/> - <property name="jmsConfigResourcePath" value="spring-hornetq-jms.xml"/> + <property name="configResourcePath" value="spring-activemq-config.xml"/> + <property name="jmsConfigResourcePath" value="spring-activemq-jms.xml"/> </bean> <bean id="listener" class="org.apache.activemq.tests.integration.spring.ExampleListener"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/jms-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml index 1388617..e9a6aee 100644 --- a/tests/jms-tests/pom.xml +++ b/tests/jms-tests/pom.xml @@ -12,7 +12,7 @@ <name>ActiveMQ6 JMS Tests</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/joram-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml index eb4397e..009d54d 100644 --- a/tests/joram-tests/pom.xml +++ b/tests/joram-tests/pom.xml @@ -25,7 +25,7 @@ <name>ActiveMQ6 Joram Tests</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQQAdmin.java ---------------------------------------------------------------------- diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQQAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQQAdmin.java index 9d3c897..6d7b3ff 100644 --- a/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQQAdmin.java +++ b/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQQAdmin.java @@ -59,7 +59,7 @@ public class ActiveMQQAdmin implements Admin * {@link ActiveMQQAdmin#serverStop()}. This is used when testing combinations of client and * servers with different versions. * - * @see https://github.com/hornetq/hornetq-version-tests + * @see https://github.com/activemq/activemq-version-tests */ private final boolean serverLifeCycleActive; private static final String SERVER_LIVE_CYCLE_PROPERTY = "org.apache.activemq.jms.ActiveMQAdmin.serverLifeCycle"; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/performance-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml index d205793..599d735 100644 --- a/tests/performance-tests/pom.xml +++ b/tests/performance-tests/pom.xml @@ -25,7 +25,7 @@ <name>ActiveMQ6 performance Tests</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/pom.xml b/tests/pom.xml index 598bbc5..7aa593d 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -13,7 +13,7 @@ <packaging>pom</packaging> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <build> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/soak-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml index 7078702..488d7f8 100644 --- a/tests/soak-tests/pom.xml +++ b/tests/soak-tests/pom.xml @@ -25,7 +25,7 @@ <name>ActiveMQ6 soak Tests</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/stress-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml index 9339bd3..386bc0a 100644 --- a/tests/stress-tests/pom.xml +++ b/tests/stress-tests/pom.xml @@ -25,7 +25,7 @@ <name>ActiveMQ6 stress Tests</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/timing-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml index 6c14f78..2000a4d 100644 --- a/tests/timing-tests/pom.xml +++ b/tests/timing-tests/pom.xml @@ -25,7 +25,7 @@ <name>ActiveMQ6 timing Tests</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/tests/unit-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml index 28dd063..b159159 100644 --- a/tests/unit-tests/pom.xml +++ b/tests/unit-tests/pom.xml @@ -12,7 +12,7 @@ <name>ActiveMQ6 Unit Tests</name> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies>
