[jboss-cvs] JBossAS SVN: r79761 - projects/aop/trunk/aop/src/resources/bin.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Oct 20 16:10:55 EDT 2008


Author: flavia.rainone at jboss.com
Date: 2008-10-20 16:10:55 -0400 (Mon, 20 Oct 2008)
New Revision: 79761

Modified:
   projects/aop/trunk/aop/src/resources/bin/aopc.bat
   projects/aop/trunk/aop/src/resources/bin/run-load.bat
   projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.bat
   projects/aop/trunk/aop/src/resources/bin/run-precompiled.bat
Log:
[JBAOP-668] Fixed bat scripts.

Modified: projects/aop/trunk/aop/src/resources/bin/aopc.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/aopc.bat	2008-10-20 19:39:17 UTC (rev 79760)
+++ projects/aop/trunk/aop/src/resources/bin/aopc.bat	2008-10-20 20:10:55 UTC (rev 79761)
@@ -1,5 +1,7 @@
 @echo off
 
+set LIB_DIR=%~dp0..\lib\
+
 IF %1a==a goto display_usage
 IF %2a==a goto display_usage
 IF %3a==a goto display_usage
@@ -40,21 +42,20 @@
 :doneStart
 
 
-
 REM Setup AOP classpath
-SET AOPC_CLASSPATH=..\lib\javassist.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-aop-client.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-reflect.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-mdr.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-logging-log4j.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-logging-spi.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-standalone-aspect-library.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\log4j.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\pluggable-instrumentor.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-aop.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-aspect-library.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-common-core.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\trove.jar
+SET AOPC_CLASSPATH=%LIB_DIR%javassist.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-aop-client.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-reflect.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-mdr.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-logging-log4j.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-logging-spi.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-standalone-aspect-library.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%log4j.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%pluggable-instrumentor.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-aop.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-aspect-library.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-common-core.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%trove.jar
 SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%USER_CLASSPATH%
 
 
@@ -65,13 +66,13 @@
 :display_usage
 echo Batch file for running the aop precopiler
 echo Usage:
-echo aopc.bat classpath [-aoppath path_to_aop.xml [-aopclasspath path_to_annotated] [-report] [-verbose]  dir_or_file+
-   echo    classpath:        Classpath of your sourcefiles and all required libraries
-   echo    path_to_.aop.xml: Path to your *-aop.xml files. Use colon as separator  if you have more than one
-   echo    path_to_annotated Path to jars/directories that have annotated aspects. Use colon as separator if you have more than one.
-   echo    dir_or_file:      Directory containing files to be aop precompiled
-   echo    -verbose:         Specify if you want verbose output
-   echo    -report:          If specified, classes do not get instrumented. Instead you get an xml file containing the bindings applied.
+echo aopc.bat classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] [-report] [-verbose]  dir_or_file+
+   echo    classpath:         Classpath of your sourcefiles and all required libraries
+   echo    path_to_.aop.xml:  Path to your *-aop.xml files (separated by colon)
+   echo    path_to_annotated: Path to jars/directories that have annotated aspects (separated by colon)
+   echo    dir_or_file:       Directory containing files to be aop precompiled
+   echo    -verbose:          Specify if you want verbose output
+   echo    -report:           If specified, classes do not get instrumented. Instead you get an xml file containing the bindings applied
 
 :end
 

Modified: projects/aop/trunk/aop/src/resources/bin/run-load.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load.bat	2008-10-20 19:39:17 UTC (rev 79760)
+++ projects/aop/trunk/aop/src/resources/bin/run-load.bat	2008-10-20 20:10:55 UTC (rev 79761)
@@ -1,5 +1,7 @@
 @echo off
 
+set LIB_DIR=%~dp0..\lib\
+
 IF %1a==a goto display_usage
 IF %2a==a goto display_usage
 IF %3a==a goto display_usage
@@ -43,35 +45,36 @@
 
 
 REM Setup AOP classpath
-SET AOPC_CLASSPATH=..\lib\javassist.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-aop-client.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-reflect.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-mdr.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-logging-log4j.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-logging-spi.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-standalone-aspect-library.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\log4j.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\pluggable-instrumentor.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-aop.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-common-core.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\trove.jar
+SET AOPC_CLASSPATH=%LIB_DIR%javassist.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-aop-client.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-reflect.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-mdr.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-logging-log4j.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-logging-spi.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-standalone-aspect-library.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%log4j.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%pluggable-instrumentor.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-aop.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-aspect-library.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-common-core.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%trove.jar
 SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%USER_CLASSPATH%
 
 
-java -javaagent:../lib/jboss-aop.jar -classpath %AOPC_CLASSPATH% %AOPPATH% %AOPCLASSPATH% %MAINCLASS_AND_ARGS%
+java -javaagent:%LIB_DIR%jboss-aop.jar -classpath %AOPC_CLASSPATH% %AOPPATH% %AOPCLASSPATH% %MAINCLASS_AND_ARGS%
 
 goto end
 
 :display_usage
 echo Script file for running loadtime instrumented aop applications
 echo Usage:
-echo run-load.bat classpath [-aoppath path_to_aop.xml [-aopclasspath path_to_annotated] [-report] [-verbose]  dir_or_file+
-   echo    classpath:        Classpath of your sourcefiles and all required libraries
-   echo    path_to_.aop.xml: Path to your *-aop.xml files. Use colon as separator  if you have more than one
-   echo    path_to_annotated Path to jars/directories that have annotated aspects. Use colon as separator if you have more than one.
-   echo    dir_or_file:      Directory containing files to be aop precompiled
-   echo    -verbose:         Specify if you want verbose output
-   echo    -report:          If specified, classes do not get instrumented. Instead you get an xml file containing the bindings applied.
+echo run-load.bat classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] [-verbose]  Main.class [args]
+   echo    classpath:         Classpath of your sourcefiles and all required libraries
+   echo    path_to_.aop.xml:  Path to your *-aop.xml files (separated by colon)
+   echo    path_to_annotated: Path to jars/directories that have annotated aspects (separated by colon)
+   echo    -verbose:          Specify if you want verbose output
+   echo    Main.class:        Your main class
+   echo    args:              The args to Main.class
 
 :end
 

Modified: projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.bat	2008-10-20 19:39:17 UTC (rev 79760)
+++ projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.bat	2008-10-20 20:10:55 UTC (rev 79761)
@@ -1,5 +1,7 @@
 @echo off
 
+set LIB_DIR=%~dp0..\lib\
+
 IF %1a==a goto display_usage
 IF %2a==a goto display_usage
 IF %3a==a goto display_usage
@@ -35,6 +37,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
@@ -42,35 +45,35 @@
 
 
 REM Setup AOP classpath
-SET AOPC_CLASSPATH=..\lib\javassist.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-aop-client.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-reflect.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-mdr.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-logging-log4j.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-logging-spi.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-standalone-aspect-library.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\log4j.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\pluggable-instrumentor.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-aop.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-common-core.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\trove.jar
+SET AOPC_CLASSPATH=%LIB_DIR%javassist.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-aop-client.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-reflect.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-mdr.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-logging-log4j.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-logging-spi.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-standalone-aspect-library.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%log4j.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%pluggable-instrumentor.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-aop.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-aspect-library.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-common-core.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%trove.jar
 SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%USER_CLASSPATH%
 
 
-java -javaagent:../lib/jboss-aop.jar=-hotSwap -classpath %AOPC_CLASSPATH% %AOPPATH% %AOPCLASSPATH% %MAINCLASS_AND_ARGS%
-
+java -javaagent:%LIB_DIR%jboss-aop.jar=-hotSwap -classpath %AOPC_CLASSPATH% %AOPPATH% %AOPCLASSPATH% %MAINCLASS_AND_ARGS%
 goto end
 
 :display_usage
 echo Script file for running loadtime instrumented aop applications
 echo Usage:
-echo run-loadHotSwap.bat classpath [-aoppath path_to_aop.xml [-aopclasspath path_to_annotated] [-report] [-verbose]  dir_or_file+
-   echo    classpath:        Classpath of your sourcefiles and all required libraries
-   echo    path_to_.aop.xml: Path to your *-aop.xml files. Use colon as separator  if you have more than one
-   echo    path_to_annotated Path to jars/directories that have annotated aspects. Use colon as separator if you have more than one.
-   echo    dir_or_file:      Directory containing files to be aop precompiled
-   echo    -verbose:         Specify if you want verbose output
-   echo    -report:          If specified, classes do not get instrumented. Instead you get an xml file containing the bindings applied.
+echo run-loadHotSwap.bat classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] [-verbose]  Main.class [args]
+   echo    classpath:         Classpath of your sourcefiles and all required libraries
+   echo    path_to_.aop.xml:  Path to your *-aop.xml files (separated by colon)
+   echo    path_to_annotated: Path to jars/directories that have annotated aspects (separated by colon)
+   echo    -verbose:          Specify if you want verbose output
+   echo    Main.class:        Your main class
+   echo    args:              The args to Main.class
 
 :end
 

Modified: projects/aop/trunk/aop/src/resources/bin/run-precompiled.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-precompiled.bat	2008-10-20 19:39:17 UTC (rev 79760)
+++ projects/aop/trunk/aop/src/resources/bin/run-precompiled.bat	2008-10-20 20:10:55 UTC (rev 79761)
@@ -1,5 +1,7 @@
 @echo off
 
+set LIB_DIR=%~dp0..\lib\
+
 IF %1a==a goto display_usage
 IF %2a==a goto display_usage
 IF %3a==a goto display_usage
@@ -43,19 +45,19 @@
 
 
 REM Setup AOP classpath
-SET AOPC_CLASSPATH=..\lib\javassist.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-aop-client.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-reflect.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-mdr.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-logging-log4j.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-logging-spi.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-standalone-aspect-library.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\log4j.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\pluggable-instrumentor.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-aop.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-aspect-library.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\jboss-common-core.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\trove.jar
+SET AOPC_CLASSPATH=%LIB_DIR%javassist.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-aop-client.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-reflect.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-mdr.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-logging-log4j.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-logging-spi.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-standalone-aspect-library.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%log4j.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%pluggable-instrumentor.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-aop.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-aspect-library.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%jboss-common-core.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%LIB_DIR%trove.jar
 SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%USER_CLASSPATH%
 
 
@@ -66,13 +68,14 @@
 :display_usage
 echo Script file for running compile time instrumented aop applications
 echo Usage:
-echo run-precompiled.bat classpath [-aoppath path_to_aop.xml [-aopclasspath path_to_annotated] [-report] [-verbose]  dir_or_file+
-   echo    classpath:        Classpath of your sourcefiles and all required libraries
-   echo    path_to_.aop.xml: Path to your *-aop.xml files. Use colon as separator  if you have more than one
-   echo    path_to_annotated Path to jars/directories that have annotated aspects. Use colon as separator if you have more than one.
-   echo    dir_or_file:      Directory containing files to be aop precompiled
-   echo    -verbose:         Specify if you want verbose output
-   echo    -report:          If specified, classes do not get instrumented. Instead you get an xml file containing the bindings applied.
+echo run-precompiled.bat classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] [-verbose]  Main.class [args]
+   echo    classpath:         Classpath of your sourcefiles and all required libraries
+   echo    path_to_.aop.xml:  Path to your *-aop.xml files (separated by colon)
+   echo    path_to_annotated: Path to jars/directories that have annotated aspects (separated by colon)
+   echo    -verbose:          Specify if you want verbose output
+   echo    Main.class:        Your main class
+   echo    args:              The args to Main.class
 
+
 :end
 




More information about the jboss-cvs-commits mailing list