Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository
In directory sc8-pr-cvs1:/tmp/cvs-serv10667/src/java/core/org/krysalis/ruper/repository
Modified Files:
RepositorySet.java DefaultRepository.java
AbstractRepository.java RepositoryWrapper.java
Log Message:
1) listSpecifiers ought not work
2) unit tests run again [need to add those to a project]
3) FilenameAnalyzer a bit smarter (copes w/ -alpha better, ala Ben's soln)
4) FileUpdater does something -- kinda/sorta, try it :-)
5) Ant task same...
Index: RepositorySet.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/RepositorySet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RepositorySet.java 12 Sep 2003 15:19:43 -0000 1.8
--- RepositorySet.java 12 Sep 2003 20:23:43 -0000 1.9
***************
*** 28,41 ****
*/
public RepositorySet() {
! this(new RepositorySetIdentifier(RuperConstants.DEFAULT));
}
public RepositorySet(ArrayList list) {
! this(new RepositorySetIdentifier(RuperConstants.DEFAULT));
this.m_repositories = list;
}
public RepositorySet(Repository target) {
! this(new RepositorySetIdentifier(RuperConstants.DEFAULT));
m_repositories = new ArrayList();
m_repositories.add(target);
--- 28,47 ----
*/
public RepositorySet() {
! this(new RepositorySetIdentifier(RuperConstants.UNNAMED));
}
public RepositorySet(ArrayList list) {
! this(new RepositorySetIdentifier(RuperConstants.UNNAMED));
this.m_repositories = list;
}
public RepositorySet(Repository target) {
! this(new RepositorySetIdentifier(RuperConstants.UNNAMED));
! m_repositories = new ArrayList();
! m_repositories.add(target);
! }
!
! public RepositorySet(String id, Repository target) {
! this(new RepositorySetIdentifier(id));
m_repositories = new ArrayList();
m_repositories.add(target);
Index: DefaultRepository.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/DefaultRepository.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DefaultRepository.java 12 Sep 2003 15:19:43 -0000 1.9
--- DefaultRepository.java 12 Sep 2003 20:23:43 -0000 1.10
***************
*** 6,9 ****
--- 6,10 ----
import java.io.File;
import java.util.ArrayList;
+ import java.util.Iterator;
import java.util.List;
***************
*** 12,16 ****
--- 13,19 ----
import org.krysalis.ruper.resource.Resource;
import org.krysalis.ruper.resource.ResourceGroup;
+ import org.krysalis.ruper.resource.compare.StandardResourceComparisons;
import org.krysalis.ruper.util.Flag;
+ import org.krysalis.ruper.util.compare.ComparisonHelper;
import org.krysalis.ruper.util.select.AllSelector;
import org.krysalis.ruper.util.select.SelectionHelper;
***************
*** 23,27 ****
public class DefaultRepository extends AbstractRepository {
-
private final static List EMPTY_LIST = new ArrayList();
--- 26,29 ----
***************
*** 33,45 ****
}
-
public DefaultRepository(String id, final String root) {
super(id, new VirtualResourceLocator(root));
classInit(m_hierarchical);
-
}
! public DefaultRepository(String id, final String root,
! final boolean hierarchical) {
super(id, new VirtualResourceLocator(root));
classInit(hierarchical);
--- 35,47 ----
}
public DefaultRepository(String id, final String root) {
super(id, new VirtualResourceLocator(root));
classInit(m_hierarchical);
}
! public DefaultRepository(
! String id,
! final String root,
! final boolean hierarchical) {
super(id, new VirtualResourceLocator(root));
classInit(hierarchical);
***************
*** 51,56 ****
}
! public DefaultRepository(String id, final File root,
! final boolean hierarchical) {
super(id, new VirtualResourceLocator(root));
classInit(hierarchical);
--- 53,60 ----
}
! public DefaultRepository(
! String id,
! final File root,
! final boolean hierarchical) {
super(id, new VirtualResourceLocator(root));
classInit(hierarchical);
***************
*** 62,66 ****
}
! public DefaultRepository(String id,
final VirtualResourceLocator root,
final boolean hierarchical) {
--- 66,71 ----
}
! public DefaultRepository(
! String id,
final VirtualResourceLocator root,
final boolean hierarchical) {
***************
*** 88,91 ****
--- 93,127 ----
}
+ public List listSpecifiers(
+ ResourceUpdaterContext context,
+ ResourceGroup group,
+ Selector selector)
+ throws Exception {
+
+ List results = null;
+ List resources = listResources(context, group, selector);
+
+ if (!resources.isEmpty()) {
+ List unique =
+ ComparisonHelper.sortUnique(
+ resources,
+ StandardResourceComparisons.getNameType());
+
+ if (!unique.isEmpty()) {
+ results = new ArrayList(unique.size());
+
+ for ( Iterator i = unique.iterator(); i.hasNext(); ){
+ results.add(((Resource)i.next()).getSpecifier());
+ }
+ }
+ else
+ results = EMPTY_LIST;
+ }
+ else
+ results = EMPTY_LIST;
+
+ return results;
+ }
+
public List listResources(
final ResourceUpdaterContext context,
***************
*** 109,114 ****
container,
selector)),
! selector,
! context.getLogger());
}
else
--- 145,149 ----
container,
selector)),
! selector);
}
else
***************
*** 151,155 ****
public static Repository getLocalTestRepository() {
! return new DefaultRepository("test",
new VirtualResourceLocator(
new VirtualResourceLocator(SystemUtils.getCWD()),
--- 186,191 ----
public static Repository getLocalTestRepository() {
! return new DefaultRepository(
! "test",
new VirtualResourceLocator(
new VirtualResourceLocator(SystemUtils.getCWD()),
Index: AbstractRepository.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/AbstractRepository.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AbstractRepository.java 12 Sep 2003 15:19:43 -0000 1.10
--- AbstractRepository.java 12 Sep 2003 20:23:43 -0000 1.11
***************
*** 8,11 ****
--- 8,12 ----
import org.krysalis.ruper.files.DefaultResourceFilenameAnalyzer;
import org.krysalis.ruper.files.ResourceFilenameAnalyzer;
+ import org.krysalis.ruper.impl.ReferenceManager;
import org.krysalis.ruper.impl.ResourceUpdaterContext;
import org.krysalis.ruper.protocols.VirtualResourceLocator;
***************
*** 125,129 ****
throw new RepositoryException(
this,
! "Unsupported Feature: " + RepositoryCapability.LISTABLE);
}
--- 126,130 ----
throw new RepositoryException(
this,
! "Unsupported Capability: " + RepositoryCapability.LISTABLE);
}
***************
*** 134,138 ****
throw new RepositoryException(
this,
! "Unsupported Feature: " + RepositoryCapability.DELETABLE);
}
--- 135,139 ----
throw new RepositoryException(
this,
! "Unsupported Capability: " + RepositoryCapability.DELETABLE);
}
***************
*** 144,149 ****
throw new RepositoryException(
this,
! "Unsupported Feature: " + RepositoryCapability.PUBLISHABLE);
return null;
}
--- 145,154 ----
throw new RepositoryException(
this,
! "Unsupported Capability: " + RepositoryCapability.PUBLISHABLE);
return null;
+ }
+
+ public Object createChild(Class clazz, String tagId, String refId) {
+ return ReferenceManager.createReferenceObject(clazz, tagId, refId);
}
Index: RepositoryWrapper.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/RepositoryWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RepositoryWrapper.java 11 Sep 2003 23:34:39 -0000 1.3
--- RepositoryWrapper.java 12 Sep 2003 20:23:43 -0000 1.4
***************
*** 39,43 ****
Logger.getLog().debug(
Messages.getString(
! "LIST_GROUPS",
new Object[] { m_repository, selector }));
--- 39,43 ----
Logger.getLog().debug(
Messages.getString(
! MessageConstants.LIST_GROUPS,
new Object[] { m_repository, selector }));
***************
*** 49,53 ****
throw new RepositoryException(
m_repository,
! "List Categories Failed",
e);
}
--- 49,55 ----
throw new RepositoryException(
m_repository,
! Messages.getString(
! MessageConstants.LIST_GROUPS_FAILED,
! new Object[] { m_repository, selector, e }),
e);
}
***************
*** 68,72 ****
Logger.getLog().debug(
Messages.getString(
! "LIST_SPECIFIERS",
new Object[] { m_repository, group, selector }));
--- 70,74 ----
Logger.getLog().debug(
Messages.getString(
! MessageConstants.LIST_SPECIFIERS,
new Object[] { m_repository, group, selector }));
***************
*** 81,85 ****
throw new RepositoryException(
m_repository,
! "List Categories Failed",
e);
}
--- 83,87 ----
throw new RepositoryException(
m_repository,
! MessageConstants.LIST_SPECIFIERS_FAILED,
e);
}
***************
*** 95,99 ****
public List listResources(ResourceGroup group, Selector selector)
throws Exception {
!
Logger.getLog().debug(
Messages.getString(
--- 97,101 ----
public List listResources(ResourceGroup group, Selector selector)
throws Exception {
!
Logger.getLog().debug(
Messages.getString(
***************
*** 106,110 ****
}
catch (Exception e) {
! throw new RepositoryException(m_repository, "List Failed", e);
}
return resources;
--- 108,117 ----
}
catch (Exception e) {
! throw new RepositoryException(
! m_repository,
! Messages.getString(
! MessageConstants.LIST_RESOURCES_FAILED,
! new Object[] { m_repository, group, selector, e }),
! e);
}
return resources;
***************
*** 118,122 ****
*/
public void deleteResource(Resource resource) throws Exception {
!
Logger.getLog().debug(
Messages.getString(
--- 125,129 ----
*/
public void deleteResource(Resource resource) throws Exception {
!
Logger.getLog().debug(
Messages.getString(
***************
*** 129,133 ****
}
catch (Exception e) {
! throw new RepositoryException(m_repository, "Delete Failed", e);
}
}
--- 136,145 ----
}
catch (Exception e) {
! throw new RepositoryException(
! m_repository,
! Messages.getString(
! MessageConstants.DELETE_RESOURCE_FAILED,
! new Object[] { m_repository, resource }),
! e);
}
}
***************
*** 140,144 ****
*/
public Resource publishResource(Resource resource) throws Exception {
!
Logger.getLog().debug(
Messages.getString(
--- 152,156 ----
*/
public Resource publishResource(Resource resource) throws Exception {
!
Logger.getLog().debug(
Messages.getString(
-------------------------------------------------------
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.