Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository
In directory sc8-pr-cvs1:/tmp/cvs-serv10851/src/java/core/org/krysalis/ruper/repository
Modified Files:
DefaultRepositorySet.java RepositoryAttribute.java
RepositorySet.java RepositoryManager.java
AbstractRepository.java
Added Files:
RepositoryConstants.java
Removed Files:
RepositoryConstant.java
Log Message:
handler chain process added
--- NEW FILE: RepositoryConstants.java ---
/*
* Created on Aug 29, 2003
*
*/
package org.krysalis.ruper.repository;
/**
* @author anou_mana
*/
public class RepositoryConstants
{
// Default Repository IDs
public final static String LOCAL_FILE_SYSTEM_ID = "LocalFileSystem";
public final static String KRYSALIS_ID = "Krysalis";
public final static String MAVEN_ID = "Maven";
}
Index: DefaultRepositorySet.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/DefaultRepositorySet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultRepositorySet.java 11 Sep 2003 14:33:31 -0000 1.3
--- DefaultRepositorySet.java 11 Sep 2003 17:03:29 -0000 1.4
***************
*** 28,33 ****
private void initClass() {
! add(new DefaultRepository(RuperConstants.KRYSALIS_ID, RuperConstants.KRYSALIS_VRL));
! add(new DefaultRepository(RuperConstants.MAVEN_ID, RuperConstants.MAVEN_VRL));
}
}
--- 28,33 ----
private void initClass() {
! addRepository(new DefaultRepository(RepositoryConstants.KRYSALIS_ID, RuperConstants.KRYSALIS_VRL));
! addRepository(new DefaultRepository(RepositoryConstants.MAVEN_ID, RuperConstants.MAVEN_VRL));
}
}
Index: RepositoryAttribute.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/RepositoryAttribute.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RepositoryAttribute.java 10 Sep 2003 21:05:02 -0000 1.2
--- RepositoryAttribute.java 11 Sep 2003 17:03:29 -0000 1.3
***************
*** 14,17 ****
--- 14,21 ----
public class RepositoryAttribute extends Flag {
/**
+ * A is 'active' (not worth looking at it).
+ */
+ public static final RepositoryAttribute ACTIVE = new RepositoryAttribute("ACTIVE");
+ /**
* A is 'remote' (operations 'cost').
*/
Index: RepositorySet.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/RepositorySet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RepositorySet.java 10 Sep 2003 21:05:02 -0000 1.5
--- RepositorySet.java 11 Sep 2003 17:03:29 -0000 1.6
***************
*** 16,21 ****
* @author anou_mana
*/
! public class RepositorySet extends ArrayList implements Referenceable {
private RepositorySetIdentifier m_identifier = null;
/**
--- 16,22 ----
* @author anou_mana
*/
! public class RepositorySet implements Referenceable {
private RepositorySetIdentifier m_identifier = null;
+ private ArrayList m_repositories = new ArrayList();
/**
***************
*** 26,32 ****
}
! public RepositorySet(RepositorySet repositorySet) {
! super(repositorySet);
! m_identifier = new RepositorySetIdentifier(RuperConstants.DEFAULT);
}
--- 27,33 ----
}
! public RepositorySet(ArrayList list) {
! this(new RepositorySetIdentifier(RuperConstants.DEFAULT));
! this.m_repositories = list;
}
***************
*** 75,77 ****
--- 76,112 ----
return set;
}
+ /**
+ * @return
+ */
+ public ArrayList getRepositories()
+ {
+ return m_repositories;
+ }
+
+ /**
+ * @param identifier
+ */
+ public void setIdentifier(RepositorySetIdentifier identifier)
+ {
+ m_identifier = identifier;
+ }
+
+ /**
+ * @param list
+ */
+ public void setRepositories(ArrayList list)
+ {
+ m_repositories = list;
+ }
+
+ public void addRepository(Repository repository)
+ {
+ this.m_repositories.add(repository);
+ }
+
+ public void removeRepository(Repository repository)
+ {
+ this.m_repositories.remove(repository);
+ }
+
}
Index: RepositoryManager.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/RepositoryManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RepositoryManager.java 10 Sep 2003 21:05:02 -0000 1.6
--- RepositoryManager.java 11 Sep 2003 17:03:29 -0000 1.7
***************
*** 6,23 ****
import java.util.ArrayList;
- import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
- import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.krysalis.ruper.log.Logger;
import org.krysalis.ruper.util.select.Selector;
/**
* @author anou_mana
*/
! public class RepositoryManager {
public static final String DEFAULT_REPOSITORY_SET = "DEFAULT_REPOSITORY_SET";
--- 6,25 ----
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.krysalis.ruper.log.Logger;
+ import org.krysalis.ruper.util.RuperConstants;
+ import org.krysalis.ruper.util.chainprocess.HandlerChain;
+ import org.krysalis.ruper.util.chainprocess.HandlerManager;
import org.krysalis.ruper.util.select.Selector;
+ import org.krysalis.ruper.util.select.SelectorHandlerChain;
/**
* @author anou_mana
*/
! public class RepositoryManager extends HandlerManager{
public static final String DEFAULT_REPOSITORY_SET = "DEFAULT_REPOSITORY_SET";
***************
*** 29,32 ****
--- 31,36 ----
private Map m_repositorySets;
+ // handler map can have selector, comparator chains by name
+ private Map m_handlerChains;
//handlers who can sort the repository list
private List m_repositoryComparators;
***************
*** 52,59 ****
// m_selectorConfig = new RepositorySelectorConfig()
this.m_repositorySets = new HashMap();
! // create a default repository set m_defaultRepositorySet
! // add the update and download repository sort handlers
! this.m_repositoryComparators = new ArrayList();
! this.m_repositorySelectors = new ArrayList();
}
--- 56,71 ----
// m_selectorConfig = new RepositorySelectorConfig()
this.m_repositorySets = new HashMap();
! // map of selectors and comparators
! this.m_handlerChains = new HashMap();
!
! // create the comparator and
! HandlerChain comparators = new HandlerChain(RuperConstants.COMPARATOR);
! SelectorHandlerChain selectors = new SelectorHandlerChain(RuperConstants.SELECTOR);
! this.m_handlerChains.put(RuperConstants.SELECTOR, selectors);
! this.m_handlerChains.put(RuperConstants.COMPARATOR, comparators);
!
! // first add the selectors
! this.addHandlerChain(selectors);
! this.addHandlerChain(comparators);
}
***************
*** 75,82 ****
}
! // select the repositories
! repositorySet = selectRepositorySet(this.m_defaultRepositorySet);
// sort the repository set
! repositorySet = sortRepositorySet(repositorySet);
this.m_repositorySets.put(keyword, repositorySet);
--- 87,94 ----
}
! // pass it through the chain of handlers - select the repositories
// sort the repository set
! List repositories = process(m_defaultRepositorySet.getRepositories());
! repositorySet = new RepositorySet((ArrayList)repositories);
this.m_repositorySets.put(keyword, repositorySet);
***************
*** 89,126 ****
}
- private RepositorySet selectRepositorySet(RepositorySet defRepositorySet) throws Exception
- {
- RepositorySet repositorySet = new RepositorySet();
- RepositorySet currentRepositorySet = new RepositorySet(defRepositorySet);
-
- for (Iterator selectorIter = this.m_repositorySelectors.iterator(); selectorIter.hasNext();) {
- Selector currentSelector = (Selector) selectorIter.next();
-
- for(Iterator repositoryIter = currentRepositorySet.iterator(); repositoryIter.hasNext();)
- {
- Repository repository = (Repository)repositoryIter.next();
- if( currentSelector.select(repository) )
- repositorySet.add(repository);
- }
- currentRepositorySet = new RepositorySet(repositorySet);
- repositorySet = new RepositorySet();
- }
-
- return currentRepositorySet;
- }
-
- private RepositorySet sortRepositorySet(RepositorySet defRepositorySet) throws Exception
- {
- RepositorySet currentRepositorySet = new RepositorySet(defRepositorySet);
-
- for (Iterator comparatorIter = this.m_repositoryComparators.iterator(); comparatorIter.hasNext();) {
- Comparator currentComparator = (Comparator) comparatorIter.next();
-
- Collections.sort(currentRepositorySet, currentComparator);
- }
-
- return currentRepositorySet;
- }
-
public RepositorySorterConfig getSorterConfig() {
--- 101,104 ----
Index: AbstractRepository.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/repository/AbstractRepository.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AbstractRepository.java 10 Sep 2003 21:05:02 -0000 1.8
--- AbstractRepository.java 11 Sep 2003 17:03:29 -0000 1.9
***************
*** 19,22 ****
--- 19,23 ----
/**
* @author arb_jack
+ * @author anou_mana
*/
public abstract class AbstractRepository implements Repository, Selectable {
***************
*** 42,46 ****
m_repositoryRoot = root;
- //:TODO: Give a "nice" id?
m_identifier = new RepositoryIdentifier(id);
m_capabilities = new RepositoryCapabilitySet();
--- 43,46 ----
***************
*** 151,154 ****
--- 151,159 ----
{
return ReferenceManager.createReferenceObject(clazz, tagId, refId);
+ }
+
+ public void setVirtualResourceLocator(String url)
+ {
+ m_repositoryRoot = new VirtualResourceLocator(url);
}
--- RepositoryConstant.java DELETED ---
-------------------------------------------------------
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.