You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@depot.apache.org by aj...@apache.org on 2004/04/30 22:53:39 UTC
svn commit: rev 10460 - in incubator/depot/trunk/update/src/java/org/apache/depot/update: . ant/task impl
Author: ajack
Date: Fri Apr 30 15:53:38 2004
New Revision: 10460
Modified:
incubator/depot/trunk/update/src/java/org/apache/depot/update/ResourceUpdater.java
incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/RepositoryToolTask.java
incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ResourceUpdaterContext.java
Log:
Need to find a better (central) place to ensure config get's loaded.
Eventually will have to force the user to init this.
Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ResourceUpdater.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/ResourceUpdater.java (original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ResourceUpdater.java Fri Apr 30 15:53:38 2004
@@ -67,13 +67,13 @@
// The identity...
private ResourceUpdaterIdentifier m_identifier = null;
- // Options for configuring the Ruper
+ // Options for configuring the Updater
private Map m_resourceConfigOptions = new HashMap();
// Target repository
private IRepository m_targetRepository;
- //Ruper
+ //Updater
private ResourceUpdaterEngine m_updateEngine;
public static ResourceUpdater getResourceUpdater() throws UpdateException {
@@ -86,13 +86,13 @@
final boolean createIfRequired)
throws UpdateException {
- ResourceUpdater ruper = null;
+ ResourceUpdater updater = null;
GenericIdentifier identifier =
new GenericIdentifier(UpdateConstants.DEFAULT, id);
if (ReferenceManager.hasReference(identifier)) {
try {
- ruper =
+ updater =
(ResourceUpdater) ReferenceManager.getReference(identifier);
}
catch (NoSuchReferenceException exp) {
@@ -103,14 +103,14 @@
}
// Create on demand...
- if ((null == ruper) && createIfRequired) {
+ if ((null == updater) && createIfRequired) {
- ruper = new ResourceUpdater(id);
+ updater = new ResourceUpdater(id);
- ReferenceManager.createReference(ruper);
+ ReferenceManager.createReference(updater);
}
- return ruper;
+ return updater;
}
@@ -134,7 +134,7 @@
}
/**
- * Construct a default ruper
+ * Construct a default updater
*/
public ResourceUpdater() {
ResourceUpdaterIdentifier updaterId =
@@ -576,22 +576,22 @@
final boolean createIfRequired)
throws UpdateException {
- ResourceUpdater ruper = null;
+ ResourceUpdater updater = null;
if (ReferenceManager.hasReference(identifier)) {
- ruper = (ResourceUpdater) ReferenceManager.getReference(identifier);
+ updater = (ResourceUpdater) ReferenceManager.getReference(identifier);
}
else {
if (!createIfRequired)
throw new UpdateException(
"Failed to access ResourceUpdater [" + identifier + "]");
- ruper = new ResourceUpdater(identifier);
+ updater = new ResourceUpdater(identifier);
- ReferenceManager.createReference(ruper);
+ ReferenceManager.createReference(updater);
}
- return ruper;
+ return updater;
}
/**
Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/RepositoryToolTask.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/RepositoryToolTask.java (original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/RepositoryToolTask.java Fri Apr 30 15:53:38 2004
@@ -21,6 +21,7 @@
import org.apache.depot.common.log.Logger;
import org.apache.depot.update.UpdateException;
+import org.apache.depot.update.config.UpdateConfig;
import org.apache.depot.update.impl.RepositoryWrapper;
import org.apache.depot.update.impl.ResourceUpdaterContext;
import org.apache.depot.update.repository.IRepository;
@@ -66,6 +67,8 @@
// Set logging context..
Logger logger = Logger.pushContext(new AntLogListener(this));
+
+ UpdateConfig.configure();
try {
log("RepositorySet: " + m_repositories);
Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ResourceUpdaterContext.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ResourceUpdaterContext.java (original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ResourceUpdaterContext.java Fri Apr 30 15:53:38 2004
@@ -20,6 +20,7 @@
import org.apache.depot.common.util.SystemUtils;
import org.apache.depot.update.UpdateException;
+import org.apache.depot.update.config.UpdateConfig;
import org.apache.depot.update.protocols.DefaultProtocolOperationsManager;
import org.apache.depot.update.protocols.ProtocolOperationsManager;
import org.apache.depot.update.util.UpdateConstants;
@@ -31,12 +32,18 @@
*/
public class ResourceUpdaterContext implements IReferenceable {
+ static {
+ // Configure from the shared XML file...
+ //:TODO: *Maybe* move later, or allow user to pass filename
+ // in order to override
+ UpdateConfig.configure();
+ }
+
private ResourceUpdaterContextIdentifier m_identifier = null;
private ProtocolOperationsManager m_protocolManager = null;
private File m_baseFile = null;
-
private ResourceUpdaterOptions m_options = null;