Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2
In directory sc8-pr-cvs1:/tmp/cvs-serv23201/src/java/core/org/krysalis/ruper2
Modified Files:
FileUpdater.java ResourceUpdater.java
Log Message:
1) Moved IMonitor -> IFileMonitor (to allow others)
2) GroupBy now works (iterated unsorted list be accindent)
3) Started on 'clean' (remove old versions from a repo)
Index: FileUpdater.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/FileUpdater.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileUpdater.java 10 Oct 2003 21:26:23 -0000 1.1
--- FileUpdater.java 12 Oct 2003 18:12:07 -0000 1.2
***************
*** 15,19 ****
import org.krysalis.ruper2.query.ResourceResultHelper;
import org.krysalis.ruper2.repository.IRepository;
! import org.krysalis.ruper2.repository.Repository;
import org.krysalis.ruper2.repository.RepositoryAttribute;
import org.krysalis.ruper2.repository.RepositoryConstants;
--- 15,19 ----
import org.krysalis.ruper2.query.ResourceResultHelper;
import org.krysalis.ruper2.repository.IRepository;
! import org.krysalis.ruper2.repository.DefaultRepository;
import org.krysalis.ruper2.repository.RepositoryAttribute;
import org.krysalis.ruper2.repository.RepositoryConstants;
***************
*** 23,26 ****
--- 23,27 ----
import org.krysalis.ruper2.repository.select.LocalRepositorySelector;
import org.krysalis.ruper2.repository.select.RemoteRepositorySelector;
+ import org.krysalis.ruper2.util.flag.Flag;
import org.krysalis.ruper2.util.io.ResolvedFile;
import org.krysalis.ruper2.util.text.MessageConstants;
***************
*** 80,90 ****
File[] files = folder.listFiles();
! Repository target =
! new Repository(folder.getAbsolutePath(), folder, false);
// set the local repository attribute to true
target.setRepositoryAttribute(
! new RepositoryAttribute(RepositoryConstants.REMOTE),
! RepositoryConstants.FALSE);
for (int i = 0; i < files.length; ++i) {
--- 81,91 ----
File[] files = folder.listFiles();
! DefaultRepository target =
! new DefaultRepository(folder.getAbsolutePath(), folder, false);
// set the local repository attribute to true
target.setRepositoryAttribute(
! RepositoryAttribute.REMOTE,
! Flag.FALSE);
for (int i = 0; i < files.length; ++i) {
***************
*** 103,107 ****
//
IRepository target =
! new Repository(parentFolder.getAbsolutePath(), parentFolder, false);
updateFile(file, target);
--- 104,108 ----
//
IRepository target =
! new DefaultRepository(parentFolder.getAbsolutePath(), parentFolder, false);
updateFile(file, target);
***************
*** 270,280 ****
File[] files = folder.listFiles();
! Repository target =
! new Repository(folder.getAbsolutePath(), folder, false);
// set the local repository attribute to true
target.setRepositoryAttribute(
! new RepositoryAttribute(RepositoryConstants.REMOTE),
! RepositoryConstants.FALSE);
for (int i = 0; i < files.length; ++i) {
--- 271,281 ----
File[] files = folder.listFiles();
! DefaultRepository target =
! new DefaultRepository(folder.getAbsolutePath(), folder, false);
// set the local repository attribute to true
target.setRepositoryAttribute(
! RepositoryAttribute.REMOTE,
! Flag.FALSE);
for (int i = 0; i < files.length; ++i) {
Index: ResourceUpdater.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/ResourceUpdater.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ResourceUpdater.java 10 Oct 2003 21:26:23 -0000 1.8
--- ResourceUpdater.java 12 Oct 2003 18:12:07 -0000 1.9
***************
*** 30,33 ****
--- 30,34 ----
import org.krysalis.ruper2.util.text.MessageConstants;
import org.krysalis.ruper2.util.text.Messages;
+ import org.krysalis.version.util.debug.DebugUtils;
/**
***************
*** 389,392 ****
--- 390,394 ----
targetRepository = m_targetRepository;
}
+
if (targetRepository == null) {
String message =
***************
*** 400,403 ****
--- 402,431 ----
}
+ public void clean(ResourceGroup group) throws RuperException {
+ cleanRepository(m_targetRepository, group);
+ }
+
+ public void cleanRepository(IRepository repository, ResourceGroup group)
+ throws RuperException {
+
+ // Query & sort by version
+ // get the resource specifier query
+ ResourceQuery resourceQuery =
+ ResourceQueryHelper.getResourceGroupQuery(group);
+
+ // Where to look
+ resourceQuery.setRepositorySet(new RepositorySet(repository));
+
+ // Query the repositories to get the result
+ ResourceResult resourceResult = m_ruperEngine.query(resourceQuery);
+ List olderResources =
+ ResourceResultHelper.getRemainderResources(resourceResult);
+
+ //DebugUtils.dump("Older Resources", olderResources);
+
+ // Delete all but 'best'
+ m_ruperEngine.delete(repository, olderResources);
+ }
+
/**
* @return
***************
*** 415,420 ****
public static ResourceUpdater getDefaultResourceUpdater()
! throws RuperException {
! return getResourceUpdater(new ResourceUpdaterIdentifier(RuperConstants.DEFAULT), true);
}
--- 443,450 ----
public static ResourceUpdater getDefaultResourceUpdater()
! throws RuperException {
! return getResourceUpdater(
! new ResourceUpdaterIdentifier(RuperConstants.DEFAULT),
! true);
}
***************
*** 441,444 ****
--- 471,475 ----
return ruper;
}
+
/**
* @return
***************
*** 471,475 ****
/**
*
! * :TODO: temporary
* @return
*/
--- 502,506 ----
/**
*
! * :TODO: temporary, until we figure out what RU and RE both do.
* @return
*/
***************
*** 477,480 ****
return m_ruperEngine;
}
-
}
--- 508,510 ----
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.