jvanzyl 2003/07/13 10:10:35
Added: src/plugins-build/aspectj plugin.jelly.1.1.0
project.xml.1.1.0
Log:
o I am adding these which are my attempt to upgrade to 1.1.0 but nothing
seems to be working. I'm sure it's a matter of some configuration or some
bad information going between Jelly and Ant but I'll hold off for now
and find a day to upgrade AspectJ properly.
Revision Changes Path
1.1 maven/src/plugins-build/aspectj/plugin.jelly.1.1.0
Index: plugin.jelly.1.1.0
===================================================================
<?xml version="1.0"?>
<project xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:util="jelly:util">
<!--==================================================================-->
<!-- Compile all source code, weaving the Aspects -->
<!--==================================================================-->
<goal name="aspectj"
description="Compile code with AspectJ"
prereqs="aspectj:compile"/>
<goal name="aspectj:compile"
description="Compile code with AspectJ">
<j:if test="${sourcesPresent == 'true'}">
<ant:taskdef
name="ajc"
classname="org.aspectj.tools.ant.taskdefs.AjcTask"/>
<ant:available property="aspectSourcesPresent"
file="${pom.build.aspectSourceDirectory}"/>
<ant:uptodate property="aspectj.compile.notRequired"
targetfile="${maven.build.dir}/${maven.final.name}.jar">
<ant:srcfiles dir="${pom.build.sourceDirectory}"/>
<j:if test="${aspectSourcesPresent == 'true'}">
<ant:srcfiles dir="${pom.build.aspectSourceDirectory}"/>
</j:if>
</ant:uptodate>
<j:set var="aspectjCompileNotRequired" value="${aspectj.compile.notRequired}"/>
<j:if test="${aspectjCompileNotRequired == null}">
<j:set
var="ajcEmacssymFlag"
value="${maven.aspectj.ajc.option.emacssym}"/>
<ant:ajc
destdir="${maven.build.dest}"
excludes="**/package.html"
debug="${maven.compile.debug}"
deprecation="${maven.compile.deprecation}"
optimize="${maven.compile.optimize}"
emacssym="${ajcEmacssymFlag}">
<ant:src>
<ant:path refid="maven.compile.src.set"/>
<j:if test="${aspectSourcesPresent == 'true'}">
<ant:pathelement location="${pom.build.aspectSourceDirectory}"/>
</j:if>
</ant:src>
<j:forEach var="sm" items="${pom.build.sourceModifications}">
<ant:available property="classPresent" classname="${sm.className}"/>
<j:if test="${classPresent != 'true'}">
<j:forEach var="exclude" items="${sm.excludes}">
<ant:exclude name="${exclude}"/>
</j:forEach>
</j:if>
</j:forEach>
<ant:classpath>
<ant:path refid="maven.dependency.classpath"/>
<ant:pathelement path="${maven.build.dest}"/>
<ant:pathelement
path="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
</ant:classpath>
</ant:ajc>
</j:if>
</j:if>
</goal>
<goal name="aspectj:ajdoc" description="Javadoc source using ajdoc">
<j:if test="${sourcesPresent == 'true'}">
<ant:taskdef name="ajdoc" classname="org.aspectj.tools.ant.taskdefs.Ajdoc" />
<ant:available property="aspectSourcesPresent"
file="${pom.build.aspectSourceDirectory}"/>
<!-- retrieve various javadoc plugin vars -->
<util:tokenize var="javadocVarList" delim=",">
maven.javadoc.author,maven.javadoc.destdir,
maven.javadoc.links,maven.javadoc.maxmemory,
maven.javadoc.private,maven.javadoc.stylesheet,
maven.javadoc.use,maven.javadoc.version
</util:tokenize>
<j:forEach var="javadocVar" items="${javadocVarList}">
<j:set var="javadocVar" value="${javadocVar.trim()}" />
<j:set var="${javadocVar}"
value="${pom.getPluginContext('maven-javadoc-plugin').getVariable(javadocVar)}"/>
</j:forEach>
<ant:ajdoc packagenames="${pom.package}.*"
destdir="${maven.javadoc.destdir}"
author="${maven.javadoc.author}"
private="${maven.javadoc.private}"
version="${maven.javadoc.version}"
use="${maven.javadoc.use}"
windowtitle="${title}"
doctitle="${title}"
bottom="${copyright}"
stylesheetfile="${maven.javadoc.stylesheet}">
<j:forEach var="link" items="${links}">
<ant:link href="${link.trim()}"/>
</j:forEach>
<ant:classpath>
<ant:path refid="maven.dependency.classpath"/>
<ant:path location="${maven.build.dest}"/>
<ant:pathelement
path="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
</ant:classpath>
<ant:sourcepath>
<ant:path refid="maven.compile.src.set"/>
<j:if test="${aspectSourcesPresent == 'true'}">
<pathelement location="${pom.build.aspectSourceDirectory}"/>
</j:if>
</ant:sourcepath>
</ant:ajdoc>
</j:if>
</goal>
</project>
1.1 maven/src/plugins-build/aspectj/project.xml.1.1.0
Index: project.xml.1.1.0
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<extend>${basedir}/../project.xml</extend>
<pomVersion>3</pomVersion>
<id>maven-aspectj-plugin</id>
<name>Maven AspectJ Plug-in</name>
<currentVersion>1.1</currentVersion>
<description/>
<shortDescription>Eclipse Plugin for AspectJ</shortDescription>
<url>http://maven.apache.org/reference/plugins/aspectj/</url>
<siteDirectory>/www/maven.apache.org/reference/plugins/aspectj/</siteDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven/src/plugins-build/aspectj/</connection>
<url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/aspectj/</url>
</repository>
<developers>
<developer>
<name>dIon Gillard</name>
<id>dion</id>
<email>[EMAIL PROTECTED]</email>
<organization>Multitask Consulting</organization>
<roles>
<role>Documentation</role>
</roles>
</developer>
<developer>
<name>Vincent Massol</name>
<id>vmassol</id>
<email>[EMAIL PROTECTED]</email>
<organization>Octo Technology</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<name>Pete Kazmier</name>
<id>kaz</id>
<email>[EMAIL PROTECTED]</email>
<organization></organization>
<roles>
<role>Java Developer</role>
<role>Documentation</role>
</roles>
</developer>
</developers>
<dependencies>
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.1.0</version>
<properties>
<classloader>root</classloader>
</properties>
</dependency>
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<version>1.1.0</version>
<properties>
<classloader>root</classloader>
</properties>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>${basedir}</directory>
<excludes>
<exclude>target/**</exclude>
<exclude>src/**</exclude>
<exclude>xdocs/**</exclude>
<exclude>maven.xml</exclude>
<exclude>maven.log</exclude>
<exclude>velocity.log</exclude>
<exclude>.cvsignore</exclude>
</excludes>
</resource>
</resources>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
