Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/repository
In directory sc8-pr-cvs1:/tmp/cvs-serv20184/src/java/core/org/krysalis/ruper2/repository
Modified Files:
DefaultRepository.java RepositorySet.java
RepositoryWrapper.java MockRepository.java
Added Files:
RepositorySetWrapper.java
Log Message:
Started work on tools (ant and command line) to work on repo sets
--- NEW FILE: RepositorySetWrapper.java ---
/*
* Created on Sep 2, 2003
*
*/
package org.krysalis.ruper2.repository;
import java.util.Iterator;
import java.util.List;
import org.krysalis.ruper2.RuperException;
import org.krysalis.ruper2.impl.ResourceUpdaterContext;
import org.krysalis.ruper2.log.Logger;
import org.krysalis.ruper2.resource.ResourceGroup;
import org.krysalis.ruper2.util.select.AllSelector;
/**
* @author anou_mana
*/
public class RepositorySetWrapper {
private RepositorySet m_repositorySet = null;
private ResourceUpdaterContext m_context = null;
public RepositorySetWrapper(
RepositorySet repositorySet,
ResourceUpdaterContext context) {
m_repositorySet = repositorySet;
m_context = context;
}
// :TODO: Work in progress ...
// Do we make it 'high level' (1 list of unique groups returned)
// or low level?
public List listGroups() {
List allGroups = null;
int repoCnt = 0;
for (Iterator i = m_repositorySet.getRepositories().iterator();
i.hasNext();
repoCnt++) {
Repository r = (Repository) i.next();
RepositoryWrapper repo = new RepositoryWrapper(r, m_context);
Logger.getLog().info("Repository: " + repo);
try {
// List groups ...
List groups = repo.listGroups(AllSelector.getInstance());
for (Iterator gi = groups.iterator(); i.hasNext();) {
ResourceGroup group = (ResourceGroup) gi.next();
Logger.getLog().info(" - Group: " + group);
}
}
catch (RuperException re) {
Logger.getLog().warn(
" - Failed to list groups: " + re.getLocalizedMessage());
}
}
return allGroups;
}
}
Index: DefaultRepository.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/repository/DefaultRepository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultRepository.java 1 Oct 2003 21:55:55 -0000 1.3
--- DefaultRepository.java 2 Oct 2003 14:41:30 -0000 1.4
***************
*** 104,110 ****
throws Exception {
Resource publishedResource = new Resource(resource);
-
- //:TODO: Hack for hierarchical
publishedResource.setLocation(
new VirtualResourceLocator(
--- 104,109 ----
throws Exception {
+ // Create the 'remote' resource
Resource publishedResource = new Resource(resource);
publishedResource.setLocation(
new VirtualResourceLocator(
***************
*** 112,115 ****
--- 111,115 ----
resource.getFilename()));
+ // Perform copy
context.getProtocolManager().performCopy(
resource.getLocation(),
***************
*** 135,139 ****
new RepositoryIdentifier(identifier),
createIfRequired);
-
}
--- 135,138 ----
***************
*** 157,161 ****
--- 156,165 ----
// Create on demand...
if ((null == repo) && createIfRequired) {
+
+ //
+ // :TODO: Hmm, this is bogus, there is no root...
+ //
repo = new DefaultRepository(identifier.getId());
+
ReferenceManager.createReference(repo);
}
Index: RepositorySet.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/repository/RepositorySet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RepositorySet.java 1 Oct 2003 21:55:55 -0000 1.2
--- RepositorySet.java 2 Oct 2003 14:41:30 -0000 1.3
***************
*** 83,112 ****
}
-
- public static RepositorySet getRepositorySet(
- RepositorySetIdentifier identifier,
- final boolean createIfRequired) {
-
- RepositorySet set = null;
-
- if (ReferenceManager.hasReference(identifier)) {
- try {
- set = (RepositorySet) ReferenceManager.getReference(identifier);
- }
- catch (NoSuchReferenceException exp) {
- Logger.getLog().error(
- "No RepositorySet reference in the RefMgr ",
- exp);
- }
- }
-
- // Create on demand...
- if ((null == set) && createIfRequired) {
- set = new RepositorySet(identifier);
- ReferenceManager.createReference(set);
- }
-
- return set;
- }
/**
--- 83,86 ----
***************
*** 158,161 ****
--- 132,161 ----
return buff.toString();
+ }
+
+ public static RepositorySet getRepositorySet(
+ RepositorySetIdentifier identifier,
+ final boolean createIfRequired) {
+
+ RepositorySet set = null;
+
+ if (ReferenceManager.hasReference(identifier)) {
+ try {
+ set = (RepositorySet) ReferenceManager.getReference(identifier);
+ }
+ catch (NoSuchReferenceException exp) {
+ Logger.getLog().error(
+ "No RepositorySet reference in the ReferenceManager by id " + identifier,
+ exp);
+ }
+ }
+
+ // Create on demand...
+ if ((null == set) && createIfRequired) {
+ set = new RepositorySet(identifier);
+ ReferenceManager.createReference(set);
+ }
+
+ return set;
}
}
Index: RepositoryWrapper.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/repository/RepositoryWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RepositoryWrapper.java 1 Oct 2003 21:55:55 -0000 1.2
--- RepositoryWrapper.java 2 Oct 2003 14:41:30 -0000 1.3
***************
*** 7,10 ****
--- 7,11 ----
import java.util.List;
+ import org.krysalis.ruper2.RuperException;
import org.krysalis.ruper2.impl.ResourceUpdaterContext;
import org.krysalis.ruper2.log.Logger;
***************
*** 37,41 ****
* @return
*/
! public List listGroups(Selector selector) throws Exception {
testCapability(RepositoryCapability.LISTABLE);
--- 38,42 ----
* @return
*/
! public List listGroups(Selector selector) throws RuperException {
testCapability(RepositoryCapability.LISTABLE);
***************
*** 69,73 ****
*/
public List listSpecifiers(ResourceGroup group, Selector selector)
! throws Exception {
Logger.getLog().debug(
--- 70,74 ----
*/
public List listSpecifiers(ResourceGroup group, Selector selector)
! throws RuperException {
Logger.getLog().debug(
***************
*** 99,103 ****
*/
public List listResources(ResourceGroup group, Selector selector)
! throws Exception {
Logger.getLog().debug(
--- 100,104 ----
*/
public List listResources(ResourceGroup group, Selector selector)
! throws RuperException {
Logger.getLog().debug(
***************
*** 127,131 ****
* @return
*/
! public void deleteResource(Resource resource) throws Exception {
Logger.getLog().debug(
--- 128,132 ----
* @return
*/
! public void deleteResource(Resource resource) throws RuperException {
Logger.getLog().debug(
***************
*** 154,158 ****
* @return
*/
! public Resource publishResource(Resource resource) throws Exception {
Logger.getLog().debug(
--- 155,159 ----
* @return
*/
! public Resource publishResource(Resource resource) throws RuperException {
Logger.getLog().debug(
***************
*** 174,178 ****
private void testCapability(RepositoryCapability capability)
! throws Exception {
if (!m_repository.hasCapability(capability)) {
throw new RepositoryException(
--- 175,179 ----
private void testCapability(RepositoryCapability capability)
! throws RuperException {
if (!m_repository.hasCapability(capability)) {
throw new RepositoryException(
Index: MockRepository.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/repository/MockRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MockRepository.java 1 Oct 2003 21:55:55 -0000 1.2
--- MockRepository.java 2 Oct 2003 14:41:30 -0000 1.3
***************
*** 11,15 ****
import org.krysalis.ruper2.resource.Resource;
import org.krysalis.ruper2.resource.ResourceGroup;
- import org.krysalis.ruper2.util.Flag;
import org.krysalis.ruper2.util.select.SelectionHelper;
import org.krysalis.ruper2.util.select.Selector;
--- 11,14 ----
***************
*** 23,27 ****
MockRepository(String id) {
! super(id, new VirtualResourceLocator("http://mockrepo.org/stuff"), true);
}
--- 22,29 ----
MockRepository(String id) {
! super(
! id,
! new VirtualResourceLocator("http://mockrepo.org/stuff"),
! true);
}
***************
*** 49,54 ****
VirtualResourceLocator container = folderForGroup(group);
! List resourceList = Resource.getTestResourceList(group.getGroup(),10);
!
results = SelectionHelper.select(resourceList, selector);
--- 51,56 ----
VirtualResourceLocator container = folderForGroup(group);
! List resourceList = Resource.getTestResourceList(group.getGroup(), 10);
!
results = SelectionHelper.select(resourceList, selector);
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
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.