You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@depot.apache.org by ni...@apache.org on 2004/03/13 09:50:11 UTC
svn commit: rev 9427 - incubator/depot/trunk/ruper/src/java/ant/org/apache/ruper/ant/sandbox/chalko
Author: nickchalko
Date: Sat Mar 13 01:50:10 2004
New Revision: 9427
Modified:
incubator/depot/trunk/ruper/src/java/ant/org/apache/ruper/ant/sandbox/chalko/RuperSet.java
Log:
Sorting by Reverse comparator helps, to get the "latest" version.
Modified: incubator/depot/trunk/ruper/src/java/ant/org/apache/ruper/ant/sandbox/chalko/RuperSet.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/ant/org/apache/ruper/ant/sandbox/chalko/RuperSet.java (original)
+++ incubator/depot/trunk/ruper/src/java/ant/org/apache/ruper/ant/sandbox/chalko/RuperSet.java Sat Mar 13 01:50:10 2004
@@ -19,7 +19,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import org.apache.ruper.ResourceUpdater;
import org.apache.ruper.RuperException;
import org.apache.ruper.impl.RepositorySetWrapper;
@@ -32,6 +31,7 @@
import org.apache.ruper.repository.IRepository;
import org.apache.ruper.repository.RepositorySet;
import org.apache.ruper.resource.Resource;
+import org.apache.ruper.resource.compare.VersionComparator;
import org.apache.ruper.util.io.ResolvedFile;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
@@ -112,7 +112,7 @@
String path = f.getAbsolutePath();
String basepath = scanner.getBasedir().getAbsolutePath();
if (path.startsWith(basepath)) {
- path=path.substring(basepath.length()+1);
+ path = path.substring(basepath.length() + 1);
}
scanner.setIncludes(new String[]{path});
scanner.scan();
@@ -147,9 +147,9 @@
* @throws RuperException
*/
private void downLoadRemoteResult(ResourceResult res) throws RuperException {
- Resource resource= getFirstResource(res);
+ Resource resource = getFirstResource(res);
ResourceUpdater ru = new ResourceUpdater();
- ru.downloadResource(resource,getLocalRepository());
+ ru.downloadResource(resource, getLocalRepository());
}
/**
* @param r
@@ -163,7 +163,7 @@
} else if (res.size() == 1) {
return getFirstFile(res);
} else {
- log("Found " + res.size() + " mathees for " + r
+ log("Found " + res.size() + " matches for " + r
+ " returning first", Project.MSG_VERBOSE);
return getFirstFile(res);
}
@@ -195,7 +195,9 @@
try {
DefaultQueryEngine dqe = new DefaultQueryEngine();
ResourceQuery query = new ResourceQuery(r.getResourceGroup(), r
- .getResourceTypeSelector(), null, null);
+ .getResourceTypeSelector(), null, VersionComparator.REVERSE
+ );
+ //TODO need to be a better way to sort by.
ResourceUpdaterContext context = new ResourceUpdaterContext();
context.setProtocolManager(new DefaultProtocolOperationsManager(
context));