[jboss-cvs] JBossAS SVN: r62887 - in projects/aop/trunk/aop/docs/examples: injboss and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 8 16:35:17 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-05-08 16:35:17 -0400 (Tue, 08 May 2007)
New Revision: 62887
Modified:
projects/aop/trunk/aop/docs/examples/annotated-injboss/build.xml
projects/aop/trunk/aop/docs/examples/injboss/build.xml
Log:
[JBAOP-399] annotated-injboss example working with repackaging
Modified: projects/aop/trunk/aop/docs/examples/annotated-injboss/build.xml
===================================================================
--- projects/aop/trunk/aop/docs/examples/annotated-injboss/build.xml 2007-05-08 20:25:34 UTC (rev 62886)
+++ projects/aop/trunk/aop/docs/examples/annotated-injboss/build.xml 2007-05-08 20:35:17 UTC (rev 62887)
@@ -1,33 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--
'ct' = compile time AOP instrumentation
- 'lt' = load time AOP instrumentation
+ 'lt' = load time AOP instrumentation
-->
-<project default="help" name="AOP in JBoss example" basedir=".">
- <target name="prepare">
+<project default="usage" name="AOP in JBoss example" basedir=".">
+
+ <import file="../examples-build.xml"/>
+
+ <target name="prepare" depends="_prepare">
<!-- Set jboss.dir property to root of your JBoss distribution -->
- <property name="jboss.dir" value="SET_TO_JBOSS_ROOT"/>
- <!--
+ <property name="jboss.dir" value="C:/temp/jboss-4.0.5.GA"/>
+ <!--
Set jboss.server.config property to either default or all.
if you set this to default, JBoss should be started with
run -c default
if you set this to all, JBoss should be started with
run -c all
- -->
- <property name="jboss.server.config" value="all" />
+ -->
+ <property name="jboss.server.config" value="all" />
- <echo>===========================================================</echo>
+ <available file="${jboss.dir}" property="jboss.exists" type="dir"/>
+ <fail unless="jboss.exists" message="${jboss.dir} does not exist. Modify 'jboss.dir' in build.xml to be a valid root of a jboss installation"/>
+
+ <echo>===========================================================</echo>
<echo>YOUR JBOSS DISTRIBUTION ROOT IS: ${jboss.dir}</echo>
<echo>YOUR SERVER CONFIG IS: ${jboss.server.config}</echo>
<echo>MAKE SURE YOU STARTED JBOSS WITH: run -c ${jboss.server.config}</echo>
- <echo>===========================================================</echo>
-
+ <echo>===========================================================</echo>
+
<property name="src.dir" value="src/main"/>
<property name="resource.dir" value="src/resources"/>
<property name="resource.jboss-aop.xml" value="${resource.dir}/META-INF/jboss-aop.xml"/>
<property name="basic.web.dir" value="${resource.dir}/web-basic"/>
<property name="ear.web.dir" value="${resource.dir}/web-ear"/>
-
+
<property name="output.dir" value="output"/>
<property name="classes.dir" value="${output.dir}/classes"/>
<property name="aop.classes.dir" value="${output.dir}/aopclasses"/>
@@ -36,7 +42,7 @@
<property name="basic.web.out.lib.dir" value="${basic.web.out.dir}/WEB-INF/lib"/>
<property name="ear.web.out.dir" value="${output.dir}/web-basic"/>
<property name="ear.web.out.lib.dir" value="${ear.web.out.dir}/WEB-INF/lib"/>
-
+
<property name="deploy.dir" value="${jboss.dir}/server/${jboss.server.config}/deploy" />
<property name="ejb.jar.name" value="aopexampleejb.jar"/>
<property name="ejb.jar" value="${lib.dir}/${ejb.jar.name}"/>
@@ -59,25 +65,12 @@
<pathelement path="${jboss.dir}/server/default/lib/javax.servlet.jar"/>
<pathelement path="${jboss.dir}/server/default/lib/jboss-j2ee.jar"/>
</path>
-
- <property name="jboss.aop.root" value="../../../.."/>
- <!-- <property name="jboss.aop.lib" value="${jboss.aop.root}/lib"/> -->
- <property name="jboss.aop.lib" value="${jboss.aop.root}/lib-50"/>
-
- <path id="jboss.aop.classpath">
- <fileset dir="${jboss.aop.lib}">
- <include name="*.jar"/>
- </fileset>
- </path>
-
<path id="classpath">
- <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.aop.classpath50"/>
<path refid="jboss.classpath"/>
<pathelement path="."/>
</path>
-
- <property name="aop50jar" value="${jboss.aop.lib50}/jboss-aop-jdk50.jar"/>
<delete dir="${output.dir}"/>
<mkdir dir="${output.dir}"/>
@@ -86,9 +79,9 @@
<mkdir dir="${lib.dir}"/>
<mkdir dir="${basic.web.out.dir}"/>
<mkdir dir="${ear.web.out.dir}"/>
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath50"/>
</target>
-
+
<target name="compile" depends="prepare">
<javac srcdir="${src.dir}"
destdir="${classes.dir}"
@@ -99,22 +92,22 @@
<classpath refid="classpath"/>
</javac>
</target>
-
+
<target name="compile-aop" depends="compile">
<copy todir="${aop.classes.dir}">
<fileset dir="${classes.dir}">
<include name="**/*"/>
</fileset>
- </copy>
-
+ </copy>
+
<aopc compilerclasspathref="classpath" classpathref="classpath" verbose="true">
<classpath path="${aop.classes.dir}"/>
<src path="${aop.classes.dir}"/>
<aoppath path="${resource.jboss-aop.xml}"/>
</aopc>
</target>
-
-
+
+
<target name="lib-ct-jar" depends="compile-aop">
<!-- Create lib-jar -->
@@ -124,7 +117,7 @@
</fileset>
</jar>
</target>
-
+
<target name="lib-lt-jar" depends="compile">
<!-- Create lib-jar -->
@@ -134,7 +127,7 @@
</fileset>
</jar>
</target>
-
+
<target name="lib-lt-aop" depends="compile">
<!-- Create .aop file-->
@@ -144,10 +137,10 @@
</fileset>
<fileset dir="${resource.dir}">
<include name="META-INF/jboss-aop.xml"/>
- </fileset>
+ </fileset>
</jar>
</target>
-
+
<target name="lib-ct-aop" depends="compile-aop">
<!-- Create .aop file with pre-instrumented files -->
<jar destfile="${lib.aop}">
@@ -156,10 +149,10 @@
</fileset>
<fileset dir="${resource.dir}">
<include name="META-INF/jboss-aop.xml"/>
- </fileset>
+ </fileset>
</jar>
</target>
-
+
<target name="basic-ct-war" depends="lib-ct-jar">
<!-- Create simple war, containing aop'ed classes lib -->
@@ -196,7 +189,7 @@
<jar destfile="${basic.war}" basedir="${basic.web.out.dir}"/>
</target>
- <target name="basic-lt-war-in-sar" depends="lib-lt-aop">
+ <target name="basic-lt-war-in-sar" depends="lib-lt-aop">
<!-- Create war, classes will be in a .aop lib in the sar -->
<copy todir="${basic.web.out.dir}">
<fileset dir="${basic.web.dir}">
@@ -207,19 +200,19 @@
<jar destfile="${example.sar}" basedir="${lib.dir}">
<fileset dir="${resource.dir}">
<include name="META-INF/jboss-service.xml"/>
- </fileset>
+ </fileset>
</jar>
- </target>
-
- <target name="example-lt-sar" depends="lib-lt-aop">
+ </target>
+
+ <target name="example-lt-sar" depends="lib-lt-aop">
<jar destfile="${example.sar}" basedir="${lib.dir}">
<fileset dir="${resource.dir}">
<include name="META-INF/jboss-service.xml"/>
- </fileset>
+ </fileset>
</jar>
- </target>
-
- <target name="basic-ct-war-in-sar" depends="lib-ct-aop">
+ </target>
+
+ <target name="basic-ct-war-in-sar" depends="lib-ct-aop">
<!-- Create war, classes will be in a .aop lib in the sar -->
<copy todir="${basic.web.out.dir}">
<fileset dir="${basic.web.dir}">
@@ -231,14 +224,14 @@
<fileset dir="${lib.dir}">
<include name="*.war"/>
<include name="*.aop"/>
- </fileset>
+ </fileset>
<fileset dir="${resource.dir}">
<include name="META-INF/jboss-service.xml"/>
- </fileset>
+ </fileset>
</jar>
- </target>
-
- <target name="basic-lt-war-in-jar" depends="lib-lt-aop">
+ </target>
+
+ <target name="basic-lt-war-in-jar" depends="lib-lt-aop">
<!-- Create war, classes will be in a .aop lib in the jar -->
<copy todir="${basic.web.out.dir}">
<fileset dir="${basic.web.dir}">
@@ -247,9 +240,9 @@
</copy>
<jar destfile="${basic.war}" basedir="${basic.web.out.dir}"/>
<jar destfile="${example.jar}" basedir="${lib.dir}"/>
- </target>
-
-
+ </target>
+
+
<target name="ear-war" depends="compile">
<!-- Create war for use in ear -->
<copy todir="${ear.web.out.dir}">
@@ -283,11 +276,11 @@
<include name="**/web/*"/>
<include name="**/lib/*"/>
</fileset>
- </jar>
- </target>
-
+ </jar>
+ </target>
+
<target name="ear-lib-aop" depends="compile">
-
+
<!-- Create .aop file for use in ear-->
<jar destfile="${lib.aop}">
<fileset dir="${classes.dir}">
@@ -296,16 +289,16 @@
</fileset>
<fileset dir="${resource.dir}">
<include name="META-INF/jboss-aop.xml"/>
- </fileset>
+ </fileset>
</jar>
</target>
-
+
<target name="ear" depends="ear-ejb-jar, ear-lib-jar, ear-war">
<filter token="lib" value="${lib.jar.name}"/>
<mkdir dir="${output.dir}/META-INF"/>
- <copy file="${resource.dir}/META-INF/application.xml"
+ <copy file="${resource.dir}/META-INF/application.xml"
todir="${output.dir}/META-INF" filtering="on"/>
-
+
<jar destfile="${example.ear}">
<fileset dir="${lib.dir}">
<include name="${basic.war.name}"/>
@@ -316,12 +309,12 @@
<include name="META-INF/application.xml"/>
</fileset>
</jar>
- </target>
+ </target>
<target name="ear-aop" depends="ear-ejb-jar, ear-lib-aop, ear-war">
<filter token="lib" value="${lib.aop.name}"/>
<mkdir dir="${output.dir}/META-INF"/>
- <copy file="${resource.dir}/META-INF/application.xml"
+ <copy file="${resource.dir}/META-INF/application.xml"
todir="${output.dir}/META-INF" filtering="on"/>
<jar destfile="${example.ear}">
@@ -334,7 +327,7 @@
<include name="META-INF/application.xml"/>
</fileset>
</jar>
- </target>
+ </target>
<target name="undeploy" depends="prepare">
<delete>
@@ -350,25 +343,25 @@
</fileset>
</delete>
</target>
-
+
<target name="undeploy-wait" depends="undeploy">
<echo>Waiting for undeploy to take effect...</echo>
<sleep seconds="10"/>
</target>
-
- <target name="help" depends="">
+
+ <target name="usage" depends="">
<echo>
Run 'ant deploy-basic-lt-war',
'ant deploy-basic-lt-war-in-sar',
'ant deploy-basic-lt-war-in-jar',
'ant deploy-ear' or
'ant deploy-ear-aop' or
- 'deploy-example-lt-sar'
+ 'ant deploy-example-lt-sar'
to deploy to JBoss for loadtime AOP</echo>
</target>
<!--- The following are the targets to be executed -->
-
+
<target name="deploy-basic-ct-war" depends="basic-ct-war, undeploy-wait" if="">
<copy file="${basic.war}" todir="${deploy.dir}"/>
<!-- Problems - see issues.txt -->
@@ -379,7 +372,7 @@
<echo>Contains already aop'ed classes - run with enable transformations = false</echo>
<echo>=============================================================</echo>
</target>
-
+
<target name="deploy-basic-lt-war" depends="basic-lt-war, undeploy-wait">
<copy file="${resource.jboss-aop.xml}" todir="${deploy.dir}"/>
<copy file="${basic.war}" todir="${deploy.dir}"/>
@@ -393,9 +386,9 @@
<copy file="${example.sar}" todir="${deploy.dir}"/>
</target>
-
-
- <!-- This one does not get aop'ed. WEB-INF/lib contains .aop file. Possibly due to classloader stuff? -->
+
+
+ <!-- This one does not get aop'ed. WEB-INF/lib contains .aop file. Possibly due to classloader stuff? -->
<target name="deploy-basic-lt-aop-war" depends="basic-lt-aop-war, undeploy-wait">
<copy file="${basic.war}" todir="${deploy.dir}"/>
<echo>=============================================================</echo>
@@ -403,8 +396,8 @@
<echo>Deploying war with a WEB-INF/lib/lib.aop file containing the jboss-aop.xml file</echo>
<echo>=============================================================</echo>
</target>
-
-
+
+
<target name="deploy-basic-lt-war-in-sar" depends="basic-lt-war-in-sar, undeploy-wait">
<copy file="${example.sar}" todir="${deploy.dir}"/>
<echo>=============================================================</echo>
@@ -412,7 +405,7 @@
<echo>Deploying sar containing a war and all classes in a lib.aop file containing the jboss-aop.xml file</echo>
<echo>=============================================================</echo>
</target>
-
+
<target name="deploy-basic-ct-war-in-sar" depends="basic-ct-war-in-sar, undeploy-wait">
<!-- Problems - see issues.txt -->
<copy file="${example.sar}" todir="${deploy.dir}"/>
@@ -421,7 +414,7 @@
<echo>Deploying sar containing a war and all classes in a lib.aop file containing the jboss-aop.xml file</echo>
<echo>=============================================================</echo>
</target>
-
+
<target name="deploy-basic-lt-war-in-jar" depends="basic-lt-war-in-jar, undeploy-wait">
<copy file="${example.jar}" todir="${deploy.dir}"/>
<echo>=============================================================</echo>
@@ -429,7 +422,7 @@
<echo>Deploying jar containing a war and all classes in a lib.aop file containing the jboss-aop.xml file</echo>
<echo>=============================================================</echo>
</target>
-
+
<target name="deploy-ear" depends="ear, undeploy-wait">
<copy file="${resource.jboss-aop.xml}" todir="${deploy.dir}"/>
<copy file="${example.ear}" todir="${deploy.dir}"/>
Modified: projects/aop/trunk/aop/docs/examples/injboss/build.xml
===================================================================
--- projects/aop/trunk/aop/docs/examples/injboss/build.xml 2007-05-08 20:25:34 UTC (rev 62886)
+++ projects/aop/trunk/aop/docs/examples/injboss/build.xml 2007-05-08 20:35:17 UTC (rev 62887)
@@ -20,7 +20,6 @@
<property name="jboss.server.config" value="all" />
<available file="${jboss.dir}" property="jboss.exists" type="dir"/>
- <echo>xx ${jboss.exists} xx</echo>
<fail unless="jboss.exists" message="${jboss.dir} does not exist. Modify 'jboss.dir' in build.xml to be a valid root of a jboss installation"/>
<echo>===========================================================</echo>
More information about the jboss-cvs-commits
mailing list