ruper2/src/java/core/org/krysalis/ruper/repository DefaultRepository.java,1.6,1.7 AbstractRepository.java,1.5,1.6 RepositoryWrapper.java,1.1,1.2 Repository.java,1.10,1.11
[email protected] Mon, 08 Sep 2003 16:21:42 -0700
Newsgroups
gmane.comp.krysalis.metamorphosis.cvs
Message-ID
<[email protected] >
Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository
In directory sc8-pr-cvs1:/tmp/cvs-serv5134/src/java/core/org/krysalis/ruper/repository
Modified Files:
DefaultRepository.java AbstractRepository.java
RepositoryWrapper.java Repository.java
Log Message:
1) Finished Query & Query Engine
2) Worked on Files
Index: DefaultRepository.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/DefaultRepository.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DefaultRepository.java 5 Sep 2003 15:54:42 -0000 1.6
--- DefaultRepository.java 8 Sep 2003 23:21:40 -0000 1.7
***************
*** 4,7 ****
--- 4,8 ----
package org.krysalis.ruper.repository;
+ import java.io.File;
import java.util.ArrayList;
import java.util.List;
***************
*** 10,14 ****
import org.krysalis.ruper.protocols.VirtualResourceLocator;
import org.krysalis.ruper.resource.Resource;
! import org.krysalis.ruper.resource.ResourceSpecifier;
import org.krysalis.ruper.util.Flag;
import org.krysalis.ruper.util.select.AllSelector;
--- 11,15 ----
import org.krysalis.ruper.protocols.VirtualResourceLocator;
import org.krysalis.ruper.resource.Resource;
! import org.krysalis.ruper.resource.ResourceGroup;
import org.krysalis.ruper.util.Flag;
import org.krysalis.ruper.util.select.AllSelector;
***************
*** 23,27 ****
private final static List EMPTY_LIST = new ArrayList();
- ;
private boolean m_hierarchical = true;
--- 24,27 ----
***************
*** 32,35 ****
--- 32,52 ----
}
+ public DefaultRepository(final String root,
+ final boolean hierarchical) {
+ super(new VirtualResourceLocator(root));
+ classInit(hierarchical);
+ }
+
+ public DefaultRepository(final File root) {
+ super(new VirtualResourceLocator(root));
+ classInit(true);
+ }
+
+ public DefaultRepository(final File root,
+ final boolean hierarchical) {
+ super(new VirtualResourceLocator(root));
+ classInit(hierarchical);
+ }
+
public DefaultRepository(final VirtualResourceLocator root) {
super(root);
***************
*** 45,52 ****
private void classInit(final boolean hierarchical) {
!
setAttribute(
RepositoryAttribute.HIERARCHICAL,
(hierarchical ? Flag.TRUE : Flag.FALSE));
}
--- 62,73 ----
private void classInit(final boolean hierarchical) {
! m_hierarchical = hierarchical;
!
setAttribute(
RepositoryAttribute.HIERARCHICAL,
(hierarchical ? Flag.TRUE : Flag.FALSE));
+
+ addCapability(RepositoryCapability.PUBLISHABLE);
+ addCapability(RepositoryCapability.LISTABLE);
}
***************
*** 61,65 ****
public List listResources(
final ResourceUpdaterContext context,
! final ResourceSpecifier specifier,
final Selector selector)
throws Exception {
--- 82,86 ----
public List listResources(
final ResourceUpdaterContext context,
! final ResourceGroup group,
final Selector selector)
throws Exception {
***************
*** 67,71 ****
List results = null;
! VirtualResourceLocator container = folderForResource(specifier);
if (context.getProtocolManager().checkExists(container)) {
--- 88,92 ----
List results = null;
! VirtualResourceLocator container = folderForGroup(group);
if (context.getProtocolManager().checkExists(container)) {
***************
*** 89,93 ****
}
! public VirtualResourceLocator folderForResource(ResourceSpecifier specifier) {
return m_hierarchical
--- 110,114 ----
}
! public VirtualResourceLocator folderForGroup(ResourceGroup group) {
return m_hierarchical
***************
*** 95,99 ****
new VirtualResourceLocator(
getRepositoryRoot(),
! specifier.getGroup().toString()),
"jars")
: getRepositoryRoot();
--- 116,120 ----
new VirtualResourceLocator(
getRepositoryRoot(),
! group.getGroup()),
"jars")
: getRepositoryRoot();
***************
*** 107,115 ****
Resource publishedResource = new Resource(resource);
publishedResource.setLocation(
new VirtualResourceLocator(
! new VirtualResourceLocator(
! getRepositoryRoot(),
! resource.getGroup().toString()),
resource.getFilename()));
--- 128,135 ----
Resource publishedResource = new Resource(resource);
+ //:TODO: Hack for hierarchical
publishedResource.setLocation(
new VirtualResourceLocator(
! folderForGroup(resource.getGroup()),
resource.getFilename()));
Index: AbstractRepository.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/AbstractRepository.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractRepository.java 5 Sep 2003 05:51:46 -0000 1.5
--- AbstractRepository.java 8 Sep 2003 23:21:40 -0000 1.6
***************
*** 11,15 ****
import org.krysalis.ruper.protocols.VirtualResourceLocator;
import org.krysalis.ruper.resource.Resource;
! import org.krysalis.ruper.resource.ResourceSpecifier;
import org.krysalis.ruper.util.identity.GenericIdentifier;
import org.krysalis.ruper.util.select.Selectable;
--- 11,15 ----
import org.krysalis.ruper.protocols.VirtualResourceLocator;
import org.krysalis.ruper.resource.Resource;
! import org.krysalis.ruper.resource.ResourceGroup;
import org.krysalis.ruper.util.identity.GenericIdentifier;
import org.krysalis.ruper.util.select.Selectable;
***************
*** 110,119 ****
}
! public List listCategories(
ResourceUpdaterContext context,
Selector selector)
throws Exception {
!
! return listGroups(context,selector);
}
--- 110,121 ----
}
! public List listSpecifiers(
ResourceUpdaterContext context,
+ ResourceGroup group,
Selector selector)
throws Exception {
! throw new RepositoryException(
! this,
! "Unsupported Feature: " + RepositoryCapability.LISTABLE);
}
***************
*** 142,146 ****
}
! public abstract VirtualResourceLocator folderForResource(ResourceSpecifier specifier);
}
--- 144,148 ----
}
! public abstract VirtualResourceLocator folderForGroup(ResourceGroup group);
}
Index: RepositoryWrapper.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/RepositoryWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RepositoryWrapper.java 5 Sep 2003 05:51:46 -0000 1.1
--- RepositoryWrapper.java 8 Sep 2003 23:21:40 -0000 1.2
***************
*** 7,13 ****
import org.krysalis.ruper.impl.ResourceUpdaterContext;
import org.krysalis.ruper.resource.Resource;
! import org.krysalis.ruper.resource.ResourceSpecifier;
import org.krysalis.ruper.util.select.Selector;
/**
--- 7,15 ----
import org.krysalis.ruper.impl.ResourceUpdaterContext;
+ import org.krysalis.ruper.log.Logger;
import org.krysalis.ruper.resource.Resource;
! import org.krysalis.ruper.resource.ResourceGroup;
import org.krysalis.ruper.util.select.Selector;
+ import org.krysalis.ruper.util.text.Messages;
/**
***************
*** 34,37 ****
--- 36,44 ----
testCapability(RepositoryCapability.LISTABLE);
+ Logger.getLog().debug(
+ Messages.getString(
+ "LIST_GROUPS",
+ new Object[] { m_repository, selector }));
+
List groups = null;
try {
***************
*** 48,62 ****
/**
! * Return a list of ResourceCategories, using selector
*
* @param selector
* @return
*/
! public List listCategories(Selector selector) throws Exception {
testCapability(RepositoryCapability.LISTABLE);
List categories = null;
try {
! categories = m_repository.listCategories(m_context, selector);
}
catch (Exception e) {
--- 55,79 ----
/**
! * Return a list of ResourceSpeficiers, using selector
! *
! * Hmm, is this not just another query?
*
* @param selector
* @return
*/
! public List listSpecifiers(ResourceGroup group, Selector selector)
! throws Exception {
!
! Logger.getLog().debug(
! Messages.getString(
! "LIST_SPECIFIERS",
! new Object[] { m_repository, group, selector }));
!
testCapability(RepositoryCapability.LISTABLE);
List categories = null;
try {
! categories =
! m_repository.listSpecifiers(m_context, group, selector);
}
catch (Exception e) {
***************
*** 75,84 ****
* @return
*/
! public List listResources(ResourceSpecifier specifier, Selector selector)
throws Exception {
List resources = null;
try {
! resources =
! m_repository.listResources(m_context, specifier, selector);
}
catch (Exception e) {
--- 92,106 ----
* @return
*/
! public List listResources(ResourceGroup group, Selector selector)
throws Exception {
+
+ Logger.getLog().debug(
+ Messages.getString(
+ "LIST_RESOURCES",
+ new Object[] { m_repository, group, selector }));
+
List resources = null;
try {
! resources = m_repository.listResources(m_context, group, selector);
}
catch (Exception e) {
***************
*** 95,98 ****
--- 117,126 ----
*/
public void deleteResource(Resource resource) throws Exception {
+
+ Logger.getLog().debug(
+ Messages.getString(
+ "DELETE_RESOURCE",
+ new Object[] { m_repository, resource }));
+
testCapability(RepositoryCapability.DELETABLE);
try {
***************
*** 111,114 ****
--- 139,148 ----
*/
public Resource publishResource(Resource resource) throws Exception {
+
+ Logger.getLog().debug(
+ Messages.getString(
+ "PUBLISH_RESOURCE",
+ new Object[] { m_repository, resource }));
+
testCapability(RepositoryCapability.PUBLISHABLE);
Resource publishedResource = null;
***************
*** 125,129 ****
private void testCapability(RepositoryCapability capability)
throws Exception {
! if (!m_repository.hasCapability(capability)){
throw new RepositoryException(
m_repository,
--- 159,163 ----
private void testCapability(RepositoryCapability capability)
throws Exception {
! if (!m_repository.hasCapability(capability)) {
throw new RepositoryException(
m_repository,
Index: Repository.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/Repository.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Repository.java 5 Sep 2003 05:51:46 -0000 1.10
--- Repository.java 8 Sep 2003 23:21:40 -0000 1.11
***************
*** 10,13 ****
--- 10,14 ----
import org.krysalis.ruper.protocols.VirtualResourceLocator;
import org.krysalis.ruper.resource.Resource;
+ import org.krysalis.ruper.resource.ResourceGroup;
import org.krysalis.ruper.resource.ResourceSpecifier;
import org.krysalis.ruper.util.reference.Referenceable;
***************
*** 61,65 ****
* @return
*/
! List listCategories(ResourceUpdaterContext context, Selector selector)
throws Exception;
--- 62,69 ----
* @return
*/
! List listSpecifiers(
! ResourceUpdaterContext context,
! ResourceGroup group,
! Selector selector)
throws Exception;
***************
*** 72,76 ****
List listResources(
ResourceUpdaterContext context,
! ResourceSpecifier specifier,
Selector selector)
throws Exception;
--- 76,80 ----
List listResources(
ResourceUpdaterContext context,
! ResourceGroup group,
Selector selector)
throws Exception;
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf