vmassol     2004/01/28 08:07:32

  Modified:    aspectwerkz/src/plugin-test project.xml maven.xml
               aspectwerkz project.xml
  Added:       aspectwerkz/src/plugin-test/parent project.properties
                        .cvsignore maven.xml project.xml
               aspectwerkz/src/plugin-test/child/conf aspectwerkz.xml
               aspectwerkz/src/plugin-test/child maven.xml
                        project.properties .cvsignore project.xml
               aspectwerkz/src/plugin-test/child/src/main/org/apache/maven/aspectwerkz
                        Target.java SampleAspect.java
               
aspectwerkz/src/plugin-test/child/src/aspectwerkz/org/apache/maven/aspectwerkz
                        SampleNonProductionAspect.java
               aspectwerkz/src/plugin-test/parent/src/main/org/apache/maven/aspectwerkz
                        ReusableAspect.java
  Removed:     aspectwerkz/src/plugin-test/src/main/org/apache/maven/aspectwerkz
                        SampleAspect.java Target.java
               aspectwerkz/src/plugin-test project.properties
               aspectwerkz/src/plugin-test/conf aspectwerkz.xml
               aspectwerkz/src/plugin-test/src/aspectwerkz/org/apache/maven/aspectwerkz
                        SampleNonProductionAspect.java
  Log:
  - Updated to dev build of AW as weaving aspects contained in library jars is 
supposed to have been fixed in that dev build
  - Improved functional test to show the user case of weaving library aspects (the 
test is passing fine but it seems the library aspect is not weaved properly yet).
  
  Revision  Changes    Path
  1.1                  
maven-plugins/aspectwerkz/src/plugin-test/parent/project.properties
  
  Index: project.properties
  ===================================================================
  # -------------------------------------------------------------------
  # P R O J E C T  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  maven.aspectwerkz.verbose = true
  
  
  
  
  1.1                  maven-plugins/aspectwerkz/src/plugin-test/parent/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  target
  maven.log
  
  
  
  1.1                  maven-plugins/aspectwerkz/src/plugin-test/parent/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project xmlns:util="jelly:util" xmlns:j="jelly:core">
  
    <goal name="dist" prereqs="aspectwerkz:aspectc,jar:install"/>
           
  </project>
  
  
  1.1                  maven-plugins/aspectwerkz/src/plugin-test/parent/project.xml
  
  Index: project.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <project>
    <extend>${basedir}/../project.xml</extend>
    <id>test-maven-aspectwerkz-plugin-parent</id>
    <name>Maven Aspectwerkz plugin test - Parent</name>
  </project>
  
  
  
  1.1                  
maven-plugins/aspectwerkz/src/plugin-test/child/conf/aspectwerkz.xml
  
  Index: aspectwerkz.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE aspectwerkz PUBLIC "-//AspectWerkz//DTD//EN" 
"http://aspectwerkz.codehaus.org/dtd/aspectwerkz.dtd";>
  
  <aspectwerkz>
    <system id="test">
      <package name="org.apache.maven.aspectwerkz">
        <use-aspect class="SampleAspect"/>
        <use-aspect class="SampleNonProductionAspect"/>
        <use-aspect class="ReusableAspect"/>
      </package>
    </system>
  </aspectwerkz>
  
  
  
  1.1                  maven-plugins/aspectwerkz/src/plugin-test/child/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project xmlns:util="jelly:util" xmlns:j="jelly:core">
  
    <goal name="dist" prereqs="aspectwerkz:weave"/>
           
  </project>
  
  
  1.1                  
maven-plugins/aspectwerkz/src/plugin-test/child/project.properties
  
  Index: project.properties
  ===================================================================
  # -------------------------------------------------------------------
  # P R O J E C T  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  maven.aspectwerkz.verbose = true
  maven.aspectwerkz.weave.build.dir = ${maven.build.dir}/aspectwerkz/weaved
  
  
  
  1.1                  maven-plugins/aspectwerkz/src/plugin-test/child/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  target
  maven.log
  
  
  
  1.1                  maven-plugins/aspectwerkz/src/plugin-test/child/project.xml
  
  Index: project.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <project>
    <extend>${basedir}/../project.xml</extend>
    <id>test-maven-aspectwerkz-plugin-child</id>
    <name>Maven Aspectwerkz plugin test - Child</name>
    <dependencies>
      <dependency>
        <groupId>maven</groupId>
        <artifactId>test-maven-aspectwerkz-plugin-parent</artifactId>
        <version>1.0</version>
        <aspectwerkz.library>true</aspectwerkz.library>
      </dependency>
    </dependencies>
  </project>
  
  
  
  1.3       +2 -2      maven-plugins/aspectwerkz/src/plugin-test/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/aspectwerkz/src/plugin-test/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml       26 Dec 2003 13:52:37 -0000      1.2
  +++ project.xml       28 Jan 2004 16:07:07 -0000      1.3
  @@ -5,7 +5,7 @@
     <id>test-maven-aspectwerkz-plugin</id>
     <name>Test project for Maven AspectWerkz Plugin</name>
     <groupId>maven</groupId>
  -  <currentVersion>1.0-SNAPSHOT</currentVersion>
  +  <currentVersion>1.0</currentVersion>
     <organization>
       <name>Apache Software Foundation</name>
       <url>http://www.apache.org/</url>
  @@ -37,7 +37,7 @@
       <dependency>
         <groupId>aspectwerkz</groupId>
         <artifactId>aspectwerkz</artifactId>
  -      <version>0.9.RC1</version>
  +      <version>0.9.RC2.dev.20040125</version>
       </dependency>
     </dependencies>
     <build>
  
  
  
  1.4       +9 -2      maven-plugins/aspectwerkz/src/plugin-test/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/aspectwerkz/src/plugin-test/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml 27 Dec 2003 13:11:25 -0000      1.3
  +++ maven.xml 28 Jan 2004 16:07:07 -0000      1.4
  @@ -1,8 +1,15 @@
   <project xmlns:util="jelly:util" xmlns:j="jelly:core">
   
     <goal name="testPlugin">
  -    <attainGoal name="clean"/>
  -    <attainGoal name="aspectwerkz:weave"/>
  +    
  +    <!-- Clean projects -->
  +     <j:set var="goal" value="clean"/>
  +    <attainGoal name="multiproject:goal"/>
  +
  +    <!-- Generate project artifacts -->
  +     <j:set var="goal" value="dist"/>
  +    <attainGoal name="multiproject:goal"/>
  +
     </goal>
            
   </project>
  
  
  
  1.1                  
maven-plugins/aspectwerkz/src/plugin-test/child/src/main/org/apache/maven/aspectwerkz/Target.java
  
  Index: Target.java
  ===================================================================
  package org.apache.maven.aspectwerkz;
  
  /**
 * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Massol</a>
   */
public class Target
  {
    public static void someMethod1()
      {
        System.out.println("someMethod1");
      }
   
      public static void someMethod2()
      {
          System.out.println("someMethod2");
      }
  }
  
  
  1.1                  
maven-plugins/aspectwerkz/src/plugin-test/child/src/main/org/apache/maven/aspectwerkz/SampleAspect.java
  
  Index: SampleAspect.java
  ===================================================================
  package org.apache.maven.aspectwerkz;

import org.codehaus.aspectwerkz.attribdef.Pointcut;
import org.codehaus.aspectwerkz.attribdef.aspect.Aspect;
import org.codehaus.aspectwerkz.joinpoint.JoinPoint;

/**
 * @Aspect perJVM
 *
 * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Massol</a>
 */
public class SampleAspect extends Aspect
{
    /**
     * @Execution * *..Target.someMethod1(..)
     */
    Pointcut samplePointcut;
    
    /**
     * @Around samplePointcut
     */
    public Object sampleAdvice(final JoinPoint joinPoint) throws Throwable
    {
        System.out.println("samplePointcut");
        return joinPoint.proceed(); 
    }
}
  
  
  1.1                  
maven-plugins/aspectwerkz/src/plugin-test/child/src/aspectwerkz/org/apache/maven/aspectwerkz/SampleNonProductionAspect.java
  
  Index: SampleNonProductionAspect.java
  ===================================================================
  package org.apache.maven.aspectwerkz;

import org.codehaus.aspectwerkz.attribdef.Pointcut;
import org.codehaus.aspectwerkz.attribdef.aspect.Aspect;
import org.codehaus.aspectwerkz.joinpoint.JoinPoint;

/**
 * @Aspect perJVM
 *
 * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Massol</a>
 */
public class SampleNonProductionAspect extends Aspect
{
    /**
     * @Execution * *..Target.someMethod2(..)
     */
    Pointcut sampleNonProductionPointcut;
    
    /**
     * @Around sampleNonProductionPointcut
     */
    public Object sampleNonProductionAdvice(final JoinPoint joinPoint) 
        throws Throwable
    {
        System.out.println("sampleNonProductionPointcut");
        return joinPoint.proceed(); 
    }
}
  
  
  1.11      +2 -2      maven-plugins/aspectwerkz/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/aspectwerkz/project.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- project.xml       5 Jan 2004 04:47:52 -0000       1.10
  +++ project.xml       28 Jan 2004 16:07:20 -0000      1.11
  @@ -39,12 +39,12 @@
       <dependency>
         <groupId>aspectwerkz</groupId>
         <artifactId>aspectwerkz-core</artifactId>
  -      <version>0.9.RC1</version>
  +      <version>0.9.RC2.dev.20040125</version>
       </dependency>
       <dependency>
         <groupId>aspectwerkz</groupId>
         <artifactId>aspectwerkz</artifactId>
  -      <version>0.9.RC1</version>
  +      <version>0.9.RC2.dev.20040125</version>
       </dependency>
       <dependency>
         <groupId>qdox</groupId>
  
  
  
  1.1                  
maven-plugins/aspectwerkz/src/plugin-test/parent/src/main/org/apache/maven/aspectwerkz/ReusableAspect.java
  
  Index: ReusableAspect.java
  ===================================================================
  package org.apache.maven.aspectwerkz;

import org.codehaus.aspectwerkz.attribdef.Pointcut;
import org.codehaus.aspectwerkz.attribdef.aspect.Aspect;
import org.codehaus.aspectwerkz.joinpoint.JoinPoint;

/**
 * @Aspect perJVM
 *
 * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Massol</a>
 */
public class ReusableAspect extends Aspect
{
    /**
     * @Execution * *..Target.someMethod*(..)
     */
    Pointcut reusablePointcut;
    
    /**
     * @Around reusablePointcut
     */
    public Object reusableAdvice(final JoinPoint joinPoint) throws Throwable
    {
        System.out.println("reusablePointcut");
        return joinPoint.proceed(); 
    }
}
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to