[jboss-cvs] JBossAS SVN: r107113 - in projects/jboss-jca/trunk: codegenerator and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 27 09:52:53 EDT 2010
Author: jesper.pedersen
Date: 2010-07-27 09:52:52 -0400 (Tue, 27 Jul 2010)
New Revision: 107113
Modified:
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/sjc/build.xml
projects/jboss-jca/trunk/validator/build.xml
Log:
Split Arquillian support into its own area
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2010-07-27 13:48:02 UTC (rev 107112)
+++ projects/jboss-jca/trunk/build.xml 2010-07-27 13:52:52 UTC (rev 107113)
@@ -140,6 +140,9 @@
<fileset dir="${lib.dir}/embedded">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${lib.dir}/arquillian">
+ <include name="**/*.jar"/>
+ </fileset>
<fileset dir="${lib.dir}/jetty">
<include name="**/*.jar"/>
</fileset>
@@ -161,6 +164,9 @@
<fileset dir="${lib.dir}/embedded">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${lib.dir}/arquillian">
+ <include name="**/*.jar"/>
+ </fileset>
<fileset dir="${lib.dir}/test">
<include name="**/*.jar"/>
</fileset>
@@ -177,6 +183,9 @@
<fileset dir="${lib.dir}/embedded">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${lib.dir}/arquillian">
+ <include name="**/*.jar"/>
+ </fileset>
<fileset dir="${lib.dir}/jetty">
<include name="**/*.jar"/>
</fileset>
@@ -414,6 +423,9 @@
<fileset dir="${lib.dir}/embedded">
<include name="*.jar"/>
</fileset>
+ <fileset dir="${lib.dir}/arquillian">
+ <include name="*.jar"/>
+ </fileset>
<fileset dir="${lib.dir}/jetty">
<include name="*.jar"/>
</fileset>
@@ -454,6 +466,9 @@
<fileset dir="${lib.dir}/embedded">
<include name="*.jar"/>
</fileset>
+ <fileset dir="${lib.dir}/arquillian">
+ <include name="*.jar"/>
+ </fileset>
<fileset dir="${lib.dir}/jetty">
<include name="*.jar"/>
</fileset>
@@ -538,6 +553,7 @@
<pathelement location="${build.dir}/common/test"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/jetty" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
@@ -574,6 +590,7 @@
<pathelement location="${build.dir}/core/test"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/jetty" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
@@ -610,6 +627,7 @@
<pathelement location="${build.dir}/deployers/test"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/jetty" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
@@ -646,6 +664,7 @@
<pathelement location="${build.dir}/embedded/test"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/jetty" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
@@ -682,6 +701,7 @@
<pathelement location="${build.dir}/validator/test"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/jetty" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
@@ -718,6 +738,7 @@
<pathelement location="${build.dir}/codegenerator/test"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/jetty" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
Modified: projects/jboss-jca/trunk/codegenerator/build.xml
===================================================================
--- projects/jboss-jca/trunk/codegenerator/build.xml 2010-07-27 13:48:02 UTC (rev 107112)
+++ projects/jboss-jca/trunk/codegenerator/build.xml 2010-07-27 13:52:52 UTC (rev 107113)
@@ -134,6 +134,7 @@
<fileset dir="${target.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
</classpath>
@@ -184,6 +185,7 @@
<fileset dir="${target.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
</classpath>
Modified: projects/jboss-jca/trunk/common/build.xml
===================================================================
--- projects/jboss-jca/trunk/common/build.xml 2010-07-27 13:48:02 UTC (rev 107112)
+++ projects/jboss-jca/trunk/common/build.xml 2010-07-27 13:52:52 UTC (rev 107113)
@@ -132,6 +132,7 @@
<fileset dir="${target.dir}" includes="*.jar" />
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
</classpath>
@@ -182,6 +183,7 @@
<fileset dir="${target.dir}" includes="*.jar" />
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
</classpath>
Modified: projects/jboss-jca/trunk/core/build.xml
===================================================================
--- projects/jboss-jca/trunk/core/build.xml 2010-07-27 13:48:02 UTC (rev 107112)
+++ projects/jboss-jca/trunk/core/build.xml 2010-07-27 13:52:52 UTC (rev 107113)
@@ -148,6 +148,7 @@
<fileset dir="${target.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
</classpath>
@@ -197,6 +198,7 @@
<fileset dir="${target.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
</classpath>
Modified: projects/jboss-jca/trunk/deployers/build.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/build.xml 2010-07-27 13:48:02 UTC (rev 107112)
+++ projects/jboss-jca/trunk/deployers/build.xml 2010-07-27 13:52:52 UTC (rev 107113)
@@ -366,6 +366,7 @@
<fileset dir="${target.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
</classpath>
@@ -416,6 +417,7 @@
<fileset dir="${target.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
</classpath>
Modified: projects/jboss-jca/trunk/embedded/build.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/build.xml 2010-07-27 13:48:02 UTC (rev 107112)
+++ projects/jboss-jca/trunk/embedded/build.xml 2010-07-27 13:52:52 UTC (rev 107113)
@@ -180,6 +180,7 @@
<fileset dir="${target.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
</classpath>
@@ -229,6 +230,7 @@
<fileset dir="${target.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
</classpath>
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2010-07-27 13:48:02 UTC (rev 107112)
+++ projects/jboss-jca/trunk/ivy.xml 2010-07-27 13:52:52 UTC (rev 107113)
@@ -29,10 +29,11 @@
<repository name="jboss" url="http://repository.jboss.org"/>
</info>
- <configurations defaultconfmapping="common->default;sjc->default;embedded->default;jetty->default;test->default">
+ <configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->default">
<conf name="common" transitive="false"/>
<conf name="sjc" transitive="false"/>
<conf name="embedded" transitive="false"/>
+ <conf name="arquillian" transitive="false"/>
<conf name="jetty" transitive="false"/>
<conf name="test" transitive="false"/>
</configurations>
@@ -69,12 +70,12 @@
<dependency org="org.jboss" name="jboss-reflect" rev="${version.jboss.reflect}" conf="common"/>
<dependency org="org.jboss" name="jbossxb" rev="${version.jboss.xb}" conf="common"/>
<dependency org="org.jboss.apiviz" name="apiviz" rev="${version.apiviz}" conf="common"/>
- <dependency org="org.jboss.arquillian" name="arquillian-api" rev="${version.arquillian}" conf="embedded"/>
- <dependency org="org.jboss.arquillian" name="arquillian-impl-base" rev="${version.arquillian}" conf="embedded"/>
- <dependency org="org.jboss.arquillian" name="arquillian-junit" rev="${version.arquillian}" conf="embedded"/>
- <dependency org="org.jboss.arquillian" name="arquillian-spi" rev="${version.arquillian}" conf="embedded"/>
- <dependency org="org.jboss.arquillian.testenricher" name="arquillian-testenricher-resource" rev="${version.arquillian}" conf="embedded"/>
- <dependency org="org.jboss.arquillian.protocol" name="arquillian-protocol-local" rev="${version.arquillian}" conf="embedded"/>
+ <dependency org="org.jboss.arquillian" name="arquillian-api" rev="${version.arquillian}" conf="arquillian"/>
+ <dependency org="org.jboss.arquillian" name="arquillian-impl-base" rev="${version.arquillian}" conf="arquillian"/>
+ <dependency org="org.jboss.arquillian" name="arquillian-junit" rev="${version.arquillian}" conf="arquillian"/>
+ <dependency org="org.jboss.arquillian" name="arquillian-spi" rev="${version.arquillian}" conf="arquillian"/>
+ <dependency org="org.jboss.arquillian.testenricher" name="arquillian-testenricher-resource" rev="${version.arquillian}" conf="arquillian"/>
+ <dependency org="org.jboss.arquillian.protocol" name="arquillian-protocol-local" rev="${version.arquillian}" conf="arquillian"/>
<dependency org="org.jboss.integration" name="jboss-integration" rev="${version.jboss.integration}" conf="common"/>
<dependency org="org.jboss.javaee" name="jboss-jaspi-api" rev="${version.jboss.jaspi.api}" conf="common"/>
<dependency org="org.jboss.javaee" name="jboss-transaction-api" rev="${version.transaction.api}" conf="common"/>
Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml 2010-07-27 13:48:02 UTC (rev 107112)
+++ projects/jboss-jca/trunk/sjc/build.xml 2010-07-27 13:52:52 UTC (rev 107113)
@@ -108,6 +108,7 @@
<mkdir dir="${target.dir}/sjc/doc/codegenerator"/>
<mkdir dir="${target.dir}/sjc/lib"/>
<mkdir dir="${target.dir}/sjc/lib/embedded"/>
+ <mkdir dir="${target.dir}/sjc/lib/embedded/arquillian"/>
<mkdir dir="${target.dir}/sjc/lib/endorsed"/>
<mkdir dir="${target.dir}/sjc/lib/jetty"/>
<mkdir dir="${target.dir}/sjc/log"/>
@@ -175,11 +176,16 @@
<copy todir="${target.dir}/sjc/lib/embedded">
<fileset dir="${target.dir}">
- <include name="${name}-embedded-arquillian.jar"/>
<include name="${name}-embedded.jar"/>
</fileset>
</copy>
+ <copy todir="${target.dir}/sjc/lib/embedded/arquillian">
+ <fileset dir="${target.dir}">
+ <include name="${name}-embedded-arquillian.jar"/>
+ </fileset>
+ </copy>
+
<copy todir="${target.dir}/sjc/lib">
<fileset dir="${lib.dir}/common">
<include name="*.jar"/>
@@ -199,7 +205,13 @@
</fileset>
</copy>
- <copy todir="${target.dir}/sjc/lib/embedded">
+ <copy todir="${target.dir}/sjc/lib/embedded/arquillian">
+ <fileset dir="${lib.dir}/arquillian">
+ <include name="arquillian*.jar"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${target.dir}/sjc/lib/embedded/arquillian">
<fileset dir="${lib.dir}/test">
<include name="junit.jar"/>
</fileset>
Modified: projects/jboss-jca/trunk/validator/build.xml
===================================================================
--- projects/jboss-jca/trunk/validator/build.xml 2010-07-27 13:48:02 UTC (rev 107112)
+++ projects/jboss-jca/trunk/validator/build.xml 2010-07-27 13:52:52 UTC (rev 107113)
@@ -168,6 +168,7 @@
<fileset dir="${target.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
</classpath>
@@ -218,6 +219,7 @@
<fileset dir="${target.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/common" includes="*.jar" />
<fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
<fileset dir="${lib.dir}/sjc" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
</classpath>
More information about the jboss-cvs-commits
mailing list