[jboss-cvs] JBossAS SVN: r110997 - in projects/jboss-jca/trunk: adapters and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: maeste
Date: 2011-03-22 10:56:52 -0400 (Tue, 22 Mar 2011)
New Revision: 110997

Modified:
   projects/jboss-jca/trunk/adapters/build.xml
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/ivy.xml
Log:
adding ironjacamar-jdbc.jar artifact to maven repo

Modified: projects/jboss-jca/trunk/adapters/build.xml
===================================================================
--- projects/jboss-jca/trunk/adapters/build.xml	2011-03-22 13:34:21 UTC (rev 110996)
+++ projects/jboss-jca/trunk/adapters/build.xml	2011-03-22 14:56:52 UTC (rev 110997)
@@ -77,7 +77,7 @@
        Target: jars 
        ================================= -->
   <target name="jars" depends="compile">
-    <jar destfile="${build.adapters.dir}/${name}-jdbc.jar"
+    <jar destfile="${target.dir}/${name}-jdbc.jar"
          basedir="${build.adapters.dir}/impl"
          index="true"
          indexMetaInf="true"
@@ -93,12 +93,12 @@
     </jar>
 
     <jar destfile="${target.dir}/jdbc-local.rar">
-      <filelist dir="${build.adapters.dir}" files="${name}-jdbc.jar"/> 
+      <filelist dir="${target.dir}" files="${name}-jdbc.jar"/> 
       <fileset dir="src/main/resources/jdbc/local"/>
     </jar>
 
     <jar destfile="${target.dir}/jdbc-xa.rar">
-      <filelist dir="${build.adapters.dir}" files="${name}-jdbc.jar"/> 
+      <filelist dir="${target.dir}" files="${name}-jdbc.jar"/> 
       <fileset dir="src/main/resources/jdbc/xa"/>
     </jar>
 
@@ -258,7 +258,7 @@
 
     <path id="adapters.test.lib.path.id">
 	<path refid="test.lib.path.id"/>
-	<pathelement location="${build.adapters.dir}/${name}-jdbc.jar"/>		
+	<pathelement location="${target.dir}/${name}-jdbc.jar"/>		
     </path>
     <javac srcdir="src/test"
            destdir="${build.adapters.dir}/test"
@@ -281,6 +281,7 @@
       <fileset dir="${target.dir}">
         <include name="jdbc-local.rar"/>
         <include name="jdbc-xa.rar"/>
+	<include name="${name}-jdbc.jar"/>
       </fileset>
     </copy>
   </target>

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2011-03-22 13:34:21 UTC (rev 110996)
+++ projects/jboss-jca/trunk/build.xml	2011-03-22 14:56:52 UTC (rev 110997)
@@ -1501,6 +1501,23 @@
     <snapshot-deploy-file file="snapshot.sh" artifact="${name}-validator-maven" extension="jar"/>
     <snapshot-install-file file="install-snapshot.sh" artifact="${name}-validator-maven" extension="jar"/>
 
+    <!-- adapters-jdbc -->
+    <delete file="${target.dir}/${name}-jdbc.xml"/>
+    <ivy:makepom artifactName="${name}-jdbc" 
+                conf="${name}-jdbc"
+                ivyfile="${basedir}/ivy.xml" 
+                pomfile="${target.dir}/${name}-jdbc.xml"
+                headerFile="${tools.dir}/mvn/HEADER"
+                templatefile="${tools.dir}/mvn/pom.template"
+                printIvyInfo="false">
+      <mapping conf="${name}-jdbc" scope="runtime"/>
+    </ivy:makepom>
+
+     <deploy-file file="release.sh" artifact="${name}-jdbc" extension="jar"/>
+     <snapshot-deploy-file file="snapshot.sh" artifact="${name}-jdbc" extension="jar"/>
+     <snapshot-install-file file="install-snapshot.sh" artifact="${name}-jdbc" extension="jar"/>
+
+  	
     <!-- jdbc-local -->
     <delete file="${target.dir}/jdbc-local.xml"/>
     <ivy:makepom artifactName="jdbc-local" 

Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml	2011-03-22 13:34:21 UTC (rev 110996)
+++ projects/jboss-jca/trunk/ivy.xml	2011-03-22 14:56:52 UTC (rev 110997)
@@ -33,7 +33,7 @@
     </description>
   </info>
 
-  <configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->default;mail->default;;tools->default;ironjacamar-codegenerator->default;ironjacamar-common-api->default;ironjacamar-common-impl->default;ironjacamar-common-impl-papaki->default;ironjacamar-common-spi->default;ironjacamar-core-api->default;ironjacamar-core-impl->default;ironjacamar-core-spi->default;ironjacamar-depchain->default;ironjacamar-deployers-common->default;ironjacamar-deployers-fungal->default;ironjacamar-embedded->default;ironjacamar-embedded-arquillian->default;ironjacamar-spec-api->default;ironjacamar-validator->default;ironjacamar-validator-ant->default;ironjacamar-validator-cli->default;ironjacamar-validator-maven->default;jdbc-local->default;jdbc-xa->default;rhq->default;hornetq->default">
+  <configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->default;mail->default;;tools->default;ironjacamar-codegenerator->default;ironjacamar-common-api->default;ironjacamar-common-impl->default;ironjacamar-common-impl-papaki->default;ironjacamar-common-spi->default;ironjacamar-core-api->default;ironjacamar-core-impl->default;ironjacamar-core-spi->default;ironjacamar-depchain->default;ironjacamar-deployers-common->default;ironjacamar-deployers-fungal->default;ironjacamar-embedded->default;ironjacamar-embedded-arquillian->default;ironjacamar.jdbc->default;ironjacamar-spec-api->default;ironjacamar-validator->default;ironjacamar-validator-ant->default;ironjacamar-validator-cli->default;ironjacamar-validator-maven->default;jdbc-local->default;jdbc-xa->default;rhq->default;hornetq->default">
     <conf name="arquillian" transitive="false"/>
     <conf name="common" transitive="false"/>
     <conf name="embedded" transitive="false"/>
@@ -58,6 +58,7 @@
     <conf name="ironjacamar-deployers-fungal" transitive="false"/>
     <conf name="ironjacamar-embedded" transitive="false"/>
     <conf name="ironjacamar-embedded-arquillian" transitive="false"/>
+    <conf name="ironjacamar-jdbc" transitive="false"/>
     <conf name="ironjacamar-spec-api" transitive="false"/>
     <conf name="ironjacamar-validator" transitive="false"/>
     <conf name="ironjacamar-validator-ant" transitive="false"/>
@@ -82,6 +83,7 @@
     <artifact name="ironjacamar-deployers-fungal" type="jar"/>
     <artifact name="ironjacamar-embedded-arquillian" type="jar"/>
     <artifact name="ironjacamar-embedded" type="jar"/>
+    <artifact name="ironjacamar-jdbc" type="jar"/>
     <artifact name="ironjacamar-spec-api" type="jar"/>
     <artifact name="ironjacamar-validator" type="jar"/>
     <artifact name="ironjacamar-validator-cli" type="jar"/>