[jboss-cvs] JBossAS SVN: r111707 - in projects/jboss-jca/trunk: adapters and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 6 03:04:36 EDT 2011
Author: gaol
Date: 2011-07-06 03:04:36 -0400 (Wed, 06 Jul 2011)
New Revision: 111707
Modified:
projects/jboss-jca/trunk/adapters/build.xml
projects/jboss-jca/trunk/api/build.xml
projects/jboss-jca/trunk/as/build.xml
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/codegenerator/build.xml
projects/jboss-jca/trunk/common/build.xml
projects/jboss-jca/trunk/core/build.xml
projects/jboss-jca/trunk/deployers/build.xml
projects/jboss-jca/trunk/embedded/build.xml
projects/jboss-jca/trunk/ivy.xml
projects/jboss-jca/trunk/rhq/build.xml
projects/jboss-jca/trunk/sjc/build.xml
projects/jboss-jca/trunk/validator/build.xml
projects/jboss-jca/trunk/web/build.xml
Log:
[JBJCA-611] Adds support of brew build
Modified: projects/jboss-jca/trunk/adapters/build.xml
===================================================================
--- projects/jboss-jca/trunk/adapters/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/adapters/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -31,26 +31,39 @@
<!-- =================================
Target: compile
================================= -->
- <target name="compile-base">
+ <target name="compile-base">
<mkdir dir="${build.adapters.dir}" />
<mkdir dir="${build.adapters.dir}/impl" />
<javac srcdir="src/main"
destdir="${build.adapters.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
- excludes="**/jdk6/**,**/jdk7/**"
+ excludes="**/jdk6/**,**/jdk7/**,**/mail/**"
includeAntRuntime="false">
<compilerarg value="-Xlint"/>
</javac>
</target>
+ <target name="compile-mail" unless="brew">
+ <javac srcdir="src/main"
+ destdir="${build.adapters.dir}/impl"
+ classpathref="main.lib.path.id"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ optimize="${javac.optimize}"
+ includes="**/mail/**"
+ includeAntRuntime="false">
+ <compilerarg value="-Xlint"/>
+ </javac>
+ </target>
+
<target name="compile-jdk6" unless="HAVE_JDK_1.7">
<javac srcdir="src/main"
destdir="${build.adapters.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -63,7 +76,7 @@
<target name="compile-jdk7" if="HAVE_JDK_1.7">
<javac srcdir="src/main"
destdir="${build.adapters.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -73,13 +86,13 @@
</javac>
</target>
- <target name="compile" depends="compile-base,compile-jdk6,compile-jdk7">
+ <target name="compile" depends="compile-base,compile-mail,compile-jdk6,compile-jdk7">
</target>
<!-- =================================
Target: jars
================================= -->
- <target name="jars" depends="compile">
+ <target name="jars-base" depends="compile">
<copy todir="${build.adapters.dir}/impl">
<fileset dir="src/main/resources/jdbc/jar"
includes="**/*.properties"/>
@@ -99,7 +112,10 @@
<attribute name="Implementation-Vendor-Id" value="org.jboss"/>
</manifest>
</jar>
+ </target>
+ <target name="jars-rar" unless="brew">
+
<jar destfile="${target.dir}/jdbc-local.rar">
<filelist dir="${target.dir}" files="${name}-jdbc.jar"/>
<fileset dir="src/main/resources/jdbc/local"/>
@@ -131,6 +147,9 @@
</jar>
</target>
+ <target name="jars" depends="jars-base,jars-rar">
+ </target>
+
<!-- =================================
Target: docs
================================= -->
@@ -140,7 +159,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/adapters"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Adapters"
@@ -148,7 +167,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.adapters.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2010 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
@@ -298,8 +317,7 @@
<!-- =================================
Target: artifacts
================================= -->
- <target name="artifacts" depends="jars">
-
+ <target name="artifacts-base" depends="jars">
<jar destfile="${target.dir}/${name}-jdbc-sources.jar"
basedir="src/main/java"
index="true"
@@ -315,6 +333,47 @@
</manifest>
</jar>
+ <mkdir dir="${build.adapters.dir}/docs"/>
+ <mkdir dir="${build.adapters.dir}/docs/jdbc"/>
+ <javadoc destdir="${build.adapters.dir}/docs/jdbc"
+ doclet="org.jboss.apiviz.APIviz"
+ docletpathref="main.lib.path.id"
+ author="true"
+ version="true"
+ windowtitle="IronJacamar Adapters - API"
+ doctitle="IronJacamar Adapters - API"
+ use="true"
+ additionalparam="-author -version"
+ classpath="${build.adapters.dir}"
+ classpathref="main.lib.path.id"
+ bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
+
+ <packageset dir="src/main/java" defaultexcludes="yes">
+ <include name="**/adapters/jdbc/**"/>
+ </packageset>
+
+ <link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
+ </javadoc>
+ <copy todir="${build.adapters.dir}/docs/jdbc" overwrite="true">
+ <fileset dir="${tools.dir}/api"/>
+ </copy>
+
+ <jar destfile="${target.dir}/${name}-jdbc-javadoc.jar"
+ basedir="${build.adapters.dir}/docs/jdbc"
+ index="true"
+ indexMetaInf="true"
+ update="true"
+ level="9">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Adapters JDBC - 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>
+ </target>
+
+ <target name="artifacts" depends="artifacts-base" unless="brew">
<jar destfile="${target.dir}/jdbc-local-sources.jar"
basedir="src/main/java"
index="true"
@@ -360,46 +419,6 @@
</manifest>
</jar>
- <mkdir dir="${build.adapters.dir}/docs"/>
-
- <mkdir dir="${build.adapters.dir}/docs/jdbc"/>
- <javadoc destdir="${build.adapters.dir}/docs/jdbc"
- doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
- author="true"
- version="true"
- windowtitle="IronJacamar Adapters - API"
- doctitle="IronJacamar Adapters - API"
- use="true"
- additionalparam="-author -version"
- classpath="${build.adapters.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="**/adapters/jdbc/**"/>
- </packageset>
-
- <link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
- </javadoc>
- <copy todir="${build.adapters.dir}/docs/jdbc" overwrite="true">
- <fileset dir="${tools.dir}/api"/>
- </copy>
-
- <jar destfile="${target.dir}/${name}-jdbc-javadoc.jar"
- basedir="${build.adapters.dir}/docs/jdbc"
- index="true"
- indexMetaInf="true"
- update="true"
- level="9">
- <manifest>
- <attribute name="Implementation-Title" value="IronJacamar Adapters JDBC - 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>
-
<jar destfile="${target.dir}/jdbc-local-javadoc.jar"
basedir="${build.adapters.dir}/docs/jdbc"
index="true"
@@ -431,7 +450,7 @@
<mkdir dir="${build.adapters.dir}/docs/mail"/>
<javadoc destdir="${build.adapters.dir}/docs/mail"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Mail Adapter - API"
@@ -439,7 +458,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.adapters.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
Modified: projects/jboss-jca/trunk/api/build.xml
===================================================================
--- projects/jboss-jca/trunk/api/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/api/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -36,7 +36,7 @@
<javac srcdir="src"
destdir="${build.api.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -76,7 +76,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/spec"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="JCA 1.6 specification"
@@ -84,7 +84,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.api.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
@@ -117,7 +117,7 @@
sourcepath="src/main/java"
destdir="${build.api.dir}/docs"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="JCA 1.6 specification"
@@ -125,7 +125,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.api.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
Modified: projects/jboss-jca/trunk/as/build.xml
===================================================================
--- projects/jboss-jca/trunk/as/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/as/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -36,7 +36,7 @@
<javac srcdir="src"
destdir="${build.as.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -77,7 +77,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/as"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar AS tools"
@@ -85,7 +85,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.as.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2011 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
@@ -118,7 +118,7 @@
sourcepath="src/main/java"
destdir="${build.as.dir}/docs"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar AS tools"
@@ -126,7 +126,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.as.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2011 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -159,7 +159,7 @@
<!-- =================================
Paths
================================= -->
- <path id="sjc.lib.path.id">
+ <path id="main.lib.path.id">
<fileset dir="${lib.dir}/common">
<include name="**/*.jar"/>
</fileset>
@@ -184,16 +184,21 @@
<fileset dir="${lib.dir}/tools">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${lib.dir}/rhq">
+ <include name="**/*.jar"/>
+ </fileset>
<fileset dir="${target.dir}">
<include name="**/*.jar"/>
</fileset>
</path>
- <path id="rhq.lib.path.id">
- <path refid="sjc.lib.path.id"/>
- <fileset dir="${lib.dir}/rhq">
+ <path id="brew.lib.path.id">
+ <fileset dir="${lib.dir}/brew">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${target.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
</path>
<path id="test.lib.path.id">
@@ -290,7 +295,7 @@
<!-- =================================
Target: init
================================= -->
- <target name="init">
+ <target name="init" depends="init-brew-path">
<fail message="IronJacamar requires JDK6+" unless="HAVE_JDK_1.6"/>
<ivy:settings file="${basedir}/ivy.settings.xml"/>
@@ -302,8 +307,14 @@
<!-- =================================
Target: resolve
================================= -->
- <target name="resolve" depends="init">
+ <target name="resolve-brew" if="brew">
<ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]"
+ conf="brew"
+ sync="true"/>
+ </target>
+
+ <target name="resolve" depends="init,resolve-brew" unless="brew">
+ <ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]"
conf="common,sjc,embedded,arquillian,jetty,hornetq,mail,rhq,test,tools"
sync="true"/>
</target>
@@ -318,17 +329,20 @@
<!-- =================================
Target: jars
================================= -->
- <target name="jars" depends="resolve">
+ <target name="jars-base">
<ant dir="api" inheritRefs="true" target="jars"/>
<ant dir="common" inheritRefs="true" target="jars"/>
<ant dir="core" inheritRefs="true" target="jars"/>
<ant dir="validator" inheritRefs="true" target="jars"/>
<ant dir="deployers" inheritRefs="true" target="jars"/>
+ <ant dir="adapters" inheritRefs="true" target="jars"/>
+ </target>
+
+ <target name="jars" depends="resolve,jars-base" unless="brew">
<ant dir="embedded" inheritRefs="true" target="jars"/>
<ant dir="web" inheritRefs="true" target="jars"/>
<ant dir="sjc" inheritRefs="true" target="jars"/>
<ant dir="codegenerator" inheritRefs="true" target="jars"/>
- <ant dir="adapters" inheritRefs="true" target="jars"/>
<ant dir="rhq" inheritRefs="true" target="jars"/>
<ant dir="as" inheritRefs="true" target="jars"/>
</target>
@@ -336,17 +350,20 @@
<!-- =================================
Target: docs
================================= -->
- <target name="docs" depends="jars">
+ <target name="docs-base">
<ant dir="api" inheritRefs="true" target="docs"/>
<ant dir="common" inheritRefs="true" target="docs"/>
<ant dir="core" inheritRefs="true" target="docs"/>
<ant dir="validator" inheritRefs="true" target="docs"/>
<ant dir="deployers" inheritRefs="true" target="docs"/>
+ <ant dir="adapters" inheritRefs="true" target="docs"/>
+ </target>
+
+ <target name="docs" depends="jars,docs-base" unless="brew">
<ant dir="embedded" inheritRefs="true" target="docs"/>
<ant dir="web" inheritRefs="true" target="docs"/>
<ant dir="sjc" inheritRefs="true" target="docs"/>
<ant dir="codegenerator" inheritRefs="true" target="docs"/>
- <ant dir="adapters" inheritRefs="true" target="docs"/>
<ant dir="rhq" inheritRefs="true" target="docs"/>
<ant dir="as" inheritRefs="true" target="docs"/>
</target>
@@ -411,15 +428,18 @@
<!-- =================================
Target: artifacts
================================= -->
- <target name="artifacts" depends="resolve">
+ <target name="artifacts-base">
<ant dir="api" inheritRefs="true" target="artifacts"/>
<ant dir="common" inheritRefs="true" target="artifacts"/>
<ant dir="core" inheritRefs="true" target="artifacts"/>
<ant dir="validator" inheritRefs="true" target="artifacts"/>
<ant dir="deployers" inheritRefs="true" target="artifacts"/>
+ <ant dir="adapters" inheritRefs="true" target="artifacts"/>
+ </target>
+
+ <target name="artifacts" depends="resolve,artifacts-base" unless="brew">
<ant dir="embedded" inheritRefs="true" target="artifacts"/>
<ant dir="codegenerator" inheritRefs="true" target="artifacts"/>
- <ant dir="adapters" inheritRefs="true" target="artifacts"/>
<ant dir="as" inheritRefs="true" target="artifacts"/>
</target>
@@ -1160,13 +1180,7 @@
</sequential>
</macrodef>
- <target name="nexus" depends="clean,artifacts">
- <fail message="IronJacamar doesn't support JDK 7+ artifacts" if="HAVE_JDK_1.7"/>
-
- <ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]"
- conf="${name}-as,${name}-codegenerator,${name}-common-api,${name}-common-impl,${name}-common-impl-papaki,${name}-common-spi,${name}-core-api,${name}-core-impl,${name}-deployers-common,${name}-deployers-fungal,${name}-embedded,${name}-embedded-arquillian,${name}-spec-api,${name}-validator,${name}-validator-ant,${name}-validator-cli,jdbc-local,jdbc-xa,mail"
- sync="true"/>
-
+ <target name="nexus-base">
<delete file="${target.dir}/deploy.sh"/>
<delete file="${target.dir}/install.sh"/>
@@ -1181,35 +1195,24 @@
VERSION=${version}
</concat>
- <!-- ironjacamar-as -->
- <delete file="${target.dir}/${name}-as.xml"/>
- <ivy:makepom artifactName="${name}-as"
- conf="${name}-as"
- ivyfile="${basedir}/ivy.xml"
- pomfile="${target.dir}/${name}-as.xml"
- headerFile="${tools.dir}/mvn/HEADER"
- templatefile="${tools.dir}/mvn/pom.template"
- printIvyInfo="false">
- <mapping conf="${name}-as" scope="runtime"/>
- </ivy:makepom>
+ <ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]"
+ conf="${name}-common-api,${name}-common-impl,${name}-common-spi,${name}-core-api,${name}-core-impl,${name}-deployers-common,${name}-validator"
+ sync="true"/>
- <deploy-file file="deploy.sh" artifact="${name}-as" extension="jar"/>
- <install-file file="install.sh" artifact="${name}-as" extension="jar"/>
-
- <!-- ironjacamar-codegenerator -->
- <delete file="${target.dir}/${name}-codegenerator.xml"/>
- <ivy:makepom artifactName="${name}-codegenerator"
- conf="${name}-codegenerator"
+ <!-- ironjacamar-spec-api -->
+ <delete file="${target.dir}/${name}-spec-api.xml"/>
+ <ivy:makepom artifactName="${name}-spec-api"
+ conf="${name}-spec-api"
ivyfile="${basedir}/ivy.xml"
- pomfile="${target.dir}/${name}-codegenerator.xml"
+ pomfile="${target.dir}/${name}-spec-api.xml"
headerFile="${tools.dir}/mvn/HEADER"
templatefile="${tools.dir}/mvn/pom.template"
printIvyInfo="false">
- <mapping conf="${name}-codegenerator" scope="runtime"/>
+ <mapping conf="${name}-spec-api" scope="runtime"/>
</ivy:makepom>
- <deploy-file file="deploy.sh" artifact="${name}-codegenerator" extension="jar"/>
- <install-file file="install.sh" artifact="${name}-codegenerator" extension="jar"/>
+ <deploy-file file="deploy.sh" artifact="${name}-spec-api" extension="jar"/>
+ <install-file file="install.sh" artifact="${name}-spec-api" extension="jar"/>
<!-- ironjacamar-common-api -->
<delete file="${target.dir}/${name}-common-api.xml"/>
@@ -1244,22 +1247,6 @@
<deploy-file file="deploy.sh" artifact="${name}-common-impl" extension="jar"/>
<install-file file="install.sh" artifact="${name}-common-impl" extension="jar"/>
- <!-- ironjacamar-common-impl-papaki -->
- <delete file="${target.dir}/${name}-common-impl-papaki.xml"/>
- <ivy:makepom artifactName="${name}-common-impl-papaki"
- conf="${name}-common-impl-papaki"
- ivyfile="${basedir}/ivy.xml"
- pomfile="${target.dir}/${name}-common-impl-papaki.xml"
- headerFile="${tools.dir}/mvn/HEADER"
- templatefile="${tools.dir}/mvn/pom.template"
- printIvyInfo="false">
- <mapping conf="${name}-common-impl-papaki" scope="runtime"/>
- <dependency artifact="${name}-common-spi" scope="runtime"/>
- </ivy:makepom>
-
- <deploy-file file="deploy.sh" artifact="${name}-common-impl-papaki" extension="jar"/>
- <install-file file="install.sh" artifact="${name}-common-impl-papaki" extension="jar"/>
-
<!-- ironjacamar-common-spi -->
<delete file="${target.dir}/${name}-common-spi.xml"/>
<ivy:makepom artifactName="${name}-common-spi"
@@ -1309,6 +1296,110 @@
<deploy-file file="deploy.sh" artifact="${name}-core-impl" extension="jar"/>
<install-file file="install.sh" artifact="${name}-core-impl" extension="jar"/>
+ <!-- ironjacamar-deployers-common -->
+ <delete file="${target.dir}/${name}-deployers-common.xml"/>
+ <ivy:makepom artifactName="${name}-deployers-common"
+ conf="${name}-deployers-common"
+ ivyfile="${basedir}/ivy.xml"
+ pomfile="${target.dir}/${name}-deployers-common.xml"
+ headerFile="${tools.dir}/mvn/HEADER"
+ templatefile="${tools.dir}/mvn/pom.template"
+ printIvyInfo="false">
+ <mapping conf="${name}-deployers-common" scope="runtime"/>
+ </ivy:makepom>
+
+ <deploy-file file="deploy.sh" artifact="${name}-deployers-common" extension="jar"/>
+ <install-file file="install.sh" artifact="${name}-deployers-common" extension="jar"/>
+
+ <!-- ironjacamar-validator -->
+ <delete file="${target.dir}/${name}-validator.xml"/>
+ <ivy:makepom artifactName="${name}-validator"
+ conf="${name}-validator"
+ ivyfile="${basedir}/ivy.xml"
+ pomfile="${target.dir}/${name}-validator.xml"
+ headerFile="${tools.dir}/mvn/HEADER"
+ templatefile="${tools.dir}/mvn/pom.template"
+ printIvyInfo="false">
+ <mapping conf="${name}-validator" scope="runtime"/>
+ <dependency artifact="${name}-common-api" scope="runtime"/>
+ <dependency artifact="${name}-common-impl" scope="runtime"/>
+ <dependency artifact="${name}-common-spi" scope="runtime"/>
+ <dependency artifact="${name}-spec-api" scope="runtime"/>
+ </ivy:makepom>
+
+ <deploy-file file="deploy.sh" artifact="${name}-validator" extension="jar"/>
+ <install-file file="install.sh" artifact="${name}-validator" extension="jar"/>
+
+ <!-- ironjacamar-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="deploy.sh" artifact="${name}-jdbc" extension="jar"/>
+ <install-file file="install.sh" artifact="${name}-jdbc" extension="jar"/>
+
+ </target>
+
+ <target name="nexus" depends="clean,artifacts,nexus-base" unless="brew">
+ <fail message="IronJacamar doesn't support JDK 7+ artifacts" if="HAVE_JDK_1.7"/>
+
+ <ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]"
+ conf="${name}-as,${name}-codegenerator,${name}-common-impl-papaki,${name}-deployers-fungal,${name}-embedded,${name}-embedded-arquillian,${name}-spec-api,${name}-validator-ant,${name}-validator-cli,jdbc-local,jdbc-xa,mail"
+ sync="true"/>
+
+ <!-- ironjacamar-as -->
+ <delete file="${target.dir}/${name}-as.xml"/>
+ <ivy:makepom artifactName="${name}-as"
+ conf="${name}-as"
+ ivyfile="${basedir}/ivy.xml"
+ pomfile="${target.dir}/${name}-as.xml"
+ headerFile="${tools.dir}/mvn/HEADER"
+ templatefile="${tools.dir}/mvn/pom.template"
+ printIvyInfo="false">
+ <mapping conf="${name}-as" scope="runtime"/>
+ </ivy:makepom>
+
+ <deploy-file file="deploy.sh" artifact="${name}-as" extension="jar"/>
+ <install-file file="install.sh" artifact="${name}-as" extension="jar"/>
+
+ <!-- ironjacamar-codegenerator -->
+ <delete file="${target.dir}/${name}-codegenerator.xml"/>
+ <ivy:makepom artifactName="${name}-codegenerator"
+ conf="${name}-codegenerator"
+ ivyfile="${basedir}/ivy.xml"
+ pomfile="${target.dir}/${name}-codegenerator.xml"
+ headerFile="${tools.dir}/mvn/HEADER"
+ templatefile="${tools.dir}/mvn/pom.template"
+ printIvyInfo="false">
+ <mapping conf="${name}-codegenerator" scope="runtime"/>
+ </ivy:makepom>
+
+ <deploy-file file="deploy.sh" artifact="${name}-codegenerator" extension="jar"/>
+ <install-file file="install.sh" artifact="${name}-codegenerator" extension="jar"/>
+
+ <!-- ironjacamar-common-impl-papaki -->
+ <delete file="${target.dir}/${name}-common-impl-papaki.xml"/>
+ <ivy:makepom artifactName="${name}-common-impl-papaki"
+ conf="${name}-common-impl-papaki"
+ ivyfile="${basedir}/ivy.xml"
+ pomfile="${target.dir}/${name}-common-impl-papaki.xml"
+ headerFile="${tools.dir}/mvn/HEADER"
+ templatefile="${tools.dir}/mvn/pom.template"
+ printIvyInfo="false">
+ <mapping conf="${name}-common-impl-papaki" scope="runtime"/>
+ <dependency artifact="${name}-common-spi" scope="runtime"/>
+ </ivy:makepom>
+
+ <deploy-file file="deploy.sh" artifact="${name}-common-impl-papaki" extension="jar"/>
+ <install-file file="install.sh" artifact="${name}-common-impl-papaki" extension="jar"/>
+
<!-- ironjacamar-depchain -->
<delete file="${target.dir}/${name}-depchain.xml"/>
<ivy:makepom artifactName="${name}-depchain"
@@ -1328,21 +1419,6 @@
mvn install:install-file -Dfile=$PWD/${name}-depchain.xml -DpomFile=${name}-depchain.xml -DuniqueVersion=false $REPOSITORY
</concat>
- <!-- ironjacamar-deployers-common -->
- <delete file="${target.dir}/${name}-deployers-common.xml"/>
- <ivy:makepom artifactName="${name}-deployers-common"
- conf="${name}-deployers-common"
- ivyfile="${basedir}/ivy.xml"
- pomfile="${target.dir}/${name}-deployers-common.xml"
- headerFile="${tools.dir}/mvn/HEADER"
- templatefile="${tools.dir}/mvn/pom.template"
- printIvyInfo="false">
- <mapping conf="${name}-deployers-common" scope="runtime"/>
- </ivy:makepom>
-
- <deploy-file file="deploy.sh" artifact="${name}-deployers-common" extension="jar"/>
- <install-file file="install.sh" artifact="${name}-deployers-common" extension="jar"/>
-
<!-- ironjacamar-deployers-fungal -->
<delete file="${target.dir}/${name}-deployers-fungal.xml"/>
<ivy:makepom artifactName="${name}-deployers-fungal"
@@ -1394,40 +1470,6 @@
<deploy-file file="deploy.sh" artifact="${name}-embedded-arquillian" extension="jar"/>
<install-file file="install.sh" artifact="${name}-embedded-arquillian" extension="jar"/>
- <!-- ironjacamar-spec-api -->
- <delete file="${target.dir}/${name}-spec-api.xml"/>
- <ivy:makepom artifactName="${name}-spec-api"
- conf="${name}-spec-api"
- ivyfile="${basedir}/ivy.xml"
- pomfile="${target.dir}/${name}-spec-api.xml"
- headerFile="${tools.dir}/mvn/HEADER"
- templatefile="${tools.dir}/mvn/pom.template"
- printIvyInfo="false">
- <mapping conf="${name}-spec-api" scope="runtime"/>
- </ivy:makepom>
-
- <deploy-file file="deploy.sh" artifact="${name}-spec-api" extension="jar"/>
- <install-file file="install.sh" artifact="${name}-spec-api" extension="jar"/>
-
- <!-- ironjacamar-validator -->
- <delete file="${target.dir}/${name}-validator.xml"/>
- <ivy:makepom artifactName="${name}-validator"
- conf="${name}-validator"
- ivyfile="${basedir}/ivy.xml"
- pomfile="${target.dir}/${name}-validator.xml"
- headerFile="${tools.dir}/mvn/HEADER"
- templatefile="${tools.dir}/mvn/pom.template"
- printIvyInfo="false">
- <mapping conf="${name}-validator" scope="runtime"/>
- <dependency artifact="${name}-common-api" scope="runtime"/>
- <dependency artifact="${name}-common-impl" scope="runtime"/>
- <dependency artifact="${name}-common-spi" scope="runtime"/>
- <dependency artifact="${name}-spec-api" scope="runtime"/>
- </ivy:makepom>
-
- <deploy-file file="deploy.sh" artifact="${name}-validator" extension="jar"/>
- <install-file file="install.sh" artifact="${name}-validator" extension="jar"/>
-
<!-- ironjacamar-validator-ant -->
<delete file="${target.dir}/${name}-validator-ant.xml"/>
<ivy:makepom artifactName="${name}-validator-ant"
@@ -1476,21 +1518,6 @@
<deploy-file file="deploy.sh" artifact="${name}-validator-maven" extension="jar"/>
<install-file file="install.sh" artifact="${name}-validator-maven" extension="jar"/>
- <!-- ironjacamar-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="deploy.sh" artifact="${name}-jdbc" extension="jar"/>
- <install-file file="install.sh" artifact="${name}-jdbc" extension="jar"/>
-
<!-- jdbc-local -->
<delete file="${target.dir}/jdbc-local.xml"/>
<ivy:makepom artifactName="jdbc-local"
@@ -1541,4 +1568,10 @@
</target>
+ <target name="init-brew-path" if="brew">
+ <path id="main.lib.path.id">
+ <path refid="brew.lib.path.id"/>
+ </path>
+ </target>
+
</project>
Modified: projects/jboss-jca/trunk/codegenerator/build.xml
===================================================================
--- projects/jboss-jca/trunk/codegenerator/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/codegenerator/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -37,7 +37,7 @@
<javac srcdir="src/main"
destdir="${build.codegenerator.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -93,7 +93,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/codegenerator"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Code Generator"
@@ -101,7 +101,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.codegenerator.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008-2009 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
@@ -252,7 +252,7 @@
sourcepath="src/main/java"
destdir="${build.codegenerator.dir}/docs"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Codegenerator"
@@ -260,7 +260,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.codegenerator.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
Modified: projects/jboss-jca/trunk/common/build.xml
===================================================================
--- projects/jboss-jca/trunk/common/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/common/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -31,14 +31,29 @@
<!-- =================================
Target: compile
================================= -->
- <target name="compile">
+ <target name="compile-papaki" unless="brew">
+ <javac srcdir="src/main"
+ destdir="${build.common.dir}"
+ classpathref="main.lib.path.id"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ includes="**/papaki/**"
+ optimize="${javac.optimize}"
+ includeAntRuntime="false">
+ <compilerarg value="-Xlint"/>
+ <compilerarg value="-AgeneratedTranslationFilesPath=${build.common.dir}"/>
+ </javac>
+ </target>
+
+ <target name="compile-base">
<mkdir dir="${build.common.dir}" />
<javac srcdir="src/main"
destdir="${build.common.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
+ excludes="**/papaki/**"
optimize="${javac.optimize}"
includeAntRuntime="false">
<compilerarg value="-Xlint"/>
@@ -47,7 +62,7 @@
<javac srcdir="${build.common.dir}"
destdir="${build.common.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -64,11 +79,14 @@
</copy>
</target>
+
+ <target name="compile" depends="compile-base,compile-papaki">
+ </target>
<!-- =================================
Target: jars
================================= -->
- <target name="jars" depends="compile">
+ <target name="jars-base">
<jar destfile="${target.dir}/${name}-common-api.jar"
basedir="${build.common.dir}"
index="true"
@@ -113,7 +131,9 @@
<attribute name="Implementation-Vendor-Id" value="org.jboss"/>
</manifest>
</jar>
+ </target>
+ <target name="jars" depends="compile,jars-base" unless="brew">
<jar destfile="${target.dir}/${name}-common-impl-papaki.jar"
basedir="${build.common.dir}"
index="true"
@@ -139,7 +159,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/common"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Common"
@@ -147,7 +167,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.common.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
@@ -276,8 +296,7 @@
<!-- =================================
Target: artifacts
================================= -->
- <target name="artifacts" depends="jars">
-
+ <target name="artifacts-base">
<jar destfile="${target.dir}/${name}-common-api-sources.jar"
basedir="src/main/java"
index="true"
@@ -323,27 +342,12 @@
</manifest>
</jar>
- <jar destfile="${target.dir}/${name}-common-impl-papaki-sources.jar"
- basedir="src/main/java"
- index="true"
- indexMetaInf="true"
- update="true"
- level="9"
- includes="**/papaki/**">
- <manifest>
- <attribute name="Implementation-Title" value="IronJacamar Common Implementation - Papaki - 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>
-
<mkdir dir="${build.common.dir}/docs"/>
<mkdir dir="${build.common.dir}/docs/api"/>
<javadoc destdir="${build.common.dir}/docs/api"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Common - API"
@@ -351,7 +355,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.common.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
@@ -381,7 +385,7 @@
<mkdir dir="${build.common.dir}/docs/spi"/>
<javadoc destdir="${build.common.dir}/docs/spi"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Common - SPI"
@@ -389,7 +393,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.common.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
@@ -419,7 +423,7 @@
<mkdir dir="${build.common.dir}/docs/impl"/>
<javadoc destdir="${build.common.dir}/docs/impl"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Common - Implementation"
@@ -427,7 +431,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.common.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
@@ -455,11 +459,29 @@
<attribute name="Implementation-Vendor-Id" value="org.jboss"/>
</manifest>
</jar>
+ </target>
+ <target name="artifacts" depends="jars,artifacts-base" unless="brew">
+
+ <jar destfile="${target.dir}/${name}-common-impl-papaki-sources.jar"
+ basedir="src/main/java"
+ index="true"
+ indexMetaInf="true"
+ update="true"
+ level="9"
+ includes="**/papaki/**">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Common Implementation - Papaki - 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>
+
<mkdir dir="${build.common.dir}/docs/papaki"/>
<javadoc destdir="${build.common.dir}/docs/papaki"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Common - Implementation - Papaki"
@@ -467,7 +489,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.common.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
Modified: projects/jboss-jca/trunk/core/build.xml
===================================================================
--- projects/jboss-jca/trunk/core/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/core/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -37,7 +37,7 @@
<javac srcdir="src/main"
destdir="${build.core.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -55,7 +55,7 @@
<javac srcdir="${build.core.dir}/impl"
destdir="${build.core.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -115,7 +115,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/core"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Core"
@@ -123,7 +123,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.core.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008-2009 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
@@ -405,7 +405,7 @@
<mkdir dir="${build.core.dir}/docs/api"/>
<javadoc destdir="${build.core.dir}/docs/api"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Core - API"
@@ -413,7 +413,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.core.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
@@ -444,7 +444,7 @@
<mkdir dir="${build.core.dir}/docs/impl"/>
<javadoc destdir="${build.core.dir}/docs/impl"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Core - Implementation"
@@ -452,7 +452,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.core.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
Modified: projects/jboss-jca/trunk/deployers/build.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/deployers/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -31,24 +31,40 @@
<!-- =================================
Target: compile
================================= -->
- <target name="compile">
+ <target name="compile-fungal" unless="brew">
+ <javac srcdir="src/main"
+ destdir="${build.deployers.dir}/impl"
+ classpathref="main.lib.path.id"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ includes="**/fungal/**"
+ optimize="${javac.optimize}"
+ includeAntRuntime="false">
+ <compilerarg value="-Xlint"/>
+ <compilerarg value="-AgeneratedTranslationFilesPath=${build.deployers.dir}/impl"/>
+ </javac>
+ </target>
+
+ <target name="compile-base">
<mkdir dir="${build.deployers.dir}" />
<mkdir dir="${build.deployers.dir}/impl" />
-
<javac srcdir="src/main"
destdir="${build.deployers.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
+ excludes="**/fungal/**"
optimize="${javac.optimize}"
includeAntRuntime="false">
<compilerarg value="-Xlint"/>
<compilerarg value="-AgeneratedTranslationFilesPath=${build.deployers.dir}/impl"/>
</javac>
+ </target>
+ <target name="compile" depends="compile-base,compile-fungal">
<javac srcdir="${build.deployers.dir}/impl"
destdir="${build.deployers.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -61,7 +77,7 @@
<!-- =================================
Target: jars
================================= -->
- <target name="jars" depends="compile">
+ <target name="jars-base">
<mkdir dir="${build.deployers.dir}/jars" />
<!-- Common -->
@@ -79,6 +95,8 @@
<attribute name="Implementation-Vendor-Id" value="org.jboss"/>
</manifest>
</jar>
+ </target>
+ <target name="jars" depends="compile,jars-base" unless="brew">
<!-- Fungal -->
<jar destfile="${target.dir}/${name}-deployers-fungal.jar"
@@ -173,7 +191,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/deployers"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Deployers"
@@ -181,7 +199,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.deployers.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008-2009 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
@@ -312,8 +330,7 @@
<!-- =================================
Target: artifacts
================================= -->
- <target name="artifacts" depends="jars">
-
+ <target name="artifacts-base">
<!-- Common -->
<jar destfile="${target.dir}/${name}-deployers-common-sources.jar"
basedir="src/main/java"
@@ -334,7 +351,7 @@
<mkdir dir="${build.deployers.dir}/docs/common"/>
<javadoc destdir="${build.deployers.dir}/docs/common"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Deployers - Common"
@@ -342,7 +359,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.deployers.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
@@ -368,7 +385,9 @@
<attribute name="Implementation-Vendor-Id" value="org.jboss"/>
</manifest>
</jar>
+ </target>
+ <target name="artifacts" depends="jars,artifacts-base" unless="brew">
<!-- Fungal -->
<jar destfile="${target.dir}/${name}-deployers-fungal-sources.jar"
basedir="src/main/java"
@@ -388,7 +407,7 @@
<mkdir dir="${build.deployers.dir}/docs/fungal"/>
<javadoc destdir="${build.deployers.dir}/docs/fungal"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Deployers - Fungal"
@@ -396,7 +415,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.deployers.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
Modified: projects/jboss-jca/trunk/embedded/build.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/embedded/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -42,7 +42,7 @@
<target name="compile" depends="init">
<javac srcdir="src/main"
destdir="${build.embedded.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -106,7 +106,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/embedded"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Embedded"
@@ -114,7 +114,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.embedded.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008-2009 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
@@ -286,7 +286,7 @@
<mkdir dir="${build.embedded.dir}/docs/embedded"/>
<javadoc destdir="${build.embedded.dir}/docs/embedded"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Embedded"
@@ -294,7 +294,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.embedded.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
@@ -324,7 +324,7 @@
<mkdir dir="${build.embedded.dir}/docs/arquillian"/>
<javadoc destdir="${build.embedded.dir}/docs/arquillian"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Embedded - Arquillian"
@@ -332,7 +332,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.embedded.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/ivy.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -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-as->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-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">
+ <configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->default;mail->default;;tools->default;ironjacamar-as->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-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;brew->default">
<conf name="arquillian" transitive="false"/>
<conf name="common" transitive="false"/>
<conf name="embedded" transitive="false"/>
@@ -44,6 +44,7 @@
<conf name="test" transitive="false"/>
<conf name="tools" transitive="false"/>
<conf name="rhq" transitive="false"/>
+ <conf name="brew" transitive="false"/>
<conf name="ironjacamar-as" transitive="false"/>
<conf name="ironjacamar-codegenerator" transitive="false"/>
@@ -96,10 +97,10 @@
<dependencies>
<!-- Maven doesn't handle dependencies well, so logging has to be first -->
- <dependency org="org.jboss.logging" name="jboss-logging" rev="${version.jboss.logging}" conf="common,ironjacamar-common-impl,ironjacamar-common-impl-papaki,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-common,ironjacamar-deployers-fungal"/>
+ <dependency org="org.jboss.logging" name="jboss-logging" rev="${version.jboss.logging}" conf="common,ironjacamar-common-impl,ironjacamar-common-impl-papaki,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-common,ironjacamar-deployers-fungal,brew"/>
<dependency org="org.jboss.logging" name="jboss-logging-generator" rev="${version.jboss.logging-generator}" conf="common"/>
<dependency org="org.jboss.logging" name="jboss-logging-processor" rev="${version.jboss.logging-processor}" conf="common"/>
- <dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="common,ironjacamar-depchain"/>
+ <dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="common,ironjacamar-depchain,brew"/>
<!-- Keep these sorted -->
<dependency org="apache-logging" name="commons-logging" rev="${version.apache-logging}" conf="common,ironjacamar-depchain"/>
@@ -110,7 +111,7 @@
<dependency org="javax.activation" name="activation" rev="${version.activation}" conf="rhq"/>
<dependency org="javax.mail" name="mail" rev="${version.mail-api}" conf="mail"/>
<dependency org="javax.persistence" name="persistence-api" rev="${version.jpa}" conf="rhq"/>
- <dependency org="javax.validation" name="validation-api" rev="${version.validation-api}" conf="common,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal"/>
+ <dependency org="javax.validation" name="validation-api" rev="${version.validation-api}" conf="common,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal,brew"/>
<dependency org="javax.xml" name="jaxb-api" rev="${version.jaxb.api}" conf="rhq"/>
<dependency org="javax.xml" name="jaxb-impl" rev="${version.jaxb.impl}" conf="rhq"/>
<dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="tools"/>
@@ -143,8 +144,8 @@
</dependency>
<dependency org="org.javassist" name="javassist" rev="${version.javassist}" conf="common,ironjacamar-depchain"/>
<dependency org="org.jboss" name="jboss-common-core" rev="${version.jboss.common}" conf="common,ironjacamar-depchain"/>
- <dependency org="org.jboss" name="jboss-transaction-spi" rev="${version.jboss.ts.spi}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain"/>
- <dependency org="org.jboss.apiviz" name="apiviz" rev="${version.apiviz}" conf="tools"/>
+ <dependency org="org.jboss" name="jboss-transaction-spi" rev="${version.jboss.ts.spi}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain,brew"/>
+ <dependency org="org.jboss.apiviz" name="apiviz" rev="${version.apiviz}" conf="tools,brew"/>
<dependency org="org.jboss.arquillian.config" name="arquillian-config-api" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
<dependency org="org.jboss.arquillian.config" name="arquillian-config-impl-base" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
<dependency org="org.jboss.arquillian.config" name="arquillian-config-spi" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
@@ -174,14 +175,14 @@
<dependency org="org.jboss.shrinkwrap" name="shrinkwrap-spi" rev="${version.jboss.shrinkwrap}" conf="embedded,ironjacamar-depchain"/>
<dependency org="org.jboss.slf4j" name="slf4j-jboss-logmanager" rev="${version.jboss.slf4j.logmanager}" conf="common,ironjacamar-depchain"/>
<dependency org="org.jboss.spec.javax.jms" name="jboss-jms-api_1.1_spec" rev="${version.jboss.jms.api}" conf="hornetq,ironjacamar-depchain"/>
- <dependency org="org.jboss.spec.javax.security.auth.message" name="jboss-jaspi-api_1.0_spec" rev="${version.jboss.jaspi.api}" conf="common,ironjacamar-core-impl,ironjacamar-depchain"/>
- <dependency org="org.jboss.spec.javax.transaction" name="jboss-transaction-api_1.1_spec" rev="${version.transaction.api}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal,ironjacamar-spec-api"/>
+ <dependency org="org.jboss.spec.javax.security.auth.message" name="jboss-jaspi-api_1.0_spec" rev="${version.jboss.jaspi.api}" conf="common,ironjacamar-core-impl,ironjacamar-depchain,brew"/>
+ <dependency org="org.jboss.spec.javax.transaction" name="jboss-transaction-api_1.1_spec" rev="${version.transaction.api}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal,ironjacamar-spec-api,brew"/>
<dependency org="org.jboss.stdio" name="jboss-stdio" rev="${version.jboss.stdio}" conf="common,ironjacamar-depchain"/>
- <dependency org="org.jboss.threads" name="jboss-threads" rev="${version.jboss.threads}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain"/>
+ <dependency org="org.jboss.threads" name="jboss-threads" rev="${version.jboss.threads}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain,brew"/>
<dependency org="org.mockito" name="mockito-all" rev="${version.mockito}" conf="test"/>
<dependency org="org.mortbay.jetty" name="jsp-api-2.1-glassfish" rev="${version.jetty.glassfish}" conf="jetty"/>
<dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="${version.jetty.servlet}" conf="jetty"/>
- <dependency org="org.picketbox" name="picketbox" rev="${version.jboss.picketbox}" conf="common,ironjacamar-depchain"/>
+ <dependency org="org.picketbox" name="picketbox" rev="${version.jboss.picketbox}" conf="common,ironjacamar-depchain,brew"/>
<dependency org="org.rhq" name="rhq-core-client-api" rev="${version.rhq}" conf="rhq"/>
<dependency org="org.rhq" name="rhq-core-comm-api" rev="${version.rhq}" conf="rhq"/>
<dependency org="org.rhq" name="rhq-core-domain" rev="${version.rhq}" conf="rhq"/>
Modified: projects/jboss-jca/trunk/rhq/build.xml
===================================================================
--- projects/jboss-jca/trunk/rhq/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/rhq/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -37,7 +37,7 @@
<javac srcdir="src/main"
destdir="${build.rhq.dir}/impl"
- classpathref="rhq.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -75,7 +75,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/rhq"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Code Generator"
@@ -83,7 +83,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.rhq.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008-2009 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
@@ -311,7 +311,7 @@
sourcepath="src/main/java"
destdir="${build.rhq.dir}/docs"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar RHQ"
@@ -319,7 +319,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.rhq.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2011 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/sjc/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -42,7 +42,7 @@
<target name="compile" depends="init">
<javac srcdir="src/main"
destdir="${build.sjc.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -80,7 +80,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/sjc"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar SJC"
@@ -88,7 +88,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.sjc.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008-2009 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
Modified: projects/jboss-jca/trunk/validator/build.xml
===================================================================
--- projects/jboss-jca/trunk/validator/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/validator/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -31,13 +31,14 @@
<!-- =================================
Target: compile
================================= -->
- <target name="compile">
+ <target name="compile-base">
<mkdir dir="${build.validator.dir}" />
<mkdir dir="${build.validator.dir}/impl" />
<javac srcdir="src/main"
destdir="${build.validator.dir}/impl"
- classpathref="sjc.lib.path.id"
+ excludes="**/cli/**, **/ant/**, **/maven/**"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -46,10 +47,23 @@
</javac>
</target>
+ <target name="compile" depends="compile-base" unless="brew">
+ <javac srcdir="src/main"
+ destdir="${build.validator.dir}/impl"
+ classpathref="main.lib.path.id"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ includes="**/cli/**, **/ant/**, **/maven/**"
+ optimize="${javac.optimize}"
+ includeAntRuntime="false">
+ <compilerarg value="-Xlint"/>
+ </javac>
+ </target>
+
<!-- =================================
Target: jars
================================= -->
- <target name="jars" depends="compile">
+ <target name="jars-base">
<mkdir dir="${build.validator.dir}/jars" />
<!-- Validator -->
@@ -64,16 +78,6 @@
<fileset dir="src/main/resources/"
includes="**/*.properties"/>
</copy>
-
- <mkdir dir="${build.validator.dir}/jars/validator/META-INF/maven" />
- <copy todir="${build.validator.dir}/jars/validator/META-INF/maven">
- <fileset dir="src/main/resources/"
- includes="plugin.xml"/>
- <filterset>
- <filter token="VERSION.IRONJACAMAR" value="${version}"/>
- </filterset>
- </copy>
-
<jar destfile="${target.dir}/${name}-validator.jar"
basedir="${build.validator.dir}/jars/validator"
index="true"
@@ -89,7 +93,19 @@
<attribute name="Class-Path" value="jboss-logging.jar jboss-common-core.jar ${name}-spec-api.jar papaki-core.jar javassist.jar ${name}-common-api.jar ${name}-common-impl.jar"/>
</manifest>
</jar>
+ </target>
+ <target name="jars" depends="compile,jars-base" unless="brew">
+
+ <mkdir dir="${build.validator.dir}/jars/validator/META-INF/maven" />
+ <copy todir="${build.validator.dir}/jars/validator/META-INF/maven">
+ <fileset dir="src/main/resources/"
+ includes="plugin.xml"/>
+ <filterset>
+ <filter token="VERSION.IRONJACAMAR" value="${version}"/>
+ </filterset>
+ </copy>
+
<jar destfile="${target.dir}/${name}-validator-cli.jar"
basedir="${build.validator.dir}/jars/validator"
index="true"
@@ -149,7 +165,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/validator"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Validator"
@@ -157,7 +173,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.validator.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008-2009 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
@@ -288,52 +304,94 @@
<!-- =================================
Target: artifacts
================================= -->
- <target name="artifacts" depends="jars">
-
- <jar destfile="${target.dir}/${name}-validator-ant-sources.jar"
+ <target name="artifacts-base">
+ <jar destfile="${target.dir}/${name}-validator-sources.jar"
basedir="src/main/java"
index="true"
indexMetaInf="true"
update="true"
level="9"
- includes="**/validator/ant/**">
+ excludes="**/validator/ant/**,**/validator/cli/**,**/validator/maven/**">
<manifest>
- <attribute name="Implementation-Title" value="IronJacamar Validator Ant - Sources"/>
+ <attribute name="Implementation-Title" value="IronJacamar Validator - 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>
+
+ <mkdir dir="${build.validator.dir}/docs/impl"/>
+ <javadoc destdir="${build.validator.dir}/docs/impl"
+ doclet="org.jboss.apiviz.APIviz"
+ docletpathref="main.lib.path.id"
+ author="true"
+ version="true"
+ windowtitle="IronJacamar Validator"
+ doctitle="IronJacamar Validator"
+ use="true"
+ additionalparam="-author -version"
+ classpath="${build.validator.dir}"
+ classpathref="main.lib.path.id"
+ bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
- <jar destfile="${target.dir}/${name}-validator-maven-sources.jar"
+ <packageset dir="src/main/java" defaultexcludes="yes">
+ <exclude name="**/validator/ant/**"/>
+ <exclude name="**/validator/cli/**"/>
+ </packageset>
+
+ <link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
+ </javadoc>
+ <copy todir="${build.validator.dir}/docs/impl" overwrite="true">
+ <fileset dir="${tools.dir}/api"/>
+ </copy>
+
+ <jar destfile="${target.dir}/${name}-validator-javadoc.jar"
+ basedir="${build.validator.dir}/docs/impl"
+ index="true"
+ indexMetaInf="true"
+ update="true"
+ level="9">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Validator - 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>
+ </target>
+
+ <target name="artifacts" depends="jars,artifacts-base" unless="brew">
+
+ <jar destfile="${target.dir}/${name}-validator-ant-sources.jar"
basedir="src/main/java"
index="true"
indexMetaInf="true"
update="true"
level="9"
- includes="**/validator/maven/**">
+ includes="**/validator/ant/**">
<manifest>
- <attribute name="Implementation-Title" value="IronJacamar Validator Maven - Sources"/>
+ <attribute name="Implementation-Title" value="IronJacamar Validator Ant - 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}-validator-sources.jar"
+ </jar>
+
+ <jar destfile="${target.dir}/${name}-validator-maven-sources.jar"
basedir="src/main/java"
index="true"
indexMetaInf="true"
update="true"
level="9"
- excludes="**/validator/ant/**,**/validator/cli/**,**/validator/maven/**">
+ includes="**/validator/maven/**">
<manifest>
- <attribute name="Implementation-Title" value="IronJacamar Validator - Sources"/>
+ <attribute name="Implementation-Title" value="IronJacamar Validator Maven - 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>
+
<jar destfile="${target.dir}/${name}-validator-cli-sources.jar"
basedir="src/main/java"
@@ -354,7 +412,7 @@
<mkdir dir="${build.validator.dir}/docs/ant"/>
<javadoc destdir="${build.validator.dir}/docs/ant"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Validator - Ant"
@@ -362,7 +420,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.validator.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
@@ -392,7 +450,7 @@
<mkdir dir="${build.validator.dir}/docs/maven"/>
<javadoc destdir="${build.validator.dir}/docs/maven"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Validator - Maven"
@@ -400,7 +458,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.validator.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
@@ -427,50 +485,11 @@
</manifest>
</jar>
-
- <mkdir dir="${build.validator.dir}/docs/impl"/>
- <javadoc destdir="${build.validator.dir}/docs/impl"
- doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
- author="true"
- version="true"
- windowtitle="IronJacamar Validator"
- doctitle="IronJacamar Validator"
- use="true"
- additionalparam="-author -version"
- classpath="${build.validator.dir}"
- classpathref="sjc.lib.path.id"
- bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
- <packageset dir="src/main/java" defaultexcludes="yes">
- <exclude name="**/validator/ant/**"/>
- <exclude name="**/validator/cli/**"/>
- </packageset>
-
- <link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
- </javadoc>
- <copy todir="${build.validator.dir}/docs/impl" overwrite="true">
- <fileset dir="${tools.dir}/api"/>
- </copy>
-
- <jar destfile="${target.dir}/${name}-validator-javadoc.jar"
- basedir="${build.validator.dir}/docs/impl"
- index="true"
- indexMetaInf="true"
- update="true"
- level="9">
- <manifest>
- <attribute name="Implementation-Title" value="IronJacamar Validator - 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.validator.dir}/docs/cli"/>
<javadoc destdir="${build.validator.dir}/docs/cli"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Validator - CLI"
@@ -478,7 +497,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.validator.dir}"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
Modified: projects/jboss-jca/trunk/web/build.xml
===================================================================
--- projects/jboss-jca/trunk/web/build.xml 2011-07-05 19:46:08 UTC (rev 111706)
+++ projects/jboss-jca/trunk/web/build.xml 2011-07-06 07:04:36 UTC (rev 111707)
@@ -42,7 +42,7 @@
<target name="compile" depends="init">
<javac srcdir="src/main"
destdir="${build.web.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
@@ -112,7 +112,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/web"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="sjc.lib.path.id"
+ docletpathref="main.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Web"
@@ -120,7 +120,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.web.dir}/impl"
- classpathref="sjc.lib.path.id"
+ classpathref="main.lib.path.id"
bottom="Copyright © 2009 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
More information about the jboss-cvs-commits
mailing list