[jboss-cvs] JBossAS SVN: r79634 - in projects/aop/trunk: aop/docs/examples and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 17 08:07:58 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-10-17 08:07:57 -0400 (Fri, 17 Oct 2008)
New Revision: 79634
Added:
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/run-load.bat
projects/aop/trunk/aop/src/resources/bin/run-load.sh
projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.bat
projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.sh
projects/aop/trunk/aop/src/resources/bin/run-precompiled.bat
projects/aop/trunk/aop/src/resources/bin/run-precompiled.sh
Removed:
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/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-precompiled15.bat
projects/aop/trunk/aop/src/resources/bin/run-precompiled15.sh
Modified:
projects/aop/trunk/aop/docs/examples/examples-build.xml
projects/aop/trunk/aop/docs/reference/reference/en/images/install.jpg
projects/aop/trunk/aop/docs/reference/reference/en/modules/compiling.xml
projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml
projects/aop/trunk/aop/docs/reference/reference/en/modules/running.xml
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/aspects/pom.xml
projects/aop/trunk/aspects/src/test/org/jboss/test/proxyfactory/AbstractProxyTest.java
projects/aop/trunk/build/build.xml
Log:
[JBAOP-668] Rename lib-50/ in release to lib/. Get rid of -jdk50 extensions for jars in lib/ folder
Modified: projects/aop/trunk/aop/docs/examples/examples-build.xml
===================================================================
--- projects/aop/trunk/aop/docs/examples/examples-build.xml 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/docs/examples/examples-build.xml 2008-10-17 12:07:57 UTC (rev 79634)
@@ -16,15 +16,15 @@
description="Set up the common paths and properties needed later">
<property name="jboss.aop.root" value="../../../.."/>
- <property name="jboss.aop.lib50" value="${jboss.aop.root}/lib-50"/>
+ <property name="jboss.aop.lib" value="${jboss.aop.root}/lib"/>
<path id="jboss.aop.classpath50">
- <fileset dir="${jboss.aop.lib50}">
+ <fileset dir="${jboss.aop.lib}">
<include name="*.jar"/>
</fileset>
</path>
- <property name="aop50jar" value="${jboss.aop.lib50}/jboss-aop-jdk50.jar"/>
+ <property name="aop50jar" value="${jboss.aop.lib}/jboss-aop.jar"/>
<path id="classpath50">
<path refid="jboss.aop.classpath50"/>
Modified: projects/aop/trunk/aop/docs/reference/reference/en/images/install.jpg
===================================================================
(Binary files differ)
Modified: projects/aop/trunk/aop/docs/reference/reference/en/modules/compiling.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/reference/en/modules/compiling.xml 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/docs/reference/reference/en/modules/compiling.xml 2008-10-17 12:07:57 UTC (rev 79634)
@@ -85,7 +85,7 @@
<!-- JDK version 1.5 -->
<path id="jboss.aop.classpath">
- <pathelement path="../../../jboss-aop-jdk50.jar"/>
+ <pathelement path="../../../jboss-aop.jar"/>
</path>
<!-- JDK version 1.5 - END -->]]>
@@ -108,7 +108,7 @@
<!-- JDK version 1.5 -->
<path id="jboss.aop.classpath">
- <pathelement path="../../../jboss-aop-jdk50.jar"/>
+ <pathelement path="../../../jboss-aop.jar"/>
</path>
<!-- JDK version 1.5 - END -->
@@ -316,7 +316,7 @@
this easier. It includes all the aop libs for you, so you just have to worry
about your files. The usage:
<programlisting>
-$ aopc15 <classpath> [-aoppath ...] [-aopclasspath ...] [-report] [-verbose] \
+$ aopc <classpath> [-aoppath ...] [-aopclasspath ...] [-report] [-verbose] \
<class files or directories>+
</programlisting>
</para>
Modified: projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml 2008-10-17 12:07:57 UTC (rev 79634)
@@ -20,8 +20,7 @@
<title>Installing Standalone</title>
<para>
- There's nothing really to install if you're running outside the JBoss application server.
- If you're using JDK 5.0, use the libraries under <literal>lib-50/</literal>.
+ There's nothing really to install if you're running outside the JBoss application server. Just use the libraries under <literal>lib/</literal>.
</para>
</sect1>
Modified: projects/aop/trunk/aop/docs/reference/reference/en/modules/running.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/reference/en/modules/running.xml 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/docs/reference/reference/en/modules/running.xml 2008-10-17 12:07:57 UTC (rev 79634)
@@ -125,7 +125,7 @@
this easier. It includes all the aop libs for you, so you just have to worry
about your files. The usage:
<programlisting>
-$ run-precompiled15 classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] \
+$ run-precompiled classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] \
com.blah.MyMainClass [args...]
</programlisting>
If your application is not in a jar with a META-INF/jboss-aop.xml file, you must
@@ -181,7 +181,7 @@
this easier. It includes all the aop libs for you, so you just have to worry
about your files. The usage for JDK 5 is:
<programlisting>
-$ run-load15 classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] \
+$ run-load classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] \
com.blah.MyMainClass [args...]
</programlisting>
The parameters have the same meaning as for the run-precompiled scripts.
@@ -378,11 +378,11 @@
</programlisting>
</para>
<para>
- The <literal>run-load15HotSwap</literal> batch/script files contained in the /bin folder of the distribution are similar to the
- <literal>run-load15</literal> ones, described in the previous subsection. All aop libs are included in these script files.
+ The <literal>run-loadHotSwap</literal> batch/script files contained in the /bin folder of the distribution are similar to the
+ <literal>run-load</literal> ones, described in the previous subsection. All aop libs are included in these script files.
To use them, run:
<programlisting>
-$ run-load15 classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] \
+$ run-load classpath [-aoppath path_to_aop.xml] [-aopclasspath path_to_annotated] \
com.blah.MyMainClass [args...]
</programlisting>
</para>
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/pom.xml 2008-10-17 12:07:57 UTC (rev 79634)
@@ -174,11 +174,11 @@
<copy todir="${basedir}/output/etc">
<fileset dir="${basedir}/src/etc" />
</copy>
- <copy file="${project.build.directory}/${project.artifactId}.jar" tofile="${basedir}/output/lib/jboss-aop-jdk50.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-sources.jar" tofile="${basedir}/output/lib/jboss-aop-jdk50-sources.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-client.jar" tofile="${basedir}/output/lib/jboss-aop-jdk50-client.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-client-sources.jar" tofile="${basedir}/output/lib/jboss-aop-jdk50-client-sources.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-single.jar" tofile="${basedir}/output/lib/jboss-aop-jdk50-single.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}.jar" tofile="${basedir}/output/lib/jboss-aop.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-sources.jar" tofile="${basedir}/output/lib/jboss-aop-sources.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-client.jar" tofile="${basedir}/output/lib/jboss-aop-client.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-client-sources.jar" tofile="${basedir}/output/lib/jboss-aop-client-sources.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-single.jar" tofile="${basedir}/output/lib/jboss-aop-single.jar" />
</tasks>
</configuration>
</execution>
Copied: projects/aop/trunk/aop/src/resources/bin/aopc.bat (from rev 79631, projects/aop/trunk/aop/src/resources/bin/aopc15.bat)
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/aopc.bat (rev 0)
+++ projects/aop/trunk/aop/src/resources/bin/aopc.bat 2008-10-17 12:07:57 UTC (rev 79634)
@@ -0,0 +1,77 @@
+ at echo off
+
+IF %1a==a goto display_usage
+IF %2a==a goto display_usage
+IF %3a==a goto display_usage
+IF %4a==a goto display_usage
+IF %2==%4 goto display_usage
+
+SET USER_CLASSPATH=%1
+SET AOPPATH=
+SET AOPCLASSPATH=
+
+IF %2==-aoppath SET AOPPATH=-Djboss.aop.path=%3
+IF %2==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%3
+
+IF %4%5==-aoppath goto display_usage
+IF %4%5==-aopclasspath goto display_usage
+IF %4==-aoppath SET AOPPATH=-Djboss.aop.path=%5
+IF %4==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%5
+
+
+
+IF %4==-aoppath shift
+IF %3==-aoppath shift
+IF %4==-aopclasspath shift
+IF %3==-aopclasspath shift
+
+
+shift
+shift
+shift
+set ARGS_AND_FILES=
+REM get all the command line args
+:setupArgs
+if %1a==a goto doneStart
+ set ARGS_AND_FILES=%ARGS_AND_FILES% %1
+shift
+goto setupArgs
+
+: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=%AOPC_CLASSPATH%;%USER_CLASSPATH%
+
+
+java -classpath %AOPC_CLASSPATH% %AOPPATH% %AOPCLASSPATH% org.jboss.aop.standalone.Compiler %ARGS_AND_FILES%
+
+goto end
+
+: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.
+
+:end
+
Copied: projects/aop/trunk/aop/src/resources/bin/aopc.sh (from rev 79631, projects/aop/trunk/aop/src/resources/bin/aopc15.sh)
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/aopc.sh (rev 0)
+++ projects/aop/trunk/aop/src/resources/bin/aopc.sh 2008-10-17 12:07:57 UTC (rev 79634)
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+
+usage(){
+ echo Batch file for running the aop precopiler
+ echo Usage:
+ 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
+ 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
+ echo dir_or_file: Directory containing files to be aop precompiled
+ echo
+ 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.
+
+ exit 1
+}
+
+#Make sure have $1, $2 and $3
+if [ "x$1" = "x" ]; then
+ usage
+fi
+if [ "x$2" = "x" ]; then
+ usage
+fi
+if [ "x$3" = "x" ]; then
+ usage
+fi
+if [ "x$4" = "x" ]; then
+ usage
+fi
+if [ "$2" = "$4" ]; then
+ usage
+fi
+
+USER_CLASSPATH=$1
+
+AOPPATH=
+AOPCLASSPATH=
+
+if [ "$2" = "-aoppath" ]; then
+ AOPPATH=-Djboss.aop.path=$3
+ FILESTART=3
+fi
+
+if [ "$4" = "-aoppath" ]; then
+ if [ "x$5" = "x" ]; then
+ usage
+ fi
+ AOPPATH=-Djboss.aop.path=$5
+ FILESTART=5
+fi
+
+if [ "$2" = "-aopclasspath" ]; then
+ AOPCLASSPATH=-Djboss.aop.class.path=$3
+ FILESTART=3
+fi
+
+
+
+if [ "$4" = "-aopclasspath" ]; then
+ if [ "x$5" = "x" ]; then
+ usage
+ fi
+ AOPCLASSPATH=-Djboss.aop.class.path=$5
+ FILESTART=5
+fi
+
+
+
+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=$AOPC_CLASSPATH:$USER_CLASSPATH
+
+CTR=0
+
+for param in $*; do
+
+ CTR=`expr $CTR + 1`
+ if [ $CTR -gt $FILESTART ]; then
+ ARGS_AND_FILES=$ARGS_AND_FILES" "$param
+ fi
+done
+
+#Check for cygwin and convert path if necessary
+if (cygpath --version) >/dev/null 2>/dev/null; then
+ AOPC_CLASSPATH=`cygpath --path --windows $AOPC_CLASSPATH`
+fi
+
+
+java -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH org.jboss.aop.standalone.Compiler $ARGS_AND_FILES
+
Deleted: projects/aop/trunk/aop/src/resources/bin/aopc15.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/aopc15.bat 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/src/resources/bin/aopc15.bat 2008-10-17 12:07:57 UTC (rev 79634)
@@ -1,77 +0,0 @@
- at echo off
-
-IF %1a==a goto display_usage
-IF %2a==a goto display_usage
-IF %3a==a goto display_usage
-IF %4a==a goto display_usage
-IF %2==%4 goto display_usage
-
-SET USER_CLASSPATH=%1
-SET AOPPATH=
-SET AOPCLASSPATH=
-
-IF %2==-aoppath SET AOPPATH=-Djboss.aop.path=%3
-IF %2==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%3
-
-IF %4%5==-aoppath goto display_usage
-IF %4%5==-aopclasspath goto display_usage
-IF %4==-aoppath SET AOPPATH=-Djboss.aop.path=%5
-IF %4==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%5
-
-
-
-IF %4==-aoppath shift
-IF %3==-aoppath shift
-IF %4==-aopclasspath shift
-IF %3==-aopclasspath shift
-
-
-shift
-shift
-shift
-set ARGS_AND_FILES=
-REM get all the command line args
-:setupArgs
-if %1a==a goto doneStart
- set ARGS_AND_FILES=%ARGS_AND_FILES% %1
-shift
-goto setupArgs
-
-:doneStart
-
-
-
-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-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
-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%
-
-
-java -classpath %AOPC_CLASSPATH% %AOPPATH% %AOPCLASSPATH% org.jboss.aop.standalone.Compiler %ARGS_AND_FILES%
-
-goto end
-
-:display_usage
-echo Batch file for running the aop precopiler for JDK 1.5
-echo Usage:
-echo aopc15.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.
-
-:end
-
Deleted: projects/aop/trunk/aop/src/resources/bin/aopc15.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/aopc15.sh 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/src/resources/bin/aopc15.sh 2008-10-17 12:07:57 UTC (rev 79634)
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-
-usage(){
- echo Batch file for running the aop precopiler for JDK 1.4
- echo Usage:
- echo aopc15.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
- 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
- echo dir_or_file: Directory containing files to be aop precompiled
- echo
- 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.
-
- exit 1
-}
-
-#Make sure have $1, $2 and $3
-if [ "x$1" = "x" ]; then
- usage
-fi
-if [ "x$2" = "x" ]; then
- usage
-fi
-if [ "x$3" = "x" ]; then
- usage
-fi
-if [ "x$4" = "x" ]; then
- usage
-fi
-if [ "$2" = "$4" ]; then
- usage
-fi
-
-USER_CLASSPATH=$1
-
-AOPPATH=
-AOPCLASSPATH=
-
-if [ "$2" = "-aoppath" ]; then
- AOPPATH=-Djboss.aop.path=$3
- FILESTART=3
-fi
-
-if [ "$4" = "-aoppath" ]; then
- if [ "x$5" = "x" ]; then
- usage
- fi
- AOPPATH=-Djboss.aop.path=$5
- FILESTART=5
-fi
-
-if [ "$2" = "-aopclasspath" ]; then
- AOPCLASSPATH=-Djboss.aop.class.path=$3
- FILESTART=3
-fi
-
-
-
-if [ "$4" = "-aopclasspath" ]; then
- if [ "x$5" = "x" ]; then
- usage
- fi
- AOPCLASSPATH=-Djboss.aop.class.path=$5
- FILESTART=5
-fi
-
-
-
-AOPC_CLASSPATH=../lib-50/javassist.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-aop-jdk50-client.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
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/log4j.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/pluggable-instrumentor.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-aop-jdk50.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-common-core.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/trove.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$USER_CLASSPATH
-
-CTR=0
-
-for param in $*; do
-
- CTR=`expr $CTR + 1`
- if [ $CTR -gt $FILESTART ]; then
- ARGS_AND_FILES=$ARGS_AND_FILES" "$param
- fi
-done
-
-#Check for cygwin and convert path if necessary
-if (cygpath --version) >/dev/null 2>/dev/null; then
- AOPC_CLASSPATH=`cygpath --path --windows $AOPC_CLASSPATH`
-fi
-
-
-java -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH org.jboss.aop.standalone.Compiler $ARGS_AND_FILES
-
Copied: projects/aop/trunk/aop/src/resources/bin/run-load.bat (from rev 79631, projects/aop/trunk/aop/src/resources/bin/run-load15.bat)
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load.bat (rev 0)
+++ projects/aop/trunk/aop/src/resources/bin/run-load.bat 2008-10-17 12:07:57 UTC (rev 79634)
@@ -0,0 +1,77 @@
+ at echo off
+
+IF %1a==a goto display_usage
+IF %2a==a goto display_usage
+IF %3a==a goto display_usage
+IF %4a==a goto display_usage
+IF %2==%4 goto display_usage
+
+SET USER_CLASSPATH=%1
+SET AOPPATH=
+SET AOPCLASSPATH=
+
+IF %2==-aoppath SET AOPPATH=-Djboss.aop.path=%3
+IF %2==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%3
+
+IF %4%5==-aoppath goto display_usage
+IF %4%5==-aopclasspath goto display_usage
+IF %4==-aoppath SET AOPPATH=-Djboss.aop.path=%5
+IF %4==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%5
+
+
+
+IF %4==-aoppath shift
+IF %3==-aoppath shift
+IF %4==-aopclasspath shift
+IF %3==-aopclasspath shift
+
+
+shift
+shift
+shift
+set ARGS_AND_FILES=
+REM get all the command line args
+:setupArgs
+if %1a==a goto doneStart
+ set ARGS_AND_FILES=%ARGS_AND_FILES% %1
+shift
+set MAINCLASS_AND_ARGS=%ARGS_AND_FILES%
+goto setupArgs
+
+: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-common-core.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\trove.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%USER_CLASSPATH%
+
+
+java -javaagent:../lib/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.
+
+:end
+
Copied: projects/aop/trunk/aop/src/resources/bin/run-load.sh (from rev 79631, projects/aop/trunk/aop/src/resources/bin/run-load15.sh)
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load.sh (rev 0)
+++ projects/aop/trunk/aop/src/resources/bin/run-load.sh 2008-10-17 12:07:57 UTC (rev 79634)
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+
+usage(){
+ echo Script file for running loadtime instrumented aop applications5
+ echo Usage:
+ echo run-load.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
+ 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
+ echo Main.class: Your main class
+ exit 1
+}
+
+#Make sure have $1, $2 and $3
+if [ "x$1" = "x" ]; then
+ usage
+fi
+if [ "x$2" = "x" ]; then
+ usage
+fi
+if [ "x$3" = "x" ]; then
+ usage
+fi
+if [ "x$4" = "x" ]; then
+ usage
+fi
+if [ "$2" = "$4" ]; then
+ usage
+fi
+
+USER_CLASSPATH=$1
+
+AOPPATH=
+AOPCLASSPATH=
+
+if [ "$2" = "-aoppath" ]; then
+ AOPPATH=-Djboss.aop.path=$3
+ FILESTART=3
+fi
+
+if [ "$4" = "-aoppath" ]; then
+ if [ "x$5" = "x" ]; then
+ usage
+ fi
+ AOPPATH=-Djboss.aop.path=$5
+ FILESTART=5
+fi
+
+if [ "$2" = "-aopclasspath" ]; then
+ AOPCLASSPATH=-Djboss.aop.class.path=$3
+ FILESTART=3
+fi
+
+
+
+if [ "$4" = "-aopclasspath" ]; then
+ if [ "x$5" = "x" ]; then
+ usage
+ fi
+ AOPCLASSPATH=-Djboss.aop.class.path=$5
+ FILESTART=5
+fi
+
+
+
+
+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=$AOPC_CLASSPATH:$USER_CLASSPATH
+
+
+CTR=0
+
+for param in $*; do
+
+ CTR=`expr $CTR + 1`
+ if [ $CTR -gt $FILESTART ]; then
+ MAINCLASS_AND_ARGS=$MAINCLASS_AND_ARGS" "$param
+ fi
+done
+
+
+#Check for cygwin and convert path if necessary
+if (cygpath --version) >/dev/null 2>/dev/null; then
+ AOPC_CLASSPATH=`cygpath --path --windows $AOPC_CLASSPATH`
+fi
+
+
+java -javaagent:../lib/jboss-aop.jar -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH $MAINCLASS_AND_ARGS
+
+
Deleted: projects/aop/trunk/aop/src/resources/bin/run-load15.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load15.bat 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/src/resources/bin/run-load15.bat 2008-10-17 12:07:57 UTC (rev 79634)
@@ -1,77 +0,0 @@
- at echo off
-
-IF %1a==a goto display_usage
-IF %2a==a goto display_usage
-IF %3a==a goto display_usage
-IF %4a==a goto display_usage
-IF %2==%4 goto display_usage
-
-SET USER_CLASSPATH=%1
-SET AOPPATH=
-SET AOPCLASSPATH=
-
-IF %2==-aoppath SET AOPPATH=-Djboss.aop.path=%3
-IF %2==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%3
-
-IF %4%5==-aoppath goto display_usage
-IF %4%5==-aopclasspath goto display_usage
-IF %4==-aoppath SET AOPPATH=-Djboss.aop.path=%5
-IF %4==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%5
-
-
-
-IF %4==-aoppath shift
-IF %3==-aoppath shift
-IF %4==-aopclasspath shift
-IF %3==-aopclasspath shift
-
-
-shift
-shift
-shift
-set ARGS_AND_FILES=
-REM get all the command line args
-:setupArgs
-if %1a==a goto doneStart
- set ARGS_AND_FILES=%ARGS_AND_FILES% %1
-shift
-set MAINCLASS_AND_ARGS=%ARGS_AND_FILES%
-goto setupArgs
-
-:doneStart
-
-
-
-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-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
-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-common-core.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\trove.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%USER_CLASSPATH%
-
-
-java -javaagent:../lib-50/jboss-aop-jdk50.jar -classpath %AOPC_CLASSPATH% %AOPPATH% %AOPCLASSPATH% %MAINCLASS_AND_ARGS%
-
-goto end
-
-:display_usage
-echo Script file for running loadtime instrumented aop applications for JDK 1.5
-echo Usage:
-echo run-load15.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.
-
-:end
-
Deleted: projects/aop/trunk/aop/src/resources/bin/run-load15.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load15.sh 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/src/resources/bin/run-load15.sh 2008-10-17 12:07:57 UTC (rev 79634)
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-
-usage(){
- echo Script file for running loadtime instrumented aop applications for JDK 1.5
- echo Usage:
- echo run-load-15.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
- 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
- echo Main.class: Your main class
- exit 1
-}
-
-#Make sure have $1, $2 and $3
-if [ "x$1" = "x" ]; then
- usage
-fi
-if [ "x$2" = "x" ]; then
- usage
-fi
-if [ "x$3" = "x" ]; then
- usage
-fi
-if [ "x$4" = "x" ]; then
- usage
-fi
-if [ "$2" = "$4" ]; then
- usage
-fi
-
-USER_CLASSPATH=$1
-
-AOPPATH=
-AOPCLASSPATH=
-
-if [ "$2" = "-aoppath" ]; then
- AOPPATH=-Djboss.aop.path=$3
- FILESTART=3
-fi
-
-if [ "$4" = "-aoppath" ]; then
- if [ "x$5" = "x" ]; then
- usage
- fi
- AOPPATH=-Djboss.aop.path=$5
- FILESTART=5
-fi
-
-if [ "$2" = "-aopclasspath" ]; then
- AOPCLASSPATH=-Djboss.aop.class.path=$3
- FILESTART=3
-fi
-
-
-
-if [ "$4" = "-aopclasspath" ]; then
- if [ "x$5" = "x" ]; then
- usage
- fi
- AOPCLASSPATH=-Djboss.aop.class.path=$5
- FILESTART=5
-fi
-
-
-
-
-AOPC_CLASSPATH=../lib-50/javassist.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-aop-jdk50-client.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
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/log4j.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/pluggable-instrumentor.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-aop-jdk50.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-common-core.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/trove.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$USER_CLASSPATH
-
-
-CTR=0
-
-for param in $*; do
-
- CTR=`expr $CTR + 1`
- if [ $CTR -gt $FILESTART ]; then
- MAINCLASS_AND_ARGS=$MAINCLASS_AND_ARGS" "$param
- fi
-done
-
-
-#Check for cygwin and convert path if necessary
-if (cygpath --version) >/dev/null 2>/dev/null; then
- AOPC_CLASSPATH=`cygpath --path --windows $AOPC_CLASSPATH`
-fi
-
-
-java -javaagent:../lib-50/jboss-aop-jdk50.jar -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH $MAINCLASS_AND_ARGS
-
-
Deleted: projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.bat 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.bat 2008-10-17 12:07:57 UTC (rev 79634)
@@ -1,76 +0,0 @@
- at echo off
-
-IF %1a==a goto display_usage
-IF %2a==a goto display_usage
-IF %3a==a goto display_usage
-IF %4a==a goto display_usage
-IF %2==%4 goto display_usage
-
-SET USER_CLASSPATH=%1
-SET AOPPATH=
-SET AOPCLASSPATH=
-
-IF %2==-aoppath SET AOPPATH=-Djboss.aop.path=%3
-IF %2==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%3
-
-IF %4%5==-aoppath goto display_usage
-IF %4%5==-aopclasspath goto display_usage
-IF %4==-aoppath SET AOPPATH=-Djboss.aop.path=%5
-IF %4==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%5
-
-
-
-IF %4==-aoppath shift
-IF %3==-aoppath shift
-IF %4==-aopclasspath shift
-IF %3==-aopclasspath shift
-
-
-shift
-shift
-shift
-set ARGS_AND_FILES=
-REM get all the command line args
-:setupArgs
-if %1a==a goto doneStart
- set ARGS_AND_FILES=%ARGS_AND_FILES% %1
-shift
-goto setupArgs
-
-:doneStart
-
-
-
-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-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
-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-common-core.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib-50\trove.jar
-SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%USER_CLASSPATH%
-
-
-java -javaagent:../lib-50/jboss-aop-jdk50.jar=-hotSwap -classpath %AOPC_CLASSPATH% %AOPPATH% %AOPCLASSPATH% %MAINCLASS_AND_ARGS%
-
-goto end
-
-:display_usage
-echo Script file for running loadtime instrumented aop applications for JDK 1.5
-echo Usage:
-echo run-load15.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.
-
-:end
-
Deleted: projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.sh 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.sh 2008-10-17 12:07:57 UTC (rev 79634)
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-
-usage(){
- echo Script file for running loadtime instrumented aop applications for JDK 1.5
- echo Usage:
- echo run-load-15.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
- 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
- echo Main.class: Your main class
- exit 1
-}
-
-#Make sure have $1, $2 and $3
-if [ "x$1" = "x" ]; then
- usage
-fi
-if [ "x$2" = "x" ]; then
- usage
-fi
-if [ "x$3" = "x" ]; then
- usage
-fi
-if [ "x$4" = "x" ]; then
- usage
-fi
-if [ "$2" = "$4" ]; then
- usage
-fi
-
-USER_CLASSPATH=$1
-
-AOPPATH=
-AOPCLASSPATH=
-
-if [ "$2" = "-aoppath" ]; then
- AOPPATH=-Djboss.aop.path=$3
- FILESTART=3
-fi
-
-if [ "$4" = "-aoppath" ]; then
- if [ "x$5" = "x" ]; then
- usage
- fi
- AOPPATH=-Djboss.aop.path=$5
- FILESTART=5
-fi
-
-if [ "$2" = "-aopclasspath" ]; then
- AOPCLASSPATH=-Djboss.aop.class.path=$3
- FILESTART=3
-fi
-
-
-
-if [ "$4" = "-aopclasspath" ]; then
- if [ "x$5" = "x" ]; then
- usage
- fi
- AOPCLASSPATH=-Djboss.aop.class.path=$5
- FILESTART=5
-fi
-
-
-
-
-AOPC_CLASSPATH=../lib-50/javassist.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-aop-jdk50-client.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
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/log4j.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/pluggable-instrumentor.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-aop-jdk50.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-common-core.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/trove.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$USER_CLASSPATH
-
-
-CTR=0
-
-for param in $*; do
-
- CTR=`expr $CTR + 1`
- if [ $CTR -gt $FILESTART ]; then
- MAINCLASS_AND_ARGS=$MAINCLASS_AND_ARGS" "$param
- fi
-done
-
-
-#Check for cygwin and convert path if necessary
-if (cygpath --version) >/dev/null 2>/dev/null; then
- AOPC_CLASSPATH=`cygpath --path --windows $AOPC_CLASSPATH`
-fi
-
-
-java -javaagent:../lib-50/jboss-aop-jdk50.jar=-hotSwap -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH $MAINCLASS_AND_ARGS
-
-
Copied: projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.bat (from rev 79631, projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.bat)
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.bat (rev 0)
+++ projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.bat 2008-10-17 12:07:57 UTC (rev 79634)
@@ -0,0 +1,76 @@
+ at echo off
+
+IF %1a==a goto display_usage
+IF %2a==a goto display_usage
+IF %3a==a goto display_usage
+IF %4a==a goto display_usage
+IF %2==%4 goto display_usage
+
+SET USER_CLASSPATH=%1
+SET AOPPATH=
+SET AOPCLASSPATH=
+
+IF %2==-aoppath SET AOPPATH=-Djboss.aop.path=%3
+IF %2==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%3
+
+IF %4%5==-aoppath goto display_usage
+IF %4%5==-aopclasspath goto display_usage
+IF %4==-aoppath SET AOPPATH=-Djboss.aop.path=%5
+IF %4==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%5
+
+
+
+IF %4==-aoppath shift
+IF %3==-aoppath shift
+IF %4==-aopclasspath shift
+IF %3==-aopclasspath shift
+
+
+shift
+shift
+shift
+set ARGS_AND_FILES=
+REM get all the command line args
+:setupArgs
+if %1a==a goto doneStart
+ set ARGS_AND_FILES=%ARGS_AND_FILES% %1
+shift
+goto setupArgs
+
+: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-common-core.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;..\lib\trove.jar
+SET AOPC_CLASSPATH=%AOPC_CLASSPATH%;%USER_CLASSPATH%
+
+
+java -javaagent:../lib/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.
+
+:end
+
Copied: projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.sh (from rev 79631, projects/aop/trunk/aop/src/resources/bin/run-load15HotSwap.sh)
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.sh (rev 0)
+++ projects/aop/trunk/aop/src/resources/bin/run-loadHotSwap.sh 2008-10-17 12:07:57 UTC (rev 79634)
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+
+usage(){
+ echo Script file for running loadtime instrumented aop applications
+ echo Usage:
+ echo run-loadHotSwap.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
+ 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
+ echo Main.class: Your main class
+ exit 1
+}
+
+#Make sure have $1, $2 and $3
+if [ "x$1" = "x" ]; then
+ usage
+fi
+if [ "x$2" = "x" ]; then
+ usage
+fi
+if [ "x$3" = "x" ]; then
+ usage
+fi
+if [ "x$4" = "x" ]; then
+ usage
+fi
+if [ "$2" = "$4" ]; then
+ usage
+fi
+
+USER_CLASSPATH=$1
+
+AOPPATH=
+AOPCLASSPATH=
+
+if [ "$2" = "-aoppath" ]; then
+ AOPPATH=-Djboss.aop.path=$3
+ FILESTART=3
+fi
+
+if [ "$4" = "-aoppath" ]; then
+ if [ "x$5" = "x" ]; then
+ usage
+ fi
+ AOPPATH=-Djboss.aop.path=$5
+ FILESTART=5
+fi
+
+if [ "$2" = "-aopclasspath" ]; then
+ AOPCLASSPATH=-Djboss.aop.class.path=$3
+ FILESTART=3
+fi
+
+
+
+if [ "$4" = "-aopclasspath" ]; then
+ if [ "x$5" = "x" ]; then
+ usage
+ fi
+ AOPCLASSPATH=-Djboss.aop.class.path=$5
+ FILESTART=5
+fi
+
+
+
+
+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=$AOPC_CLASSPATH:$USER_CLASSPATH
+
+
+CTR=0
+
+for param in $*; do
+
+ CTR=`expr $CTR + 1`
+ if [ $CTR -gt $FILESTART ]; then
+ MAINCLASS_AND_ARGS=$MAINCLASS_AND_ARGS" "$param
+ fi
+done
+
+
+#Check for cygwin and convert path if necessary
+if (cygpath --version) >/dev/null 2>/dev/null; then
+ AOPC_CLASSPATH=`cygpath --path --windows $AOPC_CLASSPATH`
+fi
+
+
+java -javaagent:../lib/jboss-aop.jar=-hotSwap -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH $MAINCLASS_AND_ARGS
+
+
Copied: projects/aop/trunk/aop/src/resources/bin/run-precompiled.bat (from rev 79631, projects/aop/trunk/aop/src/resources/bin/run-precompiled15.bat)
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-precompiled.bat (rev 0)
+++ projects/aop/trunk/aop/src/resources/bin/run-precompiled.bat 2008-10-17 12:07:57 UTC (rev 79634)
@@ -0,0 +1,78 @@
+ at echo off
+
+IF %1a==a goto display_usage
+IF %2a==a goto display_usage
+IF %3a==a goto display_usage
+IF %4a==a goto display_usage
+IF %2==%4 goto display_usage
+
+SET USER_CLASSPATH=%1
+SET AOPPATH=
+SET AOPCLASSPATH=
+
+IF %2==-aoppath SET AOPPATH=-Djboss.aop.path=%3
+IF %2==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%3
+
+IF %4%5==-aoppath goto display_usage
+IF %4%5==-aopclasspath goto display_usage
+IF %4==-aoppath SET AOPPATH=-Djboss.aop.path=%5
+IF %4==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%5
+
+
+
+IF %4==-aoppath shift
+IF %3==-aoppath shift
+IF %4==-aopclasspath shift
+IF %3==-aopclasspath shift
+
+
+shift
+shift
+shift
+set ARGS_AND_FILES=
+REM get all the command line args
+:setupArgs
+if %1a==a goto doneStart
+ set ARGS_AND_FILES=%ARGS_AND_FILES% %1
+shift
+set MAINCLASS_AND_ARGS=%ARGS_AND_FILES%
+goto setupArgs
+
+: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=%AOPC_CLASSPATH%;%USER_CLASSPATH%
+
+
+java -classpath %AOPC_CLASSPATH% %AOPPATH% %AOPCLASSPATH% %MAINCLASS_AND_ARGS%
+
+goto end
+
+: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.
+
+:end
+
Copied: projects/aop/trunk/aop/src/resources/bin/run-precompiled.sh (from rev 79631, projects/aop/trunk/aop/src/resources/bin/run-precompiled15.sh)
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-precompiled.sh (rev 0)
+++ projects/aop/trunk/aop/src/resources/bin/run-precompiled.sh 2008-10-17 12:07:57 UTC (rev 79634)
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+
+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
+ 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
+ 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
+ exit 1
+}
+
+#Make sure have $1, $2 and $3
+if [ "x$1" = "x" ]; then
+ usage
+fi
+if [ "x$2" = "x" ]; then
+ usage
+fi
+if [ "x$3" = "x" ]; then
+ usage
+fi
+if [ "x$4" = "x" ]; then
+ usage
+fi
+if [ "$2" = "$4" ]; then
+ usage
+fi
+
+USER_CLASSPATH=$1
+
+AOPPATH=
+AOPCLASSPATH=
+
+if [ "$2" = "-aoppath" ]; then
+ AOPPATH=-Djboss.aop.path=$3
+ FILESTART=3
+fi
+
+if [ "$4" = "-aoppath" ]; then
+ if [ "x$5" = "x" ]; then
+ usage
+ fi
+ AOPPATH=-Djboss.aop.path=$5
+ FILESTART=5
+fi
+
+if [ "$2" = "-aopclasspath" ]; then
+ AOPCLASSPATH=-Djboss.aop.class.path=$3
+ FILESTART=3
+fi
+
+
+
+if [ "$4" = "-aopclasspath" ]; then
+ if [ "x$5" = "x" ]; then
+ usage
+ fi
+ AOPCLASSPATH=-Djboss.aop.class.path=$5
+ FILESTART=5
+fi
+
+
+
+
+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=$AOPC_CLASSPATH:$USER_CLASSPATH
+
+
+CTR=0
+
+for param in $*; do
+
+ CTR=`expr $CTR + 1`
+ if [ $CTR -gt $FILESTART ]; then
+ MAINCLASS_AND_ARGS=$MAINCLASS_AND_ARGS" "$param
+ fi
+done
+
+
+#Check for cygwin and convert path if necessary
+if (cygpath --version) >/dev/null 2>/dev/null; then
+ AOPC_CLASSPATH=`cygpath --path --windows $AOPC_CLASSPATH`
+fi
+
+
+java -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH $MAINCLASS_AND_ARGS
+
+
Deleted: projects/aop/trunk/aop/src/resources/bin/run-precompiled15.bat
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-precompiled15.bat 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/src/resources/bin/run-precompiled15.bat 2008-10-17 12:07:57 UTC (rev 79634)
@@ -1,78 +0,0 @@
- at echo off
-
-IF %1a==a goto display_usage
-IF %2a==a goto display_usage
-IF %3a==a goto display_usage
-IF %4a==a goto display_usage
-IF %2==%4 goto display_usage
-
-SET USER_CLASSPATH=%1
-SET AOPPATH=
-SET AOPCLASSPATH=
-
-IF %2==-aoppath SET AOPPATH=-Djboss.aop.path=%3
-IF %2==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%3
-
-IF %4%5==-aoppath goto display_usage
-IF %4%5==-aopclasspath goto display_usage
-IF %4==-aoppath SET AOPPATH=-Djboss.aop.path=%5
-IF %4==-aopclasspath SET AOPCLASSPATH=-Djboss.aop.class.path=%5
-
-
-
-IF %4==-aoppath shift
-IF %3==-aoppath shift
-IF %4==-aopclasspath shift
-IF %3==-aopclasspath shift
-
-
-shift
-shift
-shift
-set ARGS_AND_FILES=
-REM get all the command line args
-:setupArgs
-if %1a==a goto doneStart
- set ARGS_AND_FILES=%ARGS_AND_FILES% %1
-shift
-set MAINCLASS_AND_ARGS=%ARGS_AND_FILES%
-goto setupArgs
-
-:doneStart
-
-
-
-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-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
-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%
-
-
-java -classpath %AOPC_CLASSPATH% %AOPPATH% %AOPCLASSPATH% %MAINCLASS_AND_ARGS%
-
-goto end
-
-:display_usage
-echo Script file for running compile time instrumented aop applications for JDK 1.5
-echo Usage:
-echo run-precompiled15.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.
-
-:end
-
Deleted: projects/aop/trunk/aop/src/resources/bin/run-precompiled15.sh
===================================================================
--- projects/aop/trunk/aop/src/resources/bin/run-precompiled15.sh 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aop/src/resources/bin/run-precompiled15.sh 2008-10-17 12:07:57 UTC (rev 79634)
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-
-usage(){
- echo Script file for running compile time instrumented aop applications for JDK 1.5
- echo Usage:
- echo run-precompiled15.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
- 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
- echo Main.class: Your main class
- exit 1
-}
-
-#Make sure have $1, $2 and $3
-if [ "x$1" = "x" ]; then
- usage
-fi
-if [ "x$2" = "x" ]; then
- usage
-fi
-if [ "x$3" = "x" ]; then
- usage
-fi
-if [ "x$4" = "x" ]; then
- usage
-fi
-if [ "$2" = "$4" ]; then
- usage
-fi
-
-USER_CLASSPATH=$1
-
-AOPPATH=
-AOPCLASSPATH=
-
-if [ "$2" = "-aoppath" ]; then
- AOPPATH=-Djboss.aop.path=$3
- FILESTART=3
-fi
-
-if [ "$4" = "-aoppath" ]; then
- if [ "x$5" = "x" ]; then
- usage
- fi
- AOPPATH=-Djboss.aop.path=$5
- FILESTART=5
-fi
-
-if [ "$2" = "-aopclasspath" ]; then
- AOPCLASSPATH=-Djboss.aop.class.path=$3
- FILESTART=3
-fi
-
-
-
-if [ "$4" = "-aopclasspath" ]; then
- if [ "x$5" = "x" ]; then
- usage
- fi
- AOPCLASSPATH=-Djboss.aop.class.path=$5
- FILESTART=5
-fi
-
-
-
-
-AOPC_CLASSPATH=../lib-50/javassist.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-aop-jdk50-client.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
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/log4j.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/pluggable-instrumentor.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-aop-jdk50.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/jboss-common-core.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:../lib-50/trove.jar
-AOPC_CLASSPATH=$AOPC_CLASSPATH:$USER_CLASSPATH
-
-
-CTR=0
-
-for param in $*; do
-
- CTR=`expr $CTR + 1`
- if [ $CTR -gt $FILESTART ]; then
- MAINCLASS_AND_ARGS=$MAINCLASS_AND_ARGS" "$param
- fi
-done
-
-
-#Check for cygwin and convert path if necessary
-if (cygpath --version) >/dev/null 2>/dev/null; then
- AOPC_CLASSPATH=`cygpath --path --windows $AOPC_CLASSPATH`
-fi
-
-
-java -classpath $AOPC_CLASSPATH $AOPPATH $AOPCLASSPATH $MAINCLASS_AND_ARGS
-
-
Modified: projects/aop/trunk/aspects/pom.xml
===================================================================
--- projects/aop/trunk/aspects/pom.xml 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aspects/pom.xml 2008-10-17 12:07:57 UTC (rev 79634)
@@ -71,7 +71,7 @@
<tasks>
<mkdir dir="${basedir}/output" />
<mkdir dir="${basedir}/output/lib" />
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar" tofile="${basedir}/output/lib/jboss-standalone-aspect-library-jdk50.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar" tofile="${basedir}/output/lib/jboss-standalone-aspect-library.jar" />
<copy file="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar" tofile="${basedir}/output/lib/jboss-standalone-aspect-library-sources.jar" />
</tasks>
</configuration>
Modified: projects/aop/trunk/aspects/src/test/org/jboss/test/proxyfactory/AbstractProxyTest.java
===================================================================
--- projects/aop/trunk/aspects/src/test/org/jboss/test/proxyfactory/AbstractProxyTest.java 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/aspects/src/test/org/jboss/test/proxyfactory/AbstractProxyTest.java 2008-10-17 12:07:57 UTC (rev 79634)
@@ -38,6 +38,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public abstract class AbstractProxyTest extends AbstractTestCaseWithSetup
{
/** The proxy factory */
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2008-10-17 12:03:14 UTC (rev 79633)
+++ projects/aop/trunk/build/build.xml 2008-10-17 12:07:57 UTC (rev 79634)
@@ -374,9 +374,9 @@
<!-- Now pull everything together -->
<!-- ================================================== -->
- <property name="aop.50.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50.jar"/>
- <property name="aop.50.single.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50-single.jar"/>
- <property name="aop.aspect-library50.location" value="${project.root}/aspects/output/lib/jboss-standalone-aspect-library-jdk50.jar"/>
+ <property name="aop.50.location" value="${project.root}/aop/output/lib/jboss-aop.jar"/>
+ <property name="aop.50.single.location" value="${project.root}/aop/output/lib/jboss-aop-single.jar"/>
+ <property name="aop.aspect-library50.location" value="${project.root}/aspects/output/lib/jboss-standalone-aspect-library.jar"/>
<property name="aop.asintegration-core.location" value="${project.root}/asintegration-core/target/jboss-aop-asintegration-core.jar"/>
<property name="aop.asintegration-jmx.location" value="${project.root}/asintegration-jmx/target/jboss-aop-asintegration-jmx.jar"/>
<property name="aop.asintegration-mc.location" value="${project.root}/asintegration-mc/target/jboss-aop-asintegration-mc.jar"/>
@@ -390,22 +390,22 @@
<copy todir="${project.release}" file="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
<!-- The JDK 5 libs -->
- <copy todir="${project.release}/lib-50" file="${aop.50.location}"/>
- <copy todir="${project.release}/lib-50" file="${aop.50.single.location}"/>
- <copy todir="${project.release}/lib-50" file="${project.root}/aop/output/lib/jboss-aop-jdk50-client.jar"/>
- <copy todir="${project.release}/lib-50" file="${aop.aspect-library50.location}"/>
- <copy todir="${project.release}/lib-50" file="${aop.jrockit-pluggable-instrumentor.location}"/>
- <copy todir="${project.release}/lib-50" file="${aop.pluggable-instrumentor.location}"/>
- <copy tofile="${project.release}/lib-50/javassist.jar" file="${javassist:javassist:jar}"/>
- <copy tofile="${project.release}/lib-50/jboss-common-core.jar" file="${org.jboss:jboss-common-core:jar}"/>
+ <copy todir="${project.release}/lib" file="${aop.50.location}"/>
+ <copy todir="${project.release}/lib" file="${aop.50.single.location}"/>
+ <copy todir="${project.release}/lib" file="${project.root}/aop/output/lib/jboss-aop-client.jar"/>
+ <copy todir="${project.release}/lib" file="${aop.aspect-library50.location}"/>
+ <copy todir="${project.release}/lib" file="${aop.jrockit-pluggable-instrumentor.location}"/>
+ <copy todir="${project.release}/lib" file="${aop.pluggable-instrumentor.location}"/>
+ <copy tofile="${project.release}/lib/javassist.jar" file="${javassist:javassist:jar}"/>
+ <copy tofile="${project.release}/lib/jboss-common-core.jar" file="${org.jboss:jboss-common-core:jar}"/>
- <copy tofile="${project.release}/lib-50/jboss-reflect.jar" file="${org.jboss:jboss-reflect:jar}"/>
- <copy tofile="${project.release}/lib-50/jboss-mdr.jar" file="${org.jboss:jboss-mdr:jar}"/>
+ <copy tofile="${project.release}/lib/jboss-reflect.jar" file="${org.jboss:jboss-reflect:jar}"/>
+ <copy tofile="${project.release}/lib/jboss-mdr.jar" file="${org.jboss:jboss-mdr:jar}"/>
- <copy tofile="${project.release}/lib-50/jboss-logging-log4j.jar" file="${org.jboss.logging:jboss-logging-log4j:jar}"/>
- <copy tofile="${project.release}/lib-50/jboss-logging-spi.jar" file="${org.jboss.logging:jboss-logging-spi:jar}"/>
- <copy tofile="${project.release}/lib-50/log4j.jar" file="${log4j:log4j:jar}"/>
- <copy tofile="${project.release}/lib-50/trove.jar" file="${trove:trove:jar}"/>
+ <copy tofile="${project.release}/lib/jboss-logging-log4j.jar" file="${org.jboss.logging:jboss-logging-log4j:jar}"/>
+ <copy tofile="${project.release}/lib/jboss-logging-spi.jar" file="${org.jboss.logging:jboss-logging-spi:jar}"/>
+ <copy tofile="${project.release}/lib/log4j.jar" file="${log4j:log4j:jar}"/>
+ <copy tofile="${project.release}/lib/trove.jar" file="${trove:trove:jar}"/>
<!-- The JBoss 4.0.x and 4.2.x libs for JDK 5 -->
<copy file="${aop.jboss-service.location}" tofile="output/temp/jboss-service-jdk50.xml" filtering="true">
More information about the jboss-cvs-commits
mailing list