You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/09/03 16:14:12 UTC
svn commit: r267460 - in /maven/maven-1/plugins/trunk/jdiff: plugin.jelly
project.xml xdocs/changes.xml
Author: brett
Date: Sat Sep 3 07:14:08 2005
New Revision: 267460
URL: http://svn.apache.org/viewcvs?rev=267460&view=rev
Log:
PR: MPJDIFF-2
Fix up class paths
Modified:
maven/maven-1/plugins/trunk/jdiff/plugin.jelly
maven/maven-1/plugins/trunk/jdiff/project.xml
maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/jdiff/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jdiff/plugin.jelly?rev=267460&r1=267459&r2=267460&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/jdiff/plugin.jelly Sat Sep 3 07:14:08 2005
@@ -136,16 +136,19 @@
</j:otherwise>
</j:choose>
- <ant:property name="maven.cp.sub" refid="maven-classpath"/>
- <ant:property name="jdiff.jar" value="${plugin.getDependencyPath('jdiff')}"/>
- <ant:property name="maven.cp" value="${maven.cp.sub};${jdiff.jar};${java.class.path}"/>
-
<ant:property name="baseuri" value="${plugin.dir}"/>
+ <ant:property name="jdiff.cp" value="${plugin.getDependencyPath('jdiff')};${plugin.getDependencyPath('xerces')}" />
+
+ <ant:path id="maven.cp">
+ <ant:pathelement location="${plugin.getDependencyPath('jdiff')}" />
+ <ant:path refid="maven.dependency.classpath" />
+ </ant:path>
<ant:javadoc
+ classpathref="maven.cp"
sourcepath="${maven.jdiff.old.src}"
packagenames="${pom.package}.*">
- <ant:doclet name="jdiff.JDiff" path="${maven.cp}">
+ <ant:doclet name="jdiff.JDiff" path="${jdiff.cp}">
<ant:param name="-apidir" value="${maven.jdiff.dir}"/>
<ant:param name="-apiname" value="${maven.jdiff.old.tag}"/>
<ant:param name="-baseURI" value="${baseuri}"/>
@@ -153,10 +156,10 @@
</ant:javadoc>
<ant:javadoc
+ classpathref="maven.cp"
packagenames="${pom.package}.*"
sourcepath="${maven.jdiff.new.src}">
-
- <ant:doclet name="jdiff.JDiff" path="${maven.cp}">
+ <ant:doclet name="jdiff.JDiff" path="${jdiff.cp}">
<ant:param name="-apidir" value="${maven.jdiff.dir}"/>
<ant:param name="-apiname" value="${maven.jdiff.new.tag}"/>
<ant:param name="-baseURI" value="${baseuri}"/>
@@ -164,18 +167,19 @@
</ant:javadoc>
<ant:javadoc
+ classpathref="maven.cp"
private="yes"
destdir="${maven.jdiff.changes.dir}"
packagenames="${pom.package}.*"
sourcepath="${maven.jdiff.new.src}">
-
- <ant:doclet name="jdiff.JDiff" path="${maven.cp}">
+ <ant:doclet name="jdiff.JDiff" path="${jdiff.cp}">
<ant:param name="-stats"/>
<ant:param name="-oldapi" value="${maven.jdiff.old.tag}"/>
+ <ant:param name="-oldapidir" value="${maven.jdiff.dir}"/>
<ant:param name="-newapi" value="${maven.jdiff.new.tag}"/>
+ <ant:param name="-newapidir" value="${maven.jdiff.dir}"/>
<ant:param name="-javadocnew" value="${javadocDestdir}/"/>
</ant:doclet>
-
</ant:javadoc>
<ant:copy todir="${maven.jdiff.changes.dir}">
Modified: maven/maven-1/plugins/trunk/jdiff/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jdiff/project.xml?rev=267460&r1=267459&r2=267460&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/project.xml (original)
+++ maven/maven-1/plugins/trunk/jdiff/project.xml Sat Sep 3 07:14:08 2005
@@ -78,5 +78,10 @@
<artifactId>jdiff</artifactId>
<version>1.0.9</version>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ <version>2.6.2</version>
+ </dependency>
</dependencies>
</project>
Modified: maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml?rev=267460&r1=267459&r2=267460&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml Sat Sep 3 07:14:08 2005
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.4.1-SNAPSHOT" date="in SVN">
+ <action dev="brett" type="fix" issue="MPJDIFF-2">Add the classpath to the Javadoc tag to properly resolve classes</action>
<action dev="brett" type="update" issue="MPJDIFF-4">Store difference XML files in the <code>target/jdiff</code> directory</action>
<action dev="brett" type="update" due-to="Phil Steitz" issue="MPJDIFF-6">Utilise SCM plugin to support multiple SCMs (tested with CVS and Subversion)</action>
<action dev="dion" type="add">Add basic homepage.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org