Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ActiveMQ6-65 Examples updated: 3rd party CatX deps 

Removes any occurances of CatX deps from examples and removes a couple
of other references to Cat X 3rd party deps.
This commit is contained in:
Martyn Taylor 2015-01-12 15:52:38 +00:00
parent 0028efbdc5
commit 82f1e7a503
18 changed files with 21 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/user-manual/en/client-classpath.md
View File

@ -20,10 +20,10 @@ on your client classpath.
## JMS Client ## JMS Client
If you are using JMS on the client side, then you will also need to If you are using JMS on the client side, then you will also need to
include `activemq-jms-client.jar` and `jboss-jms-api.jar`. include `activemq-jms-client.jar` and `geronimo-jms_2.0_spec.jar`.
> **Note** > **Note**
> >
> `jboss-jms-api.jar` just contains Java EE API interface classes needed > `geronimo-jms_2.0_spec.jar` just contains Java EE API interface classes needed
> for the `javax.jms.*` classes. If you already have a jar with these > for the `javax.jms.*` classes. If you already have a jar with these
> interface classes on your classpath, you will not need it. > interface classes on your classpath, you will not need it.

5
examples/core/embedded-remote/pom.xml
View File

@ -52,11 +52,6 @@ under the License.
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
<version>1.1.0.GA</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId> <artifactId>geronimo-jms_2.0_spec</artifactId>

5
examples/core/embedded/pom.xml
View File

@ -52,11 +52,6 @@ under the License.
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
<version>1.1.0.GA</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId> <artifactId>geronimo-jms_2.0_spec</artifactId>

10
examples/core/perf/pom.xml
View File

@ -48,11 +48,6 @@ under the License.
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
<version>${netty.version}</version> <version>${netty.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
<version>1.1.0.GA</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.activemq.examples.jms</groupId> <groupId>org.apache.activemq.examples.jms</groupId>
<artifactId>activemq-jms-examples-common</artifactId> <artifactId>activemq-jms-examples-common</artifactId>
@ -128,11 +123,6 @@ under the License.
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
<version>${netty.version}</version> <version>${netty.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
<version>1.1.0.GA</version>
</dependency>
</dependencies> </dependencies>
</plugin> </plugin>
</plugins> </plugins>

10
examples/core/vertx-connector/pom.xml
View File

@ -57,9 +57,8 @@ under the License.
<version>${netty.version}</version> <version>${netty.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.javaee</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>jboss-jms-api</artifactId> <artifactId>geronimo-jms_2.0_spec</artifactId>
<version>1.1.0.GA</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
@ -158,11 +157,6 @@ under the License.
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
<version>${netty.version}</version> <version>${netty.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
<version>1.1.0.GA</version>
</dependency>
<dependency> <dependency>
<groupId>io.vertx</groupId> <groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId> <artifactId>vertx-core</artifactId>

8
examples/jms/activemq-ra-rar/pom.xml
View File

@ -51,12 +51,8 @@ under the License.
<artifactId>geronimo-jms_2.0_spec</artifactId> <artifactId>geronimo-jms_2.0_spec</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId> <artifactId>geronimo-ejb_3.0_spec</artifactId>
</exclusion>
<exclusion>
<groupId>jboss.jbossts.jts</groupId>
<artifactId>jbossjts-jacorb</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>

1
examples/jms/aerogear/pom.xml
View File

@ -140,7 +140,6 @@ under the License.
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId> <artifactId>geronimo-jms_2.0_spec</artifactId>
<version>${geronimo.jms.2.spec.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>

2
examples/jms/applet/applet.html
View File

@ -30,7 +30,7 @@ under the License.
<applet code="org.apache.activemq.jms.example.AppletExample.class" <applet code="org.apache.activemq.jms.example.AppletExample.class"
codebase="build/classes/" codebase="build/classes/"
archive="activemq-core-client.jar,activemq-jms-client.jar,jboss-jms-api.jar,netty.jar" archive="activemq-core-client.jar,activemq-jms-client.jar,geronimo-jms_2.0_spec.jar,netty.jar"
width="640" height="480"></applet> width="640" height="480"></applet>
</body> </body>
</html> </html>

2
examples/jms/bridge/pom.xml
View File

@ -70,8 +70,6 @@ under the License.
<goal>start</goal> <goal>start</goal>
</goals> </goals>
<configuration> <configuration>
<jndiPort>1199</jndiPort>
<jndiRmiPort>1198</jndiRmiPort>
<configurationDir>${basedir}/target/classes/activemq/server1</configurationDir> <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
<fork>true</fork> <fork>true</fork>
</configuration> </configuration>

2
examples/jms/ha-policy-autobackup/pom.xml
View File

@ -71,8 +71,6 @@ under the License.
<goal>start</goal> <goal>start</goal>
</goals> </goals>
<configuration> <configuration>
<jndiPort>1199</jndiPort>
<jndiRmiPort>1198</jndiRmiPort>
<configurationDir>${basedir}/target/classes/activemq/server1</configurationDir> <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
<fork>true</fork> <fork>true</fork>
<systemProperties> <systemProperties>

10
examples/jms/jms-bridge/readme.html
View File

@ -118,7 +118,12 @@ under the License.
InitialContext sourceContext = createContext(sourceServer); InitialContext sourceContext = createContext(sourceServer);
InitialContext targetContext = createContext(targetServer); InitialContext targetContext = createContext(targetServer);
</pre> </pre>
<li>We then create a JMS Bridge and start it, Note, the Bridge needs a transaction manager, in this instance we will use the JBoss TM</li> <li>We then create a JMS Bridge and start it, Note, for certain quality of service modes such as
ONCE_AND_ONCE_ONLY and AT_LEAST_ONCE a Transaction Manager is required to ensure Messages are delivered
accordingly. A Transaction Manager can be either loaded via implementation of TransactionManagerLocator intefer
and loaded via standard a ServiceLoader or by explicitly setting an instance of a Transaction Manager on the
bridge using setTranscationManager(TransactionManager tm) method. In this example we'll be using the DUPLICATES_OK
quality of service so there is no need for a Transaction Manager.
<pre class="prettyprint"> <pre class="prettyprint">
JMSBridge jmsBridge = new JMSBridgeImpl( JMSBridge jmsBridge = new JMSBridgeImpl(
new JNDIConnectionFactoryFactory(sourceJndiParams, "source/ConnectionFactory"), new JNDIConnectionFactoryFactory(sourceJndiParams, "source/ConnectionFactory"),
@ -132,13 +137,12 @@ under the License.
null, null,
5000, 5000,
10, 10,
QualityOfServiceMode.ONCE_AND_ONLY_ONCE, QualityOfServiceMode.DUPLICATES_OK,
1, 1,
-1, -1,
null, null,
null, null,
true); true);
jmsBridge.setTransactionManager(new TransactionManagerImple());
.... ....
jmsBridge.start(); jmsBridge.start();
</pre> </pre>

4
examples/jms/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java
View File

@ -16,7 +16,6 @@
*/ */
package org.apache.activemq.jms.example; package org.apache.activemq.jms.example;
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
import org.apache.activemq.jms.bridge.JMSBridge; import org.apache.activemq.jms.bridge.JMSBridge;
import org.apache.activemq.jms.bridge.QualityOfServiceMode; import org.apache.activemq.jms.bridge.QualityOfServiceMode;
import org.apache.activemq.jms.bridge.impl.JMSBridgeImpl; import org.apache.activemq.jms.bridge.impl.JMSBridgeImpl;
@ -77,13 +76,12 @@ public class JMSBridgeExample
null, null,
5000, 5000,
10, 10,
QualityOfServiceMode.ONCE_AND_ONLY_ONCE, QualityOfServiceMode.DUPLICATES_OK,
1, 1,
-1, -1,
null, null,
null, null,
true); true);
jmsBridge.setTransactionManager(new TransactionManagerImple());
Connection sourceConnection = null; Connection sourceConnection = null;
Connection targetConnection = null; Connection targetConnection = null;

10
examples/jms/perf/pom.xml
View File

@ -49,9 +49,8 @@ under the License.
<version>${netty.version}</version> <version>${netty.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.javaee</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>jboss-jms-api</artifactId> <artifactId>geronimo-jms_2.0_spec</artifactId>
<version>1.1.0.GA</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq.examples.jms</groupId> <groupId>org.apache.activemq.examples.jms</groupId>
@ -129,9 +128,8 @@ under the License.
<version>${netty.version}</version> <version>${netty.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.javaee</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>jboss-jms-api</artifactId> <artifactId>geronimo-jms_2.0_spec</artifactId>
<version>1.1.0.GA</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>

10
examples/jms/proton-cpp/pom.xml
View File

@ -48,11 +48,6 @@ under the License.
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
<version>${netty.version}</version> <version>${netty.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
<version>1.1.0.GA</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId> <artifactId>geronimo-jms_2.0_spec</artifactId>
@ -130,9 +125,8 @@ under the License.
<version>${netty.version}</version> <version>${netty.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.javaee</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>jboss-jms-api</artifactId> <artifactId>geronimo-jms_2.0_spec</artifactId>
<version>1.1.0.GA</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>

2
examples/jms/stop-server-failover/pom.xml
View File

@ -75,8 +75,6 @@ under the License.
<goal>start</goal> <goal>start</goal>
</goals> </goals>
<configuration> <configuration>
<jndiPort>1199</jndiPort>
<jndiRmiPort>1198</jndiRmiPort>
<configurationDir>${basedir}/target/classes/activemq/server1</configurationDir> <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
<fork>true</fork> <fork>true</fork>
<systemProperties> <systemProperties>

5
examples/jms/xa-heuristic/pom.xml
View File

@ -42,11 +42,6 @@ under the License.
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId> <artifactId>geronimo-jms_2.0_spec</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.jboss.jbossts.jts</groupId>
<artifactId>jbossjts-jacorb</artifactId>
<version>4.17.4.Final</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

5
examples/jms/xa-with-jta/pom.xml
View File

@ -46,11 +46,6 @@ under the License.
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId> <artifactId>geronimo-ejb_3.0_spec</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
<artifactId>jbossjta</artifactId>
<version>4.16.4.Final</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>

2
examples/jms/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.java
View File

@ -30,8 +30,6 @@ import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource; import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid; import javax.transaction.xa.Xid;
import com.arjuna.ats.jta.TransactionManager;
import org.apache.activemq.common.example.ActiveMQExample; import org.apache.activemq.common.example.ActiveMQExample;
/** /**