[jboss-cvs] JBossAS SVN: r62886 - projects/aop/trunk/aop/docs/examples/injboss.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2007-05-08 16:25:34 -0400 (Tue, 08 May 2007)
New Revision: 62886

Modified:
   projects/aop/trunk/aop/docs/examples/injboss/build.xml
Log:
[JBAOP-399] injboss example working with repackaging

Modified: projects/aop/trunk/aop/docs/examples/injboss/build.xml
===================================================================
--- projects/aop/trunk/aop/docs/examples/injboss/build.xml	2007-05-08 19:53:29 UTC (rev 62885)
+++ projects/aop/trunk/aop/docs/examples/injboss/build.xml	2007-05-08 20:25:34 UTC (rev 62886)
@@ -3,10 +3,13 @@
    'ct' = compile 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="C:/jboss-4.0"/>
+      <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
@@ -16,6 +19,10 @@
         -->
       <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>
       <echo>YOUR JBOSS DISTRIBUTION ROOT IS: ${jboss.dir}</echo>
       <echo>YOUR SERVER CONFIG IS: ${jboss.server.config}</echo>
@@ -60,37 +67,12 @@
          <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.lib50" value="${jboss.aop.root}/lib-50"/>
-
-      <path id="jboss.aop.classpath">
-         <fileset dir="${jboss.aop.lib}">
-            <include name="*.jar"/>
-         </fileset>
-      </path>
-      <echo message="${jboss.aop.lib}"/>
-      <echo message="${jboss.aop.lib}"/>
-
-      <path id="jboss.aop.classpath50">
-         <fileset dir="${jboss.aop.lib50}">
-            <include name="*.jar"/>
-         </fileset>
-      </path>
-
       <path id="classpath">
-         <path refid="jboss.aop.classpath"/>
+         <path refid="jboss.aop.classpath14"/>
          <path refid="jboss.classpath"/>
          <pathelement path="."/>
       </path>
 
-      <property name="aop50jar" value="${jboss.aop.lib50}/jboss-aop-jdk50.jar"/>
-
-      <path id="classpath50">
-         <path refid="jboss.aop.classpath50"/>
-         <pathelement path="."/>
-      </path>
-
       <delete dir="${output.dir}"/>
       <mkdir dir="${output.dir}"/>
       <mkdir dir="${classes.dir}"/>
@@ -98,7 +80,7 @@
       <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.classpath14"/>
    </target>
 
    <target name="compile" depends="prepare">
@@ -368,14 +350,14 @@
       <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>