[jboss-cvs] JBossAS SVN: r71485 - in projects/aop/trunk: aop/src/resources/bin and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 31 11:22:59 EDT 2008
Author: stalep
Date: 2008-03-31 11:22:59 -0400 (Mon, 31 Mar 2008)
New Revision: 71485
Modified:
projects/aop/trunk/aop/build.xml
projects/aop/trunk/aop/src/resources/bin/annotationc.bat
projects/aop/trunk/aop/src/resources/bin/annotationc.sh
projects/aop/trunk/aop/src/resources/bin/aopc.bat
projects/aop/trunk/aop/src/resources/bin/aopc.sh
projects/aop/trunk/aop/src/resources/bin/aopc15.bat
projects/aop/trunk/aop/src/resources/bin/aopc15.sh
projects/aop/trunk/aop/src/resources/bin/create-pluggable-jboss-classloader.bat
projects/aop/trunk/aop/src/resources/bin/create-pluggable-jboss-classloader.sh
projects/aop/trunk/aop/src/resources/bin/run-load-boot.bat
projects/aop/trunk/aop/src/resources/bin/run-load-boot.sh
projects/aop/trunk/aop/src/resources/bin/run-load15.bat
projects/aop/trunk/aop/src/resources/bin/run-load15.sh
projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.bat
projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.sh
projects/aop/trunk/aop/src/resources/bin/run-precompiled.bat
projects/aop/trunk/aop/src/resources/bin/run-precompiled.sh
projects/aop/trunk/aop/src/resources/bin/run-precompiled15.bat
projects/aop/trunk/aop/src/resources/bin/run-precompiled15.sh
projects/aop/trunk/build/build-release.xml
projects/aop/trunk/build/build-thirdparty.xml
projects/aop/trunk/build/build_for_dist/build.xml
Log:
[JBAOP-547] updated the build files with the new mc dependencies
Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/build.xml 2008-03-31 15:22:59 UTC (rev 71485)
@@ -86,7 +86,8 @@
<path refid="jboss/common.logging.log4j.classpath"/>
<path refid="jboss/common.logging.jdk.classpath"/>
<path refid="jboss/common.logging.spi.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss/jboss.reflect.classpath"/>
+ <path refid="jboss/jboss.mdr.classpath"/>
<path refid="jboss.test.classpath"/>
</path>
Modified: projects/aop/trunk/aop/src/resources/bin/annotationc.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/annotationc.bat 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/annotationc.bat 2008-03-31 15:22:59 UTC (rev 71485)
@@ -21,7 +21,8 @@
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-aop.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-backport-concurrent.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-common-core-jdk14.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-jdk14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-reflect-jdk14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-mdr-jdk14.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-logging-log4j.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-logging-spi.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-retro-rt.jar
Modified: projects/aop/trunk/aop/src/resources/bin/annotationc.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/annotationc.sh 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/annotationc.sh 2008-03-31 15:22:59 UTC (rev 71485)
@@ -30,7 +30,8 @@
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-aop.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-backport-concurrent.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-common-core-jdk14.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-jdk14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-reflect-jdk14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-mdr-jdk14.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-logging-log4j.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-logging-spi.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-retro-rt.jar
Modified: projects/aop/trunk/aop/src/resources/bin/aopc.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/aopc.bat 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/aopc.bat 2008-03-31 15:22:59 UTC (rev 71485)
@@ -45,7 +45,8 @@
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-aop.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-backport-concurrent.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-common-core-jdk14.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-jdk14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-reflect-jdk14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-mdr-jdk14.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-logging-log4j.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-logging-spi.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-retro-rt.jar
Modified: projects/aop/trunk/aop/src/resources/bin/aopc.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/aopc.sh 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/aopc.sh 2008-03-31 15:22:59 UTC (rev 71485)
@@ -78,7 +78,8 @@
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-aop.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-backport-concurrent.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-common-core-jdk14.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-jdk14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-reflect-jdk14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-mdr-jdk14.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-logging-log4j.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-logging-spi.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-retro-rt.jar
Modified: projects/aop/trunk/aop/src/resources/bin/aopc15.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/aopc15.bat 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/aopc15.bat 2008-03-31 15:22:59 UTC (rev 71485)
@@ -44,7 +44,8 @@
REM Setup AOP classpath
SET AOPC_CLASSPATH=..\lib-50\javassist.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-aop-jdk50-client.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-container.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-reflect.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-mdr.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-logging-log4j.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-logging-spi.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-standalone-aspect-library-jdk50.jar
Modified: projects/aop/trunk/aop/src/resources/bin/aopc15.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/aopc15.sh 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/aopc15.sh 2008-03-31 15:22:59 UTC (rev 71485)
@@ -75,7 +75,8 @@
AOPC_CLASSPATH=../lib-50/javassist.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-aop-jdk50-client.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-container.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-reflect.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-mdr.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-logging-log4j.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-logging-spi.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-standalone-aspect-library-jdk50.jar
Modified: projects/aop/trunk/aop/src/resources/bin/create-pluggable-jboss-classloader.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/create-pluggable-jboss-classloader.bat 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/create-pluggable-jboss-classloader.bat 2008-03-31 15:22:59 UTC (rev 71485)
@@ -8,7 +8,8 @@
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-aop.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-backport-concurrent.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-common-core-jdk14.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-jdk14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-reflect-jdk14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-mdr-jdk14.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-logging-log4j.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-logging-spi.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-retro-rt.jar
Modified: projects/aop/trunk/aop/src/resources/bin/create-pluggable-jboss-classloader.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/create-pluggable-jboss-classloader.sh 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/create-pluggable-jboss-classloader.sh 2008-03-31 15:22:59 UTC (rev 71485)
@@ -12,7 +12,8 @@
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-aop.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-backport-concurrent.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-common-core-jdk14.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-jdk14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-reflect-jdk14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-mdr-jdk14.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-logging-log4j.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-logging-spi.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-retro-rt.jar
Modified: projects/aop/trunk/aop/src/resources/bin/run-load-boot.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load-boot.bat 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/run-load-boot.bat 2008-03-31 15:22:59 UTC (rev 71485)
@@ -45,7 +45,8 @@
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-aop.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-backport-concurrent.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-common-core-jdk14.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-jdk14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-reflect-jdk14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-mdr-jdk14.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-logging-log4j.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-logging-spi.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-retro-rt.jar
Modified: projects/aop/trunk/aop/src/resources/bin/run-load-boot.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load-boot.sh 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/run-load-boot.sh 2008-03-31 15:22:59 UTC (rev 71485)
@@ -71,7 +71,8 @@
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-aop.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-backport-concurrent.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-common-core-jdk14.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-jdk14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-reflect-jdk14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-mdr-jdk14.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-logging-log4j.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-logging-spi.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-retro-rt.jar
Modified: projects/aop/trunk/aop/src/resources/bin/run-load15.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load15.bat 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/run-load15.bat 2008-03-31 15:22:59 UTC (rev 71485)
@@ -45,7 +45,8 @@
REM Setup AOP classpath
SET AOPC_CLASSPATH=..\lib-50\javassist.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-aop-jdk50-client.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-container.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-reflect.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-mdr.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-logging-log4j.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-logging-spi.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-standalone-aspect-library-jdk50.jar
Modified: projects/aop/trunk/aop/src/resources/bin/run-load15.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load15.sh 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/run-load15.sh 2008-03-31 15:22:59 UTC (rev 71485)
@@ -71,7 +71,8 @@
AOPC_CLASSPATH=../lib-50/javassist.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-aop-jdk50-client.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-container.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-reflect.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-mdr.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-logging-log4j.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-logging-spi.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-standalone-aspect-library-jdk50.jar
Modified: projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.bat 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.bat 2008-03-31 15:22:59 UTC (rev 71485)
@@ -44,7 +44,8 @@
REM Setup AOP classpath
SET AOPC_CLASSPATH=..\lib-50\javassist.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-aop-jdk50-client.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-container.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-reflect.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-mdr.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-logging-log4j.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-logging-spi.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-standalone-aspect-library-jdk50.jar
Modified: projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.sh 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.sh 2008-03-31 15:22:59 UTC (rev 71485)
@@ -71,7 +71,8 @@
AOPC_CLASSPATH=../lib-50/javassist.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-aop-jdk50-client.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-container.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-reflect.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-mdr.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-logging-log4j.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-logging-spi.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-standalone-aspect-library-jdk50.jar
Modified: projects/aop/trunk/aop/src/resources/bin/run-precompiled.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-precompiled.bat 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/run-precompiled.bat 2008-03-31 15:22:59 UTC (rev 71485)
@@ -48,7 +48,8 @@
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-aop.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-backport-concurrent.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-common-core-jdk14.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-jdk14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-reflect-jdk14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-mdr-jdk14.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-logging-log4j.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-logging-spi.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-retro-rt.jar
Modified: projects/aop/trunk/aop/src/resources/bin/run-precompiled.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-precompiled.sh 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/run-precompiled.sh 2008-03-31 15:22:59 UTC (rev 71485)
@@ -73,7 +73,8 @@
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-aop.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-backport-concurrent.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-common-core-jdk14.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-jdk14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-reflect-jdk14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-mdr-jdk14.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-logging-log4j.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-logging-spi.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-retro-rt.jar
Modified: projects/aop/trunk/aop/src/resources/bin/run-precompiled15.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-precompiled15.bat 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/run-precompiled15.bat 2008-03-31 15:22:59 UTC (rev 71485)
@@ -45,7 +45,8 @@
REM Setup AOP classpath
SET AOPC_CLASSPATH=..\lib-50\javassist.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-aop-jdk50-client.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-container.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-reflect.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-mdr.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-logging-log4j.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-logging-spi.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-standalone-aspect-library-jdk50.jar
Modified: projects/aop/trunk/aop/src/resources/bin/run-precompiled15.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-precompiled15.sh 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/aop/src/resources/bin/run-precompiled15.sh 2008-03-31 15:22:59 UTC (rev 71485)
@@ -71,7 +71,8 @@
AOPC_CLASSPATH=../lib-50/javassist.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-aop-jdk50-client.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-container.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-reflect.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-mdr.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-logging-log4j.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-logging-spi.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-standalone-aspect-library-jdk50.jar
Modified: projects/aop/trunk/build/build-release.xml
===================================================================
--- projects/aop/trunk/build/build-release.xml 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/build/build-release.xml 2008-03-31 15:22:59 UTC (rev 71485)
@@ -147,9 +147,14 @@
<property name="jboss-common-core14.location" value="${jboss/common.core.14.lib}/jboss-common-core-jdk14.jar"/>
<property name="jboss-logging-log4j.location" value="${jboss/common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
<property name="jboss-logging-spi.location" value="${jboss/common.logging.spi.lib}/jboss-logging-spi.jar"/>
+ <!--
<property name="jboss-container.location" value="${jboss.microcontainer.lib}/jboss-container.jar"/>
<property name="jboss-container14.location" value="${jboss.microcontainer14.lib}/jboss-container-jdk14.jar"/>
+ -->
+ <property name="jboss-reflect.location" value="${project.thirdparty}/jboss/jboss-reflect/lib/jboss-reflect.jar"/>
+ <property name="jboss-mdr.location" value="${project.thirdparty}/jboss/jboss-mdr/lib/jboss-mdr.jar"/>
+
<!-- Use the "old" jboss retro names, see "hack" in aop/build.xml/configure -->
<property name="jbossretro.location" value="${jboss/jboss.retro.lib}/jboss-retro.jar"/>
<property name="jbossretro-rt.location" value="${jboss/jboss.retro.lib}/jboss-retro-rt.jar"/>
@@ -158,6 +163,55 @@
<property name="qdox.location" value="${qdox.qdox.lib}/qdox.jar"/>
<property name="trove.location" value="${trove.trove.lib}/trove.jar"/>
+
+ <mkdir dir="output/temp/jboss-reflect-classes"/>
+ <mkdir dir="output/temp/jboss-reflect-classes14"/>
+ <mkdir dir="output/temp/jboss-mdr-classes"/>
+ <mkdir dir="output/temp/jboss-mdr-classes14"/>
+ <unjar src="${jboss-reflect.location}" dest="output/temp/jboss-reflect-classes"/>
+ <unjar src="${jboss-mdr.location}" dest="output/temp/jboss-mdr-classes"/>
+
+ <path id="jbossretro.classpath">
+ <path refid="apache.ant.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="jboss/jboss.retro.classpath"/>
+ <path refid="jboss/backport.concurrent.classpath"/>
+ </path>
+
+ <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro" classpathref="jbossretro.classpath"/>
+ <retro compilerclasspathref="jbossretro.classpath" destdir="output/temp/jboss-reflect-classes14">
+ <classpath refid="jbossretro.classpath"/>
+ <classpath>
+ <pathelement path="${project.root}/aop/output/classes"/>
+ <pathelement path="output/temp/jboss-reflect-classes"/>
+ </classpath>
+ <src path="output/temp/jboss-reflect-classes"/>
+ </retro>
+
+ <retro compilerclasspathref="jbossretro.classpath" destdir="output/temp/jboss-mdr-classes14">
+ <classpath refid="jbossretro.classpath"/>
+ <classpath>
+ <pathelement path="${project.root}/aop/output/classes"/>
+ <pathelement path="output/temp/jboss-mdr-classes"/>
+ </classpath>
+ <src path="output/temp/jboss-mdr-classes"/>
+ </retro>
+
+ <jar
+ destfile="output/temp/jboss-reflect-jdk14.jar"
+ basedir="output/temp/jboss-reflect-classes14"
+ includes="**"
+ manifest="output/temp/jboss-reflect-classes/META-INF/MANIFEST.MF"/>
+
+ <jar
+ destfile="output/temp/jboss-mdr-jdk14.jar"
+ basedir="output/temp/jboss-mdr-classes14"
+ includes="**"
+ manifest="output/temp/jboss-mdr-classes/META-INF/MANIFEST.MF"/>
+
+ <property name="jboss-reflect-jdk14.location" value="output/temp/jboss-reflect-jdk14.jar"/>
+ <property name="jboss-mdr-jdk14.location" value="output/temp/jboss-mdr-jdk14.jar"/>
+
<!--
Create the MC container.jar subset with org.jboss.metadata.spi and org.jboss.annotation,factory classes since
those files do not exist in JBoss 4.0.x or 4.2.x, which is shipped with MC version 2.0.
@@ -165,6 +219,7 @@
jboss-container-metadata-spi.jar, but does not exist in any repository yet.
http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4044342#4044342
-->
+ <!--
<mkdir dir="output/temp/jboss-container-classes"/>
<mkdir dir="output/temp/jboss-container-classes14"/>
<unjar src="${jboss-container.location}" dest="output/temp/jboss-container-classes"/>
@@ -194,6 +249,7 @@
<property name="jboss-container-metadata-spi14.location" value="output/temp/jboss-container-metadata-spi14.jar"/>
<property name="jboss-container-annotation.location" value="output/temp/jboss-container-annotation.jar"/>
<property name="jboss-container-annotation14.location" value="output/temp/jboss-container-annotation14.jar"/>
+ -->
<!-- Copy across the eula -->
<copy todir="${project.release}" file="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
@@ -206,7 +262,13 @@
<copy todir="${project.release}/lib-50" file="${aop.pluggable-instrumentor.location}"/>
<copy todir="${project.release}/lib-50" file="${javassist.location}"/>
<copy todir="${project.release}/lib-50" file="${jboss-common-core.location}"/>
+ <!--
<copy todir="${project.release}/lib-50" file="${jboss-container.location}"/>
+ -->
+
+ <copy todir="${project.release}/lib-50" file="${jboss-reflect.location}"/>
+ <copy todir="${project.release}/lib-50" file="${jboss-mdr.location}"/>
+
<copy todir="${project.release}/lib-50" file="${jboss-logging-log4j.location}"/>
<copy todir="${project.release}/lib-50" file="${jboss-logging-spi.location}"/>
<copy todir="${project.release}/lib-50" file="${log4j.location}"/>
@@ -221,7 +283,13 @@
<copy todir="${project.release}/lib-14" file="${javassist.location}"/>
<copy todir="${project.release}/lib-14" file="${jboss-common-core14.location}"/>
<copy todir="${project.release}/lib-14" file="${jboss-backport-concurrent.location}"/>
+
+<!--
<copy todir="${project.release}/lib-14" file="${jboss-container14.location}"/>
+ -->
+ <copy todir="${project.release}/lib-14" file="${jboss-reflect-jdk14.location}"/>
+ <copy todir="${project.release}/lib-14" file="${jboss-mdr-jdk14.location}"/>
+
<copy todir="${project.release}/lib-14" file="${jboss-logging-log4j.location}"/>
<copy todir="${project.release}/lib-14" file="${jboss-logging-spi.location}"/>
<copy todir="${project.release}/lib-14" file="${jbossretro-rt.location}"/>
@@ -244,8 +312,13 @@
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${aop.jboss4.jdk14.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer/" file="${aop.readme-as4.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jboss-backport-concurrent.location}"/><!-- TODO figure out for what versions of jboss this is necessary, and if it exists in other locations -->
+
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer/" file="${jboss-reflect-jdk14.location}"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer/" file="${jboss-mdr-jdk14.location}"/>
+ <!--
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jboss-container-metadata-spi14.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jboss-container-annotation14.location}"/>
+ -->
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${javassist.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jbossretro-rt.location}"/><!-- TODO figure out for what versions of jboss this is necessary, and if it exists in other locations -->
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${trove.location}"/>
@@ -264,8 +337,12 @@
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.as4-deployer.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.jboss4.jdk50.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/" file="${aop.readme-as4.location}"/>
+ <!--
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${jboss-container-metadata-spi.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${jboss-container-annotation.location}"/>
+ -->
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${jboss-reflect.location}"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${jboss-mdr.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${javassist.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${trove.location}"/>
<copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml" file="output/temp/jboss-service-jdk50.xml"/>
Modified: projects/aop/trunk/build/build-thirdparty.xml
===================================================================
--- projects/aop/trunk/build/build-thirdparty.xml 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/build/build-thirdparty.xml 2008-03-31 15:22:59 UTC (rev 71485)
@@ -55,8 +55,15 @@
<componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
<componentref name="jboss/jboss-retro" version="1.1.2"/>
<componentref name="jboss/integration" version="5.0.0.Beta4"/>
+ <componentref name="jboss/jboss-mdr" version="2.0.0.Beta12"/>
+ <componentref name="jboss/jboss-reflect" version="2.0.0.Beta12"/>
+ <componentref name="jboss/jboss-vfs" version="2.0.0.Beta9"/>
+ <componentref name="jboss/jboss-deployers" version="2.0.0.Beta12"/>
+ <componentref name="jboss/jboss-managed" version="2.0.0.Beta10.1"/>
+ <!--
<componentref name="jboss/microcontainer" version="2.0.0.Beta10"/>
<componentref name="jboss/microcontainer14" version="2.0.0.Beta4"/>
+ -->
<componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
<componentref name="jboss/test" version="1.0.3.GA"/>
<componentref name="jboss/test14" version="1.0.3.GA"/>
Modified: projects/aop/trunk/build/build_for_dist/build.xml
===================================================================
--- projects/aop/trunk/build/build_for_dist/build.xml 2008-03-31 13:17:49 UTC (rev 71484)
+++ projects/aop/trunk/build/build_for_dist/build.xml 2008-03-31 15:22:59 UTC (rev 71485)
@@ -50,10 +50,14 @@
<pathelement path="lib-50/jboss-common-core.jar"/>
</path>
- <path id="jboss.container.classpath">
- <pathelement path="lib-50/jboss-container.jar"/>
+ <path id="jboss.reflect.classpath">
+ <pathelement path="lib-50/jboss-reflect.jar"/>
</path>
+ <path id="jboss.mdr.classpath">
+ <pathelement path="lib-50/jboss-mdr.jar"/>
+ </path>
+
<path id="jboss.logging.log4j.classpath">
<pathelement path="lib-50/jboss-logging-log4j.jar"/>
</path>
@@ -68,7 +72,8 @@
<path refid="trove.classpath"/>
<path refid="qdox.classpath"/>
<path refid="jboss.core.classpath"/>
- <path refid="jboss.container.classpath"/>
+ <path refid="jboss.reflect.classpath"/>
+ <path refid="jboss.mdr.classpath"/>
<path refid="jboss.logging.log4j.classpath"/>
<path refid="jboss.logging.classpath"/>
<!--
More information about the jboss-cvs-commits
mailing list