Author: hboutemy
Date: Sun Jan 27 04:11:43 2008
New Revision: 615586
URL: http://svn.apache.org/viewvc?rev=615586&view=rev
Log:
[MANTTASKS-88] renamed javadocsFilesetId to javadocFilesetId (without s) to be
consistent with Maven classifier (merged from trunk r615585)
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml?rev=615586&r1=615585&r2=615586&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml Sun Jan 27
04:11:43 2008
@@ -262,7 +262,7 @@
</target>
<target name="test-deps-sources" depends="initTaskDefs">
- <artifact:dependencies filesetId="jar.fileset"
sourcesFilesetId="sources.fileset" javadocsFilesetId="javadocs.fileset">
+ <artifact:dependencies filesetId="jar.fileset"
sourcesFilesetId="sources.fileset" javadocFilesetId="javadoc.fileset">
<dependency groupId="it.ant-tasks" artifactId="release" version="2.0.7"/>
<localRepository refid="local.repository"/>
<remoteRepository url="file://${user.dir}/src/test/repo" id="test.repo">
@@ -281,20 +281,20 @@
<available file="${it.ant-tasks:release:java-source:sources}"
property="propertySources"/>
<fail unless="propertySources">property
it.ant-tasks:release:java-source:sources should point to an existing file in
local repo</fail>
- <delete dir="${basedir}/target/files/javadocs"/>
- <copy todir="${basedir}/target/files/javadocs">
- <fileset refid="javadocs.fileset"/>
+ <delete dir="${basedir}/target/files/javadoc"/>
+ <copy todir="${basedir}/target/files/javadoc">
+ <fileset refid="javadoc.fileset"/>
<mapper type="flatten"/>
</copy>
- <available
file="${basedir}/target/files/javadocs/release-2.0.7-javadoc.jar"
property="release-javadoc.jar"/>
+ <available
file="${basedir}/target/files/javadoc/release-2.0.7-javadoc.jar"
property="release-javadoc.jar"/>
<fail unless="release-javadoc.jar">release javadoc should have been
found</fail>
<available file="${it.ant-tasks:release:java-source:javadoc}"
property="propertyJavadoc"/>
<fail unless="propertyJavadoc">property
it.ant-tasks:release:java-source:javadoc should point to an existing file in
local repo</fail>
</target>
<target name="test-deps-sources-empty" depends="initTaskDefs">
- <artifact:dependencies sourcesFilesetId="sources.fileset"
javadocsFilesetId="javadocs.fileset">
+ <artifact:dependencies sourcesFilesetId="sources.fileset"
javadocFilesetId="javadoc.fileset">
<dependency groupId="it.ant-tasks" artifactId="snapshotUniqueFalse"
version="2.0.7-SNAPSHOT"/>
<localRepository refid="local.repository"/>
<remoteRepository url="file://${user.dir}/src/test/repo" id="test.repo">
@@ -309,15 +309,15 @@
<mapper type="merge" to="sources.bin"/>
</copy>
<copy todir="${basedir}/target/files/empty">
- <fileset refid="javadocs.fileset"/>
- <mapper type="merge" to="javadocs.bin"/>
+ <fileset refid="javadoc.fileset"/>
+ <mapper type="merge" to="javadoc.bin"/>
</copy>
<available file="${basedir}/target/files/empty/sources.bin"
property="sources.bin"/>
<fail if="sources.bin">no dependencies sources should have been
found</fail>
- <available file="${basedir}/target/files/empty/javadocs.bin"
property="javadocs.bin"/>
- <fail if="javadocs.bin">no dependencies javadocs should have been
found</fail>
+ <available file="${basedir}/target/files/empty/javadoc.bin"
property="javadoc.bin"/>
+ <fail if="javadoc.bin">no dependencies javadoc should have been
found</fail>
</target>
<target name="test-deploy-spaces" depends="initTaskDefs,installSshProvider">
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=615586&r1=615585&r2=615586&view=diff
==============================================================================
---
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
(original)
+++
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
Sun Jan 27 04:11:43 2008
@@ -58,6 +58,7 @@
* Dependencies task, using maven-artifact.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Herve Boutemy</a>
* @version $Id$
*/
public class DependenciesTask
@@ -71,7 +72,7 @@
private String sourcesFilesetId;
- private String javadocsFilesetId;
+ private String javadocFilesetId;
private String versionsId;
@@ -226,7 +227,7 @@
artifact, "sources", sourcesFileSet );
}
- if ( javadocsFilesetId != null )
+ if ( javadocFilesetId != null )
{
resolveSource( artifactFactory, resolver,
remoteArtifactRepositories, localRepo,
artifact, "javadoc", javadocsFileSet );
@@ -247,7 +248,7 @@
defineFilesetReference( sourcesFilesetId, sourcesFileSet );
- defineFilesetReference( javadocsFilesetId, javadocsFileSet );
+ defineFilesetReference( javadocFilesetId, javadocsFileSet );
if ( versionsId != null )
{
@@ -349,14 +350,14 @@
return sourcesFilesetId;
}
- public void setJavadocsFilesetId( String filesetId )
+ public void setJavadocFilesetId( String filesetId )
{
- this.javadocsFilesetId = filesetId;
+ this.javadocFilesetId = filesetId;
}
- public String getJavadocsFilesetId()
+ public String getJavadocFilesetId()
{
- return javadocsFilesetId;
+ return javadocFilesetId;
}
public void setFilesetId( String filesetId )
