[jboss-cvs] JBossAS SVN: r67789 - trunk/embedded.

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

Author: petemuir
Date: 2007-12-03 12:56:10 -0500 (Mon, 03 Dec 2007)
New Revision: 67789

Modified:
   trunk/embedded/build.xml
Log:
Split out embedded classes into own jar

Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml	2007-12-03 17:54:56 UTC (rev 67788)
+++ trunk/embedded/build.xml	2007-12-03 17:56:10 UTC (rev 67789)
@@ -329,18 +329,7 @@
          <fileset dir="${junit.junit.lib}">
             <include name="*.jar"/>
          </fileset>
-      </copy>
-   	  <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-deployers.jar">
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-client.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-client-spi.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-core.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-core-spi.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-impl.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-spi.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-structure-spi.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-vfs.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-vfs-spi.jar"/>
-   	  </jar>
+      </copy>
 
       <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded-tomcat-bootstrap.jar">
          <fileset dir="${build.classes}">
@@ -350,7 +339,8 @@
          </fileset>
       </jar>
    	
-   	  <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded-api.jar">
+      
+   	  <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded.jar">
    	     <fileset dir="${build.classes}">
    	        <include name="org/jboss/embedded/**"/>
    	        <exclude name="org/jboss/embedded/tomcat/EmbeddedJBossBootstrapListener.class"/>
@@ -362,9 +352,6 @@
       <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded-all.jar">
          <fileset dir="${build.classes}">
             <exclude name="org/jboss/embedded/**"/>
-            <exclude name="org/jboss/embedded/tomcat/EmbeddedJBossBootstrapListener.class"/>
-            <exclude name="org/jboss/embedded/tomcat/WebinfScanner.class"/>
-            <exclude name="org/jboss/embedded/tomcat/security/*.class"/>
          </fileset>
          <fileset dir="../ejb3/src/resources">
             <include name="META-INF/persistence.properties"/>
@@ -401,7 +388,16 @@
          <zipfileset src="${jboss.microcontainer.lib}/jboss-kernel.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-container.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-classloader.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-dependency.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-dependency.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-client.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-client-spi.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-core.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-core-spi.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-impl.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-spi.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-structure-spi.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-vfs.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-vfs-spi.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-aop-mc-int.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-metatype.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-managed.jar"/>
@@ -433,7 +429,7 @@
          <zipfileset src="${jboss.jboss.jaspi.api.lib}/jboss-jaspi-api.jar"/>
          <zipfileset src="${jboss.metadata.lib}/jboss-metadata.jar"/>
          <zipfileset src="${jboss.jboss.ejb3.cache.lib}/jboss-ejb3-cache.jar"/>
-         <zipfileset src="${jboss.jboss.ejb3.ext.api.lib}/jboss-ejb3-ext-api.jar"/>
+         <zipfileset src="${jboss.jboss.ejb3.ext.api.lib}/jboss-ejb3-ext-api-0.1.1.Beta2.jar"/>
       	 <zipfileset src="${jboss.profileservice.lib}/jboss-profileservice.jar" />
          <zipfileset src="../messaging/output/lib/jboss-messaging-int.jar"/>
       </jar>