Merging apache#59

This closes apache#59
d0k1 · Jan 12, 2015 · ff7dbff · ff7dbff
2 parents 0028efb + 86cdc58
commit ff7dbff
Show file tree

Hide file tree

Showing 25 changed files with 21 additions and 958 deletions.
diff --git a/docs/user-manual/en/client-classpath.md b/docs/user-manual/en/client-classpath.md
@@ -20,10 +20,10 @@ on your client classpath.
 ## JMS Client
 
 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**
 >
-> `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
 > interface classes on your classpath, you will not need it.
diff --git a/examples/core/embedded-remote/pom.xml b/examples/core/embedded-remote/pom.xml
@@ -52,11 +52,6 @@ under the License.
          <groupId>io.netty</groupId>
          <artifactId>netty-all</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jms-api</artifactId>
-         <version>1.1.0.GA</version>
-      </dependency>
       <dependency>
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-jms_2.0_spec</artifactId>

diff --git a/examples/core/embedded/pom.xml b/examples/core/embedded/pom.xml
@@ -52,11 +52,6 @@ under the License.
          <groupId>io.netty</groupId>
          <artifactId>netty-all</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jms-api</artifactId>
-         <version>1.1.0.GA</version>
-      </dependency>
       <dependency>
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-jms_2.0_spec</artifactId>

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

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

diff --git a/examples/jms/activemq-ra-rar/pom.xml b/examples/jms/activemq-ra-rar/pom.xml
@@ -51,12 +51,8 @@ under the License.
               <artifactId>geronimo-jms_2.0_spec</artifactId>
             </exclusion>
             <exclusion>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            </exclusion>
-            <exclusion>
-               <groupId>jboss.jbossts.jts</groupId>
-               <artifactId>jbossjts-jacorb</artifactId>
+               <groupId>org.apache.geronimo.specs</groupId>
+               <artifactId>geronimo-ejb_3.0_spec</artifactId>
             </exclusion>
          </exclusions>
       </dependency>

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

diff --git a/examples/jms/applet/applet.html b/examples/jms/applet/applet.html
@@ -30,7 +30,7 @@ <h1>ActiveMQ Applet Example</h1>
 
      <applet code="org.apache.activemq.jms.example.AppletExample.class"
              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>
   </body>
 </html>
diff --git a/examples/jms/bridge/pom.xml b/examples/jms/bridge/pom.xml
@@ -70,8 +70,6 @@ under the License.
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <jndiPort>1199</jndiPort>
-                     <jndiRmiPort>1198</jndiRmiPort>
                      <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
                      <fork>true</fork>
                   </configuration>

diff --git a/examples/jms/ha-policy-autobackup/pom.xml b/examples/jms/ha-policy-autobackup/pom.xml
@@ -71,8 +71,6 @@ under the License.
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <jndiPort>1199</jndiPort>
-                     <jndiRmiPort>1198</jndiRmiPort>
                      <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
                      <fork>true</fork>
                      <systemProperties>

diff --git a/examples/jms/jms-bridge/readme.html b/examples/jms/jms-bridge/readme.html
@@ -118,7 +118,12 @@ <h2>Example step-by-step</h2>
            InitialContext sourceContext = createContext(sourceServer);
            InitialContext targetContext = createContext(targetServer);
         </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">
             JMSBridge jmsBridge = new JMSBridgeImpl(
                new JNDIConnectionFactoryFactory(sourceJndiParams, "source/ConnectionFactory"),
@@ -132,13 +137,12 @@ <h2>Example step-by-step</h2>
                null,
                5000,
                10,
-               QualityOfServiceMode.ONCE_AND_ONLY_ONCE,
+               QualityOfServiceMode.DUPLICATES_OK,
                1,
                -1,
                null,
                null,
                true);
-            jmsBridge.setTransactionManager(new TransactionManagerImple());
             ....
         jmsBridge.start();
         </pre>

diff --git a/examples/jms/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java b/examples/jms/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java
@@ -16,7 +16,6 @@
  */
 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.QualityOfServiceMode;
 import org.apache.activemq.jms.bridge.impl.JMSBridgeImpl;
@@ -77,13 +76,12 @@ public static void main(final String[] args) throws Exception
                null,
                5000,
                10,
-               QualityOfServiceMode.ONCE_AND_ONLY_ONCE,
+               QualityOfServiceMode.DUPLICATES_OK,
                1,
                -1,
                null,
                null,
                true);
-      jmsBridge.setTransactionManager(new TransactionManagerImple());
 
       Connection sourceConnection = null;
       Connection targetConnection = null;

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

diff --git a/examples/jms/pom.xml b/examples/jms/pom.xml
@@ -128,7 +128,6 @@ under the License.
             <module>xa-heuristic</module>
             <module>xa-receive</module>
             <module>xa-send</module>
-            <module>xa-with-jta</module>
          </modules>
       </profile>
       <profile>

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

diff --git a/examples/jms/stop-server-failover/pom.xml b/examples/jms/stop-server-failover/pom.xml
@@ -75,8 +75,6 @@ under the License.
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <jndiPort>1199</jndiPort>
-                     <jndiRmiPort>1198</jndiRmiPort>
                      <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
                      <fork>true</fork>
                      <systemProperties>

diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml
@@ -42,11 +42,6 @@ under the License.
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.jbossts.jts</groupId>
-         <artifactId>jbossjts-jacorb</artifactId>
-         <version>4.17.4.Final</version>
-      </dependency>
    </dependencies>
 
    <build>