incubator-depot-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: rev 22940 - in incubator/depot/trunk/update/src: java/org/apache/depot/update java/org/apache/depot/update/ant/tool java/org/apache/depot/update/config java/org/apache/depot/update/impl java/org/apache/depot/update/tool java/org/apache/depot/update/updater test/org/apache/depot/update/query
Date Thu, 15 Jul 2004 16:26:21 GMT
Author: mmay
Date: Thu Jul 15 09:26:20 2004
New Revision: 22940

Removed:
   incubator/depot/trunk/update/src/java/org/apache/depot/update/config/UpdaterConfig.java
Modified:
   incubator/depot/trunk/update/src/java/org/apache/depot/update/ArtifactInstance.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/ArtifactUpdater.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/tool/RepositoryToolTask.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ArtifactUpdaterContext.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/DownloaderTool.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/Tool.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/updater/ConfiguredArtifactUpdater.java
   incubator/depot/trunk/update/src/test/org/apache/depot/update/query/QueryTests.java
Log:
Removed UpdaterConfig and updated all calling classes, basically removed 
the call :-) Hope this works!!


Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ArtifactInstance.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/ArtifactInstance.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ArtifactInstance.java	Thu
Jul 15 09:26:20 2004
@@ -59,20 +59,6 @@
 	}
 
 	/**
-	 * Constructor
-	 * Creates an ArtifactInstance from another instance of this class.
-	 * 
-	 * :TODO: should be provided by a clone method
-	 * 
-	 * @param other
-	 */
-	public ArtifactInstance(ArtifactInstance other) {
-
-		m_artifact = new Artifact(other.m_artifact);
-		m_locator = new ArtifactLocator(other.m_locator);
-	}
-
-	/**
 	 * @return
 	 */
 	public GenericIdentifier getIdentifier() {

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ArtifactUpdater.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/ArtifactUpdater.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ArtifactUpdater.java	Thu
Jul 15 09:26:20 2004
@@ -24,7 +24,6 @@
 
 import org.apache.depot.common.log.Logger;
 import org.apache.depot.update.artifact.ArtifactGroup;
-import org.apache.depot.update.config.UpdaterConfig;
 import org.apache.depot.update.download.DownloadManager;
 import org.apache.depot.update.impl.ArtifactUpdaterContext;
 import org.apache.depot.update.impl.RepositorySetWrapper;
@@ -62,12 +61,6 @@
 		public Identifier(final String id) {
 			super(UPDATER_URI, UPDATER_PREFIX, id);
 		}
-	}
-	static {
-		// Configure from the shared XML file...
-		//:TODO: *Maybe* move later, or allow user to pass filename
-		// in order to override
-		UpdaterConfig.configure();
 	}
 
 	// The identity...

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/tool/RepositoryToolTask.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/tool/RepositoryToolTask.java
(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/tool/RepositoryToolTask.java
Thu Jul 15 09:26:20 2004
@@ -26,7 +26,6 @@
 import org.apache.depot.update.Repository;
 import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.artifact.ArtifactGroup;
-import org.apache.depot.update.config.UpdaterConfig;
 import org.apache.depot.update.impl.ArtifactUpdaterContext;
 import org.apache.depot.update.impl.RepositoryWrapper;
 import org.apache.depot.update.monitor.Monitor;
@@ -73,8 +72,6 @@
 		// Set logging context, to only errors...
 		Logger logger = Logger.pushContext(LogConstants.ERROR,
 				new AntLogListener(this));
-
-		UpdaterConfig.configure();
 
 		StatisticsMonitor statistics = new StatisticsMonitor();
 		Monitor monitor = Monitor.pushContext(statistics);

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ArtifactUpdaterContext.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ArtifactUpdaterContext.java
(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ArtifactUpdaterContext.java
Thu Jul 15 09:26:20 2004
@@ -21,7 +21,6 @@
 import org.apache.depot.common.util.SystemUtils;
 import org.apache.depot.update.ArtifactUpdaterOptions;
 import org.apache.depot.update.UpdateException;
-import org.apache.depot.update.config.UpdaterConfig;
 import org.apache.depot.update.protocols.DefaultProtocolOperationsManager;
 import org.apache.depot.update.protocols.ProtocolOperationsManager;
 import org.apache.depot.update.util.UpdateConstants;
@@ -47,13 +46,6 @@
 		}
 	}
 	
-	static {
-		// Configure from the shared XML file...
-		//:TODO: *Maybe* move later, or allow user to pass filename
-		// in order to override
-		UpdaterConfig.configure();
-	}
-
 	private ArtifactUpdaterContext.Identifier m_identifier = null;
 
 	private ProtocolOperationsManager m_protocolManager = null;

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/DownloaderTool.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/DownloaderTool.java
(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/DownloaderTool.java
Thu Jul 15 09:26:20 2004
@@ -19,7 +19,6 @@
 import org.apache.depot.update.ArtifactUpdater;
 import org.apache.depot.update.Repository;
 import org.apache.depot.update.artifact.ArtifactGroup;
-import org.apache.depot.update.config.UpdaterConfig;
 import org.apache.depot.update.repository.DefaultRepository;
 import org.apache.depot.update.repository.RepositorySet;
 /**
@@ -80,9 +79,6 @@
 
 		// Assigned the target (to copy into)
 		updater.setTargetRepository(getTargetRepository(targetDir));
-		
-		if (null != configName)
-			UpdaterConfig.configure(configName);
 		
 		// The group to go get
 		ArtifactGroup group = new ArtifactGroup(groupName);

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/Tool.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/Tool.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/Tool.java	Thu Jul 15
09:26:20 2004
@@ -26,7 +26,6 @@
 import org.apache.depot.common.util.cli.Options;
 import org.apache.depot.common.util.cli.ParseException;
 import org.apache.depot.common.util.debug.DebugUtils;
-import org.apache.depot.update.config.UpdaterConfig;
 import org.apache.depot.update.monitor.Monitor;
 import org.apache.depot.update.monitor.StatisticsMonitor;
 import org.apache.depot.update.version.VersionHelper;
@@ -101,7 +100,6 @@
 		//:TODO:Hack
 		//DebugUtils.enableCommonsLogging();
 		//DebugUtils.enableHttpClientDebug();
-		UpdaterConfig.configure();
 		init();
 		CommandLine cmdline = parseCommandLine(args);
 		if (l_help) {

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/updater/ConfiguredArtifactUpdater.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/updater/ConfiguredArtifactUpdater.java
(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/updater/ConfiguredArtifactUpdater.java
Thu Jul 15 09:26:20 2004
@@ -18,7 +18,6 @@
 
 import org.apache.depot.update.ArtifactUpdater;
 import org.apache.depot.update.UpdateException;
-import org.apache.depot.update.config.UpdaterConfig;
 
 /**
  * A StandardResourceUpdater is a {@link org.apache.depot.update.updater.DefaultArtifactUpdater
}
@@ -62,7 +61,5 @@
 	}
 	
 	private void initClass() {
-		// Configure from the XML file...
-		UpdaterConfig.configure(m_filename);
 	}
 }

Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/query/QueryTests.java
==============================================================================
--- incubator/depot/trunk/update/src/test/org/apache/depot/update/query/QueryTests.java	(original)
+++ incubator/depot/trunk/update/src/test/org/apache/depot/update/query/QueryTests.java	Thu
Jul 15 09:26:20 2004
@@ -26,7 +26,6 @@
 import org.apache.depot.update.artifact.select.ReleaseLevelSelector;
 import org.apache.depot.update.artifact.select.TypeSelector;
 import org.apache.depot.update.artifact.select.VersionSelector;
-import org.apache.depot.update.config.UpdaterConfig;
 import org.apache.depot.update.impl.ArtifactUpdaterContext;
 import org.apache.depot.update.impl.RepositorySetWrapper;
 import org.apache.depot.update.repository.RepositorySet;
@@ -44,11 +43,6 @@
 	private QueryEngine m_engine = null;
 	private ArtifactUpdaterContext m_context = null;
 	private RepositorySetWrapper m_repoSet = null;
-
-	static {
-		//Logger.testInit();
-		UpdaterConfig.configure();
-	}
 
 	public QueryTests(String name) {
 		super(name);

Mime
View raw message