[jboss-cvs] JBossAS SVN: r71186 - in projects/aop/branches/joinpoint_graph/aop/src/resources: test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Mar 23 23:50:39 EDT 2008
Author: flavia.rainone at jboss.com
Date: 2008-03-23 23:50:38 -0400 (Sun, 23 Mar 2008)
New Revision: 71186
Added:
projects/aop/branches/joinpoint_graph/aop/src/resources/test/duplicatemethod/
projects/aop/branches/joinpoint_graph/aop/src/resources/test/duplicatemethod/jboss-aop.xml
projects/aop/branches/joinpoint_graph/aop/src/resources/test/rebuildcallerchain/
projects/aop/branches/joinpoint_graph/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml
Removed:
projects/aop/branches/joinpoint_graph/aop/src/resources/test/duplicatemethod/jboss-aop.xml
projects/aop/branches/joinpoint_graph/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml
Modified:
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/annotationc.bat
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/annotationc.sh
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc.bat
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc.sh
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc15.bat
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc15.sh
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/create-pluggable-jboss-classloader.bat
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/create-pluggable-jboss-classloader.sh
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-boot.bat
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-boot.sh
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-system.bat
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-system.sh
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15.bat
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15.sh
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15HotSwap.bat
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15HotSwap.sh
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled.bat
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled.sh
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled15.bat
projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled15.sh
Log:
Merging with trunk.
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/annotationc.bat
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/annotationc.bat 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/annotationc.bat 2008-03-24 03:50:38 UTC (rev 71186)
@@ -21,11 +21,10 @@
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-container14.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-metadata-spi14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-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\jbossretro-rt.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-retro-rt.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-standalone-aspect-library-jdk14.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jdk14-pluggable-instrumentor.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\log4j.jar
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/annotationc.sh
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/annotationc.sh 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/annotationc.sh 2008-03-24 03:50:38 UTC (rev 71186)
@@ -30,11 +30,10 @@
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-container14.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-metadata-spi14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-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/jbossretro-rt.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-retro-rt.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-standalone-aspect-library-jdk14.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jdk14-pluggable-instrumentor.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/log4j.jar
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc.bat
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc.bat 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc.bat 2008-03-24 03:50:38 UTC (rev 71186)
@@ -45,11 +45,10 @@
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-container14.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-metadata-spi14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-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\jbossretro-rt.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-retro-rt.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-standalone-aspect-library-jdk14.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jdk14-pluggable-instrumentor.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\log4j.jar
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc.sh
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc.sh 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc.sh 2008-03-24 03:50:38 UTC (rev 71186)
@@ -78,11 +78,10 @@
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-container14.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-metadata-spi14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-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/jbossretro-rt.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-retro-rt.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-standalone-aspect-library-jdk14.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jdk14-pluggable-instrumentor.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/log4j.jar
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc15.bat
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc15.bat 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc15.bat 2008-03-24 03:50:38 UTC (rev 71186)
@@ -44,7 +44,7 @@
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-metadata-spi.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-container.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/branches/joinpoint_graph/aop/src/resources/bin/aopc15.sh
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc15.sh 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/aopc15.sh 2008-03-24 03:50:38 UTC (rev 71186)
@@ -75,7 +75,7 @@
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-metadata-spi.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-container.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/branches/joinpoint_graph/aop/src/resources/bin/create-pluggable-jboss-classloader.bat
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/create-pluggable-jboss-classloader.bat 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/create-pluggable-jboss-classloader.bat 2008-03-24 03:50:38 UTC (rev 71186)
@@ -8,11 +8,10 @@
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-container14.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-metadata-spi14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-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\jbossretro-rt.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-retro-rt.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-standalone-aspect-library-jdk14.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jdk14-pluggable-instrumentor.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\log4j.jar
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/create-pluggable-jboss-classloader.sh
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/create-pluggable-jboss-classloader.sh 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/create-pluggable-jboss-classloader.sh 2008-03-24 03:50:38 UTC (rev 71186)
@@ -12,11 +12,10 @@
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-container14.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-metadata-spi14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-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/jbossretro-rt.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-retro-rt.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-standalone-aspect-library-jdk14.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jdk14-pluggable-instrumentor.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/log4j.jar
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-boot.bat
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-boot.bat 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-boot.bat 2008-03-24 03:50:38 UTC (rev 71186)
@@ -45,11 +45,10 @@
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-container14.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-metadata-spi14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-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\jbossretro-rt.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-retro-rt.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-standalone-aspect-library-jdk14.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jdk14-pluggable-instrumentor.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\log4j.jar
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-boot.sh
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-boot.sh 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-boot.sh 2008-03-24 03:50:38 UTC (rev 71186)
@@ -71,11 +71,10 @@
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-container14.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-metadata-spi14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-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/jbossretro-rt.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-retro-rt.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-standalone-aspect-library-jdk14.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jdk14-pluggable-instrumentor.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/log4j.jar
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-system.bat
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-system.bat 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-system.bat 2008-03-24 03:50:38 UTC (rev 71186)
@@ -47,11 +47,10 @@
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-container14.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-metadata-spi14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-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\jbossretro-rt.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-retro-rt.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-standalone-aspect-library-jdk14.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jdk14-pluggable-instrumentor.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\log4j.jar
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-system.sh
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-system.sh 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load-system.sh 2008-03-24 03:50:38 UTC (rev 71186)
@@ -73,11 +73,10 @@
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-container14.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-metadata-spi14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-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/jbossretro-rt.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-retro-rt.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-standalone-aspect-library-jdk14.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jdk14-pluggable-instrumentor.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/log4j.jar
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15.bat
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15.bat 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15.bat 2008-03-24 03:50:38 UTC (rev 71186)
@@ -45,14 +45,13 @@
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-metadata-spi.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-container.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
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\log4j.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\pluggable-instrumentor.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-aop-jdk50.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-aspect-library.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-common-core.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\trove.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%USER_CLASSPATH%
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15.sh
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15.sh 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15.sh 2008-03-24 03:50:38 UTC (rev 71186)
@@ -71,7 +71,7 @@
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-metadata-spi.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-container.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/branches/joinpoint_graph/aop/src/resources/bin/run-load15HotSwap.bat
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15HotSwap.bat 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15HotSwap.bat 2008-03-24 03:50:38 UTC (rev 71186)
@@ -44,14 +44,13 @@
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-metadata-spi.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-container.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
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\log4j.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\pluggable-instrumentor.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-aop-jdk50.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-aspect-library.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-common-core.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\trove.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%USER_CLASSPATH%
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15HotSwap.sh
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15HotSwap.sh 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-load15HotSwap.sh 2008-03-24 03:50:38 UTC (rev 71186)
@@ -71,7 +71,7 @@
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-metadata-spi.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-container.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/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled.bat
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled.bat 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled.bat 2008-03-24 03:50:38 UTC (rev 71186)
@@ -35,6 +35,7 @@
if %1a==a goto doneStart
set ARGS_AND_FILES=%ARGS_AND_FILES% %1
shift
+set MAINCLASS_AND_ARGS=%ARGS_AND_FILES%
goto setupArgs
:doneStart
@@ -47,11 +48,10 @@
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-container14.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-metadata-spi14.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-container-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\jbossretro-rt.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-retro-rt.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jboss-standalone-aspect-library-jdk14.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\jdk14-pluggable-instrumentor.jar
SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-14\log4j.jar
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled.sh
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled.sh 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled.sh 2008-03-24 03:50:38 UTC (rev 71186)
@@ -73,11 +73,10 @@
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-container14.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-metadata-spi14.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-container-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/jbossretro-rt.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-retro-rt.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jboss-standalone-aspect-library-jdk14.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/jdk14-pluggable-instrumentor.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-14/log4j.jar
Modified: projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled15.bat
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled15.bat 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled15.bat 2008-03-24 03:50:38 UTC (rev 71186)
@@ -35,6 +35,7 @@
if %1a==a goto doneStart
set ARGS_AND_FILES=%ARGS_AND_FILES% %1
shift
+set MAINCLASS_AND_ARGS=%ARGS_AND_FILES%
goto setupArgs
:doneStart
@@ -44,7 +45,7 @@
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-metadata-spi.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\jboss-container.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/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled15.sh
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled15.sh 2008-03-24 03:46:45 UTC (rev 71185)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/bin/run-precompiled15.sh 2008-03-24 03:50:38 UTC (rev 71186)
@@ -71,7 +71,7 @@
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-metadata-spi.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-container.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
Copied: projects/aop/branches/joinpoint_graph/aop/src/resources/test/duplicatemethod (from rev 71182, projects/aop/trunk/aop/src/resources/test/duplicatemethod)
Deleted: projects/aop/branches/joinpoint_graph/aop/src/resources/test/duplicatemethod/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/duplicatemethod/jboss-aop.xml 2008-03-24 01:24:49 UTC (rev 71182)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/test/duplicatemethod/jboss-aop.xml 2008-03-24 03:50:38 UTC (rev 71186)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aop>
- <prepare expr="execution(* org.jboss.test.aop.duplicatemethod.TestDupe->foo())"/>
-
- <bind pointcut="execution(* $instanceof{javassist.util.proxy.ProxyObject}->foo())">
- <interceptor class="org.jboss.test.aop.duplicatemethod.TestDupeInterceptor"/>
- </bind>
-</aop>
\ No newline at end of file
Copied: projects/aop/branches/joinpoint_graph/aop/src/resources/test/duplicatemethod/jboss-aop.xml (from rev 71182, projects/aop/trunk/aop/src/resources/test/duplicatemethod/jboss-aop.xml)
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/test/duplicatemethod/jboss-aop.xml (rev 0)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/test/duplicatemethod/jboss-aop.xml 2008-03-24 03:50:38 UTC (rev 71186)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aop>
+ <prepare expr="execution(* org.jboss.test.aop.duplicatemethod.TestDupe->foo())"/>
+
+ <bind pointcut="execution(* $instanceof{javassist.util.proxy.ProxyObject}->foo())">
+ <interceptor class="org.jboss.test.aop.duplicatemethod.TestDupeInterceptor"/>
+ </bind>
+</aop>
\ No newline at end of file
Copied: projects/aop/branches/joinpoint_graph/aop/src/resources/test/rebuildcallerchain (from rev 71182, projects/aop/trunk/aop/src/resources/test/rebuildcallerchain)
Deleted: projects/aop/branches/joinpoint_graph/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml 2008-03-24 01:24:49 UTC (rev 71182)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml 2008-03-24 03:50:38 UTC (rev 71186)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aop>
-<prepare expr="call(* org.jboss.test.aop.rebuildcallerchain.*->execute())" />
-<!--
-
-
- <bind pointcut="call(* org.jboss.test.aop.rebuildcallerchain.*->execute())">
- <interceptor class="org.jboss.test.aop.rebuildcallerchain.RebuildCallerChainInterceptor"/>
- </bind>
-
- -->
-
-
-</aop>
Copied: projects/aop/branches/joinpoint_graph/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml (from rev 71182, projects/aop/trunk/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml)
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml (rev 0)
+++ projects/aop/branches/joinpoint_graph/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml 2008-03-24 03:50:38 UTC (rev 71186)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aop>
+<prepare expr="call(* org.jboss.test.aop.rebuildcallerchain.*->execute())" />
+<!--
+
+
+ <bind pointcut="call(* org.jboss.test.aop.rebuildcallerchain.*->execute())">
+ <interceptor class="org.jboss.test.aop.rebuildcallerchain.RebuildCallerChainInterceptor"/>
+ </bind>
+
+ -->
+
+
+</aop>
More information about the jboss-cvs-commits
mailing list