QPID-4445: make the jar file produced by the JCA module use 'jca' in its name rather than 'ra', add support for generating maven artifacts for the jar and the packaged rar.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454935 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 182 insertions, 20 deletions

diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index f60ffd8ff8..416ca090ef 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -100,7 +100,7 @@ broker-plugins-management-jmx.test.libs=${test.libs}
 management-common.test.libs=${test.libs}
 
 # JCA Resource adapter
-jca.libs=${geronimo-j2ee} ${geronimo-jta} ${geronimo-jms} ${test.libs} ${geronimo-kernel} ${geronimo-openejb} ${geronimo-servlet}
+jca.libs=${geronimo-j2ee} ${geronimo-jta} ${geronimo-jms} ${geronimo-openejb} ${geronimo-servlet} ${geronimo-kernel}
 jca.test.libs=${test.libs}
 
 # optional bdbstore module deps
diff --git a/qpid/java/genpom b/qpid/java/genpom
index 6ac0e970cc..d18b16cefc 100755
--- a/qpid/java/genpom
+++ b/qpid/java/genpom
@@ -41,6 +41,7 @@ parser.add_option("-S", "--scope", metavar="ARTIFACT=SCOPE", action="append",
                   default=[],
                   help="specify scope for an artifact")
 parser.add_option("-o", "--output")
+parser.add_option("-t", "--type", default="jar", help="packaging type")
 
 opts, jars = parser.parse_args()
 
@@ -160,6 +161,7 @@ TEMPLATE = """<?xml version="1.0" encoding="UTF-8"?>
          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>
+  <packaging>%(type)s</packaging>
   <groupId>%(group)s</groupId>
   <artifactId>%(artifact)s</artifactId>
   <version>%(version)s</version>
diff --git a/qpid/java/ivy.nexus.xml b/qpid/java/ivy.nexus.xml
index c39f466da3..36b49f27d9 100644
--- a/qpid/java/ivy.nexus.xml
+++ b/qpid/java/ivy.nexus.xml
@@ -93,6 +93,17 @@
     <artifact name="qpid-bdbstore-jmx" type="jar.asc" ext="jar.asc"/>
     <artifact name="qpid-bdbstore-jmx" type="source" ext="jar" e:classifier="sources"/>
     <artifact name="qpid-bdbstore-jmx" type="source.asc" ext="jar.asc" e:classifier="sources"/>
+    <artifact name="qpid-jca" type="pom" ext="pom"/>
+    <artifact name="qpid-jca" type="pom.asc" ext="pom.asc"/>
+    <artifact name="qpid-jca" type="jar" ext="jar"/>
+    <artifact name="qpid-jca" type="jar.asc" ext="jar.asc"/>
+    <artifact name="qpid-jca" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="qpid-jca" type="source.asc" ext="jar.asc" e:classifier="sources"/>
+    <artifact name="qpid-ra" type="pom" ext="pom"/>
+    <artifact name="qpid-ra" type="pom.asc" ext="pom.asc"/>
+    <artifact name="qpid-ra" type="rar" ext="rar"/>
+    <artifact name="qpid-ra" type="rar.asc" ext="rar.asc"/>
+
   </publications>
 
   <dependencies/>
diff --git a/qpid/java/jca/build.xml b/qpid/java/jca/build.xml
index 42a19ff83a..7137467e4b 100644
--- a/qpid/java/jca/build.xml
+++ b/qpid/java/jca/build.xml
@@ -18,26 +18,21 @@
  - under the License.
  -
  -->
-<project name="Qpid JCA" default="build">
+<project name="jca" xmlns:artifact="antlib:org.apache.maven.artifact.ant" default="build">
 
   <property name="module.depends" value="common client"/>
   <property name="module.name" value="jca"/>
-  <!-- Hack to make the renamed module jars available on the module test classpath -->
-  <property name="module.test.depends" value="ra ra/tests"/>
 
-  <!-- Import common.xml to make the properties it defines available before importing module.xml -->
-  <import file="../common.xml"/>
-
-  <!-- Override the standard output jar names before importing module.xml, to produce
-       artifacts that use ra in the name instead of jca like the module should -->
-  <property name="module.test.jar" value="${build.lib}/${project.name}-ra-tests-${project.version}.jar"/>
-  <property name="module.jar" value="${build.lib}/${project.name}-ra-${project.version}.jar"/>
-  <property name="module.source.jar" value="${build.lib}/${project.name}-ra-${project.version}-sources.jar"/>
+  <property name="module.genpom" value="true"/>
+  <property name="module.genpom.args" value="-Sgeronimo-j2ee-connector_1.5_spec=provided -Sgeronimo-jta_1.1_spec=provided -Sgeronimo-jms_1.1_spec=provided -Sgeronimo-ejb_3.0_spec=provided -Sgeronimo-servlet_2.5_spec=provided -Sgeronimo-kernel=provided"/>
 
   <import file="../module.xml"/>
 
-  <property name="module.rar" value="${build.lib}/${project.name}-ra-${project.version}.rar"/>
+  <property name="rar.name.prefix" value="${project.name}-ra"/>
+  <property name="module.rar" value="${build.lib}/${rar.name.prefix}-${project.version}.rar"/>
   <property name="rar.resources" value="rar/src/main/resources"/>
+  <property name="rar.scratch.pom" value="${build.scratch}/${rar.name.prefix}-${project.version}.pom"/>
+
 
   <target name="rar" depends="jar" description="creates a rar file containing the module jar, client jars, etc">
     <jar destfile="${module.rar}">
@@ -45,7 +40,7 @@
         <include name="**/*.xml"/>
       </fileset>
       <fileset dir="${build.lib}">
-        <include name="${project.name}-ra-${project.version}.jar"/>
+        <include name="${project.name}-jca-${project.version}.jar"/>
         <include name="${project.name}-client-${project.version}.jar"/>
         <include name="${project.name}-common-${project.version}.jar"/>
       </fileset>
@@ -54,7 +49,7 @@
 
   <!-- Create properties file for examples -->
   <target name="example-properties-file">
-    <copy file="example/build-properties.xml.temp" tofile="example/build-properties.xml">
+    <copy file="example/build-properties.xml.temp" tofile="example/build-properties.xml" overwrite="true">
       <filterset>
         <filter token="project.version" value="${project.version}"/>
       </filterset>
@@ -66,7 +61,7 @@
     <mkdir dir="example/lib"/>
     <copy todir="example/lib">
       <fileset dir="${build.lib}">
-        <include name="${project.name}-ra-${project.version}.jar"/>
+        <include name="${project.name}-jca-${project.version}.jar"/>
         <include name="${project.name}-client-${project.version}.jar"/>
         <include name="${project.name}-common-${project.version}.jar"/>
       </fileset>
@@ -80,4 +75,59 @@
   <!-- Override module.xml 'libs' target to avoid copying the jar files dependencies
        into the 'build/lib' dir, since they will be supplied by the app server -->
   <target name="libs"/>
+
+  <!--Overrides, but depends on, [module.]pom target in module.xml -->
+  <target name="pom" depends="module.pom" if="module.genpom">
+    <jython path="${mllib.dir}">
+      <args>
+        <arg line='"${project.root}/genpom"'/>
+        <arg line='-s "${project.root}/lib/poms"'/>
+        <arg line='-o "${rar.scratch.pom}"'/>
+        <arg line="-u ${project.url}"/>
+        <arg line="-g ${project.groupid}"/>
+        <arg line="-v ${project.version.maven}${maven.version.suffix}"/>
+        <arg line="-a ${rar.name.prefix}"/>
+        <arg line="-t rar"/>
+      </args>
+    </jython>
+  </target>
+
+  <!--Overrides, but depends on, [module.]release-mvn target in module.xml -->
+  <target name="release-mvn" depends="module.release-mvn" if="module.genpom" description="Install the artifacts into the local repository and prepare the release artifacts">
+    <artifact:pom id="rar.pom" file="${rar.scratch.pom}"/>
+
+    <artifact:install file="${module.rar}" pomRefId="rar.pom" settingsFile="${maven.settings.xml}">
+        <localRepository path="${maven.local.repo}"/>
+    </artifact:install>
+
+    <artifact:deploy file="${module.rar}" pomRefId="rar.pom" uniqueVersion="${maven.unique.version}" settingsFile="${maven.settings.xml}">
+      <localRepository path="${maven.local.repo}"/>
+      <remoteRepository url="${maven.remote.repo}"/>
+    </artifact:deploy>
+  </target>
+
+  <!--Overrides, but depends on, [module.]deploy-snapshot target in module.xml -->
+  <target name="deploy-snapshot" depends="module.deploy-snapshot" if="module.genpom" description="deploy a snapshot build to nexus">
+    <!-- In order to use this target you need to have predefined a username and password for the
+    server with id ${maven.snapshots.repo.id} in your m2 settings file, e.g ~/.m2/settings.xml -->
+    <artifact:pom id="rar.pom" file="${rar.scratch.pom}"/>
+
+    <fail message="The pom version must include -SNAPSHOT. Version found was: ${rar.pom.version}">
+      <condition>
+        <not>
+          <contains substring="-SNAPSHOT" string="${rar.pom.version}" />
+        </not>
+      </condition>
+    </fail>
+
+    <artifact:install file="${module.rar}" pomRefId="rar.pom" settingsFile="${maven.settings.xml}">
+        <localRepository path="${maven.local.repo}"/>
+    </artifact:install>
+
+    <artifact:deploy file="${module.rar}" pomRefId="rar.pom">
+      <localRepository path="${maven.local.repo}"/>
+      <remoteRepository id="${maven.snapshots.repo.id}" url="${maven.snapshots.repo.url}"/>
+    </artifact:deploy>
+  </target>
+
 </project>
diff --git a/qpid/java/jca/example/build-geronimo-properties.xml b/qpid/java/jca/example/build-geronimo-properties.xml
index 02ecb53134..a20753117f 100644
--- a/qpid/java/jca/example/build-geronimo-properties.xml
+++ b/qpid/java/jca/example/build-geronimo-properties.xml
@@ -104,9 +104,11 @@
 
     <path id="run.classpath">
         <fileset dir="${lib.dir}">
-            <include name="qpid-ra-*.jar"/>
+            <include name="qpid-jca-*.jar"/>
             <include name="qpid-client-*.jar"/>
             <include name="qpid-common-*.jar"/>
+            <!-- Old jar, for examples compatibility -->
+            <include name="qpid-ra-*.jar"/>
         </fileset>
         <fileset dir="${geronimo.home}/repository/org/apache/geronimo/specs">
             <include name="geronimo-j2ee-connector_1.5_spec/2.0.0/geronimo-j2ee-connector_1.5_spec-2.0.0.jar"/>
diff --git a/qpid/java/jca/example/build-glassfish-properties.xml b/qpid/java/jca/example/build-glassfish-properties.xml
index 94c79be931..90561e70cf 100644
--- a/qpid/java/jca/example/build-glassfish-properties.xml
+++ b/qpid/java/jca/example/build-glassfish-properties.xml
@@ -59,9 +59,11 @@
 
     <path id="run.classpath">
         <fileset dir="${lib.dir}">
-            <include name="qpid-ra-*.jar"/>
+            <include name="qpid-jca-*.jar"/>
             <include name="qpid-client-*.jar"/>
             <include name="qpid-common-*.jar"/>
+            <!-- Old jar, for examples compatibility -->
+            <include name="qpid-ra-*.jar"/>
         </fileset>
 
         <fileset dir="${glassfish.home}/glassfish/lib/">
diff --git a/qpid/java/jca/example/build-jboss-properties.xml b/qpid/java/jca/example/build-jboss-properties.xml
index fd38274630..f79793d9c4 100644
--- a/qpid/java/jca/example/build-jboss-properties.xml
+++ b/qpid/java/jca/example/build-jboss-properties.xml
@@ -68,9 +68,11 @@
 
     <path id="run.classpath">
         <fileset dir="${lib.dir}">
-            <include name="qpid-ra-*.jar"/>
+            <include name="qpid-jca-*.jar"/>
             <include name="qpid-client-*.jar"/>
             <include name="qpid-common-*.jar"/>
+            <!-- Old jar, for examples compatibility -->
+            <include name="qpid-ra-*.jar"/>
         </fileset>
         <fileset dir="${jboss.client}">
             <!-- Shortcut to get it working!-->
diff --git a/qpid/java/jca/example/build-jboss7-properties.xml b/qpid/java/jca/example/build-jboss7-properties.xml
index 157802cc73..e24719ba8e 100644
--- a/qpid/java/jca/example/build-jboss7-properties.xml
+++ b/qpid/java/jca/example/build-jboss7-properties.xml
@@ -74,9 +74,11 @@
             <include name="jboss-client.jar"/>
         </fileset>
         <fileset dir="${lib.dir}">
-            <include name="qpid-ra-*.jar"/>
+            <include name="qpid-jca-*.jar"/>
             <include name="qpid-client-*.jar"/>
             <include name="qpid-common-*.jar"/>
+            <!-- Old jar, for examples compatibility -->
+            <include name="qpid-ra-*.jar"/>
         </fileset>
         <fileset dir="${jboss.modules}/org/slf4j/main">
             <include name="slf4j-api-1.6.1.jar"/>
diff --git a/qpid/java/lib/poms/geronimo-ejb_3.0_spec-1.0.1.xml b/qpid/java/lib/poms/geronimo-ejb_3.0_spec-1.0.1.xml
new file mode 100644
index 0000000000..42811b5ca7
--- /dev/null
+++ b/qpid/java/lib/poms/geronimo-ejb_3.0_spec-1.0.1.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF 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.
+-->
+<dep>
+  <groupId>org.apache.geronimo.specs</groupId>
+  <artifactId>geronimo-ejb_3.0_spec</artifactId>
+  <version>1.0.1</version>
+</dep>
diff --git a/qpid/java/lib/poms/geronimo-j2ee-connector_1.5_spec-2.0.0.xml b/qpid/java/lib/poms/geronimo-j2ee-connector_1.5_spec-2.0.0.xml
new file mode 100644
index 0000000000..728144a8ea
--- /dev/null
+++ b/qpid/java/lib/poms/geronimo-j2ee-connector_1.5_spec-2.0.0.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF 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.
+-->
+<dep>
+  <groupId>org.apache.geronimo.specs</groupId>
+  <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+  <version>2.0.0</version>
+</dep>
diff --git a/qpid/java/lib/poms/geronimo-jta_1.1_spec-1.1.1.xml b/qpid/java/lib/poms/geronimo-jta_1.1_spec-1.1.1.xml
new file mode 100644
index 0000000000..b6ff5f7023
--- /dev/null
+++ b/qpid/java/lib/poms/geronimo-jta_1.1_spec-1.1.1.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF 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.
+-->
+<dep>
+  <groupId>org.apache.geronimo.specs</groupId>
+  <artifactId>geronimo-jta_1.1_spec</artifactId>
+  <version>1.1.1</version>
+</dep>
diff --git a/qpid/java/lib/poms/geronimo-kernel-2.2.1.xml b/qpid/java/lib/poms/geronimo-kernel-2.2.1.xml
new file mode 100644
index 0000000000..0a4c539f7e
--- /dev/null
+++ b/qpid/java/lib/poms/geronimo-kernel-2.2.1.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF 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.
+-->
+<dep>
+  <groupId>org.apache.geronimo.framework</groupId>
+  <artifactId>geronimo-kernel</artifactId>
+  <version>2.2.1</version>
+</dep>
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 9146403d04..1ff0be4621 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -253,6 +253,7 @@
     <mkdir dir="${module.results}"/>
   </target>
 
+  <!--Overridden by (but still used in) the JCA module -->
   <target name="pom" depends="prepare" if="module.genpom">
     <jython path="${mllib.dir}">
       <args>
@@ -271,6 +272,7 @@
     </jython>
   </target>
 
+  <!--Overridden by (but still used in) the JCA module -->
   <target name="release-mvn" depends="build,pom" if="module.genpom" description="Install the artifacts into the local repository and prepare the release artifacts">
     <artifact:pom id="module.pom" file="${build.scratch}/qpid-${module.name}.pom"/>
 
@@ -285,6 +287,7 @@
     </artifact:deploy>
   </target>
 
+  <!--Overridden by (but still used in) the JCA module -->
   <target name="deploy-snapshot" depends="build,pom" if="module.genpom" description="deploy a snapshot build to nexus">
     <!-- In order to use this target you need to have predefined a username and password for the
     server with id ${maven.snapshots.repo.id} in your m2 settings file, e.g ~/.m2/settings.xml -->