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 10055 - in incubator/depot/trunk: update/src/java update/src/java/org/apache/depot/update update/src/java/org/apache/depot/update/config update/src/java/org/apache/depot/update/tool update/src/java/org/apache/depot/update/util/net/http update/src/java/org/apache/depot/update/util/text update/src/resources update/src/test/org/apache/depot/update/ant/task update/src/test/org/apache/depot/update/query version/src/java/org/apache/depot/version/discovery/loading
Date Fri, 16 Apr 2004 20:51:37 GMT
Author: ajack
Date: Fri Apr 16 13:51:36 2004
New Revision: 10055

Added:
   incubator/depot/trunk/update/src/java/depot-update.properties
   incubator/depot/trunk/update/src/java/depot-update.xml
   incubator/depot/trunk/update/src/java/org/apache/depot/update/config/UpdateConfig.java
Removed:
   incubator/depot/trunk/update/src/resources/apache-ruper.properties
   incubator/depot/trunk/update/src/resources/depot-update.xml
Modified:
   incubator/depot/trunk/update/src/java/org/apache/depot/update/FileUpdater.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/ResourceUpdater.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/StandardResourceUpdater.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/util/net/http/HttpClientUserAgent.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/util/text/Messages.java
   incubator/depot/trunk/update/src/java/package.html
   incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/AntTasksTests.java
   incubator/depot/trunk/update/src/test/org/apache/depot/update/query/QueryTests.java
   incubator/depot/trunk/version/src/java/org/apache/depot/version/discovery/loading/FilenameVersionLoader.java
Log:
Guess what .. more name changing...


Added: incubator/depot/trunk/update/src/java/depot-update.properties
==============================================================================
--- (empty file)
+++ incubator/depot/trunk/update/src/java/depot-update.properties	Fri Apr 16 13:51:36 2004
@@ -0,0 +1,110 @@
+# @file          Krysalis Ruper (Resource Updater)
+# @fileEncoding  
+# @fileLanguage  
+# @fileCountry   
+# @fileVariant   
+# @fileManager   
+# @fileComment   
+
+
+#
+# @group RepositoryGroup
+#
+# @groupComment 
+
+# @translated true @created 2003-10-06 @modified 2003-10-06 @creator Anou Manavalan @modifier
Anou Manavalan
+# @comment 
+NO_TARGET_REPOSITORY=No\ target\ repository\ specified
+
+#
+# @group ResourceGroup
+#
+# @groupComment Messages related to Resources
+
+# @translated true @created 2003-09-22 @modified 2003-09-22
+CONFIG=Configure\ using\ {0}\ named\ {1}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+CONFIG_PARSER_ERROR=Parser\ error\ in\ the\ config\ file\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+CREATE_OBJECT_ERROR=Create\ Object\ Error\ {0}\ \!\=\ {1}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+DELETE_RESOURCE=Delete\ Resource\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+DELETE_RESOURCE_FAILED=Delete\ Resource\ Failed\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+EXTRACTED=Extracted\:\ Group\ {0},\ Name\ {1},\ Version\ {2},\ Type\ {3},\ Extension\ {4}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+FILENAME_COMPARATOR=Filename\ Comparator
+# @translated true @created 2003-09-22 @modified 2003-09-22
+FILENAME_SELECTOR=Filename\ Selector
+# @translated true @created 2003-09-22 @modified 2003-09-22
+GENERAL_EXCEPTION=
+# @translated true @created 2003-09-22 @modified 2003-09-22 @creator Adam Jack @modifier
Adam Jack
+# @comment Exception with two parameters
+GENERAL_EXCEPTION2=General\ Exception\ \:\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22 @creator Adam Jack @modifier
Adam Jack
+# @comment Exception with three parameters
+GENERAL_EXCEPTION3=General\ Exception\ \:\ {2}\ for\ Resource\ \:\ {0},\ Location\ {1}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+LIST_FAILED=List\ Failed\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+LIST_GROUPS=List\ Groups\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+LIST_GROUPS_FAILED=List\ Groups\ Failed\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+LIST_RESOURCES=List\ Resources\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+LIST_RESOURCES_FAILED=List\ Resources\ Failed\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+LIST_SPECIFIERS=List\ Specifiers\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+LIST_SPECIFIERS_FAILED=List\ Specifiers\ Failed\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+MERGE=Merge\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+NAME_COMPARATOR=Name\ Comparator
+# @translated true @created 2003-09-22 @modified 2003-09-22
+NAME_SELECTOR=Name\ Selector
+# @translated true @created 2003-09-22 @modified 2003-09-22 @creator Adam Jack @modifier
Adam Jack
+# @{0} 
+# @comment None found (in repo, in general)
+NO_RESOURCES_FOUND=No\ Resource\ Found\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22 @creator Adam Jack @modifier
Adam Jack
+# @{0} 
+# @comment None found (in repo, in general)
+NO_RESOURCES_FOUND_IN=No\ resources\ found\ in\ repository\ {1}\ in\ group\ [{2}]
+# @translated true @created 2003-09-22 @modified 2003-09-22
+NO_SUCH_REFERENCE=No\ Such\ Reference\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22 @creator Adam Jack @modifier
Adam Jack
+# @{0} 
+# @comment 
+NO_UPDATE_FOUND=No\ Update\ Found\ for\ {0}
+# @translated true @created 2003-10-06 @modified 2003-10-06 @creator Anou Manavalan @modifier
Anou Manavalan
+# @comment 
+NULL_RESOURCE=Given\ Resource\ is\ null
+# @translated true @created 2003-09-22 @modified 2003-09-22
+PROCESS=Process\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+PUBLISH_RESOURCE=Publish\ Resource\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+PUBLISH_RESOURCE_FAILED=Publish\ Resource\ Failed\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+RESOURCE_GROUP=Resource\ Group\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+RESOURCE_REQUEST=Resource\ Request\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+SEARCH_REPOSITORY=Search\ Repository\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+TYPE_COMPARATOR=Type\ Comparator
+# @translated true @created 2003-09-22 @modified 2003-09-22
+TYPE_SELECTOR=Type\ Selector
+# @translated true @created 2003-09-22 @modified 2003-09-22
+UNABLE_TO_LOAD_CONFIG=Unable\ to\ load\ the\ config\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+UPDATE_FOUND=Update\ Found\ for\ {0}
+# @translated true @created 2003-09-22 @modified 2003-09-22
+VERSION_COMPARATOR=Version\ Comparator
+# @translated true @created 2003-09-22 @modified 2003-09-22
+VERSION_SELECTOR=Version\ Selector
+# @translated true @created 2003-09-22 @modified 2003-09-22
+WRONG_TYPE=Wrong\ type\ of\ object\ provided\ [{0}],\ Expected\ [{1}]

Added: incubator/depot/trunk/update/src/java/depot-update.xml
==============================================================================
--- (empty file)
+++ incubator/depot/trunk/update/src/java/depot-update.xml	Fri Apr 16 13:51:36 2004
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!--
+==============================================================================
+
+	Default Ruper Configuration
+ 
+====================;lo[oj[oj  llnnioh==========================================================
+-->
+<config>
+	<repositoryset id="mock">	
+		<repository id="mock" 
+					class="org.apache.depot.update.repository.MockRepository"/>					
+	</repositoryset>
+	
+	<repositoryset id="default">
+		<repository id="maven" 
+					url="http://www.ibiblio.org/maven/"
+					remote="true" />
+		
+		<repository id="avalon" 
+					url="http://www.apache.org/dyn/closer.cgi"
+					mirrorDir="avalon/"
+					remote="true" />
+		
+		<repository id="apache" 
+					url="http://www.apache.org/library/projects/"
+					remote="true"/>
+							
+		<repository id="apache_sf" 
+					url="http://prdownloads.sourceforge.net/apache/"
+					remote="true"
+					hierarchical="false" />		
+	</repositoryset>
+	
+	<repositoryset id="test">					
+		<repository id="test_local" 
+					url="http://www.test.org/jars/"
+					remote="true"/>
+					
+		<repository id="test" 
+					url="./testrepo"
+					remote="true"/>
+	</repositoryset>	
+		
+	<repositoryset id="gump">					
+		<repository id="gump_dotnot" 
+					url="http://gump.dotnot.org/repository/"
+					remote="true" />
+					
+		<repository id="gump_lsd" 
+					url="http://lsd.student.utwente.nl/gump/jars/"
+					remote="true" />
+	</repositoryset>	
+
+	<repositoryset id="lib">	
+		<repository id="lib" 
+					url="./lib"
+					remote="false"/>				
+	</repositoryset>	
+		
+	
+</config>

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/FileUpdater.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/FileUpdater.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/FileUpdater.java	Fri Apr
16 13:51:36 2004
@@ -235,7 +235,7 @@
 
 		resourceQuery.setRepositorySetSortContext(repositorySortContext);
 
-		return m_ruper.getRuperEngine().query(resourceQuery);
+		return m_ruper.getUpdateEngine().query(resourceQuery);
 	}
 
 	public ResourceResult determineFilesUpdates(String fileName)
@@ -305,7 +305,7 @@
 			}
 		}
 		
-		return m_ruper.getRuperEngine().performRequest(request);
+		return m_ruper.getUpdateEngine().performRequest(request);
 	}
 
 	public static void main(String args[]) throws Exception {

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 16 13:51:36 2004
@@ -24,7 +24,7 @@
 import java.util.Set;
 
 import org.apache.depot.common.log.Logger;
-import org.apache.depot.update.config.RuperConfig;
+import org.apache.depot.update.config.UpdateConfig;
 import org.apache.depot.update.impl.ReferenceManager;
 import org.apache.depot.update.impl.RepositoryObject;
 import org.apache.depot.update.impl.RepositoryWrapper;
@@ -61,7 +61,7 @@
 		// Configure from the shared XML file...
 		//:TODO: *Maybe* move later, or allow user to pass filename
 		// in order to override
-		RuperConfig.configure();
+		UpdateConfig.configure();
 	}
 
 	// The identity...
@@ -74,7 +74,7 @@
 	private IRepository m_targetRepository;
 
 	//Ruper
-	private ResourceUpdaterEngine m_ruperEngine;
+	private ResourceUpdaterEngine m_updateEngine;
 
 	public static ResourceUpdater getResourceUpdater() throws UpdateException {
 
@@ -119,7 +119,7 @@
 	 */
 	public ResourceUpdater(String id) throws UpdateException {
 		m_identifier = new ResourceUpdaterIdentifier(id);
-		m_ruperEngine = new ResourceUpdaterEngine();
+		m_updateEngine = new ResourceUpdaterEngine();
 		resourceConfigInit();
 	}
 
@@ -129,7 +129,7 @@
 	public ResourceUpdater(ResourceUpdaterIdentifier id)
 		throws UpdateException {
 		m_identifier = id;
-		m_ruperEngine = new ResourceUpdaterEngine();
+		m_updateEngine = new ResourceUpdaterEngine();
 		resourceConfigInit();
 	}
 
@@ -137,9 +137,9 @@
 	* Construct a default ruper
 	*/
 	public ResourceUpdater() {
-		ResourceUpdaterIdentifier ruperId =
+		ResourceUpdaterIdentifier updaterId =
 			new ResourceUpdaterIdentifier(UpdateConstants.DEFAULT);
-		m_ruperEngine = new ResourceUpdaterEngine();
+		m_updateEngine = new ResourceUpdaterEngine();
 		resourceConfigInit();
 	}
 
@@ -153,21 +153,21 @@
 	}
 
 	public ResourceUpdaterContext getContext() {
-		return this.m_ruperEngine.getContext();
+		return this.m_updateEngine.getContext();
 	}
 
 	/* (non-Javadoc)
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#getDefaultRepositorySet()
 	 */
 	public RepositorySet getDefaultRepositorySet() {
-		return m_ruperEngine.getDefaultSortedRepositorySet();
+		return m_updateEngine.getDefaultSortedRepositorySet();
 	}
 
 	/* (non-Javadoc)
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#setDefaultRepositorySet(org.apache.depot.update.repository.RepositorySet)
 	 */
 	public void setDefaultRepositorySet(RepositorySet set) {
-		m_ruperEngine.setDefaultSortedRepositorySet(set);
+		m_updateEngine.setDefaultSortedRepositorySet(set);
 
 	}
 
@@ -176,7 +176,7 @@
 	 */
 	public void setRepositorySetSortContext(RepositorySetSortContext sortContext) {
 
-		m_ruperEngine.setDefaultRepositorySetSortContext(sortContext);
+		m_updateEngine.setDefaultRepositorySetSortContext(sortContext);
 	}
 
 	public RepositorySetSortContext getRepositorySetSortContext(RepositorySetSortContext sortContext)
{
@@ -312,11 +312,11 @@
 		}
 
 		// Query the repositories to get the result	
-		ResourceResult resourceResult = m_ruperEngine.query(resourceQuery);
+		ResourceResult resourceResult = m_updateEngine.query(resourceQuery);
 
 		// Query the target repository to get the result
 		resourceQuery.setRepositorySet(new RepositorySet(targetRepository));
-		ResourceResult targetResult = m_ruperEngine.query(resourceQuery);
+		ResourceResult targetResult = m_updateEngine.query(resourceQuery);
 
 		List resources =
 			sortResult(resourceQuery, resourceResult, targetResult);
@@ -413,7 +413,7 @@
 		if (target != null)
 			resourceQuery.setRepositorySet(new RepositorySet(target));
 		// Query the repositories to get the result	
-		ResourceResult resourceResult = m_ruperEngine.query(resourceQuery);
+		ResourceResult resourceResult = m_updateEngine.query(resourceQuery);
 		List resources = ResourceResultHelper.getResourceList(resourceResult);
 
 		return resources;
@@ -426,7 +426,7 @@
 	public List findResource(ResourceQuery resourceQuery)
 		throws UpdateException {
 		// Query the repositories to get the result	
-		ResourceResult resourceResult = m_ruperEngine.query(resourceQuery);
+		ResourceResult resourceResult = m_updateEngine.query(resourceQuery);
 		List foundResources =
 			ResourceResultHelper.getResourceList(resourceResult);
 
@@ -485,7 +485,7 @@
 			throw new UpdateException(message);
 		}
 
-		m_ruperEngine.copyTo(resources, targetRepository);
+		m_updateEngine.copyTo(resources, targetRepository);
 	}
 
 	public void downloadResourceGroup(
@@ -540,14 +540,14 @@
 		resourceQuery.setRepositorySet(new RepositorySet(repository));
 
 		// Query the repositories to get the result	
-		ResourceResult resourceResult = m_ruperEngine.query(resourceQuery);
+		ResourceResult resourceResult = m_updateEngine.query(resourceQuery);
 		List olderResources =
 			ResourceResultHelper.getRemainderResources(resourceResult);
 
 		//DebugUtils.dump("Older Resources", olderResources);
 
 		// Delete all but 'best'
-		m_ruperEngine.delete(repository, olderResources);
+		m_updateEngine.delete(repository, olderResources);
 	}
 
 	/**
@@ -627,7 +627,7 @@
 	 * :TODO: temporary, until we figure out what RU and RE both do.
 	 * @return
 	 */
-	ResourceUpdaterEngine getRuperEngine() {
-		return m_ruperEngine;
+	ResourceUpdaterEngine getUpdateEngine() {
+		return m_updateEngine;
 	}
 }

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/StandardResourceUpdater.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/StandardResourceUpdater.java
(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/StandardResourceUpdater.java
Fri Apr 16 13:51:36 2004
@@ -16,7 +16,7 @@
 
 package org.apache.depot.update;
 
-import org.apache.depot.update.config.RuperConfig;
+import org.apache.depot.update.config.UpdateConfig;
 import org.apache.depot.update.impl.ResourceUpdaterIdentifier;
 
 /**
@@ -58,6 +58,6 @@
 	private void initClass() {
 		// Configure from the XML file...
 		//:TODO: *Maybe* move later, or allow user to pass filename
-		RuperConfig.configure("standard.xml");
+		UpdateConfig.configure("standard.xml");
 	}
 }

Added: incubator/depot/trunk/update/src/java/org/apache/depot/update/config/UpdateConfig.java
==============================================================================
--- (empty file)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/config/UpdateConfig.java
Fri Apr 16 13:51:36 2004
@@ -0,0 +1,96 @@
+/*
+ * Copyright  2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.depot.update.config;
+
+import java.io.File;
+import java.io.InputStream;
+
+import org.apache.depot.common.log.Logger;
+import org.apache.depot.common.util.envsafe.ClassLoaderContext;
+import org.apache.depot.update.impl.ReferenceManager;
+import org.apache.depot.update.util.UpdateConstants;
+import org.apache.depot.update.util.text.MessageConstants;
+import org.apache.depot.update.util.text.Messages;
+import org.apache.depot.update.util.xml.XMLContext;
+import org.apache.depot.update.util.xml.XMLEntryTable;
+import org.apache.depot.update.util.xml.XMLParser;
+
+/**
+ * @author anou_mana
+ */
+public class UpdateConfig {
+	private static boolean l_configured = false;
+
+	public static synchronized void configure(String resourceName) {
+		try {
+			XMLEntryTable xmlEntryTable = new ConfigXMLEntryTable();
+			XMLContext xmlContext = null;
+			
+			ClassLoaderContext helper = new ClassLoaderContext(xmlEntryTable);
+			
+			XMLParser parser = new XMLParser(xmlEntryTable, helper);
+			
+			File configFile = new File(resourceName);
+			if (configFile.exists()) {
+				Logger.getLogger().info(
+					Messages.getString(
+						MessageConstants.CONFIG,
+						new Object[] { "file", resourceName }));
+				xmlContext = parser.parse(configFile);
+			}
+			else {
+				InputStream resource =
+				helper.getResourceAsStream(
+						resourceName);
+				if (resource == null) {
+					resource = ClassLoader.getSystemResourceAsStream(resourceName);
+				}
+				
+				Logger.getLogger().info(
+					Messages.getString(
+						MessageConstants.CONFIG,
+						new Object[] { "resource", resourceName }));
+				xmlContext = parser.parse(resource);
+			}
+
+			if (null == xmlContext)
+				Logger.getLogger().error(
+					Messages.getString(
+						MessageConstants.UNABLE_TO_LOAD_CONFIG,
+						resourceName));
+
+		}
+		catch (Exception exp) {
+			Logger.getLogger().error(
+				Messages.getString(MessageConstants.CONFIG_PARSER_ERROR),
+				exp);
+		}
+	}
+
+	public static void configure() {
+		if (!l_configured) {
+			configure(UpdateConstants.DEFAULT_CONFIG_XML);
+			l_configured = true;
+		}
+	}
+
+	public static void main(String[] args) throws Exception {
+		Logger.testInit();
+		UpdateConfig.configure();
+		ReferenceManager.dump();
+	}
+}

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
Fri Apr 16 13:51:36 2004
@@ -13,77 +13,56 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.depot.update.tool;
-
 import org.apache.depot.common.util.cli.CommandLine;
 import org.apache.depot.common.util.cli.Option;
 import org.apache.depot.update.ResourceUpdater;
-import org.apache.depot.update.config.RuperConfig;
+import org.apache.depot.update.config.UpdateConfig;
 import org.apache.depot.update.repository.DefaultRepository;
 import org.apache.depot.update.repository.IRepository;
 import org.apache.depot.update.repository.RepositorySet;
 import org.apache.depot.update.resource.ResourceGroup;
-
 /**
  */
 public class DownloaderTool extends Tool {
-
 	private static Option l_targetOption = null;
 	private static Option l_groupOption = null;
 	private static Option l_configOption = null;
-
 	static {
-		l_configOption =
-			new Option("c", "config", true, "The configuration file");
+		l_configOption = new Option("c", "config", true,
+				"The configuration file");
 		l_groupOption = new Option("g", "group", true, "The group to go get");
-		l_targetOption =
-			new Option(
-				"t",
-				"target",
-				true,
+		l_targetOption = new Option("t", "target", true,
 				"The target directory to put it into");
 	}
-
 	protected String getTitle() {
-		return "Ruper Resource Tool";
+		return "Update Resource Tool";
 	}
-
 	protected void init() {
 		getOptions().addOption(l_configOption);
 		getOptions().addOption(l_groupOption);
 		getOptions().addOption(l_targetOption);
 	}
-
 	private IRepository getTargetRepository(String targetDir) {
 		return new DefaultRepository("target", targetDir);
 	}
-
 	public void execute(CommandLine cmdline) throws Exception {
-
 		String groupName = cmdline.getMandatoryOptionValue(l_groupOption);
-		String targetDir = cmdline.getOptionValue(l_targetOption);
+		String targetDir = cmdline.getMandatoryOptionValue(l_targetOption);
 		String configName = cmdline.getOptionValue(l_configOption);
-
 		ResourceUpdater ruper = new ResourceUpdater();
-
 		// Assigned the target (to copy into)
 		ruper.setDefaultTargetRepository(getTargetRepository(targetDir));
-
 		if (null != configName)
-			RuperConfig.configure(configName);
-		ruper.setDefaultRepositorySet(
-			RepositorySet.getRepositorySet("gump", false));
-
+			UpdateConfig.configure(configName);
+		ruper.setDefaultRepositorySet(RepositorySet.getRepositorySet("gump",
+				false));
 		ResourceGroup group = new ResourceGroup(groupName);
-
 		// Update...
 		ruper.updateResourceGroup(group);
-
 		// Cleanup (to remove duplicates)
 		ruper.clean(group);
 	}
-
 	public static void main(String[] args) {
 		(new DownloaderTool()).run(args);
 	}

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	Fri Apr 16
13:51:36 2004
@@ -28,7 +28,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.RuperConfig;
+import org.apache.depot.update.config.UpdateConfig;
 import org.apache.depot.update.monitor.Monitor;
 import org.apache.depot.update.monitor.StatisticsMonitor;
 import org.apache.depot.update.version.Version;
@@ -121,7 +121,7 @@
 		//DebugUtils.enableCommonsLogging();
 		//DebugUtils.enableHttpClientDebug();
 
-		RuperConfig.configure();
+		UpdateConfig.configure();
 
 		init();
 

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/net/http/HttpClientUserAgent.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/net/http/HttpClientUserAgent.java
(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/net/http/HttpClientUserAgent.java
Fri Apr 16 13:51:36 2004
@@ -167,7 +167,7 @@
 		method.setFollowRedirects(true);
 		method.setRequestHeader(
 			"User-Agent",
-			"Apache-Ruper/" + Version.VERSION.getLongVersion());
+			"Apache-Depot-Update/" + Version.VERSION.getLongVersion());
 	}
 
 	public static void main(String args[]) {

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/text/Messages.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/text/Messages.java
(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/text/Messages.java
Fri Apr 16 13:51:36 2004
@@ -33,7 +33,7 @@
  */
 public class Messages {
 	//Name of the resource Bundle
-	private static final String BUNDLE_NAME = "apache-depot-update";
+	private static final String BUNDLE_NAME = "depot-update";
 
 	//Intialized the ResourceBundle.
 	static ResourceBundle l_resourceBundle = null;
@@ -45,7 +45,7 @@
 		}
 		catch (Exception e) {
 			System.err.println(
-				"Unable to find Ruper resource bundle ["
+				"Unable to find Update resource bundle ["
 					+ BUNDLE_NAME
 					+ "] with locale ["
 					+ Locale.getDefault()

Modified: incubator/depot/trunk/update/src/java/package.html
==============================================================================
--- incubator/depot/trunk/update/src/java/package.html	(original)
+++ incubator/depot/trunk/update/src/java/package.html	Fri Apr 16 13:51:36 2004
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Ruper2 Package Overview</title>
+<title>Update Package Overview</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <body>
 <p>
@@ -74,7 +74,7 @@
 </p>
 <p>
 
-//TODO  - The ResourceUpdater ConfigOptions Object will take care of the simple user selectors
and comparators. User will be able to say “BestOfAll” , “ReleaseOnly”, “AllMatches”… as the
options and the QueryHelper will take that and construct the query.
+//TODO  - The ResourceUpdater ConfigOptions Object will take care of the simple user selectors
and comparators. User will be able to say �BestOfAll� , �ReleaseOnly�, �AllMatches��
as the options and the QueryHelper will take that and construct the query.
 </p>
 <p>
 

Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/AntTasksTests.java
==============================================================================
--- incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/AntTasksTests.java
(original)
+++ incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/AntTasksTests.java
Fri Apr 16 13:51:36 2004
@@ -26,7 +26,7 @@
 public class AntTasksTests extends BuildFileTest {
 
 	/**
-	 * Constructor for RuperDependTaskTest.
+	 * Constructor for UpdateDependTaskTest.
 	 * @param arg0
 	 */
 	public AntTasksTests(String arg0) {

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	Fri
Apr 16 13:51:36 2004
@@ -20,7 +20,7 @@
 
 import org.apache.depot.common.util.debug.DebugUtils;
 import org.apache.depot.update.UpdateException;
-import org.apache.depot.update.config.RuperConfig;
+import org.apache.depot.update.config.UpdateConfig;
 import org.apache.depot.update.impl.RepositorySetWrapper;
 import org.apache.depot.update.impl.ResourceUpdaterContext;
 import org.apache.depot.update.repository.RepositorySet;
@@ -47,7 +47,7 @@
 
 	static {
 		//Logger.testInit();
-		RuperConfig.configure();
+		UpdateConfig.configure();
 	}
 
 	public QueryTests(String name) {

Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/discovery/loading/FilenameVersionLoader.java
==============================================================================
--- incubator/depot/trunk/version/src/java/org/apache/depot/version/discovery/loading/FilenameVersionLoader.java
(original)
+++ incubator/depot/trunk/version/src/java/org/apache/depot/version/discovery/loading/FilenameVersionLoader.java
Fri Apr 16 13:51:36 2004
@@ -75,7 +75,7 @@
 
 	/**
 	 * 
-	 * This is *based upon* requirements from Ruper...
+	 * This is *based upon* requirements from Update...
 	 * 
 	 *  <pre>
 	 * foo                          (0.0.0-release-0)

Mime
View raw message