[jboss-cvs] JBossAS SVN: r79712 - projects/aop/trunk/aop/src/resources/bin.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Oct 19 10:18:24 EDT 2008
Author: flavia.rainone at jboss.com
Date: 2008-10-19 10:18:23 -0400 (Sun, 19 Oct 2008)
New Revision: 79712
Modified:
projects/aop/trunk/aop/src/resources/bin/aopc.sh
projects/aop/trunk/aop/src/resources/bin/run-load.sh
projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.sh
projects/aop/trunk/aop/src/resources/bin/run-precompiled.sh
Log:
[JBAOP-668] All sh scripts (aop/src/resources/bin/*.sh) are fixed and working.
Modified: projects/aop/trunk/aop/src/resources/bin/aopc.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/aopc.sh 2008-10-19 07:51:55 UTC (rev 79711)
+++ projects/aop/trunk/aop/src/resources/bin/aopc.sh 2008-10-19 14:18:23 UTC (rev 79712)
@@ -4,19 +4,19 @@
usage(){
echo Batch file for running the aop precompiler
echo Usage:
- echo aopc.sh [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] [-report] [-verbose] dir_or_file+
+ echo aopc.sh [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] [-report] [-verbose] dir_or_file+
echo
- echo classpath: Classpath of your sourcefiles and all required libraries
+ echo classpath: Classpath of your sourcefiles and all required libraries
echo
- echo path_to_.aop.xml: Path to your *-aop.xml files. Use colon as separator if you have more than one
+ echo path_to_.aop.xml: Path to your *-aop.xml files. Use colon as separator if you have more than one
echo
- echo path_to_annotated Path to jars/directories that have annotated aspects. 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
- echo dir_or_file: Directory containing files to be aop precompiled
+ echo dir_or_file: Directory containing files to be aop precompiled
echo
- echo -verbose: Specify if you want verbose output
+ echo -verbose: Specify if you want verbose output
echo
- echo -report: If specified, classes do not get instrumented. Instead you get an xml file containing the bindings applied
+ echo -report: If specified, classes do not get instrumented. Instead you get an xml file containing the bindings applied
exit 1
}
@@ -68,28 +68,25 @@
-CURRENT_DIR=$(dirname $(which $0));
+SCRIPT_DIR=$(dirname $(which $0));
-AOPC_CLASSPATH=$CURRENT_DIR/../lib/javassist.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$CURRENT_DIR/../lib/jboss-aop-client.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$CURRENT_DIR/../lib/jboss-reflect.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$CURRENT_DIR/../lib/jboss-mdr.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$CURRENT_DIR/../lib/jboss-logging-log4j.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$CURRENT_DIR/../lib/jboss-logging-spi.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$CURRENT_DIR/../lib/jboss-standalone-aspect-library.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$CURRENT_DIR/../lib/log4j.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$CURRENT_DIR/../lib/pluggable-instrumentor.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$CURRENT_DIR/../lib/jboss-aop.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$CURRENT_DIR/../lib/jboss-common-core.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$CURRENT_DIR/../lib/trove.jar
+AOPC_CLASSPATH=$SCRIPT_DIR/../lib/javassist.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-aop-client.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-reflect.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-mdr.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-logging-log4j.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-logging-spi.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-standalone-aspect-library.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/log4j.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/pluggable-instrumentor.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-aop.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-common-core.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/trove.jar
-echo $AOP_CLASSPATH
CTR=0
for param in $*; do
- echo $param
- echo $CTR
CTR=`expr $CTR + 1`
if [ $CTR -gt $FILESTART ]; then
ARGS_AND_FILES=$ARGS_AND_FILES" "$param
@@ -102,6 +99,5 @@
AOPC_CLASSPATH=`cygpath --path --windows $AOPC_CLASSPATH`
fi
-echo $java -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH org.jboss.aop.standalone.Compiler $ARGS_AND_FILES
java -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH org.jboss.aop.standalone.Compiler $ARGS_AND_FILES
Modified: projects/aop/trunk/aop/src/resources/bin/run-load.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load.sh 2008-10-19 07:51:55 UTC (rev 79711)
+++ projects/aop/trunk/aop/src/resources/bin/run-load.sh 2008-10-19 14:18:23 UTC (rev 79712)
@@ -2,21 +2,25 @@
usage(){
- echo Script file for running loadtime instrumented aop applications5
+ echo Script file for running loadtime instrumented aop applications
echo Usage:
- echo run-load.sh classpath [-aoppath path_to_aop.xml [-aopclasspath path_to_annotated] Main.class [args...]
+ echo run-load.sh classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] [-verbose] Main.class [args...]
echo
- echo classpath: Classpath of your sourcefiles and all required libraries
+ echo classpath: Classpath of your source files and all required libraries
echo
- echo path_to_.aop.xml: Path to your *-aop.xml files. Use colon as separator if you have more than one
+ echo path_to_.aop.xml: Path to your *-aop.xml files. Use colon as separator if you have more than one
echo
- echo path_to_annotated Path to jars/directories that have annotated aspects. 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
- echo Main.class: Your main class
+ echo -verbose: Specify if you want verbose output
+ echo
+ echo Main.class: Your main class
+ echo
+ echo args: The args to Main.class
exit 1
}
-#Make sure have $1, $2 and $3
+#Make sure have $1, $2, $3 and $4
if [ "x$1" = "x" ]; then
usage
fi
@@ -66,21 +70,20 @@
FILESTART=5
fi
+SCRIPT_DIR=$(dirname $(which $0));
-
-
-AOPC_CLASSPATH=../lib/javassist.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-aop-client.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-reflect.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-mdr.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-logging-log4j.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-logging-spi.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-standalone-aspect-library.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/log4j.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/pluggable-instrumentor.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-aop.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-common-core.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/trove.jar
+AOPC_CLASSPATH=$SCRIPT_DIR/../lib/javassist.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-aop-client.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-reflect.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-mdr.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-logging-log4j.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-logging-spi.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-standalone-aspect-library.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/log4j.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/pluggable-instrumentor.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-aop.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-common-core.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/trove.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:$USER_CLASSPATH
@@ -101,6 +104,6 @@
fi
-java -javaagent:../lib/jboss-aop.jar -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH $MAINCLASS_AND_ARGS
+java -javaagent:$SCRIPT_DIR/../lib/jboss-aop.jar -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH $MAINCLASS_AND_ARGS
Modified: projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.sh 2008-10-19 07:51:55 UTC (rev 79711)
+++ projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.sh 2008-10-19 14:18:23 UTC (rev 79712)
@@ -2,21 +2,25 @@
usage(){
- echo Script file for running loadtime instrumented aop applications
+ echo Script file for running loadtime instrumented aop applications with hot swap enabled
echo Usage:
- echo run-loadHotSwap.sh classpath [-aoppath path_to_aop.xml [-aopclasspath path_to_annotated] Main.class [args...]
+ echo run-loadHotSwap.sh classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] [-verbose] Main.class [args...]
echo
- echo classpath: Classpath of your sourcefiles and all required libraries
+ echo classpath: Classpath of your source files and all required libraries
echo
- echo path_to_.aop.xml: Path to your *-aop.xml files. Use colon as separator if you have more than one
+ echo path_to_.aop.xml: Path to your *-aop.xml files. Use colon as separator if you have more than one
echo
- echo path_to_annotated Path to jars/directories that have annotated aspects. 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
- echo Main.class: Your main class
+ echo -verbose: Specify if you want verbose output
+ echo
+ echo Main.class: Your main class
+ echo
+ echo args: The args to Main.class
exit 1
}
-#Make sure have $1, $2 and $3
+#Make sure have $1, $2, $3, and $4
if [ "x$1" = "x" ]; then
usage
fi
@@ -66,21 +70,20 @@
FILESTART=5
fi
+SCRIPT_DIR=$(dirname $(which $0));
-
-
-AOPC_CLASSPATH=../lib/javassist.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-aop-client.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-reflect.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-mdr.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-logging-log4j.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-logging-spi.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-standalone-aspect-library.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/log4j.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/pluggable-instrumentor.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-aop.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-common-core.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/trove.jar
+AOPC_CLASSPATH=$SCRIPT_DIR/../lib/javassist.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-aop-client.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-reflect.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-mdr.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-logging-log4j.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-logging-spi.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-standalone-aspect-library.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/log4j.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/pluggable-instrumentor.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-aop.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-common-core.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/trove.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:$USER_CLASSPATH
@@ -101,6 +104,5 @@
fi
-java -javaagent:../lib/jboss-aop.jar=-hotSwap -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH $MAINCLASS_AND_ARGS
+java -javaagent:$SCRIPT_DIR/../lib/jboss-aop.jar=-hotSwap -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH $MAINCLASS_AND_ARGS
-
Modified: projects/aop/trunk/aop/src/resources/bin/run-precompiled.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-precompiled.sh 2008-10-19 07:51:55 UTC (rev 79711)
+++ projects/aop/trunk/aop/src/resources/bin/run-precompiled.sh 2008-10-19 14:18:23 UTC (rev 79712)
@@ -4,19 +4,19 @@
usage(){
echo Script file for running compile time instrumented aop applications
echo Usage:
- echo run-precompiled.sh classpath [-aoppath path_to_aop.xml [-aopclasspath path_to_annotated] Main.class [args...]
+ echo run-precompiled.sh classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] Main.class [args...]
echo
- echo classpath: Classpath of your sourcefiles and all required libraries
+ echo classpath: Classpath of your sourcefiles and all required libraries
echo
- echo path_to_.aop.xml: Path to your *-aop.xml files. Use colon as separator if you have more than one
+ echo path_to_.aop.xml: Path to your *-aop.xml files. Use colon as separator if you have more than one
echo
- echo path_to_annotated Path to jars/directories that have annotated aspects. 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
- echo Main.class: Your main class
+ echo Main.class: Your main class
exit 1
}
-#Make sure have $1, $2 and $3
+#Make sure have $1, $2, $3, and $4
if [ "x$1" = "x" ]; then
usage
fi
@@ -68,19 +68,20 @@
+SCRIPT_DIR=$(dirname $(which $0));
-AOPC_CLASSPATH=../lib/javassist.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-aop-client.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-reflect.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-mdr.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-logging-log4j.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-logging-spi.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-standalone-aspect-library.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/log4j.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/pluggable-instrumentor.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-aop.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/jboss-common-core.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib/trove.jar
+AOPC_CLASSPATH=$SCRIPT_DIR/../lib/javassist.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-aop-client.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-reflect.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-mdr.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-logging-log4j.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-logging-spi.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-standalone-aspect-library.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/log4j.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/pluggable-instrumentor.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-aop.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/jboss-common-core.jar
+AOPC_CLASSPATH=$AOPC_CLASSPATH:$SCRIPT_DIR/../lib/trove.jar
AOPC_CLASSPATH=$AOPC_CLASSPATH:$USER_CLASSPATH
More information about the jboss-cvs-commits
mailing list