[hornetq-commits] JBoss hornetq SVN: r10466 - in trunk: hornetq-ra and 12 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Apr 8 03:26:27 EDT 2011


Author: ataylor
Date: 2011-04-08 03:26:27 -0400 (Fri, 08 Apr 2011)
New Revision: 10466

Added:
   trunk/hornetq-ra/
   trunk/hornetq-ra/hornetq-ra-jar/
   trunk/hornetq-ra/hornetq-ra-jar/pom.xml
   trunk/hornetq-ra/hornetq-ra-jar/src/
   trunk/hornetq-ra/hornetq-ra-jar/src/main/
   trunk/hornetq-ra/hornetq-ra-jar/src/main/java/
   trunk/hornetq-ra/hornetq-ra-jar/src/main/java/org/
   trunk/hornetq-ra/hornetq-ra-jar/src/main/java/org/hornetq/
   trunk/hornetq-ra/hornetq-ra-jar/src/main/java/org/hornetq/ra/
   trunk/hornetq-ra/hornetq-ra-rar/
   trunk/hornetq-ra/hornetq-ra-rar/pom.xml
   trunk/hornetq-ra/hornetq-ra-rar/src/
   trunk/hornetq-ra/hornetq-ra-rar/src/main/
   trunk/hornetq-ra/hornetq-ra-rar/src/main/resources/
   trunk/hornetq-ra/hornetq-ra-rar/src/main/resources/ra.xml
   trunk/hornetq-ra/pom.xml
Removed:
   trunk/src/config/ra.xml
   trunk/src/main/org/hornetq/ra/
Modified:
   trunk/build-hornetq.xml
   trunk/hornetq.iml
Log:
mavenized hornetq ra

Modified: trunk/build-hornetq.xml
===================================================================
--- trunk/build-hornetq.xml	2011-04-08 04:47:49 UTC (rev 10465)
+++ trunk/build-hornetq.xml	2011-04-08 07:26:27 UTC (rev 10466)
@@ -103,6 +103,7 @@
    <property name="hornetq.bootstrap.module.jar" value="hornetq-bootstrap"/>
    <property name="hornetq.twitter.module.jar" value="hornetq-twitter-integration"/>
    <property name="hornetq.service.module.jar" value="hornetq-service-sar"/>
+   <property name="hornetq.ra.rar.module.jar" value="hornetq-ra/hornetq-ra-rar"/>
    <property name="target.core.jar.dir" value="${hornetq.core.module.jar}/target"/>
    <property name="target.jms.jar.dir" value="${hornetq.jms.module.jar}/target"/>
    <property name="target.jms.client.jar.dir" value="${hornetq.jms.client.module.jar}/target"/>
@@ -112,6 +113,7 @@
    <property name="target.bootstrap.jar.dir" value="${hornetq.bootstrap.module.jar}/target"/>
    <property name="target.twitter.jar.dir" value="${hornetq.twitter.module.jar}/target"/>
    <property name="target.service.jar.dir" value="${hornetq.service.module.jar}/target"/>
+   <property name="target.ra.rar.jar.dir" value="${hornetq.ra.rar.module.jar}/target"/>
    <property name="build.core.client.java5.classes.dir" value="${build.dir}/classes/core-client-java5"/>
    <property name="build.jms.classes.dir" value="${build.dir}/classes/jms"/>
    <property name="build.jms.java5.classes.dir" value="${build.dir}/classes/jms-java5"/>
@@ -626,26 +628,7 @@
    <target name="compile-logging" depends="jar-logging">
    </target>
 
-   <target name="compile-ra" depends="init">
-      <javac destdir="${build.ra.classes.dir}"
-             target="${javac.target}"
-             source="${javac.source}"
-             optimize="${javac.optimize}"
-             debug="${javac.debug}"
-             depend="${javac.depend}"
-             verbose="${javac.verbose}"
-             deprecation="${javac.deprecation}"
-             includeAntRuntime="${javac.include.ant.runtime}"
-             includeJavaRuntime="${javac.include.java.runtime}"
-             encoding="${javac.encoding}"
-             failonerror="${javac.fail.onerror}">
-         <src>
-            <pathelement path="${build.src.dir}"/>
-            <pathelement path="${src.main.dir}"/>
-         </src>
-         <include name="**org/hornetq/ra/**/*.java"/>
-         <classpath refid="jms.compilation.classpath"/>
-      </javac>
+   <target name="compile-ra" depends="jar-ra">
    </target>
 
    <target name="build-native" depends="jar">
@@ -1027,18 +1010,12 @@
       </jar>
    </target>
 	
-   <target name="jar-ra" depends="jar-core-client, jar-jms-client, compile-ra">
-      <jar jarfile="${build.jars.dir}/${ra.jar.name}">
-         <fileset dir="${build.ra.classes.dir}">
-           <include name="org/hornetq/ra/**/*.class"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.jars.dir}/${ra.rar.name}">
-         <metainf dir="${src.config.dir}" includes="ra.xml"/>
-         <fileset file="${build.jars.dir}/${ra.jar.name}"/>
-         <fileset file="${build.jars.dir}/${core.client.jar.name}"/>
-         <fileset file="${build.jars.dir}/${jms.jar.name}"/>
-      </jar>
+   <target name="jar-ra" depends="jar-core-client, jar-jms-client">
+      <ant antfile="build-thirdparty.xml" target="maven-install">
+         <property name="maven.opts" value="-Dmaven.test.skip=true"/>
+         <property name="maven.goal" value="install"/>
+         <property name="working.dir" value="hornetq-ra"/>
+      </ant>
    </target>
 
    <target name="jar-ra-sources">
@@ -1086,12 +1063,12 @@
 
    <target name="jar-rest-init" depends="jar-jms">
       <ant antfile="build-maven.xml" target="upload-local-target">
-	<property name="artifact.id" value="hornetq-core"/>
-	<property name="file-name" value="hornetq-core"/>
+         <property name="artifact.id" value="hornetq-core"/>
+         <property name="file-name" value="hornetq-core"/>
       </ant>
       <ant antfile="build-maven.xml" target="upload-local-target">
-	<property name="artifact.id" value="hornetq-jms"/>
-	<property name="file-name" value="hornetq-jms"/>
+         <property name="artifact.id" value="hornetq-jms"/>
+         <property name="file-name" value="hornetq-jms"/>
       </ant>
    </target>
       
@@ -1147,7 +1124,6 @@
       <copy todir="${build.distro.lib.dir}">
          <fileset dir="${build.jars.dir}">
             <include name="${mc.jar.name}"/>
-            <include name="${ra.rar.name}"/>
             <include name="${core.client.java5.jar.name}"/>
          	<include name="${jms.client.java5.jar.name}"/>
          	<include name="${jnp.client.jar.name}"/>
@@ -1168,6 +1144,8 @@
       <copy file="${target.bootstrap.jar.dir}/hornetq-bootstrap-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-bootstrap.jar"/>
       <copy file="${target.twitter.jar.dir}/hornetq-twitter-integration-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-twitter-integration.jar"/>
       <copy file="${target.service.jar.dir}/hornetq-service-sar-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-service.jar"/>
+      <copy file="${target.ra.rar.jar.dir}/hornetq-rar-2.2.3-SNAPSHOT.rar" tofile="${build.distro.lib.dir}/hornetq-rar.rar"/>
+
       <copy file="${org.jboss.netty.lib}/${netty.jar.name}" tofile="${build.distro.lib.dir}/netty.jar"/>
       <copy file="${org.twitter4j.lib}/${twitter4j.jar.name}" tofile="${build.distro.lib.dir}/${twitter4j.jar.name}"/>
       <copy todir="${build.distro.config.dir}">

Added: trunk/hornetq-ra/hornetq-ra-jar/pom.xml
===================================================================
--- trunk/hornetq-ra/hornetq-ra-jar/pom.xml	                        (rev 0)
+++ trunk/hornetq-ra/hornetq-ra-jar/pom.xml	2011-04-08 07:26:27 UTC (rev 10466)
@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-ra</artifactId>
+    <packaging>jar</packaging>
+        <version>2.2.3-SNAPSHOT</version>
+    <name>HornetQ RAR JAR</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-core</artifactId>
+            <version>2.2.3-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-jms</artifactId>
+            <version>2.2.3-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.javaee</groupId>
+            <artifactId>jboss-jca-api</artifactId>
+                <version>1.5.0.GA</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: trunk/hornetq-ra/hornetq-ra-rar/pom.xml
===================================================================
--- trunk/hornetq-ra/hornetq-ra-rar/pom.xml	                        (rev 0)
+++ trunk/hornetq-ra/hornetq-ra-rar/pom.xml	2011-04-08 07:26:27 UTC (rev 10466)
@@ -0,0 +1,83 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-rar</artifactId>
+    <packaging>rar</packaging>
+    <version>2.2.3-SNAPSHOT</version>
+    <name>HornetQ JMS RA</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-jms-client</artifactId>
+            <version>2.2.3-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hornetq</groupId>
+                    <artifactId>hornetq-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.hornetq</groupId>
+                    <artifactId>hornetq-jms</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.javaee</groupId>
+                    <artifactId>jboss-jms-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.javaee</groupId>
+                    <artifactId>jboss-transaction-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jboss.jbossts</groupId>
+                    <artifactId>jbossjts</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-ra</artifactId>
+            <version>2.2.3-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-core-client</artifactId>
+            <version>2.2.3-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hornetq</groupId>
+                    <artifactId>hornetq-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+       <dependency>
+          <groupId>org.jboss.netty</groupId>
+          <artifactId>netty</artifactId>
+          <version>3.2.3.Final</version>
+       </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-rar-plugin</artifactId>
+                <configuration>
+                   <raXmlFile>src/main/resources/ra.xml</raXmlFile>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Copied: trunk/hornetq-ra/hornetq-ra-rar/src/main/resources/ra.xml (from rev 10460, trunk/src/config/ra.xml)
===================================================================
--- trunk/hornetq-ra/hornetq-ra-rar/src/main/resources/ra.xml	                        (rev 0)
+++ trunk/hornetq-ra/hornetq-ra-rar/src/main/resources/ra.xml	2011-04-08 07:26:27 UTC (rev 10466)
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: ra.xml 76819 2008-08-08 11:04:20Z jesper.pedersen $ -->
+
+<connector xmlns="http://java.sun.com/xml/ns/j2ee"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+           http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
+           version="1.5">
+
+   <description>HornetQ 2.0 Resource Adapter</description>
+   <display-name>HornetQ 2.0 Resource Adapter</display-name>
+
+   <vendor-name>Red Hat Middleware LLC</vendor-name>
+   <eis-type>JMS 1.1 Server</eis-type>
+   <resourceadapter-version>1.0</resourceadapter-version>
+
+   <license>
+      <description>
+Copyright 2009 Red Hat, Inc.
+ Red Hat licenses this file to you under the Apache License, version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.  See the License for the specific language governing
+ permissions and limitations under the License.  
+      </description>
+      <license-required>true</license-required>
+   </license>
+
+   <resourceadapter>
+      <resourceadapter-class>org.hornetq.ra.HornetQResourceAdapter</resourceadapter-class>
+      <config-property>
+         <description>
+            The transport type. Multiple connectors can be configured by using a comma separated list,
+            i.e. org.hornetq.core.remoting.impl.invm.InVMConnectorFactory,org.hornetq.core.remoting.impl.invm.InVMConnectorFactory.
+         </description>
+         <config-property-name>ConnectorClassName</config-property-name>
+         <config-property-type>java.lang.String</config-property-type>
+         <config-property-value>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</config-property-value>
+      </config-property>
+      <config-property>
+         <description>The transport configuration. These values must be in the form of key=val;key=val;,
+            if multiple connectors are used then each set must be separated by a comma i.e. host=host1;port=5445,host=host2;port=5446.
+            Each set of params maps to the connector classname specified.
+         </description>
+         <config-property-name>ConnectionParameters</config-property-name>
+         <config-property-type>java.lang.String</config-property-type>
+         <config-property-value>server-id=0</config-property-value>
+      </config-property>
+      <!--
+      <config-property>
+        <description>Does we support HA</description>
+        <config-property-name>HA</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value>false</config-property-value>
+      </config-property>
+      <config-property>
+        <description>The method to use for locating the transactionmanager</description>
+        <config-property-name>TransactionManagerLocatorMethod</config-property-name>
+        <config-property-type>java.lang.String</config-property-type>
+        <config-property-value>getTm</config-property-value>
+      </config-property>
+      <config-property>
+        <description>Use A local Transaction instead of XA?</description>
+        <config-property-name>UseLocalTx</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value>false</config-property-value>
+      </config-property>
+      <config-property>
+        <description>The user name used to login to the JMS server</description>
+        <config-property-name>UserName</config-property-name>
+        <config-property-type>java.lang.String</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The password used to login to the JMS server</description>
+        <config-property-name>Password</config-property-name>
+        <config-property-type>java.lang.String</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The discovery group address</description>
+        <config-property-name>DiscoveryAddress</config-property-name>
+        <config-property-type>java.lang.String</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The discovery group port</description>
+        <config-property-name>DiscoveryPort</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The discovery refresh timeout</description>
+        <config-property-name>DiscoveryRefreshTimeout</config-property-name>
+        <config-property-type>java.lang.Long</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The discovery initial wait timeout</description>
+        <config-property-name>DiscoveryInitialWaitTimeout</config-property-name>
+        <config-property-type>java.lang.Long</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The load balancing policy class name</description>
+        <config-property-name>LoadBalancingPolicyClassName</config-property-name>
+        <config-property-type>java.lang.String</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The client failure check period</description>
+        <config-property-name>ClientFailureCheckPeriod</config-property-name>
+        <config-property-type>java.lang.Long</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The connection TTL</description>
+        <config-property-name>ConnectionTTL</config-property-name>
+        <config-property-type>java.lang.Long</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The call timeout</description>
+        <config-property-name>CallTimeout</config-property-name>
+        <config-property-type>java.lang.Long</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The dups ok batch size</description>
+        <config-property-name>DupsOKBatchSize</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The transaction batch size</description>
+        <config-property-name>TransactionBatchSize</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The consumer window size</description>
+        <config-property-name>ConsumerWindowSize</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The consumer max rate</description>
+        <config-property-name>ConsumerMaxRate</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The confirmation window size</description>
+        <config-property-name>ConfirmationWindowSize</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The producer max rate</description>
+        <config-property-name>ProducerMaxRate</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The min large message size</description>
+        <config-property-name>MinLargeMessageSize</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The block on acknowledge</description>
+        <config-property-name>BlockOnAcknowledge</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The block on non durable send</description>
+        <config-property-name>BlockOnNonDurableSend</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The block on durable send</description>
+        <config-property-name>BlockOnDurableSend</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The auto group</description>
+        <config-property-name>AutoGroup</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The max connections</description>        
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The pre acknowledge</description>
+        <config-property-name>PreAcknowledge</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The retry interval</description>
+        <config-property-name>RetryInterval</config-property-name>
+        <config-property-type>java.lang.Long</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The retry interval multiplier</description>
+        <config-property-name>RetryIntervalMultiplier</config-property-name>
+        <config-property-type>java.lang.Double</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The client id</description>
+        <config-property-name>ClientID</config-property-name>
+        <config-property-type>java.lang.String</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>-->
+
+      <outbound-resourceadapter>
+         <connection-definition>
+            <managedconnectionfactory-class>org.hornetq.ra.HornetQRAManagedConnectionFactory</managedconnectionfactory-class>
+
+            <config-property>
+               <description>The default session type</description>
+               <config-property-name>SessionDefaultType</config-property-name>
+               <config-property-type>java.lang.String</config-property-type>
+               <config-property-value>javax.jms.Queue</config-property-value>
+            </config-property>
+            <config-property>
+               <description>Try to obtain a lock within specified number of seconds; less than or equal to 0 disable this functionality</description>
+               <config-property-name>UseTryLock</config-property-name>
+               <config-property-type>java.lang.Integer</config-property-type>
+               <config-property-value>0</config-property-value>
+            </config-property>
+
+            <connectionfactory-interface>org.hornetq.ra.HornetQRAConnectionFactory</connectionfactory-interface>
+            <connectionfactory-impl-class>org.hornetq.ra.HornetQRAConnectionFactoryImpl</connectionfactory-impl-class>
+            <connection-interface>javax.jms.Session</connection-interface>
+            <connection-impl-class>org.hornetq.ra.HornetQRASession</connection-impl-class>
+         </connection-definition>
+         <transaction-support>XATransaction</transaction-support>
+         <authentication-mechanism>
+            <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
+            <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+         </authentication-mechanism>
+         <reauthentication-support>false</reauthentication-support>
+      </outbound-resourceadapter>
+
+      <inbound-resourceadapter>
+         <messageadapter>
+            <messagelistener>
+               <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
+               <activationspec>
+                  <activationspec-class>org.hornetq.ra.inflow.HornetQActivationSpec</activationspec-class>
+                  <required-config-property>
+                      <config-property-name>destination</config-property-name>
+                  </required-config-property>
+               </activationspec>
+            </messagelistener>
+         </messageadapter>
+      </inbound-resourceadapter>
+
+   </resourceadapter>
+</connector>

Added: trunk/hornetq-ra/pom.xml
===================================================================
--- trunk/hornetq-ra/pom.xml	                        (rev 0)
+++ trunk/hornetq-ra/pom.xml	2011-04-08 07:26:27 UTC (rev 10466)
@@ -0,0 +1,26 @@
+<project>
+    <name>HornetQ RAR POM</name>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-rar-pom</artifactId>
+    <version>2.2.3-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <modules>
+        <module>hornetq-ra-jar</module>
+        <module>hornetq-ra-rar</module>
+    </modules>
+</project>

Modified: trunk/hornetq.iml
===================================================================
--- trunk/hornetq.iml	2011-04-08 04:47:49 UTC (rev 10465)
+++ trunk/hornetq.iml	2011-04-08 07:26:27 UTC (rev 10466)
@@ -14,6 +14,7 @@
       <sourceFolder url="file://$MODULE_DIR$/hornetq-spring-integration/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/hornetq-jms/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/hornetq-service-sar/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/hornetq-ra/hornetq-ra-jar/src/main/java" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/build/api" />
       <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/jars" />

Deleted: trunk/src/config/ra.xml
===================================================================
--- trunk/src/config/ra.xml	2011-04-08 04:47:49 UTC (rev 10465)
+++ trunk/src/config/ra.xml	2011-04-08 07:26:27 UTC (rev 10466)
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id: ra.xml 76819 2008-08-08 11:04:20Z jesper.pedersen $ -->
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-           http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
-           version="1.5">
-
-   <description>HornetQ 2.0 Resource Adapter</description>
-   <display-name>HornetQ 2.0 Resource Adapter</display-name>
-
-   <vendor-name>Red Hat Middleware LLC</vendor-name>
-   <eis-type>JMS 1.1 Server</eis-type>
-   <resourceadapter-version>1.0</resourceadapter-version>
-
-   <license>
-      <description>
-Copyright 2009 Red Hat, Inc.
- Red Hat licenses this file to you under the Apache License, version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied.  See the License for the specific language governing
- permissions and limitations under the License.  
-      </description>
-      <license-required>true</license-required>
-   </license>
-
-   <resourceadapter>
-      <resourceadapter-class>org.hornetq.ra.HornetQResourceAdapter</resourceadapter-class>
-      <config-property>
-         <description>
-            The transport type. Multiple connectors can be configured by using a comma separated list,
-            i.e. org.hornetq.core.remoting.impl.invm.InVMConnectorFactory,org.hornetq.core.remoting.impl.invm.InVMConnectorFactory.
-         </description>
-         <config-property-name>ConnectorClassName</config-property-name>
-         <config-property-type>java.lang.String</config-property-type>
-         <config-property-value>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</config-property-value>
-      </config-property>
-      <config-property>
-         <description>The transport configuration. These values must be in the form of key=val;key=val;,
-            if multiple connectors are used then each set must be separated by a comma i.e. host=host1;port=5445,host=host2;port=5446.
-            Each set of params maps to the connector classname specified.
-         </description>
-         <config-property-name>ConnectionParameters</config-property-name>
-         <config-property-type>java.lang.String</config-property-type>
-         <config-property-value>server-id=0</config-property-value>
-      </config-property>
-      <!--
-      <config-property>
-        <description>Does we support HA</description>
-        <config-property-name>HA</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value>false</config-property-value>
-      </config-property>
-      <config-property>
-        <description>The method to use for locating the transactionmanager</description>
-        <config-property-name>TransactionManagerLocatorMethod</config-property-name>
-        <config-property-type>java.lang.String</config-property-type>
-        <config-property-value>getTm</config-property-value>
-      </config-property>
-      <config-property>
-        <description>Use A local Transaction instead of XA?</description>
-        <config-property-name>UseLocalTx</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value>false</config-property-value>
-      </config-property>
-      <config-property>
-        <description>The user name used to login to the JMS server</description>
-        <config-property-name>UserName</config-property-name>
-        <config-property-type>java.lang.String</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The password used to login to the JMS server</description>
-        <config-property-name>Password</config-property-name>
-        <config-property-type>java.lang.String</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The discovery group address</description>
-        <config-property-name>DiscoveryAddress</config-property-name>
-        <config-property-type>java.lang.String</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The discovery group port</description>
-        <config-property-name>DiscoveryPort</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The discovery refresh timeout</description>
-        <config-property-name>DiscoveryRefreshTimeout</config-property-name>
-        <config-property-type>java.lang.Long</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The discovery initial wait timeout</description>
-        <config-property-name>DiscoveryInitialWaitTimeout</config-property-name>
-        <config-property-type>java.lang.Long</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The load balancing policy class name</description>
-        <config-property-name>LoadBalancingPolicyClassName</config-property-name>
-        <config-property-type>java.lang.String</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The client failure check period</description>
-        <config-property-name>ClientFailureCheckPeriod</config-property-name>
-        <config-property-type>java.lang.Long</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The connection TTL</description>
-        <config-property-name>ConnectionTTL</config-property-name>
-        <config-property-type>java.lang.Long</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The call timeout</description>
-        <config-property-name>CallTimeout</config-property-name>
-        <config-property-type>java.lang.Long</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The dups ok batch size</description>
-        <config-property-name>DupsOKBatchSize</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The transaction batch size</description>
-        <config-property-name>TransactionBatchSize</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The consumer window size</description>
-        <config-property-name>ConsumerWindowSize</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The consumer max rate</description>
-        <config-property-name>ConsumerMaxRate</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The confirmation window size</description>
-        <config-property-name>ConfirmationWindowSize</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The producer max rate</description>
-        <config-property-name>ProducerMaxRate</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The min large message size</description>
-        <config-property-name>MinLargeMessageSize</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The block on acknowledge</description>
-        <config-property-name>BlockOnAcknowledge</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The block on non durable send</description>
-        <config-property-name>BlockOnNonDurableSend</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The block on durable send</description>
-        <config-property-name>BlockOnDurableSend</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The auto group</description>
-        <config-property-name>AutoGroup</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The max connections</description>        
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The pre acknowledge</description>
-        <config-property-name>PreAcknowledge</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The retry interval</description>
-        <config-property-name>RetryInterval</config-property-name>
-        <config-property-type>java.lang.Long</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The retry interval multiplier</description>
-        <config-property-name>RetryIntervalMultiplier</config-property-name>
-        <config-property-type>java.lang.Double</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The client id</description>
-        <config-property-name>ClientID</config-property-name>
-        <config-property-type>java.lang.String</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>-->
-
-      <outbound-resourceadapter>
-         <connection-definition>
-            <managedconnectionfactory-class>org.hornetq.ra.HornetQRAManagedConnectionFactory</managedconnectionfactory-class>
-
-            <config-property>
-               <description>The default session type</description>
-               <config-property-name>SessionDefaultType</config-property-name>
-               <config-property-type>java.lang.String</config-property-type>
-               <config-property-value>javax.jms.Queue</config-property-value>
-            </config-property>
-            <config-property>
-               <description>Try to obtain a lock within specified number of seconds; less than or equal to 0 disable this functionality</description>
-               <config-property-name>UseTryLock</config-property-name>
-               <config-property-type>java.lang.Integer</config-property-type>
-               <config-property-value>0</config-property-value>
-            </config-property>
-
-            <connectionfactory-interface>org.hornetq.ra.HornetQRAConnectionFactory</connectionfactory-interface>
-            <connectionfactory-impl-class>org.hornetq.ra.HornetQRAConnectionFactoryImpl</connectionfactory-impl-class>
-            <connection-interface>javax.jms.Session</connection-interface>
-            <connection-impl-class>org.hornetq.ra.HornetQRASession</connection-impl-class>
-         </connection-definition>
-         <transaction-support>XATransaction</transaction-support>
-         <authentication-mechanism>
-            <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-            <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
-         </authentication-mechanism>
-         <reauthentication-support>false</reauthentication-support>
-      </outbound-resourceadapter>
-
-      <inbound-resourceadapter>
-         <messageadapter>
-            <messagelistener>
-               <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
-               <activationspec>
-                  <activationspec-class>org.hornetq.ra.inflow.HornetQActivationSpec</activationspec-class>
-                  <required-config-property>
-                      <config-property-name>destination</config-property-name>
-                  </required-config-property>
-               </activationspec>
-            </messagelistener>
-         </messageadapter>
-      </inbound-resourceadapter>
-
-   </resourceadapter>
-</connector>



More information about the hornetq-commits mailing list