krysalis-update/src/java/org/krysalis/depot/update/repository RepositoryException.java,1.1,1.2 MockRepository.java,1.1,1.2 RepositoryConstants.java,1.1,1.2 RepositorySet.java,1.1,1.2 RepositoryCapabilitySet.java,1.1,1.2 AbstractHierarchicalRepository.java,1.1,1.2 ApacheRepository.java,1.1,1.2 RepositoryCapability.java,1.1,1.2 RepositoryAttributeMap.java,1.1,1.2 DefaultRepository.java,1.1,1.2 RepositoryAttribute.java,1.1,1.2 AbstractRepository.java,1.1,1.2
Nick Chalko <[email protected]> Wed, 08 Dec 2004 09:11:51 +0000
| Newsgroups | gmane.comp.krysalis.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26470/src/java/org/krysalis/depot/update/repository
Modified Files:
RepositoryException.java MockRepository.java
RepositoryConstants.java RepositorySet.java
RepositoryCapabilitySet.java
AbstractHierarchicalRepository.java ApacheRepository.java
RepositoryCapability.java RepositoryAttributeMap.java
DefaultRepository.java RepositoryAttribute.java
AbstractRepository.java
Log Message:
format
Index: RepositoryAttributeMap.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository/RepositoryAttributeMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RepositoryAttributeMap.java 8 Dec 2004 09:06:29 -0000 1.1
--- RepositoryAttributeMap.java 8 Dec 2004 09:11:49 -0000 1.2
***************
*** 39,46 ****
super(initialSize);
}
!
/**
! * Determines if this set has a particular attribute.
! */
public boolean hasAttribute(RepositoryAttribute attribute) {
return hasFlag(attribute);
--- 39,46 ----
super(initialSize);
}
!
/**
! * Determines if this set has a particular attribute.
! */
public boolean hasAttribute(RepositoryAttribute attribute) {
return hasFlag(attribute);
***************
*** 48,53 ****
/**
! * Determines if this set has a particular set of attributes.
! */
public boolean hasAttributes(List attributes) {
return hasFlags(attributes);
--- 48,53 ----
/**
! * Determines if this set has a particular set of attributes.
! */
public boolean hasAttributes(List attributes) {
return hasFlags(attributes);
Index: RepositorySet.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository/RepositorySet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RepositorySet.java 8 Dec 2004 09:06:29 -0000 1.1
--- RepositorySet.java 8 Dec 2004 09:11:49 -0000 1.2
***************
*** 36,39 ****
--- 36,40 ----
public final static String REPO_SET_URI = "http://apache.org/repository/set";
+
public final static String REPO_SET_PREFIX = "repoSet";
***************
*** 43,53 ****
}
! public static final String REPOSITORYSET_CLASSNAME = RepositorySet.class.getName();
private RepositorySet.Identifier m_identifier = null;
private List m_repositories = new ArrayList();
/**
! *
*/
public RepositorySet() {
--- 44,56 ----
}
! public static final String REPOSITORYSET_CLASSNAME = RepositorySet.class
! .getName();
private RepositorySet.Identifier m_identifier = null;
+
private List m_repositories = new ArrayList();
/**
! *
*/
public RepositorySet() {
***************
*** 76,80 ****
/**
! *
*/
public RepositorySet(RepositorySet.Identifier identifier) {
--- 79,83 ----
/**
! *
*/
public RepositorySet(RepositorySet.Identifier identifier) {
***************
*** 83,87 ****
/**
! *
*/
public RepositorySet(String identifier) {
--- 86,90 ----
/**
! *
*/
public RepositorySet(String identifier) {
Index: RepositoryException.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository/RepositoryException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RepositoryException.java 8 Dec 2004 09:06:29 -0000 1.1
--- RepositoryException.java 8 Dec 2004 09:11:49 -0000 1.2
***************
*** 30,39 ****
m_repository = repo;
}
!
public RepositoryException(Repository repo, String message, Throwable t) {
super(message, t);
m_repository = repo;
}
!
/**
* @return Returns the repository.
--- 30,39 ----
m_repository = repo;
}
!
public RepositoryException(Repository repo, String message, Throwable t) {
super(message, t);
m_repository = repo;
}
!
/**
* @return Returns the repository.
Index: AbstractRepository.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository/AbstractRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractRepository.java 8 Dec 2004 09:06:29 -0000 1.1
--- AbstractRepository.java 8 Dec 2004 09:11:49 -0000 1.2
***************
*** 45,57 ****
* @author anou_mana
*/
! public abstract class AbstractRepository
! implements Repository, Dumpable {
private RepositoryCapabilitySet m_capabilities = null;
private RepositoryAttributeMap m_attributes = null;
private Repository.Identifier m_identifier = null;
private VirtualResourceLocator m_repositoryRoot = null;
private IArtifactFilenameAnalyzer m_analyzer = null;
private IArtifactGroupFilenameAnalyzer m_groupAnalyzer = null;
--- 45,60 ----
* @author anou_mana
*/
! public abstract class AbstractRepository implements Repository, Dumpable {
private RepositoryCapabilitySet m_capabilities = null;
+
private RepositoryAttributeMap m_attributes = null;
+
private Repository.Identifier m_identifier = null;
+
private VirtualResourceLocator m_repositoryRoot = null;
private IArtifactFilenameAnalyzer m_analyzer = null;
+
private IArtifactGroupFilenameAnalyzer m_groupAnalyzer = null;
***************
*** 76,80 ****
}
! /* (non-Javadoc)
* @see org.krysalis.depot.update.repository.Repository#getRepositoryIdentifier()
*/
--- 79,85 ----
}
! /*
! * (non-Javadoc)
! *
* @see org.krysalis.depot.update.repository.Repository#getRepositoryIdentifier()
*/
***************
*** 87,91 ****
}
! /* (non-Javadoc)
* @see org.krysalis.depot.update.repository.Repository#hasCapability(org.krysalis.depot.update.repository.Capability)
*/
--- 92,98 ----
}
! /*
! * (non-Javadoc)
! *
* @see org.krysalis.depot.update.repository.Repository#hasCapability(org.krysalis.depot.update.repository.Capability)
*/
***************
*** 94,98 ****
}
! /* (non-Javadoc)
* @see org.krysalis.depot.update.repository.Repository#hasCapabilities(org.krysalis.depot.update.repository.CapabilitySet)
*/
--- 101,107 ----
}
! /*
! * (non-Javadoc)
! *
* @see org.krysalis.depot.update.repository.Repository#hasCapabilities(org.krysalis.depot.update.repository.CapabilitySet)
*/
***************
*** 122,128 ****
}
! public void setRepositoryAttribute(
! RepositoryAttribute attribute,
! Object value) {
m_attributes.put(attribute, value);
}
--- 131,136 ----
}
! public void setRepositoryAttribute(RepositoryAttribute attribute,
! Object value) {
m_attributes.put(attribute, value);
}
***************
*** 153,184 ****
}
! public List listArtifacts(
! ArtifactUpdaterContext context,
! ArtifactGroup group,
! ISelector selector)
! throws Exception {
! throw new RepositoryException(
! this,
! "Unsupported Capability: "
+ RepositoryCapability.LISTABLE_ARTIFACTS);
}
! public void deleteArtifact(
! ArtifactUpdaterContext context,
! ArtifactInstance artifact)
! throws Exception {
! throw new RepositoryException(
! this,
! "Unsupported Capability: " + RepositoryCapability.DELETABLE);
}
! public ArtifactInstance publishArtifact(
! ArtifactUpdaterContext context,
! ArtifactInstance artifact)
! throws Exception {
if (true)
! throw new RepositoryException(
! this,
! "Unsupported Capability: " + RepositoryCapability.PUBLISHABLE);
return null;
}
--- 161,181 ----
}
! public List listArtifacts(ArtifactUpdaterContext context,
! ArtifactGroup group, ISelector selector) throws Exception {
! throw new RepositoryException(this, "Unsupported Capability: "
+ RepositoryCapability.LISTABLE_ARTIFACTS);
}
! public void deleteArtifact(ArtifactUpdaterContext context,
! ArtifactInstance artifact) throws Exception {
! throw new RepositoryException(this, "Unsupported Capability: "
! + RepositoryCapability.DELETABLE);
}
! public ArtifactInstance publishArtifact(ArtifactUpdaterContext context,
! ArtifactInstance artifact) throws Exception {
if (true)
! throw new RepositoryException(this, "Unsupported Capability: "
! + RepositoryCapability.PUBLISHABLE);
return null;
}
***************
*** 206,215 ****
out.println("Root: " + m_repositoryRoot);
! DebugUtils.dump(
! out,
! depth + 1,
! "Capabilities",
! verbose,
! m_capabilities);
DebugUtils.dump(out, depth + 1, "Atributes", verbose, m_attributes);
}
--- 203,208 ----
out.println("Root: " + m_repositoryRoot);
! DebugUtils
! .dump(out, depth + 1, "Capabilities", verbose, m_capabilities);
DebugUtils.dump(out, depth + 1, "Atributes", verbose, m_attributes);
}
***************
*** 227,249 ****
// but:
! // Ensure we support protocol
// AND
// Ensure it is a mirror (not random link)
! List mirrorVRLs =
! context.getProtocolManager().performList(
getMirrorRoot(),
! new AndSelector(
! new ProtocolVrlSelector(
! context
! .getProtocolManager()
! .getSupportedSourceProtocols()),
! new MatchingVrlSelector(
! RegularExpressionHelper.endsWith(
! m_mirrorDir))));
! // Select first, it ought be 'closest'
if (mirrorVRLs.size() > 0) {
! VirtualResourceLocator mirrorSite =
! (VirtualResourceLocator) (mirrorVRLs.get(0));
Logger.getLogger().info("Selected mirror : " + mirrorSite);
--- 220,238 ----
// but:
! // Ensure we support protocol
// AND
// Ensure it is a mirror (not random link)
! List mirrorVRLs = context.getProtocolManager().performList(
getMirrorRoot(),
! new AndSelector(new ProtocolVrlSelector(context
! .getProtocolManager()
! .getSupportedSourceProtocols()),
! new MatchingVrlSelector(RegularExpressionHelper
! .endsWith(m_mirrorDir))));
! // Select first, it ought be 'closest'
if (mirrorVRLs.size() > 0) {
! VirtualResourceLocator mirrorSite = (VirtualResourceLocator) (mirrorVRLs
! .get(0));
Logger.getLogger().info("Selected mirror : " + mirrorSite);
***************
*** 254,262 ****
m_repositoryRoot = mirrorSite;
! }
! else
! throw new RepositoryException(
! this,
! "Unable to get mirror site.");
}
}
--- 243,249 ----
m_repositoryRoot = mirrorSite;
! } else
! throw new RepositoryException(this,
! "Unable to get mirror site.");
}
}
***************
*** 266,272 ****
public VirtualResourceLocator getMirrorRoot() {
! return (null != m_mirrorDir)
! ? new VirtualResourceLocator(getRepositoryRoot(), m_mirrorDir)
! : getRepositoryRoot();
}
--- 253,258 ----
public VirtualResourceLocator getMirrorRoot() {
! return (null != m_mirrorDir) ? new VirtualResourceLocator(
! getRepositoryRoot(), m_mirrorDir) : getRepositoryRoot();
}
Index: AbstractHierarchicalRepository.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository/AbstractHierarchicalRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractHierarchicalRepository.java 8 Dec 2004 09:06:29 -0000 1.1
--- AbstractHierarchicalRepository.java 8 Dec 2004 09:11:49 -0000 1.2
***************
*** 37,46 ****
* @author arb_jack
*/
! public abstract class AbstractHierarchicalRepository
! extends AbstractRepository {
private boolean m_hierarchical = true;
-
AbstractHierarchicalRepository(String id) {
super(id);
--- 37,44 ----
* @author arb_jack
*/
! public abstract class AbstractHierarchicalRepository extends AbstractRepository {
private boolean m_hierarchical = true;
AbstractHierarchicalRepository(String id) {
super(id);
***************
*** 53,60 ****
}
! public AbstractHierarchicalRepository(
! String id,
! final String root,
! final boolean hierarchical) {
super(id, new VirtualResourceLocator(root));
classInit(hierarchical);
--- 51,56 ----
}
! public AbstractHierarchicalRepository(String id, final String root,
! final boolean hierarchical) {
super(id, new VirtualResourceLocator(root));
classInit(hierarchical);
***************
*** 66,88 ****
}
! public AbstractHierarchicalRepository(
! String id,
! final ResolvedFile root,
! final boolean hierarchical) {
super(id, new VirtualResourceLocator(root));
classInit(hierarchical);
}
! public AbstractHierarchicalRepository(
! String id,
! final VirtualResourceLocator root) {
super(id, root);
classInit(m_hierarchical);
}
! public AbstractHierarchicalRepository(
! String id,
! final VirtualResourceLocator root,
! final boolean hierarchical) {
super(id, root);
classInit(hierarchical);
--- 62,79 ----
}
! public AbstractHierarchicalRepository(String id, final ResolvedFile root,
! final boolean hierarchical) {
super(id, new VirtualResourceLocator(root));
classInit(hierarchical);
}
! public AbstractHierarchicalRepository(String id,
! final VirtualResourceLocator root) {
super(id, root);
classInit(m_hierarchical);
}
! public AbstractHierarchicalRepository(String id,
! final VirtualResourceLocator root, final boolean hierarchical) {
super(id, root);
classInit(hierarchical);
***************
*** 92,98 ****
m_hierarchical = hierarchical;
! setRepositoryAttribute(
! RepositoryAttribute.HIERARCHICAL,
! (hierarchical ? Flag.TRUE : Flag.FALSE));
addCapability(RepositoryCapability.PUBLISHABLE);
--- 83,88 ----
m_hierarchical = hierarchical;
! setRepositoryAttribute(RepositoryAttribute.HIERARCHICAL,
! (hierarchical ? Flag.TRUE : Flag.FALSE));
addCapability(RepositoryCapability.PUBLISHABLE);
***************
*** 121,142 ****
* @deprecated this method is useless
*/
! public List listArtifacts(
! ArtifactUpdaterContext context,
! ArtifactGroup group,
! ISelector selector)
! throws Exception {
List results = null;
!
// Get a lsit of all instances, and then filter for
// uniquenes (to get Artifacts)
List artifacts = listInstances(context, group, selector);
!
if (!artifacts.isEmpty()) {
! List unique =
! ComparisonHelper.sortUnique(
! artifacts,
! StandardArtifactComparisons
! .getNameTypeComparatorSequence());
if (!unique.isEmpty()) {
--- 111,127 ----
* @deprecated this method is useless
*/
! public List listArtifacts(ArtifactUpdaterContext context,
! ArtifactGroup group, ISelector selector) throws Exception {
List results = null;
!
// Get a lsit of all instances, and then filter for
// uniquenes (to get Artifacts)
List artifacts = listInstances(context, group, selector);
!
if (!artifacts.isEmpty()) {
! List unique = ComparisonHelper
! .sortUnique(artifacts, StandardArtifactComparisons
! .getNameTypeComparatorSequence());
if (!unique.isEmpty()) {
***************
*** 146,152 ****
//
//
! Collections.sort(
! unique,
! StandardArtifactComparisons
.getNameTypeVersionComparatorSequence());
--- 131,135 ----
//
//
! Collections.sort(unique, StandardArtifactComparisons
.getNameTypeVersionComparatorSequence());
***************
*** 156,164 ****
results.add(((ArtifactInstance) i.next()).getArtifact());
}
! }
! else
results = UpdateConstants.EMPTY_LIST;
! }
! else
results = UpdateConstants.EMPTY_LIST;
--- 139,145 ----
results.add(((ArtifactInstance) i.next()).getArtifact());
}
! } else
results = UpdateConstants.EMPTY_LIST;
! } else
results = UpdateConstants.EMPTY_LIST;
***************
*** 169,177 ****
* @deprecated uses a buggy method
*/
! public RepositoryManifest getManifest(
! ArtifactUpdaterContext context,
! ArtifactGroup group,
! ISelector selector)
! throws Exception {
return new RepositoryManifest(listArtifacts(context, group, selector));
--- 150,155 ----
* @deprecated uses a buggy method
*/
! public RepositoryManifest getManifest(ArtifactUpdaterContext context,
! ArtifactGroup group, ISelector selector) throws Exception {
return new RepositoryManifest(listArtifacts(context, group, selector));
***************
*** 180,193 ****
public VirtualResourceLocator folderForGroup(ArtifactGroup group) {
! return m_hierarchical
! ? new VirtualResourceLocator(
! new VirtualResourceLocator(
! getRepositoryRoot(),
! group.getName()),
"jars/")
! : getRepositoryRoot();
}
-
/**
* @return
--- 158,167 ----
public VirtualResourceLocator folderForGroup(ArtifactGroup group) {
! return m_hierarchical ? new VirtualResourceLocator(
! new VirtualResourceLocator(getRepositoryRoot(), group.getName()),
"jars/")
! : getRepositoryRoot();
}
/**
* @return
Index: MockRepository.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository/MockRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MockRepository.java 8 Dec 2004 09:06:29 -0000 1.1
--- MockRepository.java 8 Dec 2004 09:11:49 -0000 1.2
***************
*** 34,38 ****
public class MockRepository extends AbstractHierarchicalRepository {
! //private final static List EMPTY_LIST = new ArrayList();
MockRepository(String id) {
--- 34,38 ----
public class MockRepository extends AbstractHierarchicalRepository {
! // private final static List EMPTY_LIST = new ArrayList();
MockRepository(String id) {
***************
*** 61,65 ****
folderForGroup(group);
! List instanceList = null;//ArtifactInstanceTest.getTestArtifactList(group.getName(), 10);
results = SelectionHelper.select(instanceList, selector);
--- 61,66 ----
folderForGroup(group);
! List instanceList = null;// ArtifactInstanceTest.getTestArtifactList(group.getName(),
! // 10);
results = SelectionHelper.select(instanceList, selector);
***************
*** 71,87 ****
ArtifactInstance instance) throws Exception {
! ArtifactInstance publishedArtifact = new ArtifactInstance(
! instance.getArtifact(),
! new ArtifactLocator(instance.getLocator().getFilename(),
! instance.getLocator().getExtension(),
! new VirtualResourceLocator(
! folderForGroup(instance.getArtifact().getGroup()),
! instance.getLocator().getFilename())));
return publishedArtifact;
}
!
public void initialize(ArtifactUpdaterContext context) throws Exception {
!
}
--- 72,87 ----
ArtifactInstance instance) throws Exception {
! ArtifactInstance publishedArtifact = new ArtifactInstance(instance
! .getArtifact(), new ArtifactLocator(instance.getLocator()
! .getFilename(), instance.getLocator().getExtension(),
! new VirtualResourceLocator(folderForGroup(instance
! .getArtifact().getGroup()), instance.getLocator()
! .getFilename())));
return publishedArtifact;
}
!
public void initialize(ArtifactUpdaterContext context) throws Exception {
!
}
Index: RepositoryConstants.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository/RepositoryConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RepositoryConstants.java 8 Dec 2004 09:06:29 -0000 1.1
--- RepositoryConstants.java 8 Dec 2004 09:11:49 -0000 1.2
***************
*** 20,33 ****
* @author anou_mana
*/
! public class RepositoryConstants
! {
!
// Default Repository IDs
public final static String APACHE_ID = "apache";
public final static String MAVEN_ID = "maven";
public final static String ACTIVE = "ACTIVE";
public final static String REMOTE = "REMOTE";
public final static String LOCAL = "LOCAL";
public final static String PRIORITY = "PRIORITY";
--- 20,36 ----
* @author anou_mana
*/
! public class RepositoryConstants {
!
// Default Repository IDs
public final static String APACHE_ID = "apache";
+
public final static String MAVEN_ID = "maven";
public final static String ACTIVE = "ACTIVE";
+
public final static String REMOTE = "REMOTE";
+
public final static String LOCAL = "LOCAL";
+
public final static String PRIORITY = "PRIORITY";
Index: RepositoryCapabilitySet.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository/RepositoryCapabilitySet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RepositoryCapabilitySet.java 8 Dec 2004 09:06:29 -0000 1.1
--- RepositoryCapabilitySet.java 8 Dec 2004 09:11:49 -0000 1.2
***************
*** 41,45 ****
/**
! * @param otherCollection -- set to copy from
*/
public RepositoryCapabilitySet(Collection otherCollection) {
--- 41,46 ----
/**
! * @param otherCollection --
! * set to copy from
*/
public RepositoryCapabilitySet(Collection otherCollection) {
***************
*** 48,55 ****
/**
! * Determines if this set has a particular capability.
! *
! * @param capability The capability to check for.
! */
public boolean hasCapability(RepositoryCapability capability) {
boolean hasIt = false;
--- 49,57 ----
/**
! * Determines if this set has a particular capability.
! *
! * @param capability
! * The capability to check for.
! */
public boolean hasCapability(RepositoryCapability capability) {
boolean hasIt = false;
***************
*** 61,68 ****
/**
! * Determines if this set has a particular set of capability.
! *
! * @param capability The capabilities to check for.
! */
public boolean hasCapabilities(RepositoryCapabilitySet capabilities) {
boolean hasEm = true;
--- 63,71 ----
/**
! * Determines if this set has a particular set of capability.
! *
! * @param capability
! * The capabilities to check for.
! */
public boolean hasCapabilities(RepositoryCapabilitySet capabilities) {
boolean hasEm = true;
Index: ApacheRepository.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository/ApacheRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ApacheRepository.java 8 Dec 2004 09:06:29 -0000 1.1
--- ApacheRepository.java 8 Dec 2004 09:11:49 -0000 1.2
***************
*** 15,18 ****
--- 15,19 ----
*/
package org.krysalis.depot.update.repository;
+
import java.util.List;
***************
*** 22,25 ****
--- 23,27 ----
import org.krysalis.depot.update.util.net.VirtualResourceLocator;
import org.krysalis.depot.update.util.select.ISelector;
+
/**
* An apache style repository as decribed in <a
***************
*** 34,37 ****
--- 36,40 ----
super(id);
}
+
/**
* @param id
***************
*** 42,45 ****
--- 45,49 ----
// TODO Auto-generated constructor stub
}
+
/*
* (non-Javadoc)
***************
*** 51,54 ****
--- 55,59 ----
return null;
}
+
/*
* (non-Javadoc)
***************
*** 62,65 ****
--- 67,71 ----
return null;
}
+
/*
* (non-Javadoc)
***************
*** 74,77 ****
--- 80,84 ----
return null;
}
+
/*
* (non-Javadoc)
Index: RepositoryAttribute.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository/RepositoryAttribute.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RepositoryAttribute.java 8 Dec 2004 09:06:29 -0000 1.1
--- RepositoryAttribute.java 8 Dec 2004 09:11:49 -0000 1.2
***************
*** 24,32 ****
* @author anou_mana
*/
! public class RepositoryAttribute extends Flag implements IXMLAttribute{
!
! public static final String REPOSITORY_ATTRIBUTE_CLASSNAME =
! RepositoryAttribute.class.getName();
!
/**
* A is 'active' (not worth looking at it if not active).
--- 24,32 ----
* @author anou_mana
*/
! public class RepositoryAttribute extends Flag implements IXMLAttribute {
!
! public static final String REPOSITORY_ATTRIBUTE_CLASSNAME = RepositoryAttribute.class
! .getName();
!
/**
* A is 'active' (not worth looking at it if not active).
***************
*** 34,57 ****
* Allows us to keep configuration, but inactivate it.
*/
! public static final RepositoryAttribute ACTIVE =
! new RepositoryAttribute(RepositoryConstants.ACTIVE);
!
/**
* A is 'remote' (operations 'cost' network usage).
*/
! public static final RepositoryAttribute REMOTE =
! new RepositoryAttribute(RepositoryConstants.REMOTE);
/**
* A has 'priority' .
*/
! public static final RepositoryAttribute PRIORITY =
! new RepositoryAttribute(RepositoryConstants.PRIORITY);
/**
* A repository that is hierarchical
*/
! public static final RepositoryAttribute HIERARCHICAL =
! new RepositoryAttribute("HIERARCHICAL");
private RepositoryAttribute(final String name) {
--- 34,57 ----
* Allows us to keep configuration, but inactivate it.
*/
! public static final RepositoryAttribute ACTIVE = new RepositoryAttribute(
! RepositoryConstants.ACTIVE);
!
/**
* A is 'remote' (operations 'cost' network usage).
*/
! public static final RepositoryAttribute REMOTE = new RepositoryAttribute(
! RepositoryConstants.REMOTE);
/**
* A has 'priority' .
*/
! public static final RepositoryAttribute PRIORITY = new RepositoryAttribute(
! RepositoryConstants.PRIORITY);
/**
* A repository that is hierarchical
*/
! public static final RepositoryAttribute HIERARCHICAL = new RepositoryAttribute(
! "HIERARCHICAL");
private RepositoryAttribute(final String name) {
Index: RepositoryCapability.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository/RepositoryCapability.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RepositoryCapability.java 8 Dec 2004 09:06:29 -0000 1.1
--- RepositoryCapability.java 8 Dec 2004 09:11:49 -0000 1.2
***************
*** 23,51 ****
*/
public class RepositoryCapability extends Flag {
!
/**
* A repository's groups can be listed.
*/
! public static final RepositoryCapability LISTABLE_GROUPS = new RepositoryCapability("LISTABLE_GROUPS");
/**
* A repository group's artifacts can be listed.
*/
! public static final RepositoryCapability LISTABLE_ARTIFACTS = new RepositoryCapability("LISTABLE_ARTIFACTS");
/**
* A repository group's manifest can be acquired.
*/
! public static final RepositoryCapability GROUP_MANIFEST = new RepositoryCapability("GROUP_MANIFEST");
/**
* A repository can be published to
*/
! public static final RepositoryCapability PUBLISHABLE = new RepositoryCapability("PUBLISHABLE");
/**
* A repository can be deleted from (w/ correct permissions)
*/
! public static final RepositoryCapability DELETABLE = new RepositoryCapability("DELETABLE");
private RepositoryCapability(final String name) {
--- 23,56 ----
*/
public class RepositoryCapability extends Flag {
!
/**
* A repository's groups can be listed.
*/
! public static final RepositoryCapability LISTABLE_GROUPS = new RepositoryCapability(
! "LISTABLE_GROUPS");
/**
* A repository group's artifacts can be listed.
*/
! public static final RepositoryCapability LISTABLE_ARTIFACTS = new RepositoryCapability(
! "LISTABLE_ARTIFACTS");
/**
* A repository group's manifest can be acquired.
*/
! public static final RepositoryCapability GROUP_MANIFEST = new RepositoryCapability(
! "GROUP_MANIFEST");
/**
* A repository can be published to
*/
! public static final RepositoryCapability PUBLISHABLE = new RepositoryCapability(
! "PUBLISHABLE");
/**
* A repository can be deleted from (w/ correct permissions)
*/
! public static final RepositoryCapability DELETABLE = new RepositoryCapability(
! "DELETABLE");
private RepositoryCapability(final String name) {
Index: DefaultRepository.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/repository/DefaultRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DefaultRepository.java 8 Dec 2004 09:06:29 -0000 1.1
--- DefaultRepository.java 8 Dec 2004 09:11:49 -0000 1.2
***************
*** 41,45 ****
*/
public class DefaultRepository extends AbstractHierarchicalRepository {
! public static final String DEFAULT_REPOSITORY_CLASSNAME = DefaultRepository.class.getName();
DefaultRepository(String id) {
--- 41,46 ----
*/
public class DefaultRepository extends AbstractHierarchicalRepository {
! public static final String DEFAULT_REPOSITORY_CLASSNAME = DefaultRepository.class
! .getName();
DefaultRepository(String id) {
***************
*** 131,142 ****
// Create the 'remote' instance
! ArtifactInstance publishedInstance = new ArtifactInstance(
! instance.getArtifact(),
! new ArtifactLocator(
! instance.getLocator().getFilename(),
! instance.getLocator().getExtension(),
! new VirtualResourceLocator(
! folderForGroup(instance.getArtifact().getGroup()),
! instance.getLocator().getFilename())));
// Perform copy
--- 132,141 ----
// Create the 'remote' instance
! ArtifactInstance publishedInstance = new ArtifactInstance(instance
! .getArtifact(), new ArtifactLocator(instance.getLocator()
! .getFilename(), instance.getLocator().getExtension(),
! new VirtualResourceLocator(folderForGroup(instance
! .getArtifact().getGroup()), instance.getLocator()
! .getFilename())));
// Perform copy
***************
*** 158,167 ****
public static Repository getLocalTestRepository() {
! return new DefaultRepository(
! "test",
! new VirtualResourceLocator(
! new VirtualResourceLocator(
! ResolvedFile.resolve(SystemUtils.getCWD().getAbsolutePath())),
! "src/artifacts/test/repo"));
}
--- 157,164 ----
public static Repository getLocalTestRepository() {
! return new DefaultRepository("test", new VirtualResourceLocator(
! new VirtualResourceLocator(ResolvedFile.resolve(SystemUtils
! .getCWD().getAbsolutePath())),
! "src/artifacts/test/repo"));
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/