Author: hibou
Date: Tue Aug 21 15:09:00 2012
New Revision: 1375596
URL: http://svn.apache.org/viewvc?rev=1375596&view=rev
Log:
Use the word 'uncompress' every where
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCachePath.java
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/CacheDownloadOptions.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DownloadOptions.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveOptions.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java
ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCachePath.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCachePath.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCachePath.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCachePath.java Tue Aug 21
15:09:00 2012
@@ -75,7 +75,7 @@ public class IvyCachePath extends IvyCac
for (Iterator iter = getArtifactReports().iterator();
iter.hasNext();) {
ArtifactDownloadReport a = (ArtifactDownloadReport)
iter.next();
File f = a.getLocalFile();
- if (isUncompressed() && a.getUncompressedLocalDir() != null) {
+ if (isUncompress() && a.getUncompressedLocalDir() != null) {
f = a.getUncompressedLocalDir();
}
addToPath(path, f);
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java Tue
Aug 21 15:09:00 2012
@@ -76,7 +76,7 @@ public abstract class IvyPostResolveTask
private boolean changing = false;
- private boolean uncompressed;
+ private boolean uncompress;
private IvyResolve resolve = new IvyResolve();
@@ -96,12 +96,12 @@ public abstract class IvyPostResolveTask
this.log = log;
}
- public boolean isUncompressed() {
- return uncompressed;
+ public boolean isUncompress() {
+ return uncompress;
}
- public void setUncompressed(boolean uncompressed) {
- this.uncompressed = uncompressed;
+ public void setUncompress(boolean uncompress) {
+ this.uncompress = uncompress;
}
public IvyDependency createDependency() {
@@ -325,7 +325,7 @@ public abstract class IvyPostResolveTask
resolve.setLog(getLog());
resolve.setSettingsRef(getSettingsRef());
resolve.setResolveMode(getResolveMode());
- resolve.setUncompressed(uncompressed);
+ resolve.setUncompress(uncompress);
return resolve;
}
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java Tue Aug 21
15:09:00 2012
@@ -89,7 +89,7 @@ public class IvyResolve extends IvyTask
private String log = ResolveOptions.LOG_DEFAULT;
- private boolean uncompressed = false;
+ private boolean uncompress = false;
private boolean checkIfChanged = true; //for backward compatibility
@@ -195,12 +195,12 @@ public class IvyResolve extends IvyTask
this.log = log;
}
- public boolean isUncompressed() {
- return uncompressed;
+ public boolean isUncompress() {
+ return uncompress;
}
- public void setUncompressed(boolean uncompressed) {
- this.uncompressed = uncompressed;
+ public void setUncompress(boolean uncompress) {
+ this.uncompress = uncompress;
}
/**
@@ -456,7 +456,7 @@ public class IvyResolve extends IvyTask
.setResolveMode(resolveMode)
.setResolveId(resolveId)
.setCheckIfChanged(checkIfChanged)
- .setExpandCompressed(uncompressed);
+ .setUncompress(uncompress);
}
public String getModule() {
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java Tue Aug 21
15:09:00 2012
@@ -110,7 +110,7 @@ public class IvyRetrieve extends IvyPost
.setMakeSymlinks(symlink)
.setMakeSymlinksInMass(symlinkmass)
.setResolveId(getResolveId())
- .setUncompressed(isUncompressed())
+ .setUncompress(isUncompress())
.setMapper(mapper == null ? null : new
MapperAdapter(mapper)));
int targetsCopied = report.getNbrArtifactsCopied();
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/CacheDownloadOptions.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/CacheDownloadOptions.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/CacheDownloadOptions.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/CacheDownloadOptions.java
Tue Aug 21 15:09:00 2012
@@ -23,7 +23,7 @@ public class CacheDownloadOptions {
private boolean force = false;
- private boolean expandCompressed = false;
+ private boolean uncompress = false;
public DownloadListener getListener() {
return listener;
@@ -43,12 +43,12 @@ public class CacheDownloadOptions {
return this;
}
- public boolean isExpandCompressed() {
- return expandCompressed;
+ public boolean isUncompress() {
+ return uncompress;
}
- public CacheDownloadOptions setExpandCompressed(boolean expandCompressed) {
- this.expandCompressed = expandCompressed;
+ public CacheDownloadOptions setUncompress(boolean uncompress) {
+ this.uncompress = uncompress;
return this;
}
}
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
Tue Aug 21 15:09:00 2012
@@ -907,8 +907,8 @@ public class DefaultRepositoryCacheManag
adr.setDownloadTimeMillis(System.currentTimeMillis() -
start);
}
}
- if (options.isExpandCompressed() && adr.getDownloadStatus() !=
DownloadStatus.FAILED) {
- expandCompressedArtifact(artifact, adr, options);
+ if (options.isUncompress() && adr.getDownloadStatus() !=
DownloadStatus.FAILED) {
+ uncompressArtifact(artifact, adr, options);
}
if (listener != null) {
listener.endArtifactDownload(this, artifact, adr, archiveFile);
@@ -919,7 +919,7 @@ public class DefaultRepositoryCacheManag
}
}
- private void expandCompressedArtifact(Artifact artifact,
ArtifactDownloadReport adr,
+ private void uncompressArtifact(Artifact artifact, ArtifactDownloadReport
adr,
CacheDownloadOptions options) {
String compression = artifact.getExtraAttribute("compression");
if (compression == null) {
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DownloadOptions.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DownloadOptions.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DownloadOptions.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DownloadOptions.java
Tue Aug 21 15:09:00 2012
@@ -22,17 +22,17 @@ import org.apache.ivy.core.LogOptions;
public class DownloadOptions extends LogOptions {
- private boolean expandCompressed;
+ private boolean uncompress;
public DownloadOptions() {
}
- public DownloadOptions setExpandCompressed(boolean expandCompressed) {
- this.expandCompressed = expandCompressed;
+ public DownloadOptions setUncompress(boolean uncompress) {
+ this.uncompress = uncompress;
return this;
}
- public boolean isExpandCompressed() {
- return expandCompressed;
+ public boolean isUncompress() {
+ return uncompress;
}
}
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
Tue Aug 21 15:09:00 2012
@@ -333,7 +333,7 @@ public class ResolveEngine {
DownloadOptions downloadOptions = new DownloadOptions();
downloadOptions.setLog(options.getLog());
-
downloadOptions.setExpandCompressed(options.isExpandCompressed());
+ downloadOptions.setUncompress(options.isUncompress());
downloadArtifacts(report, options.getArtifactFilter(),
downloadOptions);
}
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveOptions.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveOptions.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveOptions.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveOptions.java
Tue Aug 21 15:09:00 2012
@@ -117,7 +117,7 @@ public class ResolveOptions extends LogO
* True if the resolve should compare the new resolution against the
previous report
**/
private boolean checkIfChanged = false;
- private boolean expandCompressed;
+ private boolean uncompress;
public ResolveOptions() {
}
@@ -307,13 +307,13 @@ public class ResolveOptions extends LogO
return moduleId.getOrganisation() + "-" + moduleId.getName();
}
- public ResolveOptions setExpandCompressed(boolean expandCompressed) {
- this.expandCompressed = expandCompressed;
+ public ResolveOptions setUncompress(boolean uncompress) {
+ this.uncompress = uncompress;
return this;
}
- public boolean isExpandCompressed() {
- return expandCompressed;
+ public boolean isUncompress() {
+ return uncompress;
}
}
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
Tue Aug 21 15:09:00 2012
@@ -135,7 +135,7 @@ public class RetrieveEngine {
for (Iterator iter = artifactsToCopy.keySet().iterator();
iter.hasNext();) {
ArtifactDownloadReport artifact = (ArtifactDownloadReport)
iter.next();
File archive = artifact.getLocalFile();
- if (options.isUncompressed() &&
artifact.getUncompressedLocalDir() != null) {
+ if (options.isUncompress() &&
artifact.getUncompressedLocalDir() != null) {
archive = artifact.getUncompressedLocalDir();
}
if (archive == null) {
@@ -343,7 +343,7 @@ public class RetrieveEngine {
Artifact artifact = adr.getArtifact();
String ext = artifact.getExt();
- if (options.isUncompressed() && adr.getUncompressedLocalDir()
!= null) {
+ if (options.isUncompress() && adr.getUncompressedLocalDir() !=
null) {
ext = "";
}
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java
Tue Aug 21 15:09:00 2012
@@ -86,7 +86,7 @@ public class RetrieveOptions extends Log
private String resolveId;
private FileNameMapper mapper;
- private boolean uncompressed;
+ private boolean uncompress;
public RetrieveOptions() {
}
@@ -104,7 +104,7 @@ public class RetrieveOptions extends Log
this.makeSymlinksInMass = options.makeSymlinksInMass;
this.resolveId = options.resolveId;
this.mapper = options.mapper;
- this.uncompressed = options.uncompressed;
+ this.uncompress = options.uncompress;
}
public String getDestArtifactPattern() {
@@ -206,12 +206,12 @@ public class RetrieveOptions extends Log
return this;
}
- public boolean isUncompressed() {
- return uncompressed;
+ public boolean isUncompress() {
+ return uncompress;
}
- public RetrieveOptions setUncompressed(boolean uncompressed) {
- this.uncompressed = uncompressed;
+ public RetrieveOptions setUncompress(boolean uncompress) {
+ this.uncompress = uncompress;
return this;
}
}
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
Tue Aug 21 15:09:00 2012
@@ -446,7 +446,7 @@ public abstract class AbstractResolver
protected CacheDownloadOptions getCacheDownloadOptions(DownloadOptions
options) {
CacheDownloadOptions cacheDownloadOptions = new CacheDownloadOptions();
- cacheDownloadOptions.setExpandCompressed(options.isExpandCompressed());
+ cacheDownloadOptions.setUncompress(options.isUncompress());
cacheDownloadOptions.setListener(getDownloadListener(options));
return cacheDownloadOptions;
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java Tue
Aug 21 15:09:00 2012
@@ -243,7 +243,7 @@ public class IvyCachePathTest extends Te
project.setProperty("ivy.dep.file",
"test/repositories/1/compression/module1/ivys/ivy-1.0.xml");
path.setPathid("testUncompress");
- path.setUncompressed(true);
+ path.setUncompress(true);
path.execute();
Object ref = project.getReference("testUncompress");
assertNotNull(ref);
@@ -257,7 +257,7 @@ public class IvyCachePathTest extends Te
project.setProperty("ivy.dep.file",
"test/repositories/1/compression/module5/ivys/ivy-1.0.xml");
path.setPathid("testOSGi");
- path.setUncompressed(true);
+ path.setUncompress(true);
path.setOsgi(true);
path.execute();
Object ref = project.getReference("testOSGi");
@@ -277,7 +277,7 @@ public class IvyCachePathTest extends Te
project.setProperty("ivy.dep.file",
"test/repositories/1/compression/module6/ivys/ivy-1.0.xml");
path.setPathid("testOSGi");
- path.setUncompressed(true);
+ path.setUncompress(true);
path.setOsgi(true);
path.execute();
Object ref = project.getReference("testOSGi");
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
Tue Aug 21 15:09:00 2012
@@ -5436,7 +5436,7 @@ public class ResolveTest extends TestCas
public void testCompressed() throws Exception {
ResolveOptions options = getResolveOptions(new String[] {"*"});
- options.setExpandCompressed(true);
+ options.setUncompress(true);
URL url = new
File("test/repositories/1/compression/module1/ivys/ivy-1.0.xml").toURI().toURL();
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
Tue Aug 21 15:09:00 2012
@@ -308,7 +308,7 @@ public class RetrieveTest extends TestCa
public void testUncompress() throws Exception {
ResolveOptions roptions = getResolveOptions(new String[] {"*"});
- roptions.setExpandCompressed(true);
+ roptions.setUncompress(true);
URL url = new
File("test/repositories/1/compression/module1/ivys/ivy-1.0.xml").toURI()
.toURL();
@@ -322,7 +322,7 @@ public class RetrieveTest extends TestCa
String pattern =
"build/test/retrieve/[organization]/[module]/[conf]/[type]s/[artifact]-[revision](.[ext])";
RetrieveOptions options = getRetrieveOptions();
- options.setUncompressed(true);
+ options.setUncompress(true);
ivy.retrieve(md.getModuleRevisionId(), pattern, options);
File dest = new
File("build/test/retrieve/compression/module2/default/jars/module2-1.0");
@@ -336,7 +336,7 @@ public class RetrieveTest extends TestCa
public void testUncompressSync() throws Exception {
ResolveOptions roptions = getResolveOptions(new String[] {"*"});
- roptions.setExpandCompressed(true);
+ roptions.setUncompress(true);
URL url = new
File("test/repositories/1/compression/module1/ivys/ivy-1.0.xml").toURI()
.toURL();
@@ -350,7 +350,7 @@ public class RetrieveTest extends TestCa
String pattern =
"build/test/retrieve/[organization]/[module]/[conf]/[type]s/[artifact]-[revision](.[ext])";
RetrieveOptions options = getRetrieveOptions();
- options.setUncompressed(true);
+ options.setUncompress(true);
options.setSync(true);
ivy.retrieve(md.getModuleRevisionId(), pattern, options);
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java?rev=1375596&r1=1375595&r2=1375596&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java
Tue Aug 21 15:09:00 2012
@@ -139,7 +139,7 @@ public class P2DescriptorTest extends Te
assertEquals(1, rmr.getDescriptor().getAllArtifacts().length);
DownloadOptions options = new DownloadOptions();
- options.setExpandCompressed(true);
+ options.setUncompress(true);
DownloadReport report =
p2ZippedResolver.download(rmr.getDescriptor().getAllArtifacts(),
options);
assertNotNull(report);
@@ -169,7 +169,7 @@ public class P2DescriptorTest extends Te
assertEquals(2, rmr.getDescriptor().getAllArtifacts().length);
DownloadOptions options = new DownloadOptions();
- options.setExpandCompressed(true);
+ options.setUncompress(true);
DownloadReport report =
p2ZippedResolver.download(rmr.getDescriptor().getAllArtifacts(),
options);
assertNotNull(report);
