incubator-depot-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: rev 22851 - in incubator/depot/trunk/update/src: java/org/apache/depot/update java/org/apache/depot/update/ant/tool java/org/apache/depot/update/impl java/org/apache/depot/update/repository java/org/apache/depot/update/tool java/org/apache/depot/update/updater resources test/org/apache/depot/update/query
Date Mon, 12 Jul 2004 20:06:12 GMT
Author: ajack
Date: Mon Jul 12 13:06:11 2004
New Revision: 22851

Removed:
   incubator/depot/trunk/update/src/resources/
Modified:
   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/repository/RepositorySet.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:
Renamed UpdateConfig to UpdaterConfig.



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	Mon
Jul 12 13:06:11 2004
@@ -24,7 +24,7 @@
 
 import org.apache.depot.common.log.Logger;
 import org.apache.depot.update.artifact.ArtifactGroup;
-import org.apache.depot.update.config.UpdateConfig;
+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;
@@ -67,7 +67,7 @@
 		// Configure from the shared XML file...
 		//:TODO: *Maybe* move later, or allow user to pass filename
 		// in order to override
-		UpdateConfig.configure();
+		UpdaterConfig.configure();
 	}
 
 	// The identity...
@@ -131,6 +131,8 @@
 		// Protocol operations..
 		getContext().setProtocolManager(
 			new DefaultProtocolOperationsManager(getContext()));
+		
+		m_repositorySet = RepositorySet.getDefaultRepositorySet();
 		
 		// How to perform downloads
 		m_downloadManager = new DownloadManager(getContext());

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
Mon Jul 12 13:06:11 2004
@@ -26,7 +26,7 @@
 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.UpdateConfig;
+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;
@@ -74,7 +74,7 @@
 		Logger logger = Logger.pushContext(LogConstants.ERROR,
 				new AntLogListener(this));
 
-		UpdateConfig.configure();
+		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
Mon Jul 12 13:06:11 2004
@@ -21,7 +21,7 @@
 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.UpdateConfig;
+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;
@@ -48,7 +48,7 @@
 		// Configure from the shared XML file...
 		//:TODO: *Maybe* move later, or allow user to pass filename
 		// in order to override
-		UpdateConfig.configure();
+		UpdaterConfig.configure();
 	}
 
 	private ArtifactUpdaterContext.Identifier m_identifier = null;

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositorySet.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositorySet.java
(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositorySet.java
Mon Jul 12 13:06:11 2004
@@ -152,6 +152,12 @@
 		return buff.toString();
 	}
 
+	public static RepositorySet getDefaultRepositorySet(
+			)
+	{
+		return RepositorySet.getRepositorySet(
+					new RepositorySet.Identifier(UpdateConstants.DEFAULT), true);
+	}
 	public static RepositorySet getRepositorySet(
 			RepositorySet.Identifier identifier, final boolean createIfRequired) {
 

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
Mon Jul 12 13:06:11 2004
@@ -19,7 +19,7 @@
 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.UpdateConfig;
+import org.apache.depot.update.config.UpdaterConfig;
 import org.apache.depot.update.repository.DefaultRepository;
 import org.apache.depot.update.repository.RepositorySet;
 /**
@@ -82,7 +82,7 @@
 		updater.setTargetRepository(getTargetRepository(targetDir));
 		
 		if (null != configName)
-			UpdateConfig.configure(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	Mon Jul 12
13:06:11 2004
@@ -26,7 +26,7 @@
 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.UpdateConfig;
+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 +101,7 @@
 		//:TODO:Hack
 		//DebugUtils.enableCommonsLogging();
 		//DebugUtils.enableHttpClientDebug();
-		UpdateConfig.configure();
+		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
Mon Jul 12 13:06:11 2004
@@ -18,7 +18,7 @@
 
 import org.apache.depot.update.ArtifactUpdater;
 import org.apache.depot.update.UpdateException;
-import org.apache.depot.update.config.UpdateConfig;
+import org.apache.depot.update.config.UpdaterConfig;
 
 /**
  * A StandardResourceUpdater is a {@link org.apache.depot.update.updater.DefaultArtifactUpdater
}
@@ -63,6 +63,6 @@
 	
 	private void initClass() {
 		// Configure from the XML file...
-		UpdateConfig.configure(m_filename);
+		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	Mon
Jul 12 13:06:11 2004
@@ -26,7 +26,7 @@
 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.UpdateConfig;
+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;
@@ -47,7 +47,7 @@
 
 	static {
 		//Logger.testInit();
-		UpdateConfig.configure();
+		UpdaterConfig.configure();
 	}
 
 	public QueryTests(String name) {

Mime
View raw message