Index: plugin.jelly =================================================================== RCS file: /home/cvspublic/maven-plugins/aspectj/plugin.jelly,v retrieving revision 1.8 diff -u -r1.8 plugin.jelly --- plugin.jelly 4 Mar 2004 18:00:21 -0000 1.8 +++ plugin.jelly 6 May 2004 18:21:45 -0000 @@ -1,4 +1,5 @@ + + xmlns:ant="jelly:ant"> - - - - - - - - - + + + @@ -79,155 +55,84 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - + + - - - - - + + + + + + + + + + + + Weaving with: ${dep.artifactId} + + + + + + + + + + + Weaving into: ${dep.artifactId} + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: plugin.properties =================================================================== RCS file: /home/cvspublic/maven-plugins/aspectj/plugin.properties,v retrieving revision 1.3 diff -u -r1.3 plugin.properties --- plugin.properties 4 Mar 2004 18:00:21 -0000 1.3 +++ plugin.properties 6 May 2004 18:21:45 -0000 @@ -18,21 +18,9 @@ # Default properties for the AspectJ Plugin # ------------------------------------------------------------------- -# If true, aspects located in ${pom.build.aspectSourceDirectory} will be -# weaved into the project java sources automatically upon invocation of -# the jar:jar goal. -maven.aspectj.autoweave = false - -# Name of the output jar containing the weaved aspects -maven.aspectj.outjar = ${maven.build.dir}/${maven.final.name}.jar - -# Name of non-weaved jar. The non-weaved jar (a.k.a input jar) will be -# moved to this name so that the new weaved jar can reuse the same name -maven.aspectj.injar.nonweaved = ${maven.build.dir}/${maven.final.name}-notweaved.jar - # List of resource files to exclude when copying resources from the input jar # to the weaved output jar -maven.aspectj.sourceRootCopyFilters = **/CVS/*,**/*.java,**/*.aj +maven.aspectj.sourceRootCopyFilter = **/CVS/*,**/*.java,**/*.aj # If true, emit .ajesym symbol files for Emacs support maven.aspectj.emacssym = no @@ -40,6 +28,8 @@ # If true, run in debug mode maven.aspectj.debug = false -# Name of the output jar of reusable aspects. Used only in the -# aspectj:jar goal -maven.aspectj.library = ${maven.build.dir}/${pom.artifactId}-aspects-${pom.currentVersion}.jar +# If true, emit compiler status messages during the compile. +maven.aspectj.verbose = false + +# incremental mode: Build once, then recompile only required source files when user provides input. +maven.aspectj.incremental = false \ No newline at end of file Index: project.xml =================================================================== RCS file: /home/cvspublic/maven-plugins/aspectj/project.xml,v retrieving revision 1.29 diff -u -r1.29 project.xml --- project.xml 2 May 2004 13:30:28 -0000 1.29 +++ project.xml 6 May 2004 18:21:45 -0000 @@ -23,9 +23,9 @@ 3 maven-aspectj-plugin Maven AspectJ Plug-in - 2.1-SNAPSHOT + 3.0 - Eclipse Plugin for AspectJ + AspectJ Plugin for Maven http://maven.apache.org/reference/plugins/aspectj/ http://jira.codehaus.org/BrowseProject.jspa?id=10320 /www/maven.apache.org/reference/plugins/aspectj/ @@ -50,6 +50,11 @@ 2.1 HEAD + + 3.0 + 3.0 + MAVEN_ASPECTJ_3_0 + @@ -73,23 +78,37 @@ Documentation + + Carlos Sanchez + carlossg + carlossg@users.sourceforge.net + + + Java Developer + Documentation + + + + Charlie Harvey + sbzoom + sbzoom@yahoo.com + + + Java Developer + Documentation + + aspectj aspectjrt - 1.1.0 - - root - + 1.2rc1 aspectj aspectjtools - 1.1.0 - - root - + 1.2rc1 cvs server: Diffing xdocs Index: xdocs/changes.xml =================================================================== RCS file: /home/cvspublic/maven-plugins/aspectj/xdocs/changes.xml,v retrieving revision 1.9 diff -u -r1.9 changes.xml --- xdocs/changes.xml 1 May 2004 09:20:21 -0000 1.9 +++ xdocs/changes.xml 6 May 2004 18:21:45 -0000 @@ -24,8 +24,18 @@ dIon Gillard Vincent Massol Jason van Zyl + Carlos Sanchez + + Another almost complete rewrite of the plugin. + Using AspectJ 1.2rc1 + Now performing weaving at class level + Weaving of dependency libraries + Removed weaving at jar level aspectj:weave + Removed generation of reusable aspects jar aspectj:jar and aspectj:jar-install + Added some customizable properties + Index: xdocs/goals.xml =================================================================== RCS file: /home/cvspublic/maven-plugins/aspectj/xdocs/goals.xml,v retrieving revision 1.4 diff -u -r1.4 goals.xml --- xdocs/goals.xml 4 Mar 2004 18:00:22 -0000 1.4 +++ xdocs/goals.xml 6 May 2004 18:21:45 -0000 @@ -22,43 +22,24 @@ Maven AspectJ Plug-in Goals dIon Gillard + Carlos Sanchez -
-

Todo. For the time being, please refer to the plugin.jelly file -in the aspectj plugin directory.

- -
+ + + + aspectj:compile + + Weaves project classes and dependency libraries. + + + Index: xdocs/index.xml =================================================================== RCS file: /home/cvspublic/maven-plugins/aspectj/xdocs/index.xml,v retrieving revision 1.3 diff -u -r1.3 index.xml --- xdocs/index.xml 4 Mar 2004 18:00:22 -0000 1.3 +++ xdocs/index.xml 6 May 2004 18:21:45 -0000 @@ -23,24 +23,17 @@ Maven AspectJ Plug-in dIon Gillard Vincent Massol + Carlos Sanchez

- AspectJ plugin for Maven. It offers the following features: + AspectJ plugin for Maven. It offers the ability to + weave aspects on the classes generated and dependency libraries. + This also includes the ability to add dependencies on libraries + with aspects.

-

For more information on the functionality provided by this plugin, please see the Goals document. @@ -51,5 +44,149 @@ document.

+
+

+ To install or update the plugin do the following:
+ maven plugin:download -DgroupId=maven -DartifactId=maven-aspectj-plugin -Dversion=3.0 +

+
+ +
+

You must tell Maven what aspects you want to weave project classes with + in addition to the source aspects in your project. This is achieved by + specifying meta-information in the POM, using the + aspectj.weaveWith property +

+ + + groupid + jarid + jarversion + + true + + + ]]> + +
+ +
+

You must tell Maven what libraries you want to weave with project aspects + or aspect libraries. This is achieved by + specifying meta-information in the POM, using the + aspectj.weaveInto property +

+ + + groupid + jarid + jarversion + + true + + + ]]> + +
+ +
+

If you are creating a deployable file like a war you + need to add the aspectjrt library to your dependencies so it + gets included in the file. You shouldn't need to add it for + other operations. +

+ + + aspectj + aspectjrt + 1.2rc1 + http://www.eclipse.org/aspectj + + true + + + ]]> + +
+ +
+

If you want to call the aspectj goal every time you compile + add the following to your maven.xml file. +

+ + + + + ]]> + +
+ +
+ + + + + + 3 + examples + example-with-aspects + 1.0 + + + + company-jars + jar-one + 1.0 + + true + + + + company-aspects + example-aspects + 1.0 + + true + + + + company-jars + jar-two + 1.0 + + true + + + + + + + aspectj + aspectjrt + 1.2rc1 + http://www.eclipse.org/aspectj + + true + + + + + + + src/java + src/aspectj + + + + ]]> + +
+ Index: xdocs/properties.xml =================================================================== RCS file: /home/cvspublic/maven-plugins/aspectj/xdocs/properties.xml,v retrieving revision 1.5 diff -u -r1.5 properties.xml --- xdocs/properties.xml 4 Mar 2004 18:00:22 -0000 1.5 +++ xdocs/properties.xml 6 May 2004 18:21:45 -0000 @@ -23,124 +23,68 @@ Maven AspectJ Plugin Properties dIon Gillard Vincent Massol + Carlos Sanchez
-

Todo. For the time being, please refer to the plugin.properties file -in the aspectj plugin directory.

-
+