[jboss-cvs] JBossAS SVN: r59402 - projects/microcontainer/trunk/build

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

Author: scott.stark at jboss.org
Date: 2007-01-07 12:29:33 -0500 (Sun, 07 Jan 2007)
New Revision: 59402

Modified:
   projects/microcontainer/trunk/build/build.xml
Log:
Update the module build order

Modified: projects/microcontainer/trunk/build/build.xml
===================================================================
--- projects/microcontainer/trunk/build/build.xml	2007-01-07 17:14:47 UTC (rev 59401)
+++ projects/microcontainer/trunk/build/build.xml	2007-01-07 17:29:33 UTC (rev 59402)
@@ -83,7 +83,6 @@
       <module name="metatype"/>
       <module name="managed"/>
       <module name="deployers"/>
-      <module name="osgi-int"/>
 
       <!-- Module groups -->
 
@@ -95,7 +94,7 @@
       </group>
 
       <group name="core">
-        <include modules="container, dependency, kernel, aop-mc-int, metatype, managed, deployers, osgi-int"/>
+        <include modules="container, dependency, kernel, aop-mc-int, metatype, managed, deployers"/>
       </group>
 
       <group name="default">
@@ -221,12 +220,16 @@
       <artifact id="jboss-aop-mc-int-deployer.jar"/>
       <artifact id="jboss-container.jar"/>
       <artifact id="jboss-dependency.jar"/>
+      <artifact id="jboss-deployers.jar"/>
+      <artifact id="jboss-managed.jar"/>
+      <artifact id="jboss-metatype.jar"/>
       <artifact id="jboss-microcontainer.jar"/>
-      <artifact id="jboss-deployers.jar"/>
       <artifact id="jboss-aop-mc-int-src.zip"/>
       <artifact id="jboss-container-src.zip"/>
       <artifact id="jboss-dependency-src.zip"/>
       <artifact id="jboss-deployers-src.zip"/>
+      <artifact id="jboss-managed-src.zip"/>
+      <artifact id="jboss-metatype-src.zip"/>
       <artifact id="jboss-microcontainer-src.zip"/>
       <export>
          <include input="jboss-aop-mc-int.jar"/>
@@ -234,8 +237,10 @@
          <include input="jboss-aop-mc-int-deployer.jar"/>
          <include input="jboss-container.jar"/>
          <include input="jboss-dependency.jar"/>
+         <include input="jboss-deployers.jar"/>
+         <include input="jboss-managed.jar"/>
+         <include input="jboss-metatype.jar"/>
          <include input="jboss-microcontainer.jar"/>
-         <include input="jboss-deployers.jar"/>
       </export>
    </component>
 
@@ -262,6 +267,14 @@
 	  			<include name="*.jar" />
 	  			<include name="*-src.zip" />
 	  		</fileset>  	 
+	  		<fileset dir="../managed/output/lib">
+	  			<include name="*.jar" />
+	  			<include name="*-src.zip" />
+	  		</fileset>  	 
+	  		<fileset dir="../metatype/output/lib">
+	  			<include name="*.jar" />
+	  			<include name="*-src.zip" />
+	  		</fileset>  	 
   	  	</copy>
 	<!-- The JDK14 compatible versions -->
   	<mkdir dir="${jbossbuild.repository.dir}/jboss/microcontainer14/${jbossbuild.repository.version}" />