Author: xavier
Date: Wed Jul 2 02:42:20 2008
New Revision: 673332
URL: http://svn.apache.org/viewvc?rev=673332&view=rev
Log:
add m2resource test in PackagerResolver (thanks to Archie Cobbs)
Added:
ant/ivy/core/trunk/test/repositories/packager/website/m2repo/
ant/ivy/core/trunk/test/repositories/packager/website/m2repo/org/
ant/ivy/core/trunk/test/repositories/packager/website/m2repo/org/apache/
ant/ivy/core/trunk/test/repositories/packager/website/m2repo/org/apache/ivy/
ant/ivy/core/trunk/test/repositories/packager/website/m2repo/org/apache/ivy/foobar/
ant/ivy/core/trunk/test/repositories/packager/website/m2repo/org/apache/ivy/foobar/1.0/
ant/ivy/core/trunk/test/repositories/packager/website/m2repo/org/apache/ivy/foobar/1.0/foobar-1.0-janfu.jar
(with props)
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
ant/ivy/core/trunk/test/repositories/packager/repo/org/mod/1.0/packager.xml
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java?rev=673332&r1=673331&r2=673332&view=diff
==============================================================================
---
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
(original)
+++
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
Wed Jul 2 02:42:20 2008
@@ -36,7 +36,6 @@
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.core.sort.SortEngine;
import org.apache.ivy.plugins.resolver.packager.PackagerResolver;
-import org.apache.ivy.plugins.resolver.packager.SubProcess;
import org.apache.ivy.util.FileUtil;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Copy;
@@ -154,7 +153,6 @@
assertEquals(DownloadStatus.NO, ar.getDownloadStatus());
// Now download the maven2 artifact
- /*
artifact = DefaultArtifact.cloneWithAnotherName(artifact,
"foobar-janfu");
report = resolver.download(new Artifact[] {artifact},
downloadOptions());
assertNotNull(report);
@@ -166,6 +164,5 @@
assertEquals(artifact, ar.getArtifact());
assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus());
- */
}
}
Modified:
ant/ivy/core/trunk/test/repositories/packager/repo/org/mod/1.0/packager.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/packager/repo/org/mod/1.0/packager.xml?rev=673332&r1=673331&r2=673332&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/repositories/packager/repo/org/mod/1.0/packager.xml
(original)
+++ ant/ivy/core/trunk/test/repositories/packager/repo/org/mod/1.0/packager.xml
Wed Jul 2 02:42:20 2008
@@ -26,11 +26,9 @@
<include name="${archive}/${name}.jar"/>
</resource>
- <!--
<m2resource repo="file://${user.dir}/../../../../website/m2repo"
groupId="org.apache.ivy" artifactId="foobar">
<artifact classifier="janfu"
sha1="da39a3ee5e6b4b0d3255bfef95601890afd80709"
tofile="artifacts/jars/foobar-janfu.jar"/>
</m2resource>
- -->
<build>
<move file="extract/${archive}/${name}.jar" todir="artifacts/jars"/>
Added:
ant/ivy/core/trunk/test/repositories/packager/website/m2repo/org/apache/ivy/foobar/1.0/foobar-1.0-janfu.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/packager/website/m2repo/org/apache/ivy/foobar/1.0/foobar-1.0-janfu.jar?rev=673332&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ant/ivy/core/trunk/test/repositories/packager/website/m2repo/org/apache/ivy/foobar/1.0/foobar-1.0-janfu.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
