[jboss-cvs] JBossAS SVN: r106482 - in projects/jboss-jca/trunk: codegenerator and 7 other directories.

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

Author: jesper.pedersen
Date: 2010-07-07 10:17:40 -0400 (Wed, 07 Jul 2010)
New Revision: 106482

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/codegenerator/build.xml
   projects/jboss-jca/trunk/core/build.xml
   projects/jboss-jca/trunk/deployers/build.xml
   projects/jboss-jca/trunk/doc/userguide/en/modules/configuration.xml
   projects/jboss-jca/trunk/embedded/build.xml
   projects/jboss-jca/trunk/ivy.xml
   projects/jboss-jca/trunk/lib/
   projects/jboss-jca/trunk/sjc/build.xml
   projects/jboss-jca/trunk/validator/build.xml
Log:
[JBJCA-374] Split library structure

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2010-07-07 06:55:58 UTC (rev 106481)
+++ projects/jboss-jca/trunk/build.xml	2010-07-07 14:17:40 UTC (rev 106482)
@@ -142,6 +142,15 @@
        Paths              
        ================================= -->
   <path id="sjc.lib.path.id">
+    <fileset dir="${lib.dir}/common">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${lib.dir}/embedded">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${lib.dir}/jetty">
+      <include name="**/*.jar"/>
+    </fileset>
     <fileset dir="${lib.dir}/sjc">
       <include name="**/*.jar"/>
     </fileset>
@@ -151,6 +160,12 @@
   </path>
 
   <path id="standalone.lib.path.id">
+    <fileset dir="${lib.dir}/common">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${lib.dir}/sjc">
+      <include name="**/*.jar"/>
+    </fileset>
     <fileset dir="${lib.dir}/standalone">
       <include name="**/*.jar"/>
     </fileset>
@@ -160,6 +175,18 @@
   </path>
 
   <path id="test.lib.path.id">
+    <fileset dir="${lib.dir}/common">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${lib.dir}/standalone">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${lib.dir}/sjc">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${lib.dir}/embedded">
+      <include name="**/*.jar"/>
+    </fileset>
     <fileset dir="${lib.dir}/test">
       <include name="**/*.jar"/>
     </fileset>
@@ -170,9 +197,21 @@
 
   <path id="checkstyle.lib.path.id">
     <fileset dir="${tools.dir}/checkstyle/lib"/>
-    <fileset dir="${lib.dir}/standalone">
+    <fileset dir="${lib.dir}/common">
       <include name="**/*.jar"/>
     </fileset>
+    <fileset dir="${lib.dir}/embedded">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${lib.dir}/jetty">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${lib.dir}/sjc">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${lib.dir}/test">
+      <include name="**/*.jar"/>
+    </fileset>
     <fileset dir="${target.dir}">
       <include name="**/*.jar"/>
     </fileset>
@@ -402,9 +441,24 @@
               excludeFilter="${basedir}/tools/findbugs/filter.xml"
               reportLevel="low">
       <auxClasspath>
+        <fileset dir="${lib.dir}/common">
+          <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${lib.dir}/embedded">
+          <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${lib.dir}/jetty">
+          <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${lib.dir}/sjc">
+          <include name="*.jar"/>
+        </fileset>
         <fileset dir="${lib.dir}/standalone">
           <include name="*.jar"/>
         </fileset>
+        <fileset dir="${lib.dir}/test">
+          <include name="*.jar"/>
+        </fileset>
       </auxClasspath>
       <class location="${target.dir}/jboss-jca-codegenerator.jar" />
       <class location="${target.dir}/jboss-jca-common.jar" />
@@ -432,9 +486,24 @@
               excludeFilter="${basedir}/tools/findbugs/filter.xml"
               reportLevel="low">
       <auxClasspath>
+        <fileset dir="${lib.dir}/common">
+          <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${lib.dir}/embedded">
+          <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${lib.dir}/jetty">
+          <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${lib.dir}/sjc">
+          <include name="*.jar"/>
+        </fileset>
         <fileset dir="${lib.dir}/standalone">
           <include name="*.jar"/>
         </fileset>
+        <fileset dir="${lib.dir}/test">
+          <include name="*.jar"/>
+        </fileset>
       </auxClasspath>
       <class location="${target.dir}/jboss-jca-codegenerator.jar" />
       <class location="${target.dir}/jboss-jca-common.jar" />
@@ -510,6 +579,10 @@
       <classpath>
         <fileset dir="${build.dir}/instrumented" includes="*.jar" />
         <pathelement location="${build.dir}/core/test"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+        <fileset dir="${lib.dir}/jetty" includes="*.jar" />
+        <fileset dir="${lib.dir}/sjc" includes="*.jar" />
         <fileset dir="${lib.dir}/test" includes="*.jar" />
       </classpath>
       <classpath refid="cobertura.lib.path.id" />
@@ -542,6 +615,10 @@
       <classpath>
         <fileset dir="${build.dir}/instrumented" includes="*.jar" />
         <pathelement location="${build.dir}/deployers/test"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+        <fileset dir="${lib.dir}/jetty" includes="*.jar" />
+        <fileset dir="${lib.dir}/sjc" includes="*.jar" />
         <fileset dir="${lib.dir}/test" includes="*.jar" />
       </classpath>
       <classpath refid="cobertura.lib.path.id" />
@@ -574,6 +651,10 @@
       <classpath>
         <fileset dir="${build.dir}/instrumented" includes="*.jar" />
         <pathelement location="${build.dir}/embedded/test"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+        <fileset dir="${lib.dir}/jetty" includes="*.jar" />
+        <fileset dir="${lib.dir}/sjc" includes="*.jar" />
         <fileset dir="${lib.dir}/test" includes="*.jar" />
       </classpath>
       <classpath refid="cobertura.lib.path.id" />
@@ -606,6 +687,10 @@
       <classpath>
         <fileset dir="${build.dir}/instrumented" includes="*.jar" />
         <pathelement location="${build.dir}/validator/test"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+        <fileset dir="${lib.dir}/jetty" includes="*.jar" />
+        <fileset dir="${lib.dir}/sjc" includes="*.jar" />
         <fileset dir="${lib.dir}/test" includes="*.jar" />
       </classpath>
       <classpath refid="cobertura.lib.path.id" />
@@ -638,6 +723,10 @@
       <classpath>
         <fileset dir="${build.dir}/instrumented" includes="*.jar" />
         <pathelement location="${build.dir}/codegenerator/test"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+        <fileset dir="${lib.dir}/jetty" includes="*.jar" />
+        <fileset dir="${lib.dir}/sjc" includes="*.jar" />
         <fileset dir="${lib.dir}/test" includes="*.jar" />
       </classpath>
       <classpath refid="cobertura.lib.path.id" />

Modified: projects/jboss-jca/trunk/codegenerator/build.xml
===================================================================
--- projects/jboss-jca/trunk/codegenerator/build.xml	2010-07-07 06:55:58 UTC (rev 106481)
+++ projects/jboss-jca/trunk/codegenerator/build.xml	2010-07-07 14:17:40 UTC (rev 106482)
@@ -132,6 +132,9 @@
       <classpath>
         <pathelement location="${build.codegenerator.dir}/test"/>
         <fileset dir="${target.dir}" includes="*.jar"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+        <fileset dir="${lib.dir}/sjc" includes="*.jar" />
         <fileset dir="${lib.dir}/test" includes="*.jar" />
       </classpath>
       
@@ -179,6 +182,9 @@
       <classpath>
         <pathelement location="${build.codegenerator.dir}/test"/>
         <fileset dir="${target.dir}" includes="*.jar"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" 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-07 06:55:58 UTC (rev 106481)
+++ projects/jboss-jca/trunk/core/build.xml	2010-07-07 14:17:40 UTC (rev 106482)
@@ -116,6 +116,9 @@
       <classpath>
         <pathelement location="${build.core.dir}/test"/>
         <fileset dir="${target.dir}" includes="*.jar"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+        <fileset dir="${lib.dir}/sjc" includes="*.jar" />
         <fileset dir="${lib.dir}/test" includes="*.jar" />
       </classpath>
       
@@ -162,6 +165,9 @@
       <classpath>
         <pathelement location="${build.core.dir}/test"/>
         <fileset dir="${target.dir}" includes="*.jar"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" 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-07 06:55:58 UTC (rev 106481)
+++ projects/jboss-jca/trunk/deployers/build.xml	2010-07-07 14:17:40 UTC (rev 106482)
@@ -418,6 +418,9 @@
       <classpath>
         <pathelement location="${build.deployers.dir}/test"/>
         <fileset dir="${target.dir}" includes="*.jar"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+        <fileset dir="${lib.dir}/sjc" includes="*.jar" />
         <fileset dir="${lib.dir}/test" includes="*.jar" />
       </classpath>
       
@@ -465,6 +468,9 @@
       <classpath>
         <pathelement location="${build.deployers.dir}/test"/>
         <fileset dir="${target.dir}" includes="*.jar"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+        <fileset dir="${lib.dir}/sjc" includes="*.jar" />
         <fileset dir="${lib.dir}/test" includes="*.jar" />
       </classpath>
       

Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/configuration.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/configuration.xml	2010-07-07 06:55:58 UTC (rev 106481)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/configuration.xml	2010-07-07 14:17:40 UTC (rev 106482)
@@ -260,6 +260,14 @@
 
       <para>Furthermore all .WAR files in the same directory should be removed too.</para>
 
+      <para>All the Jetty libraries can be removed by deleting the</para>
+
+      <programlisting>
+lib/jetty
+      </programlisting>
+
+      <para>directory.</para>
+
    </section>
 
 

Modified: projects/jboss-jca/trunk/embedded/build.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/build.xml	2010-07-07 06:55:58 UTC (rev 106481)
+++ projects/jboss-jca/trunk/embedded/build.xml	2010-07-07 14:17:40 UTC (rev 106482)
@@ -158,6 +158,9 @@
       <classpath>
         <pathelement location="${build.embedded.dir}/test"/>
         <fileset dir="${target.dir}" includes="*.jar"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+        <fileset dir="${lib.dir}/sjc" includes="*.jar" />
         <fileset dir="${lib.dir}/test" includes="*.jar" />
       </classpath>
       
@@ -204,6 +207,9 @@
       <classpath>
         <pathelement location="${build.embedded.dir}/test"/>
         <fileset dir="${target.dir}" includes="*.jar"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" 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-07 06:55:58 UTC (rev 106481)
+++ projects/jboss-jca/trunk/ivy.xml	2010-07-07 14:17:40 UTC (rev 106482)
@@ -29,104 +29,107 @@
     <repository name="jboss" url="http://repository.jboss.org"/>
   </info>
 
-  <configurations>
+  <configurations defaultconfmapping="common->default;standalone->default;sjc->default;embedded->default;jetty->default;test->default">
+    <conf name="common" transitive="false"/>
     <conf name="standalone" transitive="false"/>
-    <conf name="test" extends="standalone" transitive="false"/>
     <conf name="sjc" transitive="false"/>
+    <conf name="embedded" transitive="false"/>
+    <conf name="jetty" transitive="false"/>
+    <conf name="test" transitive="false"/>
   </configurations>
 
   <dependencies>
-    <dependency org="apache-logging" name="commons-logging" rev="${version.apache-logging}" conf="*"/>
-    <dependency org="com.github.fungal" name="fungal" rev="${version.fungal}" conf="standalone->default;sjc->*"/>
-    <dependency org="com.github.fungal" name="fungal-cli" rev="${version.fungal}" conf="standalone->default;sjc->*"/>
-    <dependency org="com.sun.xml.bind" name="jaxb-impl" rev="${version.jaxb.impl}" conf="standalone->default;sjc->*"/>
-    <dependency org="dom4j" name="dom4j" rev="${version.dom4j}" conf="standalone->default;sjc->*"/>
-    <dependency org="javassist" name="javassist" rev="${version.javassist}" conf="standalone->default;sjc->*"/>
-    <dependency org="javax.activation" name="activation" rev="${version.activation}" conf="standalone->default;sjc->*"/>
-    <dependency org="javax.validation" name="validation-api" rev="${version.validation-api}" conf="standalone->default;sjc->*"/>
-    <dependency org="javax.xml.bind" name="jaxb-api" rev="${version.jaxb.api}" conf="standalone->default;sjc->*"/>
-    <dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="standalone->default;sjc->*"/>
-    <dependency org="junit" name="junit" rev="${version.junit}" conf="test->default"/>
-    <dependency org="log4j" name="log4j" rev="${version.apache-log4j}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.apache" name="jasper" rev="${version.jasper}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.apache.ant" name="ant" rev="${version.ant}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.eclipse.jdt.core.compiler" name="ecj" rev="${version.eclipse.ecj}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.eclipse.jetty" name="jetty-http" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.eclipse.jetty" name="jetty-io" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.eclipse.jetty" name="jetty-jsp-2.1" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.eclipse.jetty" name="jetty-security" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.eclipse.jetty" name="jetty-server" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.eclipse.jetty" name="jetty-util" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.eclipse.jetty" name="jetty-xml" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.hibernate" name="hibernate-validator" rev="${version.hibernate-validator}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss" name="jboss-common-core" rev="${version.jboss.common}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss" name="jboss-mdr" rev="${version.jboss.mdr}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss" name="jboss-reflect" rev="${version.jboss.reflect}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss" name="jboss-vfs" rev="${version.jboss.vfs}" conf="standalone->default"/>
-    <dependency org="org.jboss" name="jbossxb" rev="${version.jboss.xb}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.apiviz" name="apiviz" rev="${version.apiviz}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.arquillian" name="arquillian-api" rev="${version.arquillian}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.arquillian" name="arquillian-impl-base" rev="${version.arquillian}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.arquillian" name="arquillian-junit" rev="${version.arquillian}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.arquillian" name="arquillian-spi" rev="${version.arquillian}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.arquillian.testenricher" name="arquillian-testenricher-resource" rev="${version.arquillian}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.arquillian.protocol" name="arquillian-protocol-local" rev="${version.arquillian}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.bootstrap" name="jboss-bootstrap" rev="${version.jboss.bootstrap}" conf="standalone->default"/>
-    <dependency org="org.jboss.cl" name="jboss-classloader" rev="${version.jboss.classloading}" conf="standalone->default"/>
-    <dependency org="org.jboss.cl" name="jboss-classloading" rev="${version.jboss.classloading}" conf="standalone->default"/>
-    <dependency org="org.jboss.cl" name="jboss-classloading-vfs" rev="${version.jboss.classloading}" conf="standalone->default"/>
-    <dependency org="org.jboss.deployers" name="jboss-deployers-client" rev="${version.jboss.deployers}" conf="standalone->default"/>
-    <dependency org="org.jboss.deployers" name="jboss-deployers-client-spi" rev="${version.jboss.deployers}" conf="standalone->default"/>
-    <dependency org="org.jboss.deployers" name="jboss-deployers-core" rev="${version.jboss.deployers}" conf="standalone->default"/>
-    <dependency org="org.jboss.deployers" name="jboss-deployers-core-spi" rev="${version.jboss.deployers}" conf="standalone->default"/>
-    <dependency org="org.jboss.deployers" name="jboss-deployers-impl" rev="${version.jboss.deployers}" conf="standalone->default"/>
-    <dependency org="org.jboss.deployers" name="jboss-deployers-spi" rev="${version.jboss.deployers}" conf="standalone->default"/>
-    <dependency org="org.jboss.deployers" name="jboss-deployers-structure-spi" rev="${version.jboss.deployers}" conf="standalone->default"/>
-    <dependency org="org.jboss.deployers" name="jboss-deployers-vfs" rev="${version.jboss.deployers}" conf="standalone->default"/>
-    <dependency org="org.jboss.deployers" name="jboss-deployers-vfs-spi" rev="${version.jboss.deployers}" conf="standalone->default"/>
-    <dependency org="org.jboss.integration" name="jboss-integration" rev="${version.jboss.integration}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.javaee" name="jboss-jaspi-api" rev="${version.jboss.jaspi.api}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.javaee" name="jboss-transaction-api" rev="${version.transaction.api}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.jbossts" name="jbossjts" rev="${version.jboss.ts}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.jbossts" name="jbossjts-integration" rev="${version.jboss.ts}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.logging" name="jboss-logging-jdk" rev="${version.jboss.logging}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.logging" name="jboss-logging-log4j" rev="${version.jboss.logging}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.logging" name="jboss-logging-logmanager" rev="${version.jboss.logging}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.logging" name="jboss-logging-spi" rev="${version.jboss.logging}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.logging" name="logging-service-metadata" rev="${version.jboss.logging.metadata}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.logmanager" name="jboss-logmanager-log4j" rev="${version.jboss.logmanager.log4j}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.man" name="jboss-managed" rev="${version.jboss.managed}" conf="standalone->default"/>
-    <dependency org="org.jboss.man" name="jboss-metatype" rev="${version.jboss.managed}" conf="standalone->default"/>
-    <dependency org="org.jboss.metadata" name="jboss-metadata-common" rev="${version.jboss.metadata.common}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.metadata" name="jboss-metadata-rar" rev="${version.jboss.metadata.rar}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.microcontainer" name="jboss-dependency" rev="${version.jboss.mc.dependency}" conf="standalone->default"/>
-    <dependency org="org.jboss.microcontainer" name="jboss-kernel" rev="${version.jboss.mc.kernel}" conf="standalone->default"/>
-    <dependency org="org.jboss.naming" name="jnpserver" rev="${version.jboss.naming}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.papaki" name="papaki-core" rev="${version.jboss.papaki}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.security" name="jboss-security-spi-bare" rev="${version.jboss.security}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-api" rev="${version.jboss.shrinkwrap}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-impl-base" rev="${version.jboss.shrinkwrap}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-spi" rev="${version.jboss.shrinkwrap}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.slf4j" name="slf4j-jboss-logging" rev="${version.jboss.slf4j}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.slf4j" name="slf4j-jboss-logmanager" rev="${version.jboss.slf4j.logmanager}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.stdio" name="jboss-stdio" rev="${version.jboss.stdio}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.threads" name="jboss-threads" rev="${version.jboss.threads}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.threads" name="jboss-threads-metadata" rev="${version.jboss.threads}" conf="standalone->default"/>
-    <dependency org="org.mockito" name="mockito-all" rev="${version.mockito}" conf="test->default"/>
-    <dependency org="org.mortbay.jetty" name="jsp-api-2.1-glassfish"  rev="${version.jetty.glassfish}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="${version.jetty.servlet}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.picketbox" name="jboss-security-spi" rev="${version.jboss.picketbox}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.picketbox" name="jbosssx" rev="${version.jboss.picketbox}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.picketbox" name="picketbox-bare" rev="${version.jboss.picketbox.bare}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${version.slf4j}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.slf4j" name="slf4j-api" rev="${version.slf4j}" conf="standalone->default;sjc->*"/>
-    <dependency org="stax" name="stax-api" rev="${version.stax}" conf="standalone->default;sjc->*"/>
-    <dependency org="trove" name="trove" rev="${version.trove}" conf="standalone->default"/>
-    <dependency org="xerces" name="xercesImpl" rev="${version.apache-xerces}" conf="standalone->default;sjc->*"/>
+    <dependency org="apache-logging" name="commons-logging" rev="${version.apache-logging}" conf="common"/>
+    <dependency org="com.github.fungal" name="fungal" rev="${version.fungal}" conf="sjc"/>
+    <dependency org="com.github.fungal" name="fungal-cli" rev="${version.fungal}" conf="sjc"/>
+    <dependency org="com.sun.xml.bind" name="jaxb-impl" rev="${version.jaxb.impl}" conf="common"/>
+    <dependency org="dom4j" name="dom4j" rev="${version.dom4j}" conf="common"/>
+    <dependency org="javassist" name="javassist" rev="${version.javassist}" conf="common"/>
+    <dependency org="javax.activation" name="activation" rev="${version.activation}" conf="common"/>
+    <dependency org="javax.validation" name="validation-api" rev="${version.validation-api}" conf="common"/>
+    <dependency org="javax.xml.bind" name="jaxb-api" rev="${version.jaxb.api}" conf="common"/>
+    <dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="common"/>
+    <dependency org="junit" name="junit" rev="${version.junit}" conf="test"/>
+    <dependency org="log4j" name="log4j" rev="${version.apache-log4j}" conf="common"/>
+    <dependency org="org.apache" name="jasper" rev="${version.jasper}" conf="jetty"/>
+    <dependency org="org.apache.ant" name="ant" rev="${version.ant}" conf="common"/>
+    <dependency org="org.eclipse.jdt.core.compiler" name="ecj" rev="${version.eclipse.ecj}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="${version.jetty}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-http" rev="${version.jetty}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-io" rev="${version.jetty}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-jsp-2.1" rev="${version.jetty}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-security" rev="${version.jetty}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-server" rev="${version.jetty}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="${version.jetty}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-util" rev="${version.jetty}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="${version.jetty}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-xml" rev="${version.jetty}" conf="jetty"/>
+    <dependency org="org.hibernate" name="hibernate-validator" rev="${version.hibernate-validator}" conf="common"/>
+    <dependency org="org.jboss" name="jboss-common-core" rev="${version.jboss.common}" conf="common"/>
+    <dependency org="org.jboss" name="jboss-mdr" rev="${version.jboss.mdr}" conf="common"/>
+    <dependency org="org.jboss" name="jboss-reflect" rev="${version.jboss.reflect}" conf="common"/>
+    <dependency org="org.jboss" name="jboss-vfs" rev="${version.jboss.vfs}" conf="standalone"/>
+    <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.bootstrap" name="jboss-bootstrap" rev="${version.jboss.bootstrap}" conf="standalone"/>
+    <dependency org="org.jboss.cl" name="jboss-classloader" rev="${version.jboss.classloading}" conf="standalone"/>
+    <dependency org="org.jboss.cl" name="jboss-classloading" rev="${version.jboss.classloading}" conf="standalone"/>
+    <dependency org="org.jboss.cl" name="jboss-classloading-vfs" rev="${version.jboss.classloading}" conf="standalone"/>
+    <dependency org="org.jboss.deployers" name="jboss-deployers-client" rev="${version.jboss.deployers}" conf="standalone"/>
+    <dependency org="org.jboss.deployers" name="jboss-deployers-client-spi" rev="${version.jboss.deployers}" conf="standalone"/>
+    <dependency org="org.jboss.deployers" name="jboss-deployers-core" rev="${version.jboss.deployers}" conf="standalone"/>
+    <dependency org="org.jboss.deployers" name="jboss-deployers-core-spi" rev="${version.jboss.deployers}" conf="standalone"/>
+    <dependency org="org.jboss.deployers" name="jboss-deployers-impl" rev="${version.jboss.deployers}" conf="standalone"/>
+    <dependency org="org.jboss.deployers" name="jboss-deployers-spi" rev="${version.jboss.deployers}" conf="standalone"/>
+    <dependency org="org.jboss.deployers" name="jboss-deployers-structure-spi" rev="${version.jboss.deployers}" conf="standalone"/>
+    <dependency org="org.jboss.deployers" name="jboss-deployers-vfs" rev="${version.jboss.deployers}" conf="standalone"/>
+    <dependency org="org.jboss.deployers" name="jboss-deployers-vfs-spi" rev="${version.jboss.deployers}" conf="standalone"/>
+    <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"/>
+    <dependency org="org.jboss.jbossts" name="jbossjts" rev="${version.jboss.ts}" conf="common"/>
+    <dependency org="org.jboss.jbossts" name="jbossjts-integration" rev="${version.jboss.ts}" conf="common"/>
+    <dependency org="org.jboss.logging" name="jboss-logging-jdk" rev="${version.jboss.logging}" conf="common"/>
+    <dependency org="org.jboss.logging" name="jboss-logging-log4j" rev="${version.jboss.logging}" conf="common"/>
+    <dependency org="org.jboss.logging" name="jboss-logging-logmanager" rev="${version.jboss.logging}" conf="common"/>
+    <dependency org="org.jboss.logging" name="jboss-logging-spi" rev="${version.jboss.logging}" conf="common"/>
+    <dependency org="org.jboss.logging" name="logging-service-metadata" rev="${version.jboss.logging.metadata}" conf="common"/>
+    <dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="common"/>
+    <dependency org="org.jboss.logmanager" name="jboss-logmanager-log4j" rev="${version.jboss.logmanager.log4j}" conf="common"/>
+    <dependency org="org.jboss.man" name="jboss-managed" rev="${version.jboss.managed}" conf="standalone"/>
+    <dependency org="org.jboss.man" name="jboss-metatype" rev="${version.jboss.managed}" conf="standalone"/>
+    <dependency org="org.jboss.metadata" name="jboss-metadata-common" rev="${version.jboss.metadata.common}" conf="common"/>
+    <dependency org="org.jboss.metadata" name="jboss-metadata-rar" rev="${version.jboss.metadata.rar}" conf="common"/>
+    <dependency org="org.jboss.microcontainer" name="jboss-dependency" rev="${version.jboss.mc.dependency}" conf="standalone"/>
+    <dependency org="org.jboss.microcontainer" name="jboss-kernel" rev="${version.jboss.mc.kernel}" conf="standalone"/>
+    <dependency org="org.jboss.naming" name="jnpserver" rev="${version.jboss.naming}" conf="common"/>
+    <dependency org="org.jboss.papaki" name="papaki-core" rev="${version.jboss.papaki}" conf="common"/>
+    <dependency org="org.jboss.security" name="jboss-security-spi-bare" rev="${version.jboss.security}" conf="common"/>
+    <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-api" rev="${version.jboss.shrinkwrap}" conf="embedded"/>
+    <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-impl-base" rev="${version.jboss.shrinkwrap}" conf="embedded"/>
+    <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-spi" rev="${version.jboss.shrinkwrap}" conf="embedded"/>
+    <dependency org="org.jboss.slf4j" name="slf4j-jboss-logging" rev="${version.jboss.slf4j}" conf="common"/>
+    <dependency org="org.jboss.slf4j" name="slf4j-jboss-logmanager" rev="${version.jboss.slf4j.logmanager}" conf="common"/>
+    <dependency org="org.jboss.stdio" name="jboss-stdio" rev="${version.jboss.stdio}" conf="common"/>
+    <dependency org="org.jboss.threads" name="jboss-threads" rev="${version.jboss.threads}" conf="common"/>
+    <dependency org="org.jboss.threads" name="jboss-threads-metadata" rev="${version.jboss.threads}" conf="standalone"/>
+    <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="jboss-security-spi" rev="${version.jboss.picketbox}" conf="common"/>
+    <dependency org="org.picketbox" name="jbosssx" rev="${version.jboss.picketbox}" conf="common"/>
+    <dependency org="org.picketbox" name="picketbox-bare" rev="${version.jboss.picketbox.bare}" conf="common"/>
+    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${version.slf4j}" conf="common"/>
+    <dependency org="org.slf4j" name="slf4j-api" rev="${version.slf4j}" conf="common"/>
+    <dependency org="stax" name="stax-api" rev="${version.stax}" conf="common"/>
+    <dependency org="trove" name="trove" rev="${version.trove}" conf="standalone"/>
+    <dependency org="xerces" name="xercesImpl" rev="${version.apache-xerces}" conf="common"/>
   </dependencies>
 
 </ivy-module>


Property changes on: projects/jboss-jca/trunk/lib
___________________________________________________________________
Name: svn:ignore
   - *.jar
standalone
test
qe
sjc


   + *.jar
standalone
test
qe
sjc
common
embedded
jetty


Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml	2010-07-07 06:55:58 UTC (rev 106481)
+++ projects/jboss-jca/trunk/sjc/build.xml	2010-07-07 14:17:40 UTC (rev 106482)
@@ -96,7 +96,9 @@
     <mkdir dir="${target.dir}/sjc/doc"/>
     <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/endorsed"/>
+    <mkdir dir="${target.dir}/sjc/lib/jetty"/>
     <mkdir dir="${target.dir}/sjc/log"/>
     <mkdir dir="${target.dir}/sjc/deploy"/>
     <mkdir dir="${target.dir}/sjc/system"/>
@@ -146,21 +148,29 @@
       <fileset dir="${target.dir}">
         <include name="*.jar"/>
         <exclude name="jboss-jca-codegenerator.jar"/>
-        <exclude name="jboss-jca-sjc.jar"/>
         <exclude name="jboss-jca-deployers-main.jar"/>
         <exclude name="jboss-jca-deployers-rar.jar"/>
+        <exclude name="jboss-jca-embedded-arquillian.jar"/>
+        <exclude name="jboss-jca-embedded.jar"/>
+        <exclude name="jboss-jca-sjc.jar"/>
         <exclude name="jboss-jca-standalone.jar"/>
         <exclude name="jboss-jca-web-console.jar"/>
       </fileset>
     </copy>
 
+    <copy todir="${target.dir}/sjc/lib/embedded">
+      <fileset dir="${target.dir}">
+        <include name="jboss-jca-embedded-arquillian.jar"/>
+        <include name="jboss-jca-embedded.jar"/>
+      </fileset>
+    </copy>
+
     <copy todir="${target.dir}/sjc/lib">
-      <fileset dir="${lib.dir}/sjc">
+      <fileset dir="${lib.dir}/common">
         <include name="*.jar"/>
         <exclude name="ant.jar"/>
         <exclude name="apiviz.jar"/>
         <exclude name="dom4j.jar"/>
-        <exclude name="fungal.jar"/>
         <exclude name="jaxb-api.jar"/>
         <exclude name="jdepend.jar"/>
         <exclude name="xercesImpl.jar"/>
@@ -168,21 +178,38 @@
       </fileset>
     </copy>
 
+    <copy todir="${target.dir}/sjc/lib/embedded">
+      <fileset dir="${lib.dir}/embedded">
+        <include name="*.jar"/>
+      </fileset>
+    </copy>
+
+    <copy todir="${target.dir}/sjc/lib/embedded">
+      <fileset dir="${lib.dir}/test">
+        <include name="junit.jar"/>
+      </fileset>
+    </copy>
+
     <copy todir="${target.dir}/sjc/lib/endorsed">
-      <fileset dir="${lib.dir}/sjc">
+      <fileset dir="${lib.dir}/common">
         <include name="jaxb-api.jar"/>
         <include name="xercesImpl.jar"/>
         <include name="stax-api.jar"/>
       </fileset>
     </copy>
 
-    <!-- HACK: remove -->
-    <copy todir="${target.dir}/sjc/lib">
-      <fileset dir="${lib.dir}/test">
-        <include name="junit.jar"/>
+    <copy todir="${target.dir}/sjc/lib/jetty">
+      <fileset dir="${lib.dir}/common">
+        <include name="dom4j.jar"/>
       </fileset>
     </copy>
 
+    <copy todir="${target.dir}/sjc/lib/jetty">
+      <fileset dir="${lib.dir}/jetty">
+        <include name="*.jar"/>
+      </fileset>
+    </copy>
+
     <copy todir="${target.dir}/sjc/system">
       <fileset dir="${target.dir}">
         <include name="*.war"/>

Modified: projects/jboss-jca/trunk/validator/build.xml
===================================================================
--- projects/jboss-jca/trunk/validator/build.xml	2010-07-07 06:55:58 UTC (rev 106481)
+++ projects/jboss-jca/trunk/validator/build.xml	2010-07-07 14:17:40 UTC (rev 106482)
@@ -132,6 +132,9 @@
       <classpath>
         <pathelement location="${build.validator.dir}/test"/>
         <fileset dir="${target.dir}" includes="*.jar"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+        <fileset dir="${lib.dir}/sjc" includes="*.jar" />
         <fileset dir="${lib.dir}/test" includes="*.jar" />
       </classpath>
       
@@ -179,6 +182,9 @@
       <classpath>
         <pathelement location="${build.validator.dir}/test"/>
         <fileset dir="${target.dir}" includes="*.jar"/>
+        <fileset dir="${lib.dir}/common" includes="*.jar" />
+        <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+        <fileset dir="${lib.dir}/sjc" includes="*.jar" />
         <fileset dir="${lib.dir}/test" includes="*.jar" />
       </classpath>