[Jboss-cvs] JBossAS SVN: r55339 - in projects/microcontainer/trunk: aop-mc-int container dependency kernel
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Aug 5 11:16:35 EDT 2006
Author: adrian at jboss.org
Date: 2006-08-05 11:16:29 -0400 (Sat, 05 Aug 2006)
New Revision: 55339
Modified:
projects/microcontainer/trunk/aop-mc-int/build-test.xml
projects/microcontainer/trunk/aop-mc-int/build.xml
projects/microcontainer/trunk/container/build-test14.xml
projects/microcontainer/trunk/container/build.xml
projects/microcontainer/trunk/dependency/build-test.xml
projects/microcontainer/trunk/kernel/build.xml
Log:
Fix the modules.ent usage and the eclipse build for the Microcontainer
build.
Modified: projects/microcontainer/trunk/aop-mc-int/build-test.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/build-test.xml 2006-08-05 15:06:31 UTC (rev 55338)
+++ projects/microcontainer/trunk/aop-mc-int/build-test.xml 2006-08-05 15:16:29 UTC (rev 55339)
@@ -68,6 +68,10 @@
<!-- The combined library classpath -->
<path id="library.classpath">
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="jboss.test.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="javassist.javassist.classpath"/>
<path refid="junit.junit.classpath"/>
@@ -90,42 +94,14 @@
<exclude name="${jar.prefix}.jar"/>
</fileset>
</path>
-<!-- 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>
-<!-- microcontainer -->
-<property name="jboss.kernel.root" value="${project.root}/kernel"/>
-<property name="jboss.kernel.lib" value="${jboss.kernel.root}/output/lib"/>
-<path id="jboss.kernel.classpath">
- <fileset dir="${jboss.kernel.lib}">
- <include name="jboss-microcontainer.jar"/>
- <include name="jboss-microcontainer-test.jar"/>
- </fileset>
-</path>
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.aop.classpath"/>
- <path refid="jboss.common.classpath"/>
<path refid="jboss.container.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.dependency.classpath"/>
<path refid="jboss.kernel.classpath"/>
+ <path refid="jboss.kernel-test.classpath"/>
<path refid="jboss.this.classpath"/>
- <path refid="jboss.test.classpath"/>
</path>
<!-- ===== -->
Modified: projects/microcontainer/trunk/aop-mc-int/build.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/build.xml 2006-08-05 15:06:31 UTC (rev 55338)
+++ projects/microcontainer/trunk/aop-mc-int/build.xml 2006-08-05 15:16:29 UTC (rev 55339)
@@ -2,6 +2,7 @@
<!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">
]>
@@ -80,40 +81,13 @@
<!-- 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>
-<!-- microcontainer -->
-<property name="jboss.kernel.root" value="${project.root}/kernel"/>
-<property name="jboss.kernel.lib" value="${jboss.kernel.root}/output/lib"/>
-<path id="jboss.kernel.classpath">
- <fileset dir="${jboss.kernel.lib}">
- <include name="jboss-microcontainer.jar"/>
- </fileset>
-</path>
+ &modules;
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.aop.classpath"/>
- <path refid="jboss.common.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.container.classpath"/>
<path refid="jboss.dependency.classpath"/>
<path refid="jboss.kernel.classpath"/>
- <path refid="jboss.test.classpath"/>
</path>
<!-- ===== -->
Modified: projects/microcontainer/trunk/container/build-test14.xml
===================================================================
--- projects/microcontainer/trunk/container/build-test14.xml 2006-08-05 15:06:31 UTC (rev 55338)
+++ projects/microcontainer/trunk/container/build-test14.xml 2006-08-05 15:16:29 UTC (rev 55339)
@@ -66,6 +66,7 @@
<!-- The combined library classpath -->
<path id="library.classpath">
+ <path refid="jboss.common.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="javassist.classpath"/>
<path refid="apache.log4j.classpath"/>
@@ -93,7 +94,6 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
<path refid="jboss.this.classpath"/>
- <path refid="jboss.common.classpath"/>
</path>
<!-- ===== -->
Modified: projects/microcontainer/trunk/container/build.xml
===================================================================
--- projects/microcontainer/trunk/container/build.xml 2006-08-05 15:06:31 UTC (rev 55338)
+++ projects/microcontainer/trunk/container/build.xml 2006-08-05 15:16:29 UTC (rev 55339)
@@ -70,6 +70,8 @@
<path refid="javassist.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ <path refid="jboss.test.classpath"/>
</path>
<!-- ======= -->
@@ -78,8 +80,6 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.common.classpath"/>
- <path refid="jboss.test.classpath"/>
</path>
<!-- ============================= -->
Modified: projects/microcontainer/trunk/dependency/build-test.xml
===================================================================
--- projects/microcontainer/trunk/dependency/build-test.xml 2006-08-05 15:06:31 UTC (rev 55338)
+++ projects/microcontainer/trunk/dependency/build-test.xml 2006-08-05 15:16:29 UTC (rev 55339)
@@ -66,6 +66,7 @@
<!-- The combined library classpath -->
<path id="library.classpath">
+ <path refid="jboss.common.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
@@ -89,7 +90,6 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
<path refid="jboss.this.classpath"/>
- <path refid="jboss.common.classpath"/>
</path>
<!-- ===== -->
Modified: projects/microcontainer/trunk/kernel/build.xml
===================================================================
--- projects/microcontainer/trunk/kernel/build.xml 2006-08-05 15:06:31 UTC (rev 55338)
+++ projects/microcontainer/trunk/kernel/build.xml 2006-08-05 15:16:29 UTC (rev 55339)
@@ -2,6 +2,7 @@
<!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">
]>
@@ -77,22 +78,8 @@
<!-- ======= -->
<!-- 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>
+
+ &modules;
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
<path refid="jboss.container.classpath"/>
More information about the jboss-cvs-commits
mailing list