[jboss-cvs] JBossAS SVN: r74641 - in projects/aop/trunk/aop/docs/examples/packaging: META-INF and 1 other directory.

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

Author: flavia.rainone at jboss.com
Date: 2008-06-16 16:37:32 -0400 (Mon, 16 Jun 2008)
New Revision: 74641

Added:
   projects/aop/trunk/aop/docs/examples/packaging/META-INF/
   projects/aop/trunk/aop/docs/examples/packaging/META-INF/jboss-aop.xml
Removed:
   projects/aop/trunk/aop/docs/examples/packaging/resources/
Modified:
   projects/aop/trunk/aop/docs/examples/packaging/build.xml
Log:
[JBAOP-594] Example packaging fixed: the task aopc was lacking src, and had an extra aoppath; moved META-INF
            from resources to packaging directory.

Added: projects/aop/trunk/aop/docs/examples/packaging/META-INF/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/docs/examples/packaging/META-INF/jboss-aop.xml	                        (rev 0)
+++ projects/aop/trunk/aop/docs/examples/packaging/META-INF/jboss-aop.xml	2008-06-16 20:37:32 UTC (rev 74641)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aop>
+   <bind pointcut="execution(public void POJO->noop())">
+       <interceptor class="SimpleInterceptor"/>
+   </bind>
+
+   <bind pointcut="execution(* POJO->*(int))">
+       <interceptor class="MethodInterceptor"/>
+   </bind>
+
+   <bind pointcut="execution(static * POJO->*(..))">
+       <interceptor class="MethodInterceptor"/>
+   </bind>
+
+   <bind pointcut="execution(* POJO$Bar->*(..))">
+       <interceptor class="MethodInterceptor"/>
+   </bind>
+
+</aop>

Modified: projects/aop/trunk/aop/docs/examples/packaging/build.xml
===================================================================
--- projects/aop/trunk/aop/docs/examples/packaging/build.xml	2008-06-16 20:29:49 UTC (rev 74640)
+++ projects/aop/trunk/aop/docs/examples/packaging/build.xml	2008-06-16 20:37:32 UTC (rev 74641)
@@ -9,9 +9,9 @@
       <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath50"/>
 
       <aopc compilerclasspathref="classpath50" classpathref="classpath50" verbose="true">
-         <sysproperty key="jboss.aop.path" value="jboss-aop.xml"/>
          <sysproperty key="jboss.aop.verbose" value="true"/>
          <classpath path="."/>
+         <src path="."/>
       </aopc>
    </target>
 
@@ -21,12 +21,15 @@
       <jar jarfile="example.jar">
          <fileset dir=".">
             <include name="*.class"/>
-         </fileset>
-         <fileset dir="resources">
             <include name="META-INF/jboss-aop.xml"/>
          </fileset>
       </jar>
 
+      <delete>
+         <fileset dir="." includes="*.class"/>
+      </delete>
+
+      
       <java fork="yes" failOnError="true" className="Driver">
          <classpath refid="jboss.aop.classpath50"/>
          <classpath path="example.jar"/>
@@ -39,12 +42,14 @@
       <jar jarfile="example.jar">
          <fileset dir=".">
             <include name="*.class"/>
-         </fileset>
-         <fileset dir="resources">
             <include name="META-INF/jboss-aop.xml"/>
          </fileset>
       </jar>
 
+      <delete>
+         <fileset dir="." includes="*.class"/>
+      </delete>
+      
       <java fork="yes" failOnError="true" className="Driver">
          <jvmarg value="-javaagent:${aop50jar}"/>
          <classpath refid="jboss.aop.classpath50"/>