Repository: activemq-6 Updated Branches: refs/heads/master 1a8951a56 -> 1ae6f5da3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/jms/topic/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml index 47afc56..1984fcf 100644 --- a/examples/jms/topic/pom.xml +++ b/examples/jms/topic/pom.xml @@ -43,89 +43,93 @@ under the License. <artifactId>geronimo-jms_2.0_spec</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-maven-plugin</artifactId> - <executions> - <execution> - <id>start</id> - <goals> - <goal>start</goal> - </goals> - <configuration> - <systemProperties> - <property> - <name>data.dir</name> - <value>${basedir}/target/</value> - </property> - </systemProperties> - </configuration> - </execution> - <execution> - <id>runClient</id> - <goals> - <goal>runClient</goal> - </goals> + <profiles> + <profile> + <id>example</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> + <executions> + <execution> + <id>start</id> + <goals> + <goal>start</goal> + </goals> + <configuration> + <systemProperties> + <property> + <name>data.dir</name> + <value>${basedir}/target/</value> + </property> + </systemProperties> + </configuration> + </execution> + <execution> + <id>runClient</id> + <goals> + <goal>runClient</goal> + </goals> + <configuration> + <clientClass>org.apache.activemq.jms.example.TopicExample</clientClass> + <args> + <param>tcp://localhost:61616</param> + </args> + </configuration> + </execution> + <execution> + <id>stop</id> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-topic-example</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + <version>${geronimo.jms.2.spec.version}</version> + </dependency> + </dependencies> <configuration> - <clientClass>org.apache.activemq.jms.example.TopicExample</clientClass> - <args> - <param>tcp://localhost:61616</param> - </args> + <waitOnStart>false</waitOnStart> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> - </execution> - <execution> - <id>stop</id> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.activemq.examples.jms</groupId> - <artifactId>activemq-jms-topic-example</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jms-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jms-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_2.0_spec</artifactId> - <version>${geronimo.jms.2.spec.version}</version> - </dependency> - </dependencies> - <configuration> - <waitOnStart>false</waitOnStart> - <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> - </configuration> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/jms/topic/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/topic/readme.html b/examples/jms/topic/readme.html index 8b73d3e..337b191 100644 --- a/examples/jms/topic/readme.html +++ b/examples/jms/topic/readme.html @@ -32,7 +32,7 @@ under the License. <p>A Topic is used to send messages using the publish-subscribe model, from a producer to 1 or more consumers.</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><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></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 it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/jms/transaction-failover/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transaction-failover/pom.xml b/examples/jms/transaction-failover/pom.xml index b7887ab..b5d698b 100644 --- a/examples/jms/transaction-failover/pom.xml +++ b/examples/jms/transaction-failover/pom.xml @@ -44,133 +44,138 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-maven-plugin</artifactId> - <executions> - <execution> - <id>start0</id> - <goals> - <goal>start</goal> - </goals> - <configuration> - <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> - <systemProperties> - <property> - <name>data.dir</name> - <value>${basedir}/target/</value> - </property> - <property> - <name>udp-address</name> - <value>${udp-address}</value> - </property> - </systemProperties> - </configuration> - </execution> - <execution> - <id>start1</id> - <goals> - <goal>start</goal> - </goals> + <profiles> + <profile> + <id>example</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> + <executions> + <execution> + <id>start0</id> + <goals> + <goal>start</goal> + </goals> + <configuration> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> + <systemProperties> + <property> + <name>data.dir</name> + <value>${basedir}/target/</value> + </property> + <property> + <name>udp-address</name> + <value>${udp-address}</value> + </property> + </systemProperties> + </configuration> + </execution> + <execution> + <id>start1</id> + <goals> + <goal>start</goal> + </goals> + <configuration> + <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir> + <fork>true</fork> + <systemProperties> + <property> + <name>data.dir</name> + <value>${basedir}/target/</value> + </property> + <property> + <name>udp-address</name> + <value>${udp-address}</value> + </property> + </systemProperties> + </configuration> + </execution> + <execution> + <id>runClient</id> + <goals> + <goal>runClient</goal> + </goals> + <configuration> + <clientClass>org.apache.activemq.jms.example.TransactionFailoverExample</clientClass> + <systemProperties> + <property> + <name>exampleConfigDir</name> + <value>${basedir}/target/classes/activemq</value> + </property> + </systemProperties> + </configuration> + </execution> + <execution> + <id>stop0</id> + <goals> + <goal>stop</goal> + </goals> + <configuration> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> + </configuration> + </execution> + <execution> + <id>stop1</id> + <goals> + <goal>stop</goal> + </goals> + <configuration> + <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-transaction-failover-example</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + <version>${geronimo.jms.2.spec.version}</version> + </dependency> + </dependencies> <configuration> - <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir> - <fork>true</fork> + <waitOnStart>false</waitOnStart> <systemProperties> <property> <name>data.dir</name> <value>${basedir}/target/</value> </property> - <property> - <name>udp-address</name> - <value>${udp-address}</value> - </property> </systemProperties> </configuration> - </execution> - <execution> - <id>runClient</id> - <goals> - <goal>runClient</goal> - </goals> - <configuration> - <clientClass>org.apache.activemq.jms.example.TransactionFailoverExample</clientClass> - <systemProperties> - <property> - <name>exampleConfigDir</name> - <value>${basedir}/target/classes/activemq</value> - </property> - </systemProperties> - </configuration> - </execution> - <execution> - <id>stop0</id> - <goals> - <goal>stop</goal> - </goals> - <configuration> - <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> - </configuration> - </execution> - <execution> - <id>stop1</id> - <goals> - <goal>stop</goal> - </goals> - <configuration> - <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.activemq.examples.jms</groupId> - <artifactId>activemq-jms-transaction-failover-example</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jms-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jms-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_2.0_spec</artifactId> - <version>${geronimo.jms.2.spec.version}</version> - </dependency> - </dependencies> - <configuration> - <waitOnStart>false</waitOnStart> - <systemProperties> - <property> - <name>data.dir</name> - <value>${basedir}/target/</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/jms/transaction-failover/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/transaction-failover/readme.html b/examples/jms/transaction-failover/readme.html index 3b17613..dcf13ff 100644 --- a/examples/jms/transaction-failover/readme.html +++ b/examples/jms/transaction-failover/readme.html @@ -41,7 +41,7 @@ under the License. section of 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><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></p> <p>In this example, the live server is server 1, and the backup server is server 0</p> <p>The connection will initially be created to server1, server 1 will crash, and the client will carry on seamlessly on server 0, the backup server.</p> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/jms/transactional/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/transactional/pom.xml b/examples/jms/transactional/pom.xml index c66afe0..cac399d 100644 --- a/examples/jms/transactional/pom.xml +++ b/examples/jms/transactional/pom.xml @@ -44,85 +44,90 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-maven-plugin</artifactId> - <executions> - <execution> - <id>start</id> - <goals> - <goal>start</goal> - </goals> - <configuration> - <systemProperties> - <property> - <name>data.dir</name> - <value>${basedir}/target/</value> - </property> - </systemProperties> - </configuration> - </execution> - <execution> - <id>runClient</id> - <goals> - <goal>runClient</goal> - </goals> + <profiles> + <profile> + <id>example</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> + <executions> + <execution> + <id>start</id> + <goals> + <goal>start</goal> + </goals> + <configuration> + <systemProperties> + <property> + <name>data.dir</name> + <value>${basedir}/target/</value> + </property> + </systemProperties> + </configuration> + </execution> + <execution> + <id>runClient</id> + <goals> + <goal>runClient</goal> + </goals> + <configuration> + <clientClass>org.apache.activemq.jms.example.TransactionalExample</clientClass> + </configuration> + </execution> + <execution> + <id>stop</id> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-transactional-example</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + <version>${geronimo.jms.2.spec.version}</version> + </dependency> + </dependencies> <configuration> - <clientClass>org.apache.activemq.jms.example.TransactionalExample</clientClass> + <waitOnStart>false</waitOnStart> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> - </execution> - <execution> - <id>stop</id> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.activemq.examples.jms</groupId> - <artifactId>activemq-jms-transactional-example</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jms-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jms-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_2.0_spec</artifactId> - <version>${geronimo.jms.2.spec.version}</version> - </dependency> - </dependencies> - <configuration> - <waitOnStart>false</waitOnStart> - <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> - </configuration> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/jms/transactional/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/transactional/readme.html b/examples/jms/transactional/readme.html index 03651c6..e2b0f47 100644 --- a/examples/jms/transactional/readme.html +++ b/examples/jms/transactional/readme.html @@ -35,7 +35,7 @@ under the License. <h2>Example step-by-step</h2> - <p><i>To run the example, simply type <code>mvn verify</code> from this directory</i></p> + <p><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></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 it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/jms/xa-heuristic/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml index df9144d..775febe 100644 --- a/examples/jms/xa-heuristic/pom.xml +++ b/examples/jms/xa-heuristic/pom.xml @@ -44,103 +44,108 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-maven-plugin</artifactId> - <executions> - <execution> - <id>start</id> - <goals> - <goal>start</goal> - </goals> - <configuration> - <!--we need to fork the server as we have system props that need set pre runtime--> - <fork>true</fork> - <systemProperties> - <property> - <name>com.sun.management.jmxremote</name> - <value></value> - </property> - <property> - <name>com.sun.management.jmxremote.port</name> - <value>3001</value> - </property> - <property> - <name>com.sun.management.jmxremote.ssl</name> - <value>false</value> - </property> - <property> - <name>com.sun.management.jmxremote.authenticate</name> - <value>false</value> - </property> - <property> - <name>data.dir</name> - <value>${basedir}/target/</value> - </property> - </systemProperties> - </configuration> - </execution> - <execution> - <id>runClient</id> - <goals> - <goal>runClient</goal> - </goals> + <profiles> + <profile> + <id>example</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> + <executions> + <execution> + <id>start</id> + <goals> + <goal>start</goal> + </goals> + <configuration> + <!--we need to fork the server as we have system props that need set pre runtime--> + <fork>true</fork> + <systemProperties> + <property> + <name>com.sun.management.jmxremote</name> + <value></value> + </property> + <property> + <name>com.sun.management.jmxremote.port</name> + <value>3001</value> + </property> + <property> + <name>com.sun.management.jmxremote.ssl</name> + <value>false</value> + </property> + <property> + <name>com.sun.management.jmxremote.authenticate</name> + <value>false</value> + </property> + <property> + <name>data.dir</name> + <value>${basedir}/target/</value> + </property> + </systemProperties> + </configuration> + </execution> + <execution> + <id>runClient</id> + <goals> + <goal>runClient</goal> + </goals> + <configuration> + <clientClass>org.apache.activemq.jms.example.XAHeuristicExample</clientClass> + </configuration> + </execution> + <execution> + <id>stop</id> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-xa-heuristic-example</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + <version>${geronimo.jms.2.spec.version}</version> + </dependency> + </dependencies> <configuration> - <clientClass>org.apache.activemq.jms.example.XAHeuristicExample</clientClass> + <waitOnStart>false</waitOnStart> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> - </execution> - <execution> - <id>stop</id> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.activemq.examples.jms</groupId> - <artifactId>activemq-jms-xa-heuristic-example</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jms-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jms-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_2.0_spec</artifactId> - <version>${geronimo.jms.2.spec.version}</version> - </dependency> - </dependencies> - <configuration> - <waitOnStart>false</waitOnStart> - <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> - </configuration> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/jms/xa-heuristic/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/xa-heuristic/readme.html b/examples/jms/xa-heuristic/readme.html index 67e2215..e499073 100644 --- a/examples/jms/xa-heuristic/readme.html +++ b/examples/jms/xa-heuristic/readme.html @@ -43,7 +43,7 @@ under the License. please look at the JMX Example.</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><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></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 it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> <pre class="prettyprint"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/jms/xa-receive/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-receive/pom.xml b/examples/jms/xa-receive/pom.xml index fc7c3e5..69f37a4 100644 --- a/examples/jms/xa-receive/pom.xml +++ b/examples/jms/xa-receive/pom.xml @@ -44,85 +44,90 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-maven-plugin</artifactId> - <executions> - <execution> - <id>start</id> - <goals> - <goal>start</goal> - </goals> - <configuration> - <systemProperties> - <property> - <name>data.dir</name> - <value>${basedir}/target/</value> - </property> - </systemProperties> - </configuration> - </execution> - <execution> - <id>runClient</id> - <goals> - <goal>runClient</goal> - </goals> + <profiles> + <profile> + <id>example</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> + <executions> + <execution> + <id>start</id> + <goals> + <goal>start</goal> + </goals> + <configuration> + <systemProperties> + <property> + <name>data.dir</name> + <value>${basedir}/target/</value> + </property> + </systemProperties> + </configuration> + </execution> + <execution> + <id>runClient</id> + <goals> + <goal>runClient</goal> + </goals> + <configuration> + <clientClass>org.apache.activemq.jms.example.XAReceiveExample</clientClass> + </configuration> + </execution> + <execution> + <id>stop</id> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-xa-receive-example</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + <version>${geronimo.jms.2.spec.version}</version> + </dependency> + </dependencies> <configuration> - <clientClass>org.apache.activemq.jms.example.XAReceiveExample</clientClass> + <waitOnStart>false</waitOnStart> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> - </execution> - <execution> - <id>stop</id> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.activemq.examples.jms</groupId> - <artifactId>activemq-jms-xa-receive-example</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jms-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jms-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_2.0_spec</artifactId> - <version>${geronimo.jms.2.spec.version}</version> - </dependency> - </dependencies> - <configuration> - <waitOnStart>false</waitOnStart> - <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> - </configuration> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/jms/xa-receive/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/xa-receive/readme.html b/examples/jms/xa-receive/readme.html index 1d371ee..02aa0e4 100644 --- a/examples/jms/xa-receive/readme.html +++ b/examples/jms/xa-receive/readme.html @@ -42,7 +42,7 @@ under the License. messages. Then we check that no more messages are to be received.</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><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></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 it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> <pre class="prettyprint"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/jms/xa-send/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/xa-send/pom.xml b/examples/jms/xa-send/pom.xml index 1e3e7d9..fb9b4c1 100644 --- a/examples/jms/xa-send/pom.xml +++ b/examples/jms/xa-send/pom.xml @@ -44,85 +44,90 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-maven-plugin</artifactId> - <executions> - <execution> - <id>start</id> - <goals> - <goal>start</goal> - </goals> - <configuration> - <systemProperties> - <property> - <name>data.dir</name> - <value>${basedir}/target/</value> - </property> - </systemProperties> - </configuration> - </execution> - <execution> - <id>runClient</id> - <goals> - <goal>runClient</goal> - </goals> + <profiles> + <profile> + <id>example</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-maven-plugin</artifactId> + <executions> + <execution> + <id>start</id> + <goals> + <goal>start</goal> + </goals> + <configuration> + <systemProperties> + <property> + <name>data.dir</name> + <value>${basedir}/target/</value> + </property> + </systemProperties> + </configuration> + </execution> + <execution> + <id>runClient</id> + <goals> + <goal>runClient</goal> + </goals> + <configuration> + <clientClass>org.apache.activemq.jms.example.XASendExample</clientClass> + </configuration> + </execution> + <execution> + <id>stop</id> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.activemq.examples.jms</groupId> + <artifactId>activemq-jms-xa-send-example</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + <version>${geronimo.jms.2.spec.version}</version> + </dependency> + </dependencies> <configuration> - <clientClass>org.apache.activemq.jms.example.XASendExample</clientClass> + <waitOnStart>false</waitOnStart> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> - </execution> - <execution> - <id>stop</id> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.activemq.examples.jms</groupId> - <artifactId>activemq-jms-xa-send-example</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jms-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jms-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_2.0_spec</artifactId> - <version>${geronimo.jms.2.spec.version}</version> - </dependency> - </dependencies> - <configuration> - <waitOnStart>false</waitOnStart> - <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> - </configuration> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/jms/xa-send/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/xa-send/readme.html b/examples/jms/xa-send/readme.html index 4ce794f..0205993 100644 --- a/examples/jms/xa-send/readme.html +++ b/examples/jms/xa-send/readme.html @@ -40,7 +40,7 @@ under the License. a new transaction with the same XAResource, but this time we commit the transaction. Both messages are received.</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><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></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 it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 5514d41..b6698b9 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -62,6 +62,7 @@ under the License. <modules> <module>core</module> <module>jms</module> + <module>soak</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/soak/normal/pom.xml ---------------------------------------------------------------------- diff --git a/examples/soak/normal/pom.xml b/examples/soak/normal/pom.xml index 0913e65..7456e6e 100644 --- a/examples/soak/normal/pom.xml +++ b/examples/soak/normal/pom.xml @@ -27,7 +27,7 @@ under the License. <name>ActiveMQ6 Soak Normal Example</name> <parent> - <groupId>org.apache.activemq.example.soak</groupId> + <groupId>org.apache.activemq.examples.soak</groupId> <artifactId>soak-examples</artifactId> <version>6.0.1-SNAPSHOT</version> </parent> @@ -87,9 +87,6 @@ under the License. <profiles> <profile> <id>local</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/examples/soak/pom.xml ---------------------------------------------------------------------- diff --git a/examples/soak/pom.xml b/examples/soak/pom.xml index aa6961b..72283fd 100644 --- a/examples/soak/pom.xml +++ b/examples/soak/pom.xml @@ -28,7 +28,7 @@ under the License. <version>6.0.1-SNAPSHOT</version> </parent> - <groupId>org.apache.activemq.example.soak</groupId> + <groupId>org.apache.activemq.examples.soak</groupId> <artifactId>soak-examples</artifactId> <packaging>pom</packaging> <name>ActiveMQ6 Soak Examples</name> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8db56b73/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 77ae86f..fa08630 100644 --- a/pom.xml +++ b/pom.xml @@ -736,7 +736,7 @@ <plugin> <groupId>org.apache.activemq</groupId> <artifactId>activemq-maven-plugin</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>${project.version}</version> </plugin> </plugins> </pluginManagement>
