[jboss-cvs] JBossAS SVN: r107936 - in projects/jboss-jca/trunk: common and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 1 12:05:39 EDT 2010
Author: jesper.pedersen
Date: 2010-09-01 12:05:38 -0400 (Wed, 01 Sep 2010)
New Revision: 107936
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/common/build.xml
projects/jboss-jca/trunk/ivy.xml
Log:
[JBJCA-412] Maven artifacts for Common SPI
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2010-09-01 15:19:40 UTC (rev 107935)
+++ projects/jboss-jca/trunk/build.xml 2010-09-01 16:05:38 UTC (rev 107936)
@@ -938,7 +938,7 @@
<target name="nexus" depends="clean,artifacts">
<ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]"
- conf="${name}-codegenerator,${name}-common-api,${name}-common-impl,${name}-core-api,${name}-core-impl,${name}-core-spi,${name}-deployers-fungal,${name}-embedded,${name}-embedded-arquillian,${name}-spec-api,${name}-validator,${name}-validator-ant,${name}-validator-cli,jdbc-local,jdbc-xa"
+ conf="${name}-codegenerator,${name}-common-api,${name}-common-impl,${name}-common-spi,${name}-core-api,${name}-core-impl,${name}-core-spi,${name}-deployers-fungal,${name}-embedded,${name}-embedded-arquillian,${name}-spec-api,${name}-validator,${name}-validator-ant,${name}-validator-cli,jdbc-local,jdbc-xa"
sync="true"/>
<fail message="Required Apache Ivy update missing"/>
@@ -1001,6 +1001,20 @@
<deploy-file file="release.sh" artifact="${name}-common-impl" extension="jar"/>
<snapshot-deploy-file file="snapshot.sh" artifact="${name}-common-impl" extension="jar"/>
+ <!-- ironjacamar-common-spi -->
+ <delete file="${target.dir}/${name}-common-spi.xml"/>
+ <ivy:makepom artifactName="${name}-common-spi"
+ conf="${name}-common-spi"
+ ivyfile="${basedir}/ivy.xml"
+ pomfile="${target.dir}/${name}-common-spi.xml"
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
+ <mapping conf="${name}-common-spi" scope="runtime"/>
+ </ivy:makepom>
+
+ <deploy-file file="release.sh" artifact="${name}-common-spi" extension="jar"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="${name}-common-spi" extension="jar"/>
+
<!-- ironjacamar-core-api -->
<delete file="${target.dir}/${name}-core-api.xml"/>
<ivy:makepom artifactName="${name}-core-api"
Modified: projects/jboss-jca/trunk/common/build.xml
===================================================================
--- projects/jboss-jca/trunk/common/build.xml 2010-09-01 15:19:40 UTC (rev 107935)
+++ projects/jboss-jca/trunk/common/build.xml 2010-09-01 16:05:38 UTC (rev 107936)
@@ -255,13 +255,28 @@
</manifest>
</jar>
+ <jar destfile="${target.dir}/${name}-common-spi-sources.jar"
+ basedir="src/main/java"
+ index="true"
+ indexMetaInf="true"
+ update="true"
+ level="9"
+ includes="**/common/spi/**">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Common SPI - Sources"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/ironjacamar)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
+
<jar destfile="${target.dir}/${name}-common-impl-sources.jar"
basedir="src/main/java"
index="true"
indexMetaInf="true"
update="true"
level="9"
- excludes="**/common/api/**">
+ excludes="**/common/api/**,**/common/spi/**">
<manifest>
<attribute name="Implementation-Title" value="IronJacamar Common Implementation - Sources"/>
<attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
@@ -310,6 +325,44 @@
</manifest>
</jar>
+ <mkdir dir="${build.common.dir}/docs/spi"/>
+ <javadoc destdir="${build.common.dir}/docs/spi"
+ doclet="org.jboss.apiviz.APIviz"
+ docletpathref="sjc.lib.path.id"
+ author="true"
+ version="true"
+ windowtitle="IronJacamar Common - SPI"
+ doctitle="IronJacamar Common - SPI"
+ use="true"
+ additionalparam="-author -version"
+ classpath="${build.common.dir}"
+ classpathref="sjc.lib.path.id"
+ bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
+
+ <packageset dir="src/main/java" defaultexcludes="yes">
+ <include name="**/common/spi/**"/>
+ </packageset>
+
+ <link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
+ </javadoc>
+ <copy todir="${build.common.dir}/docs/spi" overwrite="true">
+ <fileset dir="${tools.dir}/api"/>
+ </copy>
+
+ <jar destfile="${target.dir}/${name}-common-spi-javadoc.jar"
+ basedir="${build.common.dir}/docs/spi"
+ index="true"
+ indexMetaInf="true"
+ update="true"
+ level="9">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Common SPI - JavaDoc"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/ironjacamar)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
+
<mkdir dir="${build.common.dir}/docs/impl"/>
<javadoc destdir="${build.common.dir}/docs/impl"
doclet="org.jboss.apiviz.APIviz"
@@ -326,6 +379,7 @@
<packageset dir="src/main/java" defaultexcludes="yes">
<exclude name="**/common/api/**"/>
+ <exclude name="**/common/spi/**"/>
</packageset>
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2010-09-01 15:19:40 UTC (rev 107935)
+++ projects/jboss-jca/trunk/ivy.xml 2010-09-01 16:05:38 UTC (rev 107936)
@@ -33,7 +33,7 @@
</description>
</info>
- <configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->default;tools->default;ironjacamar-codegenerator->default;ironjacamar-common-api->default;ironjacamar-common-impl->default;ironjacamar-core-api->default;ironjacamar-core-impl->default;ironjacamar-core-spi->default;ironjacamar-depchain->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">
+ <configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->default;tools->default;ironjacamar-codegenerator->default;ironjacamar-common-api->default;ironjacamar-common-impl->default;ironjacamar-common-spi->default;ironjacamar-core-api->default;ironjacamar-core-impl->default;ironjacamar-core-spi->default;ironjacamar-depchain->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">
<conf name="common" transitive="false"/>
<conf name="sjc" transitive="false"/>
<conf name="embedded" transitive="false"/>
@@ -45,6 +45,7 @@
<conf name="ironjacamar-codegenerator" transitive="false"/>
<conf name="ironjacamar-common-api" transitive="false"/>
<conf name="ironjacamar-common-impl" transitive="false"/>
+ <conf name="ironjacamar-common-spi" transitive="false"/>
<conf name="ironjacamar-core-api" transitive="false"/>
<conf name="ironjacamar-core-impl" transitive="false"/>
<conf name="ironjacamar-core-spi" transitive="false"/>
@@ -65,6 +66,7 @@
<artifact name="ironjacamar-codegenerator" type="jar"/>
<artifact name="ironjacamar-common-api" type="jar"/>
<artifact name="ironjacamar-common-impl" type="jar"/>
+ <artifact name="ironjacamar-common-spi" type="jar"/>
<artifact name="ironjacamar-core-api" type="jar"/>
<artifact name="ironjacamar-core-impl" type="jar"/>
<artifact name="ironjacamar-core-spi" type="jar"/>
More information about the jboss-cvs-commits
mailing list