[Jboss-cvs] JBossAS SVN: r55087 - projects/microcontainer/trunk/kernel

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

Author: scott.stark at jboss.org
Date: 2006-08-02 22:21:10 -0400 (Wed, 02 Aug 2006)
New Revision: 55087

Modified:
   projects/microcontainer/trunk/kernel/build.xml
Log:
Remove the modules.ent usage

Modified: projects/microcontainer/trunk/kernel/build.xml
===================================================================
--- projects/microcontainer/trunk/kernel/build.xml	2006-08-03 02:17:08 UTC (rev 55086)
+++ projects/microcontainer/trunk/kernel/build.xml	2006-08-03 02:21:10 UTC (rev 55087)
@@ -2,7 +2,6 @@
 <!DOCTYPE project [
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
    <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
-   <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
    <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
 ]>
 
@@ -69,23 +68,35 @@
     <!-- The combined library classpath -->
     <path id="library.classpath">
       <path refid="oswego.concurrent.classpath"/>
-      <path refid="apache.xerces.classpath"/>
       <path refid="junit.junit.classpath"/>
+      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.test.classpath"/>
+      <path refid="jboss.jbossxb.classpath"/>
     </path>
 
     <!-- ======= -->
     <!-- Modules -->
     <!-- ======= -->
-
-    &modules;
-
+  	<!-- container -->
+  	<property name="jboss.container.root" value="${project.root}/container"/>
+  	<property name="jboss.container.lib" value="${jboss.container.root}/output/lib"/>
+  	<path id="jboss.container.classpath">
+  	   <fileset dir="${jboss.container.lib}">
+  	      <include name="jboss-container.jar"/>
+  	   </fileset>
+  	</path>
+  	<!-- dependency -->
+  	<property name="jboss.dependency.root" value="${project.root}/dependency"/>
+  	<property name="jboss.dependency.lib" value="${jboss.dependency.root}/output/lib"/>
+  	<path id="jboss.dependency.classpath">
+  	   <fileset dir="${jboss.dependency.lib}">
+  	      <include name="jboss-dependency.jar"/>
+  	   </fileset>
+  	</path>
     <!-- The combined dependant module classpath -->
     <path id="dependentmodule.classpath">
-      <path refid="jboss.common.classpath"/>
-      <path refid="jboss.container.classpath"/>
-      <path refid="jboss.dependency.classpath"/>
-      <path refid="jboss.test.classpath"/>
-      <path refid="jboss.jbossxb.classpath"/>
+        <path refid="jboss.container.classpath"/>
+        <path refid="jboss.dependency.classpath"/>
     </path>
 
     <!-- ===== -->