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 9846 - in incubator/depot/trunk/update: . src/java/org/apache/depot/update src/java/org/apache/depot/update/ant src/java/org/apache/depot/update/ant/sandbox/chalko src/java/org/apache/depot/update/ant/task src/java/org/apache/depot/update/files src/java/org/apache/depot/update/impl src/java/org/apache/depot/update/protocols src/java/org/apache/depot/update/query src/java/org/apache/depot/update/repository src/java/org/apache/depot/update/util/chainprocess src/java/org/apache/depot/update/util/io src/java/org/apache/depot/update/util/reference src/java/org/apache/depot/update/util/security src/java/org/apache/depot/update/util/xml src/test/org/apache/depot/update/ant/task src/test/org/apache/depot/update/files src/test/org/apache/depot/update/query src/test/org/apache/depot/update/util/xml
Date Fri, 02 Apr 2004 14:03:34 GMT
Author: ajack
Date: Fri Apr  2 06:03:31 2004
New Revision: 9846

Modified:
   incubator/depot/trunk/update/build_antlet.xml
   incubator/depot/trunk/update/build_chalko.xml
   incubator/depot/trunk/update/build_new.xml
   incubator/depot/trunk/update/src/java/org/apache/depot/update/ClasspathUpdater.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/DefaultResourceUpdater.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/FileAssistant.java
   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/ant/antlib.xml
   incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/sandbox/chalko/antlib.xml
   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/SynchronizeTask.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/files/DefaultResourceFilenameAnalyzer.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/files/DefaultResourceGroupFilenameAnalyzer.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/files/IResourceFilenameAnalyzer.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/files/IResourceGroupFilenameAnalyzer.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/RepositoryObject.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/RepositorySetWrapper.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/RepositoryWrapper.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ResourceUpdaterContext.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ResourceUpdaterEngine.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/protocols/DefaultProtocolOperationsManager.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/protocols/ProtocolOperationsManager.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/query/DefaultQueryEngine.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/query/ResourceQueryHelper.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/AbstractRepository.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositoryException.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositoryManager.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/util/chainprocess/HandlerManager.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/util/io/FileUtils.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/util/reference/NoSuchReferenceException.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/util/security/ChkSum.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/util/security/HashCodeManager.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/util/xml/XMLException.java
   incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/SynchronizeTaskTests.java
   incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/anttasks.xml
   incubator/depot/trunk/update/src/test/org/apache/depot/update/files/DefaultResourceAnalyzerTests.java
   incubator/depot/trunk/update/src/test/org/apache/depot/update/files/ResourceAnalyzerTests.java
   incubator/depot/trunk/update/src/test/org/apache/depot/update/query/QueryTests.java
   incubator/depot/trunk/update/src/test/org/apache/depot/update/util/xml/XMLParserTests.java
Log:
Move refacting cleanup.


Modified: incubator/depot/trunk/update/build_antlet.xml
==============================================================================
--- incubator/depot/trunk/update/build_antlet.xml	(original)
+++ incubator/depot/trunk/update/build_antlet.xml	Fri Apr  2 06:03:31 2004
@@ -42,7 +42,7 @@
     <importer name="apache-0.1" href="http://metamorphosis.krysalis.org/antlet/"/>
     
    
-    <path id="ruper.classpath">
+    <path id="update.classpath">
         <fileset dir="lib">
             <include name="*.jar"/>
         </fileset>

Modified: incubator/depot/trunk/update/build_chalko.xml
==============================================================================
--- incubator/depot/trunk/update/build_chalko.xml	(original)
+++ incubator/depot/trunk/update/build_chalko.xml	Fri Apr  2 06:03:31 2004
@@ -15,17 +15,17 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project name="ruper" default="all">
+<project name="update" default="all">
     <description> 
 		Depot Ruper is a Repository Updater 
 	</description>
     <tstamp/>
     <typedef resource="org/krysalis/centipede2/ant/antlib.xml"/>
-    <property name="project.name" value="depot-ruper"/>
+    <property name="project.name" value="depot-update"/>
     <property name="project.version" value="0.1-dev-${DSTAMP}"/>
     
     
-     <property name="apache.antlet.svn.www.url" value="https://svn.apache.org/repos/asf/incubator/depot/trunk/www/ruper"/>
+     <property name="apache.antlet.svn.www.url" value="https://svn.apache.org/repos/asf/incubator/depot/trunk/www/update"/>
 
     
     <!--property name="project.src.dir" value="src/java/core"/-->
@@ -42,7 +42,7 @@
     <importer name="apache-0.1" href="http://metamorphosis.krysalis.org/antlet/"/>
     
    
-    <path id="ruper.classpath">
+    <path id="update.classpath">
         <fileset dir="lib">
             <include name="*.jar"/>
         </fileset>

Modified: incubator/depot/trunk/update/build_new.xml
==============================================================================
--- incubator/depot/trunk/update/build_new.xml	(original)
+++ incubator/depot/trunk/update/build_new.xml	Fri Apr  2 06:03:31 2004
@@ -1,5 +1,5 @@
 <!-- $Header: $ -->
-<project name="ruper" default="all"> 
+<project name="update" default="all"> 
 
 
 

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ClasspathUpdater.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/ClasspathUpdater.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ClasspathUpdater.java	Fri Apr  2 06:03:31 2004
@@ -36,14 +36,14 @@
 	}
 
 	public void updateClasspathFiles(final String classpathStr)
-		throws RuperException {
+		throws UpdateException {
 		PathSet classpath = new PathSet(/* getIdentifier().getId() */
 		":TODO:", classpathStr);
 		updateClasspathFiles(classpath);
 	}
 
 	public void updateClasspathFiles(final PathSet classpath)
-		throws RuperException {
+		throws UpdateException {
 		ArrayList files = new ArrayList();
 
 		for (Iterator i = classpath.iterator(); i.hasNext();) {

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/DefaultResourceUpdater.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/DefaultResourceUpdater.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/DefaultResourceUpdater.java	Fri Apr  2 06:03:31 2004
@@ -33,27 +33,27 @@
 
 	/**
 	 * @param id
-	 * @throws RuperException
+	 * @throws UpdateException
 	 */
-	public DefaultResourceUpdater(String id) throws RuperException {
+	public DefaultResourceUpdater(String id) throws UpdateException {
 		super(id);
 		// TODO Auto-generated constructor stub
 	}
 
 	/**
 	 * @param id
-	 * @throws RuperException
+	 * @throws UpdateException
 	 */
 	public DefaultResourceUpdater(ResourceUpdaterIdentifier id)
-		throws RuperException {
+		throws UpdateException {
 		super(id);
 		// TODO Auto-generated constructor stub
 	}
 
 	/**
-	 * @throws RuperException
+	 * @throws UpdateException
 	 */
-	public DefaultResourceUpdater() throws RuperException {
+	public DefaultResourceUpdater() throws UpdateException {
 		super();
 		// TODO Auto-generated constructor stub
 	}

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/FileAssistant.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/FileAssistant.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/FileAssistant.java	Fri Apr  2 06:03:31 2004
@@ -76,10 +76,10 @@
      *
      * @return TODO
      *
-     * @throws RuperException TODO
+     * @throws UpdateException TODO
      */
     public List getResourceSpecifiersForFiles(List files)
-                                       throws RuperException {
+                                       throws UpdateException {
         List specifiers = new ArrayList();
 
         for (Iterator i = files.iterator(); i.hasNext();) {
@@ -96,10 +96,10 @@
      *
      * @return TODO
      *
-     * @throws RuperException TODO
+     * @throws UpdateException TODO
      */
     public ResourceSpecifier getResourceSpecifierForFile(File file)
-                                                  throws RuperException {
+                                                  throws UpdateException {
         Resource resource = analyzer.determineResource(file);
 
         return resource.getSpecifier();

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  2 06:03:31 2004
@@ -55,9 +55,9 @@
 	private FileAssistant m_filer = null;
 
 	/**
-	 * @throws RuperException -- failed to construct
+	 * @throws UpdateException -- failed to construct
 	 */
-	public FileUpdater() throws RuperException {
+	public FileUpdater() throws UpdateException {
 		m_ruper = ResourceUpdater.getDefaultResourceUpdater();
 		m_filer = new FileAssistant();
 	}
@@ -73,20 +73,20 @@
 	   m_filer = filer;
    }
 
-   public void updateFiles(List files) throws RuperException {
+   public void updateFiles(List files) throws UpdateException {
 		for (Iterator i = files.iterator(); i.hasNext();) {
 			updateFile((File) i.next());
 		}
 	}
 
 	public void updateFiles(List files, IRepository target)
-		throws RuperException {
+		throws UpdateException {
 		for (Iterator i = files.iterator(); i.hasNext();) {
 			updateFile((File) i.next(), target);
 		}
 	}
 
-	public void updateFiles(File file) throws RuperException {
+	public void updateFiles(File file) throws UpdateException {
 
 		ResolvedFile resolved = m_filer.resolveFile(file);
 
@@ -116,7 +116,7 @@
 		}
 	}
 
-	public void updateFile(File file) throws RuperException {
+	public void updateFile(File file) throws UpdateException {
 		ResolvedFile parentFolder =
 			m_filer.resolveFile(m_filer.resolveFile(file).getParent());
 
@@ -130,7 +130,7 @@
 	}
 
 	public void updateFile(File file, IRepository target)
-		throws RuperException {
+		throws UpdateException {
 
 		//
 		// Generate a request from the file
@@ -207,7 +207,7 @@
 	private ResourceResult queryRepository(
 		String repositoryConstant,
 		ResourceQuery resourceQuery)
-		throws RuperException {
+		throws UpdateException {
 
 		//
 		// get the sortcontext for remote repository
@@ -239,12 +239,12 @@
 	}
 
 	public ResourceResult determineFilesUpdates(String fileName)
-		throws RuperException {
+		throws UpdateException {
 		return determineFilesUpdates(new File(fileName));
 	}
 
 	public ResourceResult determineFilesUpdates(File file)
-		throws RuperException {
+		throws UpdateException {
 		ResourceResult result = null;
 
 		ResolvedFile resolved = m_filer.resolveFile(file);
@@ -268,12 +268,12 @@
 	}
 
 	public ResourceResult determineFileUpdates(String fileName)
-		throws RuperException {
+		throws UpdateException {
 		return determineFileUpdates(new File(fileName));
 	}
 
 	public ResourceResult determineFileUpdates(File file)
-		throws RuperException {
+		throws UpdateException {
 
 		ResolvedFile resolved = m_filer.resolveFile(file);
 

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  2 06:03:31 2004
@@ -76,7 +76,7 @@
 	//Ruper
 	private ResourceUpdaterEngine m_ruperEngine;
 
-	public static ResourceUpdater getResourceUpdater() throws RuperException {
+	public static ResourceUpdater getResourceUpdater() throws UpdateException {
 
 		return getResourceUpdater(RuperConstants.DEFAULT, true);
 	}
@@ -84,7 +84,7 @@
 	public static ResourceUpdater getResourceUpdater(
 		String id,
 		final boolean createIfRequired)
-		throws RuperException {
+		throws UpdateException {
 
 		ResourceUpdater ruper = null;
 		GenericIdentifier identifier =
@@ -117,7 +117,7 @@
 	/**
 	 * 
 	 */
-	public ResourceUpdater(String id) throws RuperException {
+	public ResourceUpdater(String id) throws UpdateException {
 		m_identifier = new ResourceUpdaterIdentifier(id);
 		m_ruperEngine = new ResourceUpdaterEngine();
 		resourceConfigInit();
@@ -127,7 +127,7 @@
 	 * 
 	 */
 	public ResourceUpdater(ResourceUpdaterIdentifier id)
-		throws RuperException {
+		throws UpdateException {
 		m_identifier = id;
 		m_ruperEngine = new ResourceUpdaterEngine();
 		resourceConfigInit();
@@ -184,7 +184,7 @@
 	}
 
 	public RepositoryObject getRepositoryObject(String repositoryId)
-		throws RuperException {
+		throws UpdateException {
 
 		RepositoryObject repositoryObject = null;
 
@@ -197,7 +197,7 @@
 	}
 
 	public RepositoryObject getRepositoryObject(IRepository repository)
-		throws RuperException {
+		throws UpdateException {
 
 		RepositoryWrapper wrapper =
 			new RepositoryWrapper(repository, getContext());
@@ -215,7 +215,7 @@
 	/* (non-Javadoc)
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#updateResources(java.util.List)
 	 */
-	public void updateResources(List resources) throws RuperException {
+	public void updateResources(List resources) throws UpdateException {
 		updateResources(resources, null);
 	}
 
@@ -223,7 +223,7 @@
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#updateResources(java.util.List, org.apache.depot.update.repository.Repository)
 	 */
 	public void updateResources(List resources, IRepository targetRepository)
-		throws RuperException {
+		throws UpdateException {
 		for (Iterator iterator = resources.iterator(); iterator.hasNext();) {
 			Resource resource = (Resource) iterator.next();
 			updateResource(resource, targetRepository);
@@ -232,14 +232,14 @@
 
 	/* (non-Javadoc)
 	 */
-	public void updateResource(Resource resource) throws RuperException {
+	public void updateResource(Resource resource) throws UpdateException {
 		updateResource(resource, null);
 	}
 
 	/* (non-Javadoc)
 	 */
 	public void updateResource(Resource resource, IRepository targetRepository)
-		throws RuperException {
+		throws UpdateException {
 
 		if (resource != null) {
 
@@ -252,14 +252,14 @@
 			String message = Messages.getString(MessageConstants.NULL_RESOURCE);
 			Logger.getLogger().error(message);
 
-			throw new RuperException(message);
+			throw new UpdateException(message);
 		}
 	}
 
 	/* (non-Javadoc)
 	 */
 	public void updateResourceGroup(ResourceGroup group)
-		throws RuperException {
+		throws UpdateException {
 		updateResourceGroup(group, null);
 	}
 
@@ -268,7 +268,7 @@
 	public void updateResourceGroup(
 		ResourceGroup group,
 		IRepository targetRepository)
-		throws RuperException {
+		throws UpdateException {
 
 		if (group != null) {
 			// get the resource specifier query
@@ -280,7 +280,7 @@
 			String message = Messages.getString(MessageConstants.NULL_GROUP);
 			Logger.getLogger().error(message);
 
-			throw new RuperException(message);
+			throw new UpdateException(message);
 		}
 	}
 
@@ -288,7 +288,7 @@
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#updateResource(org.apache.depot.update.resource.Resource, org.apache.depot.update.query.ResourceQuery)
 	 */
 	public void updateResource(ResourceQuery resourceQuery)
-		throws RuperException {
+		throws UpdateException {
 		updateResource(resourceQuery, null);
 	}
 
@@ -298,7 +298,7 @@
 	public void updateResource(
 		ResourceQuery resourceQuery,
 		IRepository targetRepository)
-		throws RuperException {
+		throws UpdateException {
 
 		//check for target repository
 		if (targetRepository == null) {
@@ -308,7 +308,7 @@
 			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);
+			throw new UpdateException(message);
 		}
 
 		// Query the repositories to get the result	
@@ -372,14 +372,14 @@
 	/* (non-Javadoc)
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#findResource(org.apache.depot.update.resource.Resource)
 	 */
-	public List findResource(Resource resource) throws RuperException {
+	public List findResource(Resource resource) throws UpdateException {
 		return findResource(resource, null);
 	}
 
 	/* (non-Javadoc)
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#findResources(java.util.List)
 	 */
-	public Map findResources(List resources) throws RuperException {
+	public Map findResources(List resources) throws UpdateException {
 		return findResources(resources, null);
 	}
 
@@ -387,7 +387,7 @@
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#findResources(java.util.List, org.apache.depot.update.repository.Repository)
 	 */
 	public Map findResources(List resources, IRepository target)
-		throws RuperException {
+		throws UpdateException {
 		Map resourceMap = new HashMap();
 		List foundResources = null;
 
@@ -405,7 +405,7 @@
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#findResource(org.apache.depot.update.resource.Resource, org.apache.depot.update.repository.Repository)
 	 */
 	public List findResource(Resource resource, IRepository target)
-		throws RuperException {
+		throws UpdateException {
 		// get the resource specifier query
 		ResourceQuery resourceQuery =
 			ResourceQueryHelper.getResourceSpecifierQuery(resource);
@@ -424,7 +424,7 @@
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#findResource(org.apache.depot.update.resource.Resource, org.apache.depot.update.query.ResourceQuery)
 	 */
 	public List findResource(ResourceQuery resourceQuery)
-		throws RuperException {
+		throws UpdateException {
 		// Query the repositories to get the result	
 		ResourceResult resourceResult = m_ruperEngine.query(resourceQuery);
 		List foundResources =
@@ -436,14 +436,14 @@
 	/* (non-Javadoc)
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#copyResources(java.util.List)
 	 */
-	public void downloadResources(List resources) throws RuperException {
+	public void downloadResources(List resources) throws UpdateException {
 		downloadResources(resources, null);
 	}
 
 	/* (non-Javadoc)
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#copyResource(org.apache.depot.update.resource.Resource)
 	 */
-	public void downloadResource(Resource resource) throws RuperException {
+	public void downloadResource(Resource resource) throws UpdateException {
 		downloadResource(resource, null);
 	}
 
@@ -453,7 +453,7 @@
 	public void downloadResource(
 		Resource resource,
 		IRepository targetRepository)
-		throws RuperException {
+		throws UpdateException {
 		if (resource != null) {
 			List resources = new ArrayList();
 			resources.add(resource);
@@ -463,7 +463,7 @@
 			String message = Messages.getString(MessageConstants.NULL_RESOURCE);
 			Logger.getLogger().error(message);
 
-			throw new RuperException(message);
+			throw new UpdateException(message);
 		}
 	}
 
@@ -471,7 +471,7 @@
 	 * @see org.apache.depot.update.api.ResourceAPIInterface#copyResources(java.util.List)
 	 */
 	public void downloadResources(List resources, IRepository targetRepository)
-		throws RuperException {
+		throws UpdateException {
 		//check for target repository
 		if (targetRepository == null) {
 			targetRepository = m_targetRepository;
@@ -482,7 +482,7 @@
 				Messages.getString(MessageConstants.NO_TARGET_REPOSITORY);
 			Logger.getLogger().error(message);
 
-			throw new RuperException(message);
+			throw new UpdateException(message);
 		}
 
 		m_ruperEngine.copyTo(resources, targetRepository);
@@ -491,7 +491,7 @@
 	public void downloadResourceGroup(
 		ResourceGroup group,
 		IRepository targetRepository)
-		throws RuperException {
+		throws UpdateException {
 
 		if (group != null) {
 
@@ -504,14 +504,14 @@
 			String message = Messages.getString(MessageConstants.NULL_GROUP);
 			Logger.getLogger().error(message);
 
-			throw new RuperException(message);
+			throw new UpdateException(message);
 		}
 	}
 
 	public void downloadResource(
 		ResourceQuery resourceQuery,
 		IRepository targetRepository)
-		throws RuperException {
+		throws UpdateException {
 
 		// Query the repositories to get the result	
 		List resources = findResource(resourceQuery);
@@ -524,12 +524,12 @@
 
 	}
 
-	public void clean(ResourceGroup group) throws RuperException {
+	public void clean(ResourceGroup group) throws UpdateException {
 		cleanRepository(m_targetRepository, group);
 	}
 
 	public void cleanRepository(IRepository repository, ResourceGroup group)
-		throws RuperException {
+		throws UpdateException {
 
 		// Query & sort by version
 		//		get the resource specifier query
@@ -565,7 +565,7 @@
 	}
 
 	public static ResourceUpdater getDefaultResourceUpdater()
-		throws RuperException {
+		throws UpdateException {
 		return getResourceUpdater(
 			new ResourceUpdaterIdentifier(RuperConstants.DEFAULT),
 			true);
@@ -574,7 +574,7 @@
 	public static ResourceUpdater getResourceUpdater(
 		ResourceUpdaterIdentifier identifier,
 		final boolean createIfRequired)
-		throws RuperException {
+		throws UpdateException {
 
 		ResourceUpdater ruper = null;
 
@@ -583,7 +583,7 @@
 		}
 		else {
 			if (!createIfRequired)
-				throw new RuperException(
+				throw new UpdateException(
 					"Failed to access ResourceUpdater [" + identifier + "]");
 
 			ruper = new ResourceUpdater(identifier);

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  2 06:03:31 2004
@@ -30,27 +30,27 @@
 
 	/**
 	 * @param id
-	 * @throws RuperException
+	 * @throws UpdateException
 	 */
-	public StandardResourceUpdater(String id) throws RuperException {
+	public StandardResourceUpdater(String id) throws UpdateException {
 		super(id);
 		initClass();
 	}
 
 	/**
 	 * @param id
-	 * @throws RuperException
+	 * @throws UpdateException
 	 */
 	public StandardResourceUpdater(ResourceUpdaterIdentifier id)
-		throws RuperException {
+		throws UpdateException {
 		super(id);
 		initClass();
 	}
 
 	/**
-	 * @throws RuperException
+	 * @throws UpdateException
 	 */
-	public StandardResourceUpdater() throws RuperException {
+	public StandardResourceUpdater() throws UpdateException {
 		super();
 		initClass();
 	}

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/antlib.xml
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/antlib.xml	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/antlib.xml	Fri Apr  2 06:03:31 2004
@@ -14,9 +14,9 @@
 limitations under the License.
 -->
 <antlib>
-    <typedef name="updateset" classname="org.apache.update.ant.sandbox.chalko.UpdateSet"/>
-    <typedef name="resource" classname="org.apache.update.ant.sandbox.chalko.ResourceElement"/>
-    <typedef name="repository" classname="org.apache.update.ant.sandbox.chalko.RepositoryElement"/>
-    <typedef name="repotool" classname="org.apache.update.ant.task.RepositoryToolTask"/>
-    <typedef name="reposync" classname="org.apache.update.ant.task.SynchronizeTask"/>
+    <typedef name="updateset" classname="org.apache.depot.update.ant.sandbox.chalko.UpdateSet"/>
+    <typedef name="resource" classname="org.apache.depot.update.ant.sandbox.chalko.ResourceElement"/>
+    <typedef name="repository" classname="org.apache.depot.update.ant.sandbox.chalko.RepositoryElement"/>
+    <typedef name="repotool" classname="org.apache.depot.update.ant.task.RepositoryToolTask"/>
+    <typedef name="reposync" classname="org.apache.depot.update.ant.task.SynchronizeTask"/>
 </antlib>

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/sandbox/chalko/antlib.xml
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/sandbox/chalko/antlib.xml	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/sandbox/chalko/antlib.xml	Fri Apr  2 06:03:31 2004
@@ -16,8 +16,8 @@
 <antlib>
    <typedef 
    		name="updateset" 
-   		classname="org.krysalis.centipede2.ant.ImportAntletTask"/>
+   		classname="org.apache.depot.update.ant.sandbox.chalko.UpdateSet"/>
    <typedef 
    		name="resource" 
-   		classname="org.krysalis.centipede2.ant.ImportAntletTask"/>
+   		classname="org.apache.depot.update.ant.sandbox.chalko.ResourceElement"/>
 </antlib>

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  2 06:03:31 2004
@@ -19,7 +19,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.impl.RepositoryWrapper;
 import org.apache.depot.update.impl.ResourceUpdaterContext;
 import org.apache.depot.update.repository.IRepository;
@@ -100,7 +100,7 @@
 							log(" - Group: " + group);
 						}
 					}
-					catch (RuperException re) {
+					catch (UpdateException re) {
 						log(
 							" - Failed to list groups: "
 								+ re.getLocalizedMessage(),
@@ -125,7 +125,7 @@
 							log(" - Specifier: " + specifier);
 						}
 					}
-					catch (RuperException re) {
+					catch (UpdateException re) {
 						log(
 							" - Failed to list groups: "
 								+ re.getLocalizedMessage(),

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/SynchronizeTask.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/SynchronizeTask.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/SynchronizeTask.java	Fri Apr  2 06:03:31 2004
@@ -17,7 +17,7 @@
 package org.apache.depot.update.ant.task;
 
 import org.apache.depot.update.ResourceUpdater;
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.repository.DefaultRepository;
 import org.apache.depot.update.resource.ResourceGroup;
 import org.apache.depot.update.util.RuperConstants;
@@ -113,7 +113,7 @@
 			else
 				throw new BuildException("Missing mandatory attributes, 'group' required.");
 		}
-		catch (RuperException re) {
+		catch (UpdateException re) {
 			throw new BuildException("Failed to <reposync " + m_group, re);
 		}
 		finally {

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/files/DefaultResourceFilenameAnalyzer.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/files/DefaultResourceFilenameAnalyzer.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/files/DefaultResourceFilenameAnalyzer.java	Fri Apr  2 06:03:31 2004
@@ -25,8 +25,8 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import org.apache.depot.update.RuperException;
-import org.apache.depot.update.RuperRuntimeException;
+import org.apache.depot.update.UpdateException;
+import org.apache.depot.update.UpdateRuntimeException;
 import org.apache.depot.update.monitor.FileEvent;
 import org.apache.depot.update.monitor.Monitor;
 import org.apache.depot.update.resource.Resource;
@@ -122,7 +122,7 @@
 			else {
 				// Meant to look first...
 				if (m_map.containsKey(resource))
-					throw new RuperRuntimeException(
+					throw new UpdateRuntimeException(
 						"Duplicate Resource in working store: " + id);
 
 				// Store it...
@@ -166,7 +166,7 @@
 		}
 	}
 
-	public List determineResources(List entityList) throws RuperException {
+	public List determineResources(List entityList) throws UpdateException {
 		ResourceWorkingStore store =
 			new DefaultResourceFilenameAnalyzer.ResourceWorkingStore();
 
@@ -198,7 +198,7 @@
 							entity));
 				}
 			}
-			catch (RuperException re) {
+			catch (UpdateException re) {
 				//:TODO: log/context/listeners...
 			}
 		}
@@ -206,7 +206,7 @@
 		return store.getCompletedList();
 	}
 
-	public Resource determineResource(Object entity) throws RuperException {
+	public Resource determineResource(Object entity) throws UpdateException {
 		ResourceWorkingStore store =
 			new DefaultResourceFilenameAnalyzer.ResourceWorkingStore();
 
@@ -232,7 +232,7 @@
 					Messages.getString(MessageConstants.WRONG_TYPE, entity));
 			}
 		}
-		catch (RuperException re) {
+		catch (UpdateException re) {
 			Logger.getLogger().error(
 				Messages.getString(
 					MessageConstants.GENERAL_EXCEPTION2,
@@ -246,7 +246,7 @@
 	void processVRL(
 		VirtualResourceLocator resourceVRL,
 		ResourceWorkingStore store)
-		throws RuperException {
+		throws UpdateException {
 
 		//			:TODO: Hacky
 		String group = null;
@@ -262,7 +262,7 @@
 	}
 
 	void processFile(ResolvedFile resource, ResourceWorkingStore store)
-		throws RuperException {
+		throws UpdateException {
 
 		// Get file basename
 		String name = resource.getName().toString();
@@ -299,7 +299,7 @@
 		String resourceName,
 		VirtualResourceLocator location,
 		ResourceWorkingStore store)
-		throws RuperException {
+		throws UpdateException {
 		processString(resourceName, null, location, store);
 	}
 
@@ -312,7 +312,7 @@
 		String groupStr,
 		VirtualResourceLocator location,
 		ResourceWorkingStore store)
-		throws RuperException {
+		throws UpdateException {
 
 		Logger.getLogger().debug(
 			Messages.getString(
@@ -503,7 +503,7 @@
 		return separatorPosn;
 	}
 
-	String extractExtension(String resourceName) throws RuperException {
+	String extractExtension(String resourceName) throws UpdateException {
 		//	Extract extensions
 		List probableExtns = extractProbableExtensions(resourceName);
 
@@ -522,7 +522,7 @@
 		// If not found, pick "largest" = first.
 		if (null == extension)
 			if (0 == probableExtns.size())
-				throw new RuperException(
+				throw new UpdateException(
 					"Unable to extract extension from [" + resourceName + "]");
 
 		//

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/files/DefaultResourceGroupFilenameAnalyzer.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/files/DefaultResourceGroupFilenameAnalyzer.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/files/DefaultResourceGroupFilenameAnalyzer.java	Fri Apr  2 06:03:31 2004
@@ -21,7 +21,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.monitor.FileEvent;
 import org.apache.depot.update.monitor.Monitor;
 import org.apache.depot.update.resource.ResourceGroup;
@@ -42,7 +42,7 @@
 		m_base = base;
 	}
 
-	public List determineGroups(List entityList) throws RuperException {
+	public List determineGroups(List entityList) throws UpdateException {
 		List store = new ArrayList();
 
 		for (Iterator i = entityList.iterator(); i.hasNext();) {
@@ -73,7 +73,7 @@
 							entity));
 				}
 			}
-			catch (RuperException re) {
+			catch (UpdateException re) {
 				//:TODO: log/context/listeners...
 			}
 		}
@@ -81,7 +81,7 @@
 		return store;
 	}
 
-	public ResourceGroup determineGroup(Object entity) throws RuperException {
+	public ResourceGroup determineGroup(Object entity) throws UpdateException {
 		List store = new ArrayList();
 
 		try {
@@ -106,7 +106,7 @@
 					Messages.getString(MessageConstants.WRONG_TYPE, entity));
 			}
 		}
-		catch (RuperException re) {
+		catch (UpdateException re) {
 			Logger.getLogger().error(
 				Messages.getString(
 					MessageConstants.GENERAL_EXCEPTION2,
@@ -120,7 +120,7 @@
 	}
 
 	void processVRL(VirtualResourceLocator groupVRL, List store)
-		throws RuperException {
+		throws UpdateException {
 		String baseName = groupVRL.getBasename();
 
 		//
@@ -131,7 +131,7 @@
 		processString(baseName, groupVRL, store);
 	}
 
-	void processFile(ResolvedFile group, List store) throws RuperException {
+	void processFile(ResolvedFile group, List store) throws UpdateException {
 		String name = group.getName().toString();
 		int sepPosn = name.lastIndexOf(File.pathSeparator);
 		String baseName = (-1 == sepPosn) ? name : name.substring(sepPosn + 1);
@@ -153,7 +153,7 @@
 		String groupName,
 		VirtualResourceLocator location,
 		List store)
-		throws RuperException {
+		throws UpdateException {
 
 		Logger.getLogger().debug(
 			Messages.getString(

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/files/IResourceFilenameAnalyzer.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/files/IResourceFilenameAnalyzer.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/files/IResourceFilenameAnalyzer.java	Fri Apr  2 06:03:31 2004
@@ -18,13 +18,13 @@
 
 import java.util.List;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.resource.Resource;
 
 /**
  * @author arb_jack
  */
 public interface IResourceFilenameAnalyzer {
-	List determineResources(List entityList) throws RuperException;
-	Resource determineResource(Object entity) throws RuperException;
+	List determineResources(List entityList) throws UpdateException;
+	Resource determineResource(Object entity) throws UpdateException;
 }

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/files/IResourceGroupFilenameAnalyzer.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/files/IResourceGroupFilenameAnalyzer.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/files/IResourceGroupFilenameAnalyzer.java	Fri Apr  2 06:03:31 2004
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.resource.ResourceGroup;
 
 /**
@@ -26,6 +26,6 @@
  */
 public interface IResourceGroupFilenameAnalyzer {
 
-	List determineGroups(List entityList) throws RuperException;
-	ResourceGroup determineGroup(Object entity) throws RuperException;
+	List determineGroups(List entityList) throws UpdateException;
+	ResourceGroup determineGroup(Object entity) throws UpdateException;
 }

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/RepositoryObject.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/RepositoryObject.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/RepositoryObject.java	Fri Apr  2 06:03:31 2004
@@ -20,7 +20,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.resource.Resource;
 import org.apache.depot.update.resource.ResourceGroup;
 import org.apache.depot.update.util.select.AllSelector;
@@ -99,7 +99,7 @@
     	}
     }
 
-	public RepositoryObject[] getCachedChildrenArray() throws RuperException {
+	public RepositoryObject[] getCachedChildrenArray() throws UpdateException {
 		if(m_children == null){
 			return null;
 		}
@@ -107,7 +107,7 @@
 			new RepositoryObject[m_children.size()]);
 	}
 
-	public RepositoryObject[] getChildrenArray() throws RuperException {
+	public RepositoryObject[] getChildrenArray() throws UpdateException {
 		if(null == m_children){ 
 			 //	get the children from the repository
 			syncChildren();
@@ -116,7 +116,7 @@
 			new RepositoryObject[m_children.size()]);
 	}
   
-	public List getChildren() throws RuperException {
+	public List getChildren() throws UpdateException {
 		if(null == m_children){ 
 			 //	get the children from the repository
 			syncChildren();
@@ -124,7 +124,7 @@
 		return m_children;
 	}
   
-	public void setChildrenArray(RepositoryObject[] children) throws RuperException {
+	public void setChildrenArray(RepositoryObject[] children) throws UpdateException {
 		
 		m_children = new ArrayList();
 		
@@ -133,7 +133,7 @@
 		}
 	}
     
-	public void setChildren(List children) throws RuperException {
+	public void setChildren(List children) throws UpdateException {
 
 		m_children = new ArrayList();
 		
@@ -145,7 +145,7 @@
 	}
     
 
-    public boolean hasChildren() throws RuperException {
+    public boolean hasChildren() throws UpdateException {
        if(null == m_children){ 
 			//	get the children from the repository
 			syncChildren();
@@ -153,7 +153,7 @@
 	   return (m_children.size() > 0);
     }
 
-	public void syncChildren() throws RuperException {
+	public void syncChildren() throws UpdateException {
 		
 		// not null children means it has read from the repository
 		m_children = new ArrayList();

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/RepositorySetWrapper.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/RepositorySetWrapper.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/RepositorySetWrapper.java	Fri Apr  2 06:03:31 2004
@@ -20,7 +20,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.repository.DefaultRepository;
 import org.apache.depot.update.repository.IRepository;
 import org.apache.depot.update.repository.RepositorySet;
@@ -92,7 +92,7 @@
 					Logger.getLogger().info(" - Group: " + group);
 				}
 			}
-			catch (RuperException re) {
+			catch (UpdateException re) {
 				Logger.getLogger().warn(
 					" - Failed to list groups: " + re.getLocalizedMessage());
 			}

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/RepositoryWrapper.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/RepositoryWrapper.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/RepositoryWrapper.java	Fri Apr  2 06:03:31 2004
@@ -22,7 +22,7 @@
 
 import org.apache.depot.common.util.debug.DebugUtils;
 import org.apache.depot.common.util.debug.Dumpable;
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.monitor.Monitor;
 import org.apache.depot.update.monitor.ResourceEvent;
 import org.apache.depot.update.repository.IRepository;
@@ -54,7 +54,7 @@
 	}
 
 	private synchronized void initialize(ResourceUpdaterContext context)
-		throws RuperException {
+		throws UpdateException {
 		if (m_initialized)
 			return;
 
@@ -77,7 +77,7 @@
 	 * @param selector
 	 * @return
 	 */
-	public List listGroups(ISelector selector) throws RuperException {
+	public List listGroups(ISelector selector) throws UpdateException {
 		Logger.getLogger().debug(
 			Messages.getString(
 				MessageConstants.LIST_GROUPS,
@@ -112,7 +112,7 @@
 	 * @return
 	 */
 	public List listSpecifiers(ResourceGroup group, ISelector selector)
-		throws RuperException {
+		throws UpdateException {
 
 		Logger.getLogger().debug(
 			Messages.getString(
@@ -149,7 +149,7 @@
 	public RepositoryManifest getManifest(
 		ResourceGroup group,
 		ISelector selector)
-		throws RuperException {
+		throws UpdateException {
 
 		Logger.getLogger().debug(
 			Messages.getString(
@@ -182,7 +182,7 @@
 	 * @return
 	 */
 	public List listResources(ResourceGroup group, ISelector selector)
-		throws RuperException {
+		throws UpdateException {
 
 		Logger.getLogger().debug(
 			Messages.getString(
@@ -223,7 +223,7 @@
 	 * @param selector
 	 * @return
 	*/
-	public void deleteResource(Resource resource) throws RuperException {
+	public void deleteResource(Resource resource) throws UpdateException {
 
 		Logger.getLogger().debug(
 			Messages.getString(
@@ -254,7 +254,7 @@
 	 * @param selector
 	 * @return
 	*/
-	public Resource publishResource(Resource resource) throws RuperException {
+	public Resource publishResource(Resource resource) throws UpdateException {
 
 		Logger.getLogger().debug(
 			Messages.getString(
@@ -278,7 +278,7 @@
 	}
 
 	private void testCapability(RepositoryCapability capability)
-		throws RuperException {
+		throws UpdateException {
 		if (!m_repository.hasCapability(capability)) {
 			throw new RepositoryException(
 				m_repository,

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  2 06:03:31 2004
@@ -19,7 +19,7 @@
 import java.io.File;
 
 import org.apache.depot.common.util.SystemUtils;
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.protocols.DefaultProtocolOperationsManager;
 import org.apache.depot.update.protocols.ProtocolOperationsManager;
 import org.apache.depot.update.util.RuperConstants;
@@ -116,7 +116,7 @@
 	public static ResourceUpdaterContext getResourceUpdaterContext(
 		ResourceUpdaterContextIdentifier identifier,
 		boolean createIfRequired)
-		throws RuperException {
+		throws UpdateException {
 
 		ResourceUpdaterContext context = null;
 
@@ -127,7 +127,7 @@
 		}
 		else {
 			if (!createIfRequired)
-				throw new RuperException(
+				throw new UpdateException(
 					"Failed to access ResourceUpdaterContext ["
 						+ identifier
 						+ "]");

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ResourceUpdaterEngine.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ResourceUpdaterEngine.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ResourceUpdaterEngine.java	Fri Apr  2 06:03:31 2004
@@ -19,7 +19,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.messaging.ResourceRequest;
 import org.apache.depot.update.protocols.DefaultProtocolOperationsManager;
 import org.apache.depot.update.query.DefaultQueryEngine;
@@ -97,14 +97,14 @@
 		m_context = context;
 	}
 
-	public void perform(ResourceRequest request) throws RuperException {
+	public void perform(ResourceRequest request) throws UpdateException {
 		ResourceResult result = performRequest(request);
 
 		// Now what? Perform actions??
 	}
 
 	public ResourceResult performRequest(ResourceRequest request)
-		throws RuperException {
+		throws UpdateException {
 
 		Logger.getLogger().debug(Messages.getString("ResourceRequest", request));
 
@@ -113,7 +113,7 @@
 		return query(query);
 	}
 
-	public ResourceResult query(ResourceQuery query) throws RuperException {
+	public ResourceResult query(ResourceQuery query) throws UpdateException {
 
 		// delegate the work to the repository manager to sort the repositories 
 		// based on the query
@@ -127,7 +127,7 @@
 	}
 
 	public void copyTo(List resources, IRepository targetRepository)
-		throws RuperException {
+		throws UpdateException {
 
 		RepositoryWrapper target =
 			new RepositoryWrapper(targetRepository, m_context);
@@ -158,7 +158,7 @@
 
 
 	public void delete(IRepository repository, List resources)
-		throws RuperException {
+		throws UpdateException {
 
 		RepositoryWrapper repo =
 			new RepositoryWrapper(repository, m_context);

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/protocols/DefaultProtocolOperationsManager.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/protocols/DefaultProtocolOperationsManager.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/protocols/DefaultProtocolOperationsManager.java	Fri Apr  2 06:03:31 2004
@@ -18,7 +18,7 @@
 
 import org.apache.depot.common.util.debug.DebugUtils;
 import org.apache.depot.common.util.envsafe.ClassLoaderContext;
-import org.apache.depot.update.RuperRuntimeException;
+import org.apache.depot.update.UpdateRuntimeException;
 import org.apache.depot.update.impl.ResourceUpdaterContext;
 
 /**
@@ -55,7 +55,7 @@
 			registerProvider(provider);
 		}
 		catch (Exception ve) {
-			throw new RuperRuntimeException(
+			throw new UpdateRuntimeException(
 				"No *Working* Protocol Operation Providers Detected",
 				ve);
 		}

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/protocols/ProtocolOperationsManager.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/protocols/ProtocolOperationsManager.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/protocols/ProtocolOperationsManager.java	Fri Apr  2 06:03:31 2004
@@ -26,7 +26,7 @@
 
 import org.apache.depot.common.util.debug.DebugUtils;
 import org.apache.depot.common.util.debug.Dumpable;
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.impl.ResourceUpdaterContext;
 import org.apache.depot.update.protocols.select.DestinationProtocolProviderSelector;
 import org.apache.depot.update.protocols.select.SourceDestinationProtocolProviderSelector;
@@ -178,7 +178,7 @@
 	IProtocolOperationsProvider determineProviderFor(
 		VirtualResourceLocator source,
 		VirtualResourceLocator destination)
-		throws RuperException {
+		throws UpdateException {
 		// Locate a Provider that handles both address
 		// types (e.g. protocols)
 
@@ -188,7 +188,7 @@
 				destination.getProtocol());
 
 		if (0 == providers.size())
-			throw new RuperException(
+			throw new UpdateException(
 				"No providers for protocols : "
 					+ source.getProtocol()
 					+ " and "
@@ -205,13 +205,13 @@
 	}
 
 	IProtocolOperationsProvider determineProviderFor(VirtualResourceLocator source)
-		throws RuperException {
+		throws UpdateException {
 		// Locate a Provider that handles both address
 		// types (e.g. protocols)
 		List providers = determineSourceProviders(source.getProtocol());
 
 		if (null == providers)
-			throw new RuperException(
+			throw new UpdateException(
 				"No providers for protocol : " + source.getProtocol());
 
 		IProtocolOperationsProvider provider =
@@ -225,7 +225,7 @@
 	}
 
 	private List determineSourceProviders(String protocol)
-		throws RuperException {
+		throws UpdateException {
 		List listOfProviders = null;
 		// set the selector and then pass the providers through the process chain
 		SourceProtocolProviderSelector sourceProtocolSelector =
@@ -235,7 +235,7 @@
 	}
 
 	private List determineDestinationProviders(String protocol)
-		throws RuperException {
+		throws UpdateException {
 		List listOfProviders = null;
 		// set the selector and then pass the providers through the process chain
 		DestinationProtocolProviderSelector destinationProtocolSelector =
@@ -247,7 +247,7 @@
 	private List determineSourceDestinationProviders(
 		String srcProtocol,
 		String destProtocol)
-		throws RuperException {
+		throws UpdateException {
 		List listOfProviders = null;
 		// set the selector and then pass the providers through the process chain
 		SourceDestinationProtocolProviderSelector srcDestProtocolSelector =
@@ -259,7 +259,7 @@
 	}
 
 	private List processProviderList(ISelector selector)
-		throws RuperException {
+		throws UpdateException {
 
 		List listOfProviders = null;
 		List selectorList = new ArrayList();

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/query/DefaultQueryEngine.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/query/DefaultQueryEngine.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/query/DefaultQueryEngine.java	Fri Apr  2 06:03:31 2004
@@ -23,7 +23,7 @@
 import java.util.List;
 
 import org.apache.depot.common.util.debug.DebugUtils;
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.impl.RepositorySetWrapper;
 import org.apache.depot.update.impl.RepositoryWrapper;
 import org.apache.depot.update.monitor.Monitor;
@@ -48,12 +48,12 @@
 	 * @param wrappers
 	 * @param query
 	 * @return
-	 * @throws RuperException
+	 * @throws UpdateException
 	 */
 	public ResourceResult queryRepositories(
 		RepositorySetWrapper wrappers,
 		ResourceQuery query)
-		throws RuperException {
+		throws UpdateException {
 
 		// Extract query components
 		List resourceGroups = query.getGroups();

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/query/ResourceQueryHelper.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/query/ResourceQueryHelper.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/query/ResourceQueryHelper.java	Fri Apr  2 06:03:31 2004
@@ -18,7 +18,7 @@
 
 import java.util.Comparator;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.repository.RepositorySet;
 import org.apache.depot.update.resource.Resource;
 import org.apache.depot.update.resource.ResourceGroup;
@@ -38,24 +38,24 @@
 public class ResourceQueryHelper {
 
 	public static ResourceQuery getResourceQuery(Resource resource)
-		throws RuperException {
+		throws UpdateException {
 		return getResourceSpecifierQuery(resource.getSpecifier());
 	}
 
 	public static ResourceQuery getResourceSpecifierQuery(Resource resource)
-		throws RuperException {
+		throws UpdateException {
 		return getResourceSpecifierQuery(resource.getSpecifier());
 	}
 
 	public static ResourceQuery getResourceSpecifierQuery(
 		Resource resource,
 		RepositorySet repos)
-		throws RuperException {
+		throws UpdateException {
 		return getResourceSpecifierQuery(resource.getSpecifier(), repos);
 	}
 
 	public static ResourceQuery getResourceSpecifierQuery(ResourceSpecifier specifier)
-		throws RuperException {
+		throws UpdateException {
 		return getResourceSpecifierQuery(
 			specifier,
 			RepositorySet.getRepositorySet(RuperConstants.DEFAULT, true));
@@ -64,7 +64,7 @@
 	public static ResourceQuery getResourceSpecifierQuery(
 		ResourceSpecifier specifier,
 		RepositorySet repos)
-		throws RuperException {
+		throws UpdateException {
 
 		ResourceQuery resourceQuery = null;
 		if (specifier != null) {
@@ -89,13 +89,13 @@
 			String message = Messages.getString(MessageConstants.NULL_RESOURCE);
 			Logger.getLogger().error(message);
 
-			throw new RuperException(message);
+			throw new UpdateException(message);
 		}
 		return resourceQuery;
 	}
 
 	public static ResourceQuery getResourceGroupQuery(ResourceGroup group)
-		throws RuperException {
+		throws UpdateException {
 		return getResourceGroupQuery(
 			group,
 			RepositorySet.getRepositorySet(RuperConstants.DEFAULT, true));
@@ -104,7 +104,7 @@
 	public static ResourceQuery getResourceGroupQuery(
 		ResourceGroup group,
 		RepositorySet repos)
-		throws RuperException {
+		throws UpdateException {
 
 		ResourceQuery resourceQuery = null;
 		if (group != null) {
@@ -127,7 +127,7 @@
 			String message = Messages.getString(MessageConstants.NULL_GROUP);
 			Logger.getLogger().error(message);
 
-			throw new RuperException(message);
+			throw new UpdateException(message);
 		}
 		return resourceQuery;
 	}

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/AbstractRepository.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/AbstractRepository.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/AbstractRepository.java	Fri Apr  2 06:03:31 2004
@@ -76,7 +76,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.update.repository.Repository#getRepositoryIdentifier()
+	 * @see org.apache.depot.update.repository.Repository#getRepositoryIdentifier()
 	 */
 	public GenericIdentifier getIdentifier() {
 		return m_identifier;
@@ -87,14 +87,14 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.update.repository.Repository#hasCapability(org.apache.update.repository.Capability)
+	 * @see org.apache.depot.update.repository.Repository#hasCapability(org.apache.depot.update.repository.Capability)
 	 */
 	public boolean hasCapability(RepositoryCapability capability) {
 		return m_capabilities.hasCapability(capability);
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.update.repository.Repository#hasCapabilities(org.apache.update.repository.CapabilitySet)
+	 * @see org.apache.depot.update.repository.Repository#hasCapabilities(org.apache.depot.update.repository.CapabilitySet)
 	 */
 	public boolean hasCapabilities(RepositoryCapabilitySet capabilities) {
 		return m_capabilities.hasCapabilities(capabilities);

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositoryException.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositoryException.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositoryException.java	Fri Apr  2 06:03:31 2004
@@ -16,12 +16,12 @@
 
 package org.apache.depot.update.repository;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 
 /**
  * @author arb_jack
  */
-public class RepositoryException extends RuperException {
+public class RepositoryException extends UpdateException {
 	private IRepository m_repository = null;
 
 	public RepositoryException(IRepository repo, String message) {

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositoryManager.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositoryManager.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositoryManager.java	Fri Apr  2 06:03:31 2004
@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.impl.ReferenceManager;
 import org.apache.depot.update.impl.ResourceUpdaterEngine;
 import org.apache.depot.update.query.ResourceQuery;
@@ -88,7 +88,7 @@
 			this.m_defaultSortedRepositorySet =
 				getSortedRepositorySet(repositorySet);
 		}
-		catch (RuperException exp) {
+		catch (UpdateException exp) {
 			Logger.getLogger().error(
 				"Error in sorting the default repository set",
 				exp);
@@ -125,14 +125,14 @@
 	public RepositorySet getSortedRepositorySet(
 		RepositorySet repositorySet,
 		RepositorySetSortContext repositorySetSortContext)
-		throws RuperException {
+		throws UpdateException {
 
 		setRepositorySortContext(repositorySetSortContext);
 		return getSortedRepositorySet(repositorySet);
 
 	}
 	public RepositorySet getSortedRepositorySet(RepositorySet repositorySet)
-		throws RuperException {
+		throws UpdateException {
 
 		RepositorySet selectedRepositorySet = null;
 		// pass it through the chain of handlers - select the repositories
@@ -194,7 +194,7 @@
 				repositorySet = getSortedRepositorySet(repositorySet);
 			}
 		}
-		catch (RuperException exception) {
+		catch (UpdateException exception) {
 			Logger.getLogger().error(
 				"Unable to perform repository query",
 				exception);

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/chainprocess/HandlerManager.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/chainprocess/HandlerManager.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/chainprocess/HandlerManager.java	Fri Apr  2 06:03:31 2004
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 
 public class HandlerManager {
 	protected Map m_handlerChains;
@@ -50,7 +50,7 @@
 		m_handlerNameList.remove(handlerChain.getName());
 	}
 
-	public List process(final List list) throws RuperException {
+	public List process(final List list) throws UpdateException {
 		List processedList = list;
 
 		Iterator handlerNameIterator = m_handlerNameList.iterator();

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/io/FileUtils.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/io/FileUtils.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/io/FileUtils.java	Fri Apr  2 06:03:31 2004
@@ -26,7 +26,7 @@
 import java.text.StringCharacterIterator;
 
 import org.apache.depot.common.util.io.IOUtils;
-import org.apache.depot.update.RuperRuntimeException;
+import org.apache.depot.update.UpdateRuntimeException;
 import org.apache.depot.update.util.RuperConstants;
 
 public class FileUtils {
@@ -86,7 +86,7 @@
 			//:TODO: Ought never happen, so it is a bug on
 			// us ..
 			
-			throw new RuperRuntimeException("Bogus: " + str, e);	
+			throw new UpdateRuntimeException("Bogus: " + str, e);	
 		}
 		
 		return url;

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/reference/NoSuchReferenceException.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/reference/NoSuchReferenceException.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/reference/NoSuchReferenceException.java	Fri Apr  2 06:03:31 2004
@@ -16,7 +16,7 @@
 
 package org.apache.depot.update.util.reference;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.util.identity.GenericIdentifier;
 import org.apache.depot.update.util.text.MessageConstants;
 import org.apache.depot.update.util.text.Messages;
@@ -24,7 +24,7 @@
 /**
  * @author ajack
  */
-public class NoSuchReferenceException extends RuperException {
+public class NoSuchReferenceException extends UpdateException {
 	public GenericIdentifier m_identifier = null;
 
 	public NoSuchReferenceException(GenericIdentifier identifier) {

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/security/ChkSum.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/security/ChkSum.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/security/ChkSum.java	Fri Apr  2 06:03:31 2004
@@ -21,7 +21,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.version.log.Logger;
 
 
@@ -89,17 +89,17 @@
      *
      * @return TODO
      */
-    private boolean validate() throws RuperException {
+    private boolean validate() throws UpdateException {
     	boolean returnValue = false;
     	
     	Logger.getLogger().debug("Validating HashCode");
 
         if ((this.sourceFile == null) || !this.sourceFile.exists()) {
-        			throw new RuperException("Cannot find " + sourceFile);
+        			throw new UpdateException("Cannot find " + sourceFile);
         }
 
         if ((this.hashCodeFile == null) || !this.hashCodeFile.exists()) {
-        			throw new RuperException("Cannot find " + hashCodeFile);
+        			throw new UpdateException("Cannot find " + hashCodeFile);
         }
 
         try {

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/security/HashCodeManager.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/security/HashCodeManager.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/security/HashCodeManager.java	Fri Apr  2 06:03:31 2004
@@ -30,7 +30,7 @@
 import org.apache.tools.ant.BuildException;
 
 
-//import org.apache.update.RuperException;
+//import org.apache.depot.update.RuperException;
 
 /**
  *

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/xml/XMLException.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/xml/XMLException.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/xml/XMLException.java	Fri Apr  2 06:03:31 2004
@@ -16,12 +16,12 @@
 
 package org.apache.depot.update.util.xml;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 
 /**
  * @author anou_mana
  */
-public class XMLException extends RuperException {
+public class XMLException extends UpdateException {
 
 	/**
 	 * @param message

Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/SynchronizeTaskTests.java
==============================================================================
--- incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/SynchronizeTaskTests.java	(original)
+++ incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/SynchronizeTaskTests.java	Fri Apr  2 06:03:31 2004
@@ -41,7 +41,7 @@
 	}
 
 	public void setUp() {
-		configureProject("src/test/ant/org/apache/ruper/ant/task/reposync.xml");
+		configureProject("src/test/org/apache/depot/update/ant/task/reposync.xml");
 	}
 
 	public void test1() {

Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/anttasks.xml
==============================================================================
--- incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/anttasks.xml	(original)
+++ incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/anttasks.xml	Fri Apr  2 06:03:31 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<project name="ruper-repotool-test" basedir="." default="all">
-	<typedef resource="ruper-types"/>	
-	<taskdef resource="ruper-tasks"/>	
+<project name="update-repotool-test" basedir="." default="all">
+	<typedef resource="update-types"/>	
+	<taskdef resource="update-tasks"/>	
 		
 	<target name="typical">
 		

Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/files/DefaultResourceAnalyzerTests.java
==============================================================================
--- incubator/depot/trunk/update/src/test/org/apache/depot/update/files/DefaultResourceAnalyzerTests.java	(original)
+++ incubator/depot/trunk/update/src/test/org/apache/depot/update/files/DefaultResourceAnalyzerTests.java	Fri Apr  2 06:03:31 2004
@@ -20,7 +20,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.resource.Resource;
 import org.apache.depot.update.resource.ResourceType;
 import org.apache.depot.update.util.net.VirtualResourceLocator;
@@ -71,7 +71,7 @@
 			m_analyzer.findSeparatorBeforeVersionNumbers("A-B-1"));
 	}
 
-	public void testExtensions1() throws RuperException {
+	public void testExtensions1() throws UpdateException {
 		String testPattern = "mystuff-1.2.fred";
 		List testList = new ArrayList();
 		testList.add("fred");
@@ -82,7 +82,7 @@
 			createResource(testPattern, "mystuff", "1.2", null,""));
 	}
 
-	public void testExtensions2()  throws RuperException{
+	public void testExtensions2()  throws UpdateException{
 		String testPattern = "mystuff-1.2-src.fred";
 		List testList = new ArrayList();
 		testList.add("fred");
@@ -92,7 +92,7 @@
 			createResource(testPattern, "mystuff", "1.2", "src",""));
 	}
 
-	public void testExtensions3()  throws RuperException{
+	public void testExtensions3()  throws UpdateException{
 		String testPattern = "mystuff-1.2-src.fred.Z";
 		List testList = new ArrayList();
 		testList.add("fred.Z");
@@ -109,7 +109,7 @@
 		String v,
 		String t,
 		String e)
-		throws RuperException {
+		throws UpdateException {
 		Version version = null;
 		if (null != v) {
 			try {
@@ -132,7 +132,7 @@
 	}
 
 	private void checkResource(String pattern, Resource expected)
-		throws RuperException {
+		throws UpdateException {
 			
 		//DebugUtils.printSeparator();
 		//DebugUtils.dump(expected);

Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/files/ResourceAnalyzerTests.java
==============================================================================
--- incubator/depot/trunk/update/src/test/org/apache/depot/update/files/ResourceAnalyzerTests.java	(original)
+++ incubator/depot/trunk/update/src/test/org/apache/depot/update/files/ResourceAnalyzerTests.java	Fri Apr  2 06:03:31 2004
@@ -21,7 +21,7 @@
 import junit.framework.TestCase;
 
 import org.apache.depot.common.util.debug.DebugUtils;
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.resource.Resource;
 import org.apache.depot.update.resource.ResourceType;
 import org.apache.depot.update.util.net.VirtualResourceLocator;
@@ -149,7 +149,7 @@
 
 	
 	private void checkResourceList(List patterns, List resources)
-		throws RuperException {
+		throws UpdateException {
 		List extractedResources = m_analyzer.determineResources(patterns);
 
 

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  2 06:03:31 2004
@@ -19,7 +19,7 @@
 import junit.framework.TestCase;
 
 import org.apache.depot.common.util.debug.DebugUtils;
-import org.apache.depot.update.RuperException;
+import org.apache.depot.update.UpdateException;
 import org.apache.depot.update.config.RuperConfig;
 import org.apache.depot.update.impl.RepositorySetWrapper;
 import org.apache.depot.update.impl.ResourceUpdaterContext;
@@ -65,12 +65,12 @@
 				m_context);
 	}
 
-	public void testQuery1() throws RuperException {
+	public void testQuery1() throws UpdateException {
 		ResourceQuery query = new ResourceQuery(new ResourceGroup("test"));
 		perform(query);
 	}
 
-	public void testQuery2() throws RuperException {
+	public void testQuery2() throws UpdateException {
 		ResourceQuery query =
 			new ResourceQuery(
 				new ResourceGroup("junit"),
@@ -80,7 +80,7 @@
 		perform(query);
 	}
 
-	public void testQuery3() throws RuperException {
+	public void testQuery3() throws UpdateException {
 		ResourceQuery query =
 			new ResourceQuery(
 				new ResourceGroup("junit"),
@@ -90,7 +90,7 @@
 		performAndCount(query, 1, 2);
 	}
 
-	public void testQuery4() throws RuperException {
+	public void testQuery4() throws UpdateException {
 		ResourceQuery query =
 			new ResourceQuery(
 				new ResourceGroup("junit"),
@@ -102,7 +102,7 @@
 		performAndCount(query, 1, 1);
 	}
 
-	public void testQuery5() throws RuperException {
+	public void testQuery5() throws UpdateException {
 		ResourceQuery query =
 			new ResourceQuery(
 				new ResourceGroup("junit"),
@@ -114,7 +114,7 @@
 		performAndCount(query, 1, 11);
 	}
 
-	public void testQuery6() throws RuperException {
+	public void testQuery6() throws UpdateException {
 		ResourceQuery query =
 			new ResourceQuery(
 				new ResourceGroup("junit"),
@@ -126,7 +126,7 @@
 		performAndCount(query, 10, 11);
 	}
 
-	public void testQuery7() throws RuperException {
+	public void testQuery7() throws UpdateException {
 		ResourceQuery query =
 			new ResourceQuery(
 				new ResourceGroup("junit"),
@@ -137,7 +137,7 @@
 	}
 
 	private ResourceResult performAndCountGroups(ResourceQuery query, int size)
-		throws RuperException {
+		throws UpdateException {
 		ResourceResult result = perform(query);
 
 		assertEquals(
@@ -152,7 +152,7 @@
 		ResourceQuery query,
 		int groups,
 		int resources)
-		throws RuperException {
+		throws UpdateException {
 		ResourceResult result = perform(query);
 
 		assertEquals(
@@ -168,7 +168,7 @@
 		return result;
 	}
 
-	private ResourceResult perform(ResourceQuery query) throws RuperException {
+	private ResourceResult perform(ResourceQuery query) throws UpdateException {
 		ResourceResult result = m_engine.queryRepositories(m_repoSet, query);
 
 		DebugUtils.dump(query);

Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/util/xml/XMLParserTests.java
==============================================================================
--- incubator/depot/trunk/update/src/test/org/apache/depot/update/util/xml/XMLParserTests.java	(original)
+++ incubator/depot/trunk/update/src/test/org/apache/depot/update/util/xml/XMLParserTests.java	Fri Apr  2 06:03:31 2004
@@ -39,7 +39,7 @@
 		XMLParser parser = new XMLParser(xmlEntryTable, helper);
 		XMLContext xmlContext =
 			parser.parse(
-				new File("src/java/test/core/org/apache/ruper/util/xml/test.xml"));
+				new File("src/java/test/org/apache/depot/update/util/xml/test.xml"));
 
 		HashMap map = xmlContext.getCreatedTagObjects();
 		assertNotNull("Has Parent Object", map.get("parent"));

Mime
View raw message