Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2
In directory sc8-pr-cvs1:/tmp/cvs-serv23328/src/java/core/org/krysalis/ruper2
Modified Files:
StandardResourceUpdater.java ResourceUpdater.java
Added Files:
IResourceUpdater.java
Removed Files:
DefaultResourceUpdater.java ResourceUpdaterOptions.java
Log Message:
Changed the ResourceUpdater to ResourceUpdaterEngine and the ResourceAPI
ResourceUpdater
--- NEW FILE: IResourceUpdater.java ---
/*
* Created on Oct 1, 2003
*/
package org.krysalis.ruper2;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.krysalis.ruper2.query.ResourceQuery;
import org.krysalis.ruper2.repository.Repository;
import org.krysalis.ruper2.repository.RepositorySet;
import org.krysalis.ruper2.repository.RepositorySetSortContext;
import org.krysalis.ruper2.resource.Resource;
import org.krysalis.ruper2.resource.ResourceGroup;
/**
* @author anou_mana
*/
public interface IResourceUpdater {
/*
* Configure
*/
// get/set default repositories
public RepositorySet getDefaultRepositorySet();
public void setDefaultRepositorySet(RepositorySet set);
// get/set default target repository
public Repository getDefaultTargetRepository();
public void setDefaultTargetRepository(Repository repository);
// set default repository selector/comparator - power user
public void setRepositorySetSortContext(RepositorySetSortContext sortContext);
// set default resource selectors/comparator/grouper
/*
* Functionality
*/
// update/synchronize ( resource(s) )
public void updateResource(Resource resource) throws RuperException;
public void updateResources(List resources) throws RuperException;
public void updateResourceGroup(ResourceGroup group) throws RuperException;
// find ( resource(s) )
public List findResource(Resource resource) throws RuperException;
public Map findResources(List resources) throws RuperException;
// download ( resource(s) )
public void downloadResource(Resource resource) throws RuperException;
public void downloadResources(List resources) throws RuperException;
/*
* Functionality + config
*/
// update/synchronize ( resource(s), targetRepository)
public void updateResources(List resources, Repository target)
throws RuperException;
public void updateResource(Resource resource, Repository target)
throws RuperException;
// update/synchronize ( resource(s),resourcequery )
public void updateResource(ResourceQuery query) throws RuperException;
public void updateResource(
ResourceQuery resourceQuery,
Repository targetRepository)
throws RuperException;
public void updateResourceGroup(
ResourceGroup group,
Repository targetRepository)
throws RuperException;
// download ( resource(s), targetRepository)
public void downloadResources(List resources, Repository target)
throws RuperException;
public void downloadResource(Resource resource, Repository target)
throws RuperException;
// find ( resource(s), targetRepository)
public Map findResources(List resources, Repository target)
throws RuperException;
public List findResource(Resource resource, Repository target)
throws RuperException;
// find ( resource(s),resourcequery )
public List findResource(ResourceQuery query) throws RuperException;
// config options
public Set getResourceConfigOptions();
}
Index: StandardResourceUpdater.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/StandardResourceUpdater.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StandardResourceUpdater.java 29 Sep 2003 18:09:21 -0000 1.1
--- StandardResourceUpdater.java 7 Oct 2003 17:24:50 -0000 1.2
***************
*** 4,7 ****
--- 4,8 ----
package org.krysalis.ruper2;
+ import org.krysalis.ruper2.impl.*;
import org.krysalis.ruper2.impl.ResourceUpdaterIdentifier;
***************
*** 9,13 ****
* @author arb_jack
*/
! public class StandardResourceUpdater extends DefaultResourceUpdater {
/**
--- 10,14 ----
* @author arb_jack
*/
! public class StandardResourceUpdater extends DefaultResourceUpdaterEngine {
/**
Index: ResourceUpdater.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/ResourceUpdater.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ResourceUpdater.java 7 Oct 2003 00:03:26 -0000 1.5
--- ResourceUpdater.java 7 Oct 2003 17:24:50 -0000 1.6
***************
*** 1,247 ****
/*
! * Created on Aug 27, 2003
! */
package org.krysalis.ruper2;
import java.util.Iterator;
import java.util.List;
! import org.krysalis.ruper2.config.RuperConfig;
! import org.krysalis.ruper2.impl.ReferenceManager;
! import org.krysalis.ruper2.impl.RepositorySetWrapper;
! import org.krysalis.ruper2.impl.RepositoryWrapper;
! import org.krysalis.ruper2.impl.ResourceUpdaterContext;
import org.krysalis.ruper2.impl.ResourceUpdaterIdentifier;
import org.krysalis.ruper2.log.Logger;
- import org.krysalis.ruper2.messaging.ResourceRequest;
- import org.krysalis.ruper2.query.DefaultQueryEngine;
import org.krysalis.ruper2.query.ResourceQuery;
import org.krysalis.ruper2.query.ResourceResult;
import org.krysalis.ruper2.repository.Repository;
- import org.krysalis.ruper2.repository.RepositoryException;
- import org.krysalis.ruper2.repository.RepositoryManager;
import org.krysalis.ruper2.repository.RepositorySet;
import org.krysalis.ruper2.repository.RepositorySetSortContext;
import org.krysalis.ruper2.resource.Resource;
! import org.krysalis.ruper2.resource.ResourceIdentifier;
import org.krysalis.ruper2.util.RuperConstants;
! import org.krysalis.ruper2.util.identity.GenericIdentifier;
! import org.krysalis.ruper2.util.reference.Referenceable;
import org.krysalis.ruper2.util.text.Messages;
/**
- * @author arb_jack
* @author anou_mana
*/
! public class ResourceUpdater implements Referenceable {
! static {
! // Configure from the XML file...
! //:TODO: *Maybe* move later, or allow user to pass filename
! RuperConfig.configure();
! }
!
! private ResourceUpdaterIdentifier m_identifier = null;
! private ResourceUpdaterContext m_context = null;
! private DefaultQueryEngine m_engine = null;
! // repository
! private RepositoryManager m_repositoryManager;
/**
*
*/
! public ResourceUpdater(
! ResourceUpdaterIdentifier identifier,
! ResourceUpdaterContext context) {
! m_identifier = identifier;
! m_context = context;
!
! initClass();
}
!
! public ResourceUpdater(ResourceUpdaterIdentifier identifier) {
! m_identifier = identifier;
! initClass();
}
! public ResourceUpdater(String identifier) {
! m_identifier = new ResourceUpdaterIdentifier(identifier);
! initClass();
}
! public ResourceUpdater() {
! m_identifier = new ResourceUpdaterIdentifier(RuperConstants.DEFAULT);
! initClass();
}
! private void initClass() {
! if (null == m_context)
! m_context = ResourceUpdaterContext.getDefaultContext();
! m_engine = new DefaultQueryEngine();
! // initialize the repository management
! m_repositoryManager = new RepositoryManager();
! } //
! // Instantiation/Configuration
! //
! public GenericIdentifier getIdentifier() {
! return m_identifier;
}
! //
! // Queries/Helper Methods
! //
! public final ResourceIdentifier resolveResource(final String id) {
! return new ResourceIdentifier(id);
}
! /**
! * @return
*/
! public ResourceUpdaterContext getContext() {
! return m_context;
}
! /**
! * @param context
*/
! public void setContext(ResourceUpdaterContext context) {
! m_context = context;
}
! public void perform(ResourceRequest request) throws RuperException {
! ResourceResult result = performRequest(request);
!
! // Now what? Perform actions??
}
! public ResourceResult performRequest(ResourceRequest request)
throws RuperException {
! Logger.getLog().debug(Messages.getString("ResourceRequest", request));
! ResourceQuery query = request.getQuery();
! return query(query);
}
! public ResourceResult query(ResourceQuery query) throws RuperException {
! // delegate the work to the repository manager to sort the repositories
! // based on the query
! RepositorySet repositorySet =
! m_repositoryManager.performRepositoryQuery(this, query);
! RepositorySetWrapper wrappers =
! new RepositorySetWrapper(repositorySet, m_context);
! return m_engine.query(wrappers, query);
}
! public void copyTo(List resources, Repository targetRepository)
throws RuperException {
! RepositoryWrapper target =
! new RepositoryWrapper(targetRepository, m_context);
- // for (Iterator i = result.iterator(); i.hasNext();) {
- // List group = (List) i.next();
//
! // for (Iterator j = group.iterator(); j.hasNext();) {
! // Resource resource = (Resource) j.next();
//
! for (Iterator i = resources.iterator(); i.hasNext();) {
! Resource resource = (Resource) i.next();
! try {
! target.publishResource(resource);
! }
! catch (Exception e) {
! // (1) log (2) stash in result set error table
! throw new RepositoryException(
! targetRepository,
! "Failed to publish resource: " + resource,
! e);
}
}
}
! public static ResourceUpdater getResourceUpdater(
! ResourceUpdaterIdentifier identifier,
! final boolean createIfRequired)
throws RuperException {
! ResourceUpdater ruper = null;
!
! if (ReferenceManager.hasReference(identifier)) {
! ruper = (ResourceUpdater) ReferenceManager.getReference(identifier);
}
! else {
!
! if (!createIfRequired)
! throw new RuperException(
! "Failed to access ResourceUpdater [" + identifier + "]");
! ruper = new StandardResourceUpdater(identifier);
! ReferenceManager.createReference(ruper);
! }
- return ruper;
}
! /**
! * @return
*/
! public RepositorySet getDefaultSortedRepositorySet() {
! return this.m_repositoryManager.getDefaultSortedRepositorySet();
}
! /**
! * @return
*/
! public RepositorySetSortContext getDefaultRepositorySetSortContext() {
! return m_repositoryManager.getDefaultRepositorySortContext();
}
!
! /**
! * @return
*/
! public void setDefaultRepositorySetSortContext(RepositorySetSortContext sortContext) {
! m_repositoryManager.setDefaultRepositorySortContext(sortContext);
}
! /**
! * @return
*/
! public RepositoryManager getRepositoryManager() {
! return m_repositoryManager;
}
! /**
! * @param set
*/
! public void setDefaultSortedRepositorySet(RepositorySet set) {
! this.m_repositoryManager.setDefaultSortedRepositorySet(set);
}
/**
! * @param identifier
*/
! public void setIdentifier(ResourceUpdaterIdentifier identifier) {
! m_identifier = identifier;
}
/**
! * @param manager
*/
! public void setRepositoryManager(RepositoryManager manager) {
! m_repositoryManager = manager;
}
--- 1,392 ----
/*
! * Created on Oct 1, 2003
! */
package org.krysalis.ruper2;
+ import java.util.ArrayList;
+ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
! import org.krysalis.ruper2.impl.ResourceUpdaterEngine;
import org.krysalis.ruper2.impl.ResourceUpdaterIdentifier;
import org.krysalis.ruper2.log.Logger;
import org.krysalis.ruper2.query.ResourceQuery;
+ import org.krysalis.ruper2.query.ResourceQueryHelper;
import org.krysalis.ruper2.query.ResourceResult;
+ import org.krysalis.ruper2.query.ResourceResultHelper;
import org.krysalis.ruper2.repository.Repository;
import org.krysalis.ruper2.repository.RepositorySet;
import org.krysalis.ruper2.repository.RepositorySetSortContext;
import org.krysalis.ruper2.resource.Resource;
! import org.krysalis.ruper2.resource.ResourceGroup;
import org.krysalis.ruper2.util.RuperConstants;
! import org.krysalis.ruper2.util.text.MessageConstants;
import org.krysalis.ruper2.util.text.Messages;
/**
* @author anou_mana
*/
! public class ResourceUpdater implements IResourceUpdater {
! // Options for configuring the Ruper
! private Map m_resourceConfigOptions = new HashMap();
! // default target repository
! private Repository m_targetRepository;
!
! //Ruper
! private ResourceUpdaterEngine m_ruperEngine;
/**
*
*/
! public ResourceUpdater(String id) throws RuperException {
! ResourceUpdaterIdentifier ruperId = new ResourceUpdaterIdentifier(id);
! m_ruperEngine = ResourceUpdaterEngine.getResourceUpdater(ruperId, true);
! resourceConfigInit();
}
+ /**
+ *
+ */
+ public ResourceUpdater() throws RuperException {
+ ResourceUpdaterIdentifier ruperId =
+ new ResourceUpdaterIdentifier(RuperConstants.DEFAULT);
+ m_ruperEngine = ResourceUpdaterEngine.getResourceUpdater(ruperId, true);
+ resourceConfigInit();
+ }
! private void resourceConfigInit() {
! //TODO put the options like "BestOfAll", "ReleaseOnly"
! // and the selector / comparator for it
}
! public Set getResourceConfigOptions() {
! return this.m_resourceConfigOptions.keySet();
}
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#getDefaultRepositorySet()
! */
! public RepositorySet getDefaultRepositorySet() {
! return m_ruperEngine.getDefaultSortedRepositorySet();
}
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#setDefaultRepositorySet(org.krysalis.ruper2.repository.RepositorySet)
! */
! public void setDefaultRepositorySet(RepositorySet set) {
! m_ruperEngine.setDefaultSortedRepositorySet(set);
! }
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#setRepositorySetSortContext(org.krysalis.ruper2.repository.RepositorySetSortContext)
! */
! public void setRepositorySetSortContext(RepositorySetSortContext sortContext) {
!
! m_ruperEngine.setDefaultRepositorySetSortContext(sortContext);
}
! public RepositorySetSortContext getRepositorySetSortContext(RepositorySetSortContext sortContext) {
! return RepositorySetSortContext.getDefaultRepositorySetSortContext();
!
}
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#updateResources(java.util.List)
*/
! public void updateResources(List resources) throws RuperException {
! updateResources(resources, null);
}
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#updateResources(java.util.List, org.krysalis.ruper2.repository.Repository)
*/
! public void updateResources(List resources, Repository targetRepository)
! throws RuperException {
! for (Iterator iterator = resources.iterator(); iterator.hasNext();) {
! Resource resource = (Resource) iterator.next();
! updateResource(resource, targetRepository);
! }
}
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#updateResource(org.krysalis.ruper2.resource.Resource)
! */
! public void updateResource(Resource resource) throws RuperException {
! updateResource(resource, null);
}
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#updateResource(org.krysalis.ruper2.resource.Resource)
! */
! public void updateResource(Resource resource, Repository targetRepository)
throws RuperException {
! if (resource != null) {
! // get the resource specifier query
! ResourceQuery resourceQuery =
! ResourceQueryHelper.getResourceQuery(resource);
! updateResource(resourceQuery, targetRepository);
! }
! else {
! String message = Messages.getString(MessageConstants.NULL_RESOURCE);
! Logger.getLog().error(message);
! throw new RuperException(message);
! }
}
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#updateGroup(org.krysalis.ruper2.resource.ResourceGroup)
! */
! public void updateResourceGroup(ResourceGroup group) throws RuperException {
! updateResourceGroup(group, null);
! }
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#updateGroup(org.krysalis.ruper2.resource.ResourceGroup)
! */
! public void updateResourceGroup(ResourceGroup group, Repository targetRepository)
! throws RuperException {
! if (group != null) {
! // get the resource specifier query
! ResourceQuery resourceQuery =
! ResourceQueryHelper.getResourceGroupQuery(group);
! updateResource(resourceQuery, targetRepository);
! }
! else {
! String message = Messages.getString(MessageConstants.NULL_GROUP);
! Logger.getLog().error(message);
!
! throw new RuperException(message);
! }
}
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#updateResource(org.krysalis.ruper2.resource.Resource, org.krysalis.ruper2.query.ResourceQuery)
! */
! public void updateResource(ResourceQuery resourceQuery)
throws RuperException {
+ updateResource(resourceQuery, null);
+ }
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#updateResource(org.krysalis.ruper2.resource.Resource, org.krysalis.ruper2.query.ResourceQuery)
! */
! public void updateResource(
! ResourceQuery resourceQuery,
! Repository targetRepository)
! throws RuperException {
!
! //check for target repository
! if (targetRepository == null) {
! targetRepository = this.m_targetRepository;
! }
! if (targetRepository == null) {
! String message = "Resource Update failed with no target repository";
! //String message = Messages.getString(MessageConstants.RESOURCE_REQUEST, request);
! //Logger.getLog().error(message);
! throw new RuperException(message);
! }
!
! // Query the repositories to get the result
! ResourceResult resourceResult = m_ruperEngine.query(resourceQuery);
!
! // Query the target repository to get the result
! resourceQuery.setRepositorySet(new RepositorySet(targetRepository));
! ResourceResult targetResult = m_ruperEngine.query(resourceQuery);
!
! List resources =
! sortResult(resourceQuery, resourceResult, targetResult);
//
! // Copy the resource to the repository
//
+ if (resources != null)
+ downloadResources(resources, targetRepository);
+ }
! private List sortResult(
! ResourceQuery resourceQuery,
! ResourceResult resourceResult,
! ResourceResult targetResult) {
! List resources = null;
! //
! // Assuming we found something in the main search repositories...
! //
! if (!ResourceResultHelper.noResult(resourceResult)) {
! // Compare Results Set using the OrderBy Comparator
! if (ResourceResultHelper
! .compareTo(
! resourceResult,
! targetResult,
! resourceQuery.getOrderBy())
! > 0) {
!
! resources =
! ResourceResultHelper.getResourceList(resourceResult);
!
! Logger.getLog().verbose(
! Messages.getString(
! MessageConstants.UPDATE_FOUND,
! resources));
}
+ else
+ Logger.getLog().verbose(
+ Messages.getString(
+ MessageConstants.NO_UPDATE_FOUND,
+ resourceQuery));
}
+ else
+ Logger.getLog().verbose(
+ Messages.getString(
+ MessageConstants.NO_RESOURCES_FOUND,
+ resourceQuery));
+
+ return resources;
}
+ /* (non-Javadoc)
+ * @see org.krysalis.ruper2.api.ResourceAPIInterface#findResource(org.krysalis.ruper2.resource.Resource)
+ */
+ public List findResource(Resource resource) throws RuperException {
+ return findResource(resource, null);
+ }
+ /* (non-Javadoc)
+ * @see org.krysalis.ruper2.api.ResourceAPIInterface#findResources(java.util.List)
+ */
+ public Map findResources(List resources) throws RuperException {
+ return findResources(resources, null);
+ }
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#findResources(java.util.List, org.krysalis.ruper2.repository.Repository)
! */
! public Map findResources(List resources, Repository target)
throws RuperException {
+ Map resourceMap = new HashMap();
+ List foundResources = null;
! for (Iterator iterator = resources.iterator(); iterator.hasNext();) {
! Resource resource = (Resource) iterator.next();
! foundResources = findResource(resource, target);
! if (foundResources != null) {
! resourceMap.put(resource, foundResources);
! }
}
! return resourceMap;
! }
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#findResource(org.krysalis.ruper2.resource.Resource, org.krysalis.ruper2.repository.Repository)
! */
! public List findResource(Resource resource, Repository target)
! throws RuperException {
! // get the resource specifier query
! ResourceQuery resourceQuery =
! ResourceQueryHelper.getResourceSpecifierQuery(resource);
! //set the target repository
! if (target != null)
! resourceQuery.setRepositorySet(new RepositorySet(target));
! // Query the repositories to get the result
! ResourceResult resourceResult = m_ruperEngine.query(resourceQuery);
! List resources = ResourceResultHelper.getResourceList(resourceResult);
! return resources;
}
!
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#findResource(org.krysalis.ruper2.resource.Resource, org.krysalis.ruper2.query.ResourceQuery)
*/
! public List findResource(ResourceQuery resourceQuery)
! throws RuperException {
! // Query the repositories to get the result
! ResourceResult resourceResult = m_ruperEngine.query(resourceQuery);
! List foundResources =
! ResourceResultHelper.getResourceList(resourceResult);
!
! return foundResources;
}
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#copyResources(java.util.List)
*/
! public void downloadResources(List resources) throws RuperException {
! downloadResources(resources, null);
}
!
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#copyResource(org.krysalis.ruper2.resource.Resource)
*/
! public void downloadResource(Resource resource) throws RuperException {
! downloadResource(resource, null);
}
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#copyResource(org.krysalis.ruper2.resource.Resource)
*/
! public void downloadResource(
! Resource resource,
! Repository targetRepository)
! throws RuperException {
! if (resource != null) {
! List resources = new ArrayList();
! resources.add(resource);
! downloadResources(resources, targetRepository);
! }
! else {
! String message = Messages.getString(MessageConstants.NULL_RESOURCE);
! Logger.getLog().error(message);
!
! throw new RuperException(message);
! }
}
! /* (non-Javadoc)
! * @see org.krysalis.ruper2.api.ResourceAPIInterface#copyResources(java.util.List)
*/
! public void downloadResources(List resources, Repository targetRepository)
! throws RuperException {
! //check for target repository
! if (targetRepository == null) {
! targetRepository = m_targetRepository;
! }
! if (targetRepository == null) {
! String message =
! Messages.getString(MessageConstants.NO_TARGET_REPOSITORY);
! Logger.getLog().error(message);
!
! throw new RuperException(message);
! }
!
! m_ruperEngine.copyTo(resources, targetRepository);
}
/**
! * @return
*/
! public Repository getDefaultTargetRepository() {
! return m_targetRepository;
}
/**
! * @param repository
*/
! public void setDefaultTargetRepository(Repository repository) {
! m_targetRepository = repository;
! }
!
! public static void main(String[] args) {
}
--- DefaultResourceUpdater.java DELETED ---
--- ResourceUpdaterOptions.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.