From depot-cvs-returnshelley94@example.net Thu Apr 01 22:32:41 2004 Return-Path: <depot-cvs-returnshelley94@example.net> Delivered-To: shelley94@example.net Received: (qmail 19547 invoked from network); 1 Apr 2004 22:32:41 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Apr 2004 22:32:41 -0000 Received: (qmail 905 invoked by uid 500); 1 Apr 2004 22:32:28 -0000 Delivered-To: shelley94@example.net Received: (qmail 884 invoked by uid 500); 1 Apr 2004 22:32:28 -0000 Mailing-List: contact shelley94@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shelley94@example.net> list-unsubscribe: <mailto:shelley94@example.net> list-post: <mailto:shelley94@example.net> Reply-To: shelley94@example.net Delivered-To: mailing list shelley94@example.net Received: (qmail 869 invoked from network); 1 Apr 2004 22:32:28 -0000 Received: from unknown (HELO minotaur.apache.org) (83.161.120.155) by daedalus.apache.org with SMTP; 1 Apr 2004 22:32:28 -0000 Received: (qmail 19533 invoked by uid 65534); 1 Apr 2004 22:32:40 -0000 Date: 1 Apr 2004 22:32:40 -0000 Message-ID: <shelley94@example.net> From: shelley94@example.net To: shelley94@example.net Subject: svn commit: rev 9837 - incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: ajack Date: Thu Apr 1 14:32:38 2004 New Revision: 9837 Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/ClassGenerator.java Log: Testing my Depot environment (from commandline SVN, since Eclipse SVN no worky) Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/ClassGenerator.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/ClassGenerator.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/ClassGenerator.java Thu Apr 1 14:32:38 2004 @@ -39,7 +39,6 @@ public abstract class ClassGenerator { private File m_destinationDirectory = null; - private boolean m_overWrite = false; private String m_packageName = null; private String m_className = null; From depot-cvs-returnshelley94@example.net Thu Apr 01 23:05:33 2004 Return-Path: <depot-cvs-returnshelley94@example.net> Delivered-To: shelley94@example.net Received: (qmail 38359 invoked from network); 1 Apr 2004 23:05:33 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Apr 2004 23:05:33 -0000 Received: (qmail 56414 invoked by uid 500); 1 Apr 2004 23:05:20 -0000 Delivered-To: shelley94@example.net Received: (qmail 56395 invoked by uid 500); 1 Apr 2004 23:05:20 -0000 Mailing-List: contact shelley94@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shelley94@example.net> list-unsubscribe: <mailto:shelley94@example.net> list-post: <mailto:shelley94@example.net> Reply-To: shelley94@example.net Delivered-To: mailing list shelley94@example.net Received: (qmail 56381 invoked from network); 1 Apr 2004 23:05:19 -0000 Received: from unknown (HELO minotaur.apache.org) (83.161.120.155) by daedalus.apache.org with SMTP; 1 Apr 2004 23:05:19 -0000 Received: (qmail 38356 invoked by uid 65534); 1 Apr 2004 23:05:32 -0000 Date: 1 Apr 2004 23:05:32 -0000 Message-ID: <shelley94@example.net> From: shelley94@example.net To: shelley94@example.net Subject: svn commit: rev 9838 - in incubator/depot/trunk/update/src/java: ant core org/apache/depot/update org/apache/depot/update/ant org/apache/depot/update/ant/sandbox/chalko org/apache/depot/update/repository org/apache/depot/update/util/security X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: ajack Date: Thu Apr 1 15:05:31 2004 New Revision: 9838 Removed: incubator/depot/trunk/update/src/java/ant/ incubator/depot/trunk/update/src/java/core/ Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ResourceUpdater.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/repository/AbstractRepository.java incubator/depot/trunk/update/src/java/org/apache/depot/update/util/security/HashCodeManager.java Log: Trying to help migrate from ruper to depot.update. Tonnes more to do. Also trying to delete the ant and core empty directories, but doing it via 'svn delete' not eclipse or rm. 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 Thu Apr 1 15:05:31 2004 @@ -181,7 +181,6 @@ public RepositorySetSortContext getRepositorySetSortContext(RepositorySetSortContext sortContext) { return RepositorySetSortContext.getDefaultRepositorySetSortContext(); - } public RepositoryObject getRepositoryObject(String repositoryId) 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 Thu Apr 1 15:05:31 2004 @@ -14,9 +14,9 @@ limitations under the License. --> <antlib> - <typedef name="ruperset" classname="org.apache.ruper.ant.sandbox.chalko.RuperSet"/> - <typedef name="resource" classname="org.apache.ruper.ant.sandbox.chalko.ResourceElement"/> - <typedef name="repository" classname="org.apache.ruper.ant.sandbox.chalko.RepositoryElement"/> - <typedef name="repotool" classname="org.apache.ruper.ant.task.RepositoryToolTask"/> - <typedef name="reposync" classname="org.apache.ruper.ant.task.SynchronizeTask"/> + <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"/> </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 Thu Apr 1 15:05:31 2004 @@ -15,7 +15,7 @@ --> <antlib> <typedef - name="ruperset" + name="updateset" classname="org.krysalis.centipede2.ant.ImportAntletTask"/> <typedef name="resource" 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 Thu Apr 1 15:05:31 2004 @@ -76,7 +76,7 @@ } /* (non-Javadoc) - * @see org.apache.ruper.repository.Repository#getRepositoryIdentifier() + * @see org.apache.update.repository.Repository#getRepositoryIdentifier() */ public GenericIdentifier getIdentifier() { return m_identifier; @@ -87,14 +87,14 @@ } /* (non-Javadoc) - * @see org.apache.ruper.repository.Repository#hasCapability(org.apache.ruper.repository.Capability) + * @see org.apache.update.repository.Repository#hasCapability(org.apache.update.repository.Capability) */ public boolean hasCapability(RepositoryCapability capability) { return m_capabilities.hasCapability(capability); } /* (non-Javadoc) - * @see org.apache.ruper.repository.Repository#hasCapabilities(org.apache.ruper.repository.CapabilitySet) + * @see org.apache.update.repository.Repository#hasCapabilities(org.apache.update.repository.CapabilitySet) */ public boolean hasCapabilities(RepositoryCapabilitySet capabilities) { return m_capabilities.hasCapabilities(capabilities); 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 Thu Apr 1 15:05:31 2004 @@ -29,7 +29,7 @@ import java.security.NoSuchProviderException; -//import org.apache.ruper.RuperException; +//import org.apache.update.RuperException; /** * From depot-cvs-returnshelley94@example.net Thu Apr 01 23:11:20 2004 Return-Path: <depot-cvs-returnshelley94@example.net> Delivered-To: shelley94@example.net Received: (qmail 40677 invoked from network); 1 Apr 2004 23:11:20 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Apr 2004 23:11:20 -0000 Received: (qmail 62879 invoked by uid 500); 1 Apr 2004 23:11:07 -0000 Delivered-To: shelley94@example.net Received: (qmail 62865 invoked by uid 500); 1 Apr 2004 23:11:07 -0000 Mailing-List: contact shelley94@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shelley94@example.net> list-unsubscribe: <mailto:shelley94@example.net> list-post: <mailto:shelley94@example.net> Reply-To: shelley94@example.net Delivered-To: mailing list shelley94@example.net Received: (qmail 62852 invoked from network); 1 Apr 2004 23:11:07 -0000 Received: from unknown (HELO minotaur.apache.org) (83.161.120.155) by daedalus.apache.org with SMTP; 1 Apr 2004 23:11:07 -0000 Received: (qmail 40672 invoked by uid 65534); 1 Apr 2004 23:11:20 -0000 Date: 1 Apr 2004 23:11:20 -0000 Message-ID: <shelley94@example.net> From: shelley94@example.net To: shelley94@example.net Subject: svn commit: rev 9839 - in incubator/depot/trunk/update/src/test: ant core org/apache/depot/update/ant/sandbox/chalko X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: ajack Date: Thu Apr 1 15:11:19 2004 New Revision: 9839 Removed: incubator/depot/trunk/update/src/test/ant/ incubator/depot/trunk/update/src/test/core/ Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/RuperSetTaskTest.java incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/build.xml Log: More cleanup. Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/RuperSetTaskTest.java ============================================================================== --- incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/RuperSetTaskTest.java (original) +++ incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/RuperSetTaskTest.java Thu Apr 1 15:11:19 2004 @@ -35,7 +35,7 @@ junit.textui.TestRunner.run(RuperSetTaskTest.class); } public void setUp() { - configureProject("src/test/ant/org/apache/ruper/ant/sandbox/chalko/build.xml"); + configureProject("update/src/test/org/apache/depot/update/ant/sandbox/chalko/build.xml"); } public void test1() { executeTarget("test1"); Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/build.xml ============================================================================== --- incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/build.xml (original) +++ incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/build.xml Thu Apr 1 15:11:19 2004 @@ -17,7 +17,7 @@ --> <project name="ruperModule-test" basedir="../../../../../../../../../" default="test1"> <property name="localtest.dir" value="${basedir}/src/resources/test/repo"/> - <typedef resource="org/apache/ruper/ant/antlib.xml"/> + <typedef resource="org/apache/depot/update/ant/antlib.xml"/> <repository id="maven" url="http://www.ibiblio.org/maven/" remote="true"/> <repository id="localtest" url="file:///${localtest.dir}" remote="true"/> <target name="test1" depends="clean-jars"> From depot-cvs-returnshelley94@example.net Thu Apr 01 23:55:26 2004 Return-Path: <depot-cvs-returnshelley94@example.net> Delivered-To: shelley94@example.net Received: (qmail 64737 invoked from network); 1 Apr 2004 23:55:26 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Apr 2004 23:55:26 -0000 Received: (qmail 17861 invoked by uid 500); 1 Apr 2004 23:55:12 -0000 Delivered-To: shelley94@example.net Received: (qmail 17844 invoked by uid 500); 1 Apr 2004 23:55:12 -0000 Mailing-List: contact shelley94@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shelley94@example.net> list-unsubscribe: <mailto:shelley94@example.net> list-post: <mailto:shelley94@example.net> Reply-To: shelley94@example.net Delivered-To: mailing list shelley94@example.net Received: (qmail 17830 invoked from network); 1 Apr 2004 23:55:12 -0000 Received: from unknown (HELO minotaur.apache.org) (83.161.120.155) by daedalus.apache.org with SMTP; 1 Apr 2004 23:55:12 -0000 Received: (qmail 64727 invoked by uid 65534); 1 Apr 2004 23:55:25 -0000 Date: 1 Apr 2004 23:55:25 -0000 Message-ID: <shelley94@example.net> From: shelley94@example.net To: shelley94@example.net Subject: svn commit: rev 9841 - in incubator/depot/trunk: common/src/test/org common/src/test/org/apache common/src/test/org/apache/depot common/src/test/org/apache/depot/common common/src/test/org/apache/depot/common/util common/src/test/org/apache/depot/common/util/classpath common/src/test/org/apache/depot/common/util/dom version/src/test/java/core/org/apache/depot/version/util X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: ajack Date: Thu Apr 1 15:55:24 2004 New Revision: 9841 Added: incubator/depot/trunk/common/src/test/org/ incubator/depot/trunk/common/src/test/org/apache/ incubator/depot/trunk/common/src/test/org/apache/depot/ incubator/depot/trunk/common/src/test/org/apache/depot/common/ incubator/depot/trunk/common/src/test/org/apache/depot/common/util/ - copied from rev 9839, incubator/depot/trunk/version/src/test/java/core/org/apache/depot/version/util/ Removed: incubator/depot/trunk/version/src/test/java/core/org/apache/depot/version/util/ Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/util/RegistryTests.java incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathContextTests.java incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathPartTests.java incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathSetTests.java incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerFilterTests.java incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerTests.java incubator/depot/trunk/common/src/test/org/apache/depot/common/util/dom/DOMTests.java Log: Trying to move as would seem appropriate. Hope it is. Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/util/RegistryTests.java ============================================================================== --- incubator/depot/trunk/version/src/test/java/core/org/apache/depot/version/util/RegistryTests.java (original) +++ incubator/depot/trunk/common/src/test/org/apache/depot/common/util/RegistryTests.java Thu Apr 1 15:55:24 2004 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.depot.version.util; +package org.apache.depot.common.util; import junit.framework.TestCase; Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathContextTests.java ============================================================================== --- incubator/depot/trunk/version/src/test/java/core/org/apache/depot/version/util/classpath/PathContextTests.java (original) +++ incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathContextTests.java Thu Apr 1 15:55:24 2004 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.depot.version.util.classpath; +package org.apache.depot.common.util.classpath; import junit.framework.TestCase; Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathPartTests.java ============================================================================== --- incubator/depot/trunk/version/src/test/java/core/org/apache/depot/version/util/classpath/PathPartTests.java (original) +++ incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathPartTests.java Thu Apr 1 15:55:24 2004 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.depot.version.util.classpath; +package org.apache.depot.common.util.classpath; import junit.framework.TestCase; Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathSetTests.java ============================================================================== --- incubator/depot/trunk/version/src/test/java/core/org/apache/depot/version/util/classpath/PathSetTests.java (original) +++ incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathSetTests.java Thu Apr 1 15:55:24 2004 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.depot.version.util.classpath; +package org.apache.depot.common.util.classpath; import java.util.Iterator; Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerFilterTests.java ============================================================================== --- incubator/depot/trunk/version/src/test/java/core/org/apache/depot/version/util/classpath/PathWalkerFilterTests.java (original) +++ incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerFilterTests.java Thu Apr 1 15:55:24 2004 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.depot.version.util.classpath; +package org.apache.depot.common.util.classpath; import java.io.File; import java.io.InputStream; Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerTests.java ============================================================================== --- incubator/depot/trunk/version/src/test/java/core/org/apache/depot/version/util/classpath/PathWalkerTests.java (original) +++ incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerTests.java Thu Apr 1 15:55:24 2004 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.depot.version.util.classpath; +package org.apache.depot.common.util.classpath; import java.io.File; import java.io.InputStream; Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/util/dom/DOMTests.java ============================================================================== --- incubator/depot/trunk/version/src/test/java/core/org/apache/depot/version/util/dom/DOMTests.java (original) +++ incubator/depot/trunk/common/src/test/org/apache/depot/common/util/dom/DOMTests.java Thu Apr 1 15:55:24 2004 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.depot.version.util.dom; +package org.apache.depot.common.util.dom; import junit.framework.TestCase; From depot-cvs-returnshelley94@example.net Fri Apr 02 00:40:46 2004 Return-Path: <depot-cvs-returnshelley94@example.net> Delivered-To: shelley94@example.net Received: (qmail 91077 invoked from network); 2 Apr 2004 00:40:46 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 2 Apr 2004 00:40:46 -0000 Received: (qmail 85702 invoked by uid 500); 2 Apr 2004 00:40:31 -0000 Delivered-To: shelley94@example.net Received: (qmail 85687 invoked by uid 500); 2 Apr 2004 00:40:31 -0000 Mailing-List: contact shelley94@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shelley94@example.net> list-unsubscribe: <mailto:shelley94@example.net> list-post: <mailto:shelley94@example.net> Reply-To: shelley94@example.net Delivered-To: mailing list shelley94@example.net Received: (qmail 85672 invoked from network); 2 Apr 2004 00:40:30 -0000 Received: from unknown (HELO minotaur.apache.org) (83.161.120.155) by daedalus.apache.org with SMTP; 2 Apr 2004 00:40:30 -0000 Received: (qmail 91045 invoked by uid 65534); 2 Apr 2004 00:40:45 -0000 Date: 2 Apr 2004 00:40:45 -0000 Message-ID: <shelley94@example.net> From: shelley94@example.net To: shelley94@example.net Subject: svn commit: rev 9842 - in incubator/depot/trunk/version/src/java/core/org/apache/depot/version: . constraint constraint/impl context discovery/loading extension generation/dom generation/source impl impl/data impl/data/util interfacing specification specification/formatting specification/formatting/format util/classpath util/collection util/debug util/envsafe util/note X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: ajack Date: Thu Apr 1 16:40:43 2004 New Revision: 9842 Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionError.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionException.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntime.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntimeException.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IContextConstraint.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IVersionConstraint.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/Dependency.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionComparisonConstraint.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionIdentifierConstraint.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionRangeConstraint.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionEnvironment.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionInformation.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/JarManifestVersionLoader.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/LoadContext.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/StampVersionLoader.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/VersionLoadContext.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtension.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtensionInformation.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtensionLoadContext.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/dom/DOMGenerator.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/AbstractVersionMarkerClassGenerator.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/ClassGenerator.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/DependentVersionMarkerClassGenerator.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/StandaloneVersionMarkerClassGenerator.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/ApacheVersion.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/ApacheVersionMarker.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/VersionData.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/util/VersionDataComparison.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/util/VersionDataRange.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/interfacing/PseudoInterface.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/VersionSpecificationImpl.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/formatting/VersionFormatFactory.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/formatting/format/VersionFormatImpl.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/classpath/PathContext.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/classpath/PathSet.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/classpath/PathWalker.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/collection/EntityList.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/debug/DebugUtils.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/envsafe/RelativelySafe.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/note/Annotation.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/note/AnnotationScratchpad.java Log: Trying to commit as I go. I am finding using SVN commandline outside of using Eclipse to be a royal PITA!!! Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionError.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionError.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionError.java Thu Apr 1 16:40:43 2004 @@ -16,7 +16,7 @@ package org.apache.depot.version; -import org.apache.depot.version.util.throwable.PortableError; +import org.apache.depot.common.util.throwable.PortableError; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionException.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionException.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionException.java Thu Apr 1 16:40:43 2004 @@ -16,7 +16,7 @@ package org.apache.depot.version; -import org.apache.depot.version.util.throwable.PortableException; +import org.apache.depot.common.util.throwable.PortableException; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntime.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntime.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntime.java Thu Apr 1 16:40:43 2004 @@ -24,6 +24,7 @@ import java.io.Writer; import java.util.HashMap; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.analysis.Analyzer; import org.apache.depot.version.constraint.ConstraintEvaluator; import org.apache.depot.version.constraint.ConstraintResultSet; @@ -36,7 +37,6 @@ import org.apache.depot.version.context.VersionRegistry; import org.apache.depot.version.util.classpath.PathContext; import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.dom.DOMUtils; import org.apache.depot.version.util.io.IOUtils; import org.apache.depot.version.util.note.AnnotationScratchpad; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntimeException.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntimeException.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntimeException.java Thu Apr 1 16:40:43 2004 @@ -16,7 +16,7 @@ package org.apache.depot.version; -import org.apache.depot.version.util.throwable.PortableRuntimeException; +import org.apache.depot.common.util.throwable.PortableRuntimeException; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IContextConstraint.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IContextConstraint.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IContextConstraint.java Thu Apr 1 16:40:43 2004 @@ -16,10 +16,10 @@ package org.apache.depot.version.constraint; +import org.apache.depot.common.util.dom.DOMProducer; import org.apache.depot.version.VersionException; import org.apache.depot.version.context.VersionContext; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMProducer; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IVersionConstraint.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IVersionConstraint.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IVersionConstraint.java Thu Apr 1 16:40:43 2004 @@ -16,10 +16,10 @@ package org.apache.depot.version.constraint; +import org.apache.depot.common.util.dom.DOMProducer; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMProducer; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/Dependency.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/Dependency.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/Dependency.java Thu Apr 1 16:40:43 2004 @@ -16,8 +16,8 @@ package org.apache.depot.version.constraint.impl; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.impl.VersionIdentifier; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionComparisonConstraint.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionComparisonConstraint.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionComparisonConstraint.java Thu Apr 1 16:40:43 2004 @@ -18,6 +18,7 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; import org.apache.depot.version.constraint.ConstraintConclusion; @@ -28,7 +29,6 @@ import org.apache.depot.version.impl.VersionIdentifier; import org.apache.depot.version.impl.data.util.VersionDataComparison; import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionIdentifierConstraint.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionIdentifierConstraint.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionIdentifierConstraint.java Thu Apr 1 16:40:43 2004 @@ -18,6 +18,7 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.SystemUtils; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; import org.apache.depot.version.constraint.ConstraintConclusion; @@ -27,7 +28,6 @@ import org.apache.depot.version.context.VersionContext; import org.apache.depot.version.context.VersionInformation; import org.apache.depot.version.impl.VersionIdentifier; -import org.apache.depot.version.util.SystemUtils; import org.apache.depot.version.util.debug.DebugUtils; /** Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionRangeConstraint.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionRangeConstraint.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionRangeConstraint.java Thu Apr 1 16:40:43 2004 @@ -18,6 +18,8 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.SystemUtils; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; import org.apache.depot.version.constraint.ConstraintConclusion; @@ -27,9 +29,7 @@ import org.apache.depot.version.impl.ApacheVersion; import org.apache.depot.version.impl.VersionIdentifier; import org.apache.depot.version.impl.data.util.VersionDataRange; -import org.apache.depot.version.util.SystemUtils; import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionEnvironment.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionEnvironment.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionEnvironment.java Thu Apr 1 16:40:43 2004 @@ -20,6 +20,9 @@ import java.util.HashMap; import java.util.Map; +import org.apache.depot.common.util.dom.DOMConsumer; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.VersionException; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.impl.VersionIdentifier; @@ -30,9 +33,6 @@ import org.apache.depot.version.util.classpath.PathContext; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMConsumer; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.apache.depot.version.util.note.AnnotationScratchpad; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionInformation.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionInformation.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionInformation.java Thu Apr 1 16:40:43 2004 @@ -22,6 +22,10 @@ import java.util.List; import java.util.Map; +import org.apache.depot.common.util.SystemUtils; +import org.apache.depot.common.util.dom.DOMConsumer; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.Version; import org.apache.depot.version.VersionError; import org.apache.depot.version.VersionException; @@ -32,12 +36,8 @@ import org.apache.depot.version.discovery.loading.VersionLoadContext; import org.apache.depot.version.impl.ApacheVersionMarker; import org.apache.depot.version.impl.VersionIdentifier; -import org.apache.depot.version.util.SystemUtils; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMConsumer; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/JarManifestVersionLoader.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/JarManifestVersionLoader.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/JarManifestVersionLoader.java Thu Apr 1 16:40:43 2004 @@ -23,12 +23,12 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; +import org.apache.depot.common.util.SystemUtils; import org.apache.depot.version.VersionException; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.impl.VersionIdentifier; import org.apache.depot.version.log.Logger; import org.apache.depot.version.specification.formatting.VersionFormatException; -import org.apache.depot.version.util.SystemUtils; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.jar.JarManifestHelper; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/LoadContext.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/LoadContext.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/LoadContext.java Thu Apr 1 16:40:43 2004 @@ -18,10 +18,10 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/StampVersionLoader.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/StampVersionLoader.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/StampVersionLoader.java Thu Apr 1 16:40:43 2004 @@ -18,6 +18,7 @@ import java.util.Iterator; +import org.apache.depot.common.util.SystemUtils; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.VersionRuntime; import org.apache.depot.version.context.VersionContext; @@ -28,7 +29,6 @@ import org.apache.depot.version.interfacing.PseudoInterface; import org.apache.depot.version.interfacing.StandardPseudoInterface; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.SystemUtils; import org.apache.depot.version.util.debug.DebugUtils; /** Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/VersionLoadContext.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/VersionLoadContext.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/VersionLoadContext.java Thu Apr 1 16:40:43 2004 @@ -18,10 +18,10 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.impl.VersionIdentifier; import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtension.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtension.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtension.java Thu Apr 1 16:40:43 2004 @@ -19,13 +19,13 @@ import java.io.PrintWriter; import java.util.StringTokenizer; +import org.apache.depot.common.util.dom.DOMProducer; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; import org.apache.depot.version.impl.VersionIdentifierType; import org.apache.depot.version.impl.VersionImporter; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMProducer; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtensionInformation.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtensionInformation.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtensionInformation.java Thu Apr 1 16:40:43 2004 @@ -20,12 +20,12 @@ import java.util.ArrayList; import java.util.List; +import org.apache.depot.common.util.dom.DOMProducer; import org.apache.depot.version.VersionError; import org.apache.depot.version.VersionRuntimeException; import org.apache.depot.version.discovery.loading.LoadType; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMProducer; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtensionLoadContext.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtensionLoadContext.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtensionLoadContext.java Thu Apr 1 16:40:43 2004 @@ -18,9 +18,9 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.discovery.loading.LoadContext; import org.apache.depot.version.discovery.loading.LoadType; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/dom/DOMGenerator.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/dom/DOMGenerator.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/dom/DOMGenerator.java Thu Apr 1 16:40:43 2004 @@ -16,9 +16,9 @@ package org.apache.depot.version.generation.dom; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.context.VersionEnvironment; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; /** Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/AbstractVersionMarkerClassGenerator.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/AbstractVersionMarkerClassGenerator.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/AbstractVersionMarkerClassGenerator.java Thu Apr 1 16:40:43 2004 @@ -22,13 +22,13 @@ import java.util.Iterator; import java.util.Map; +import org.apache.depot.common.util.IndentWriter; import org.apache.depot.version.CompoundVersion; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.impl.ApacheVersionMarker; import org.apache.depot.version.impl.VersionImplementationConstants; import org.apache.depot.version.impl.data.ReleaseLevel; import org.apache.depot.version.interfacing.ApacheVersionMarkerInterfaceProxy; -import org.apache.depot.version.util.IndentWriter; /** * Generate Version class. Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/ClassGenerator.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/ClassGenerator.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/ClassGenerator.java Thu Apr 1 16:40:43 2004 @@ -25,11 +25,11 @@ import java.util.Map; import java.util.StringTokenizer; +import org.apache.depot.common.util.IndentWriter; import org.apache.depot.version.VersionException; import org.apache.depot.version.interfacing.PseudoInterface; import org.apache.depot.version.interfacing.PseudoMethodEntity; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.IndentWriter; /** * Base class for generated Java sources files in ant. Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/DependentVersionMarkerClassGenerator.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/DependentVersionMarkerClassGenerator.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/DependentVersionMarkerClassGenerator.java Thu Apr 1 16:40:43 2004 @@ -18,9 +18,9 @@ import java.io.File; +import org.apache.depot.common.util.IndentWriter; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.interfacing.ApacheVersionMarkerInterfaceProxy; -import org.apache.depot.version.util.IndentWriter; /** * Generate Version class. Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/StandaloneVersionMarkerClassGenerator.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/StandaloneVersionMarkerClassGenerator.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/generation/source/StandaloneVersionMarkerClassGenerator.java Thu Apr 1 16:40:43 2004 @@ -18,10 +18,10 @@ import java.io.File; +import org.apache.depot.common.util.IndentWriter; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.interfacing.ApacheVersionMarkerInterfaceProxy; import org.apache.depot.version.interfacing.StandardPseudoInterface; -import org.apache.depot.version.util.IndentWriter; /** * Generate Version class. Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/ApacheVersion.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/ApacheVersion.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/ApacheVersion.java Thu Apr 1 16:40:43 2004 @@ -21,6 +21,9 @@ import java.util.Date; import java.util.Map; +import org.apache.depot.common.util.dom.DOMConsumer; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.CompoundVersion; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; @@ -35,9 +38,6 @@ import org.apache.depot.version.specification.formatting.VersionFormatException; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMConsumer; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/ApacheVersionMarker.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/ApacheVersionMarker.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/ApacheVersionMarker.java Thu Apr 1 16:40:43 2004 @@ -24,6 +24,9 @@ import java.util.List; import java.util.Map; +import org.apache.depot.common.util.dom.DOMConsumer; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.CompoundVersion; import org.apache.depot.version.Version; import org.apache.depot.version.VersionConstants; @@ -38,9 +41,6 @@ import org.apache.depot.version.specification.formatting.format.ApacheVersionFormat; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMConsumer; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/VersionData.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/VersionData.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/VersionData.java Thu Apr 1 16:40:43 2004 @@ -22,15 +22,16 @@ import java.util.Iterator; import java.util.Map; +import org.apache.depot.common.util.dom.DOMConsumer; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.VersionError; import org.apache.depot.version.VersionException; import org.apache.depot.version.impl.VersionImplementationConstants; import org.apache.depot.version.log.Logger; +import org.apache.depot.version.specification.formatting.VersionFormatException; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMConsumer; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/util/VersionDataComparison.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/util/VersionDataComparison.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/util/VersionDataComparison.java Thu Apr 1 16:40:43 2004 @@ -20,13 +20,13 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.VersionError; import org.apache.depot.version.VersionException; import org.apache.depot.version.impl.data.VersionData; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/util/VersionDataRange.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/util/VersionDataRange.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/util/VersionDataRange.java Thu Apr 1 16:40:43 2004 @@ -18,12 +18,12 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.VersionError; import org.apache.depot.version.impl.data.VersionData; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/interfacing/PseudoInterface.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/interfacing/PseudoInterface.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/interfacing/PseudoInterface.java Thu Apr 1 16:40:43 2004 @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.Iterator; +import org.apache.depot.common.util.SystemUtils; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.SystemUtils; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/VersionSpecificationImpl.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/VersionSpecificationImpl.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/VersionSpecificationImpl.java Thu Apr 1 16:40:43 2004 @@ -18,7 +18,7 @@ import java.io.PrintWriter; -import org.apache.depot.version.util.SystemUtils; +import org.apache.depot.common.util.SystemUtils; import org.apache.depot.version.util.debug.DebugUtils; /** Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/formatting/VersionFormatFactory.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/formatting/VersionFormatFactory.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/formatting/VersionFormatFactory.java Thu Apr 1 16:40:43 2004 @@ -20,9 +20,9 @@ import org.apache.depot.version.VersionException; import org.apache.depot.version.impl.VersionImplementationConstants; +import org.apache.depot.version.specification.formatting.format.ApacheVersionFormat; import org.apache.depot.version.specification.formatting.format.JakartaCommonsVersionFormat; import org.apache.depot.version.specification.formatting.format.JavasoftVersionFormat; -import org.apache.depot.version.specification.formatting.format.ApacheVersionFormat; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/formatting/format/VersionFormatImpl.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/formatting/format/VersionFormatImpl.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/formatting/format/VersionFormatImpl.java Thu Apr 1 16:40:43 2004 @@ -18,13 +18,13 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.SystemUtils; import org.apache.depot.version.VersionException; import org.apache.depot.version.impl.data.ReleaseLevel; import org.apache.depot.version.impl.data.VersionData; import org.apache.depot.version.impl.data.VersionDataElement; import org.apache.depot.version.specification.formatting.VersionFormat; import org.apache.depot.version.specification.formatting.VersionFormatException; -import org.apache.depot.version.util.SystemUtils; import org.apache.depot.version.util.debug.DebugUtils; /** Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/classpath/PathContext.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/classpath/PathContext.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/classpath/PathContext.java Thu Apr 1 16:40:43 2004 @@ -18,10 +18,10 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.apache.depot.version.util.envsafe.ClassLoaderContext; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/classpath/PathSet.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/classpath/PathSet.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/classpath/PathSet.java Thu Apr 1 16:40:43 2004 @@ -24,10 +24,10 @@ import java.util.List; import java.util.StringTokenizer; +import org.apache.depot.common.util.SystemUtils; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.SystemUtils; import org.apache.depot.version.util.collection.EntityList; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/classpath/PathWalker.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/classpath/PathWalker.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/classpath/PathWalker.java Thu Apr 1 16:40:43 2004 @@ -28,8 +28,8 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; +import org.apache.depot.common.util.Tuple; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.Tuple; import org.apache.depot.version.util.classpath.listener.DirectoryListener; import org.apache.depot.version.util.classpath.listener.DropListener; import org.apache.depot.version.util.classpath.listener.FileContentsListener; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/collection/EntityList.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/collection/EntityList.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/collection/EntityList.java Thu Apr 1 16:40:43 2004 @@ -21,10 +21,10 @@ import java.util.Collection; import java.util.Iterator; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/debug/DebugUtils.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/debug/DebugUtils.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/debug/DebugUtils.java Thu Apr 1 16:40:43 2004 @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; -import org.apache.depot.version.util.SystemUtils; +import org.apache.depot.common.util.SystemUtils; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/envsafe/RelativelySafe.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/envsafe/RelativelySafe.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/envsafe/RelativelySafe.java Thu Apr 1 16:40:43 2004 @@ -20,9 +20,9 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import org.apache.depot.common.util.SystemUtils; import org.apache.depot.version.VersionError; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.SystemUtils; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/note/Annotation.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/note/Annotation.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/note/Annotation.java Thu Apr 1 16:40:43 2004 @@ -16,9 +16,9 @@ package org.apache.depot.version.util.note; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/note/AnnotationScratchpad.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/note/AnnotationScratchpad.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/note/AnnotationScratchpad.java Thu Apr 1 16:40:43 2004 @@ -20,11 +20,11 @@ import java.util.Collection; import java.util.Iterator; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.util.collection.EntityList; import org.apache.depot.version.util.debug.DebugUtils; import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; From depot-cvs-returnshelley94@example.net Fri Apr 02 00:49:23 2004 Return-Path: <depot-cvs-returnshelley94@example.net> Delivered-To: shelley94@example.net Received: (qmail 93938 invoked from network); 2 Apr 2004 00:49:23 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 2 Apr 2004 00:49:23 -0000 Received: (qmail 98584 invoked by uid 500); 2 Apr 2004 00:49:08 -0000 Delivered-To: shelley94@example.net Received: (qmail 98567 invoked by uid 500); 2 Apr 2004 00:49:08 -0000 Mailing-List: contact shelley94@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shelley94@example.net> list-unsubscribe: <mailto:shelley94@example.net> list-post: <mailto:shelley94@example.net> Reply-To: shelley94@example.net Delivered-To: mailing list shelley94@example.net Received: (qmail 98549 invoked from network); 2 Apr 2004 00:49:08 -0000 Received: from unknown (HELO minotaur.apache.org) (83.161.120.155) by daedalus.apache.org with SMTP; 2 Apr 2004 00:49:08 -0000 Received: (qmail 93934 invoked by uid 65534); 2 Apr 2004 00:49:23 -0000 Date: 2 Apr 2004 00:49:23 -0000 Message-ID: <shelley94@example.net> From: shelley94@example.net To: shelley94@example.net Subject: svn commit: rev 9843 - incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: ajack Date: Thu Apr 1 16:49:22 2004 New Revision: 9843 Removed: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/util/ Log: Try to move util from version to common, but SVN keeps slapping me. From depot-cvs-returnshelley94@example.net Fri Apr 02 13:43:15 2004 Return-Path: <depot-cvs-returnshelley94@example.net> Delivered-To: shelley94@example.net Received: (qmail 99396 invoked from network); 2 Apr 2004 13:43:15 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 2 Apr 2004 13:43:15 -0000 Received: (qmail 33149 invoked by uid 500); 2 Apr 2004 13:43:12 -0000 Delivered-To: shelley94@example.net Received: (qmail 33134 invoked by uid 500); 2 Apr 2004 13:43:12 -0000 Mailing-List: contact shelley94@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shelley94@example.net> list-unsubscribe: <mailto:shelley94@example.net> list-post: <mailto:shelley94@example.net> Reply-To: shelley94@example.net Delivered-To: mailing list shelley94@example.net Received: (qmail 33111 invoked from network); 2 Apr 2004 13:43:11 -0000 Received: from unknown (HELO minotaur.apache.org) (83.161.120.155) by daedalus.apache.org with SMTP; 2 Apr 2004 13:43:11 -0000 Received: (qmail 99232 invoked by uid 65534); 2 Apr 2004 13:43:12 -0000 Date: 2 Apr 2004 13:43:12 -0000 Message-ID: <shelley94@example.net> From: shelley94@example.net To: shelley94@example.net Subject: svn commit: rev 9844 - in incubator/depot/trunk: common/src/test/org/apache/depot/common/util/classpath common/src/test/org/apache/depot/common/util/dom update/src/java/org/apache/depot/update update/src/java/org/apache/depot/update/ant/sandbox/chalko update/src/java/org/apache/depot/update/ant/task update/src/java/org/apache/depot/update/config update/src/java/org/apache/depot/update/impl update/src/java/org/apache/depot/update/messaging update/src/java/org/apache/depot/update/monitor update/src/java/org/apache/depot/update/protocols update/src/java/org/apache/depot/update/protocols/impl update/src/java/org/apache/depot/update/query update/src/java/org/apache/depot/update/repository update/src/java/org/apache/depot/update/resource update/src/java/org/apache/depot/update/resource/compare update/src/java/org/apache/depot/update/resource/select update/src/java/org/apache/depot/update/tool update/src/java/org/apache/depot/update/util/io update/src/java/org/apache/depot/update/util/net/http update/src/java/org/apache/depot/update/util/net/select update/src/java/org/apache/depot/update/util/reference update/src/java/org/apache/depot/update/util/security update/src/java/org/apache/depot/update/util/select update/src/java/org/apache/depot/update/util/text update/src/java/org/apache/depot/update/util/xml update/src/test/org/apache/depot/update/ant/sandbox/chalko update/src/test/org/apache/depot/update/files update/src/test/org/apache/depot/update/misc update/src/test/org/apache/depot/update/query update/src/test/org/apache/depot/update/usecases update/src/test/org/apache/depot/update/util/xml version/src/java/ant/org/apache/depot/version/ant version/src/java/ant/org/apache/depot/version/ant/about version/src/java/ant/org/apache/depot/version/ant/available version/src/java/ant/org/apache/depot/version/ant/constraint version/src/java/ant/org/apache/depot/version/ant/environment version/src/java/ant/org/apache/depot/version/ant/nested version/src/java/ant/org/apache/depot/version/ant/stamp version/src/java/ant/org/apache/depot/version/ant/util version/src/java/core/org/apache/depot/version version/src/java/core/org/apache/depot/version/analysis version/src/java/core/org/apache/depot/version/constraint version/src/java/core/org/apache/depot/version/constraint/impl version/src/java/core/org/apache/depot/version/context version/src/java/core/org/apache/depot/version/discovery/collecting version/src/java/core/org/apache/depot/version/discovery/loading version/src/java/core/org/apache/depot/version/experimental/sample version/src/java/core/org/apache/depot/version/extension version/src/java/core/org/apache/depot/version/impl version/src/java/core/org/apache/depot/version/impl/data version/src/java/core/org/apache/depot/version/impl/data/util version/src/java/core/org/apache/depot/version/impl/util version/src/java/core/org/apache/depot/version/interfacing version/src/java/core/org/apache/depot/version/log version/src/java/core/org/apache/depot/version/specification version/src/java/core/org/apache/depot/version/specification/formatting version/src/java/core/org/apache/depot/version/specification/formatting/experimental version/src/java/core/org/apache/depot/version/specification/formatting/format version/src/java/core/org/apache/depot/version/tool version/src/test/java/core/org/apache/depot/version X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: ajack Date: Fri Apr 2 05:43:09 2004 New Revision: 9844 Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerFilterTests.java incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerTests.java incubator/depot/trunk/common/src/test/org/apache/depot/common/util/dom/DOMTests.java incubator/depot/trunk/update/src/java/org/apache/depot/update/ClasspathUpdater.java incubator/depot/trunk/update/src/java/org/apache/depot/update/FileAssistant.java incubator/depot/trunk/update/src/java/org/apache/depot/update/RuperException.java incubator/depot/trunk/update/src/java/org/apache/depot/update/RuperRuntimeException.java incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/sandbox/chalko/ResourceElement.java incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/sandbox/chalko/RuperSet.java incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/RepositoryToolTask.java incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/SynchronizeTask.java incubator/depot/trunk/update/src/java/org/apache/depot/update/config/RuperConfig.java incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ReferenceManager.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/messaging/ResourceResponse.java incubator/depot/trunk/update/src/java/org/apache/depot/update/monitor/Monitor.java incubator/depot/trunk/update/src/java/org/apache/depot/update/monitor/StatisticsMonitor.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/protocols/impl/HttpClientProtocolOperationsProvider.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/ResourceQuery.java incubator/depot/trunk/update/src/java/org/apache/depot/update/query/ResourceResult.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/RepositoryManifest.java incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/Resource.java incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/ResourceLocator.java incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/ResourceSpecifier.java incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/compare/VersionComparator.java incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/select/AbstractResourceSelector.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/RepositoriesTool.java incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/RepositoryTool.java incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/ResourceTool.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/io/FileUtils.java incubator/depot/trunk/update/src/java/org/apache/depot/update/util/io/ResolvedFile.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/net/select/AbstractVrlSelector.java incubator/depot/trunk/update/src/java/org/apache/depot/update/util/reference/ReferenceTable.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/select/AllSelector.java incubator/depot/trunk/update/src/java/org/apache/depot/update/util/select/CompositeSelector.java 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/xml/XMLHandler.java incubator/depot/trunk/update/src/java/org/apache/depot/update/util/xml/XMLParser.java incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/RuperSetTaskTest.java incubator/depot/trunk/update/src/test/org/apache/depot/update/files/ResourceAnalyzerTests.java incubator/depot/trunk/update/src/test/org/apache/depot/update/misc/VfsTests.java incubator/depot/trunk/update/src/test/org/apache/depot/update/query/QueryTests.java incubator/depot/trunk/update/src/test/org/apache/depot/update/usecases/SynchronizeTests.java incubator/depot/trunk/update/src/test/org/apache/depot/update/util/xml/XMLParserTests.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/AntInterface.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/AntTask.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/ClassGeneratorTask.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/VersionMarkerTask.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/about/AboutBoxClassGenerator.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/about/AboutBoxGeneratorTask.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/available/AvailableTask.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/available/SetPropertyTask.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintCheckTask.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintClassGenerator.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintGeneratorTask.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintInformationSet.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/VersionRangeConstraintInformation.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/environment/EnvironmentCheckTask.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/environment/EnvironmentTask.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/DefaultVersionMarkerAttributes.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/NestedElement.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionFormatNestedElement.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionMarkerNestedElement.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionNestedElement.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionSpecificationNestedElement.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/stamp/VersionMarkerGeneratorTask.java incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/util/AntLogListener.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionError.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionException.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntime.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntimeException.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/analysis/Analyzer.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintEvaluator.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintResult.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintResultSet.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintSet.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IContextConstraint.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IVersionConstraint.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionComparisonConstraint.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionIdentifierConstraint.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionRangeConstraint.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionedConstraintResult.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/ConstraintRegistry.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/ExtensionRegistry.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/Reviewer.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionContext.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionContextStore.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionEnvironment.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionInformation.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionRegistry.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/ClassFormatList.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/ClassFormatPartsList.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/FilenameCollector.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/JarManifestExtensionCollector.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/JarManifestVersionCollector.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/TextFileConstraintCollector.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/VersionStampCollector.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/FilenameVersionLoadContext.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/FilenameVersionLoader.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/JarManifestVersionLoader.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/LoadContext.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/PackageVersionLoadContext.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/StampVersionLoader.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/TextConstraintLoader.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/loading/VersionLoadContext.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/experimental/sample/Construction.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/experimental/sample/Overview.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtension.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/extension/VirtualMachineExtensionInformation.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/ApacheVersion.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/ApacheVersionMarker.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/VersionIdentifier.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/VersionIdentifierType.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/VersionImporter.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/VersionData.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/util/VersionDataComparison.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/data/util/VersionDataRange.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/impl/util/ApacheVersionMarkerDiffTool.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/interfacing/ApacheVersionMarkerInterfaceProxy.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/log/Logger.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/VersionSpecification.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/VersionSpecificationImpl.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/formatting/VersionFormat.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/formatting/experimental/Mask.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/specification/formatting/format/VersionFormatImpl.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/tool/VersionTool.java incubator/depot/trunk/version/src/java/core/org/apache/depot/version/tool/VersionToolImpl.java incubator/depot/trunk/version/src/test/java/core/org/apache/depot/version/VersionRuntimeTests.java Log: Comminting as I go, migrating version.util to common.util. One circ dep to go. Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerFilterTests.java ============================================================================== --- incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerFilterTests.java (original) +++ incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerFilterTests.java Fri Apr 2 05:43:09 2004 @@ -22,12 +22,12 @@ import junit.framework.TestCase; -import org.apache.depot.version.util.classpath.listener.DirectoryListener; -import org.apache.depot.version.util.classpath.listener.FileContentsListener; -import org.apache.depot.version.util.classpath.listener.FileListener; -import org.apache.depot.version.util.classpath.listener.JarListener; -import org.apache.depot.version.util.classpath.listener.ManifestListener; -import org.apache.depot.version.util.classpath.listener.NameFilter; +import org.apache.depot.common.util.classpath.listener.DirectoryListener; +import org.apache.depot.common.util.classpath.listener.FileContentsListener; +import org.apache.depot.common.util.classpath.listener.FileListener; +import org.apache.depot.common.util.classpath.listener.JarListener; +import org.apache.depot.common.util.classpath.listener.ManifestListener; +import org.apache.depot.common.util.classpath.listener.NameFilter; /** * @author ajack Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerTests.java ============================================================================== --- incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerTests.java (original) +++ incubator/depot/trunk/common/src/test/org/apache/depot/common/util/classpath/PathWalkerTests.java Fri Apr 2 05:43:09 2004 @@ -22,12 +22,12 @@ import junit.framework.TestCase; -import org.apache.depot.version.util.classpath.listener.DirectoryListener; -import org.apache.depot.version.util.classpath.listener.FileContentsListener; -import org.apache.depot.version.util.classpath.listener.FileListener; -import org.apache.depot.version.util.classpath.listener.JarListener; -import org.apache.depot.version.util.classpath.listener.ManifestListener; -import org.apache.depot.version.util.classpath.listener.NameFilter; +import org.apache.depot.common.util.classpath.listener.DirectoryListener; +import org.apache.depot.common.util.classpath.listener.FileContentsListener; +import org.apache.depot.common.util.classpath.listener.FileListener; +import org.apache.depot.common.util.classpath.listener.JarListener; +import org.apache.depot.common.util.classpath.listener.ManifestListener; +import org.apache.depot.common.util.classpath.listener.NameFilter; /** * @author ajack Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/util/dom/DOMTests.java ============================================================================== --- incubator/depot/trunk/common/src/test/org/apache/depot/common/util/dom/DOMTests.java (original) +++ incubator/depot/trunk/common/src/test/org/apache/depot/common/util/dom/DOMTests.java Fri Apr 2 05:43:09 2004 @@ -18,7 +18,7 @@ import junit.framework.TestCase; -import org.apache.depot.version.VersionException; +import org.apache.depot.common.DepotException; import org.apache.depot.version.VersionRuntime; import org.apache.depot.version.context.VersionEnvironment; import org.apache.depot.version.impl.ApacheVersion; @@ -41,14 +41,14 @@ } - public void testEnvironmentDOM() throws VersionException { + public void testEnvironmentDOM() throws DepotException { VersionEnvironment env = VersionRuntime.getRuntime().getEnvironment(); Document doc = DOMUtils.produceDOM(env); } - public void testEnvironmentDOMLoop() throws VersionException { + public void testEnvironmentDOMLoop() throws DepotException { VersionEnvironment env = VersionRuntime.getRuntime().getEnvironment(); @@ -59,7 +59,7 @@ //DebugUtils.dump("Environment", env2); } - public void testApacheVersionDOM() throws VersionException { + public void testApacheVersionDOM() throws DepotException { ApacheVersion version = new ApacheVersion(1, 1, ReleaseLevel.ALPHA, 1);; @@ -67,7 +67,7 @@ //DOMUtils.dump(SystemUtils.getSystemOut(), doc); } - public void testApacheVersionDOMLoop() throws VersionException { + public void testApacheVersionDOMLoop() throws DepotException { ApacheVersion version = new ApacheVersion(1, 1, ReleaseLevel.ALPHA, 1);; @@ -78,7 +78,7 @@ //DebugUtils.dump("ApacheVersion", version2); } - public void testApacheVersionMarkerDOM() throws VersionException { + public void testApacheVersionMarkerDOM() throws DepotException { VersionIdentifier versionId = new VersionIdentifier("test"); ApacheVersion version = new ApacheVersion(1, 1); ApacheVersionMarker marker = @@ -88,7 +88,7 @@ //DOMUtils.dump(SystemUtils.getSystemOut(), doc); } - public void testApacheVersionMarkerDOMLoop() throws VersionException { + public void testApacheVersionMarkerDOMLoop() throws DepotException { VersionIdentifier versionId = new VersionIdentifier("test"); ApacheVersion version = new ApacheVersion(1, 1); 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 05:43:09 2004 @@ -19,8 +19,8 @@ import java.util.ArrayList; import java.util.Iterator; -import org.apache.depot.version.util.classpath.PathPart; -import org.apache.depot.version.util.classpath.PathSet; +import org.apache.depot.common.util.classpath.PathPart; +import org.apache.depot.common.util.classpath.PathSet; /** * @author arb_jack 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 05:43:09 2004 @@ -15,19 +15,18 @@ */ package org.apache.depot.update; +import java.io.File; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.apache.depot.common.util.SystemUtils; import org.apache.depot.update.files.DefaultResourceFilenameAnalyzer; import org.apache.depot.update.files.IResourceFilenameAnalyzer; import org.apache.depot.update.resource.Resource; import org.apache.depot.update.resource.ResourceSpecifier; import org.apache.depot.update.util.io.ResolvedFile; import org.apache.depot.update.util.net.VirtualResourceLocator; -import org.apache.depot.version.util.SystemUtils; - -import java.io.File; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; /** Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/RuperException.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/RuperException.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/RuperException.java Fri Apr 2 05:43:09 2004 @@ -15,7 +15,7 @@ */ package org.apache.depot.update; -import org.apache.depot.version.util.throwable.PortableException; +import org.apache.depot.common.util.throwable.PortableException; public class RuperException extends PortableException { Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/RuperRuntimeException.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/RuperRuntimeException.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/RuperRuntimeException.java Fri Apr 2 05:43:09 2004 @@ -16,7 +16,7 @@ package org.apache.depot.update; -import org.apache.depot.version.util.throwable.PortableRuntimeException; +import org.apache.depot.common.util.throwable.PortableRuntimeException; /** Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/sandbox/chalko/ResourceElement.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/sandbox/chalko/ResourceElement.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/sandbox/chalko/ResourceElement.java Fri Apr 2 05:43:09 2004 @@ -25,8 +25,8 @@ import org.apache.depot.update.resource.select.TypeSelector; import org.apache.depot.update.util.io.ResolvedFile; import org.apache.depot.update.util.net.VirtualResourceLocator; -import org.apache.tools.ant.Project; import org.apache.depot.version.Version; +import org.apache.tools.ant.Project; /** * @version $Revision: $ */ Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/sandbox/chalko/RuperSet.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/sandbox/chalko/RuperSet.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/sandbox/chalko/RuperSet.java Fri Apr 2 05:43:09 2004 @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import org.apache.depot.update.ResourceUpdater; import org.apache.depot.update.RuperException; import org.apache.depot.update.impl.RepositorySetWrapper; 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 05:43:09 2004 @@ -19,9 +19,6 @@ import java.util.Iterator; import java.util.List; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; import org.apache.depot.update.RuperException; import org.apache.depot.update.impl.RepositoryWrapper; import org.apache.depot.update.impl.ResourceUpdaterContext; @@ -33,6 +30,9 @@ import org.apache.depot.update.util.select.AllSelector; import org.apache.depot.version.ant.util.AntLogListener; import org.apache.depot.version.log.Logger; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; /** * @author ajack 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 05:43:09 2004 @@ -16,9 +16,6 @@ package org.apache.depot.update.ant.task; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; import org.apache.depot.update.ResourceUpdater; import org.apache.depot.update.RuperException; import org.apache.depot.update.repository.DefaultRepository; @@ -26,6 +23,9 @@ import org.apache.depot.update.util.RuperConstants; import org.apache.depot.version.ant.util.AntLogListener; import org.apache.depot.version.log.Logger; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; /** * @author ajack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/config/RuperConfig.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/config/RuperConfig.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/config/RuperConfig.java Fri Apr 2 05:43:09 2004 @@ -19,6 +19,7 @@ import java.io.File; import java.io.InputStream; +import org.apache.depot.common.util.envsafe.ClassLoaderContext; import org.apache.depot.update.impl.ReferenceManager; import org.apache.depot.update.util.RuperConstants; import org.apache.depot.update.util.text.MessageConstants; @@ -27,7 +28,6 @@ import org.apache.depot.update.util.xml.XMLEntryTable; import org.apache.depot.update.util.xml.XMLParser; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.envsafe.ClassLoaderContext; /** * @author anou_mana Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ReferenceManager.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ReferenceManager.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/impl/ReferenceManager.java Fri Apr 2 05:43:09 2004 @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.Map; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.update.util.identity.GenericIdentifier; import org.apache.depot.update.util.identity.GenericNamespace; import org.apache.depot.update.util.reference.IReferenceable; @@ -28,7 +29,6 @@ import org.apache.depot.update.util.text.MessageConstants; import org.apache.depot.update.util.text.Messages; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.debug.DebugUtils; /** * @author ajack 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 05:43:09 2004 @@ -20,6 +20,8 @@ import java.util.Iterator; import java.util.List; +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.monitor.Monitor; import org.apache.depot.update.monitor.ResourceEvent; @@ -33,8 +35,6 @@ import org.apache.depot.update.util.text.MessageConstants; import org.apache.depot.update.util.text.Messages; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; /** * @author arb_jack 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 05:43:09 2004 @@ -18,13 +18,13 @@ import java.io.File; +import org.apache.depot.common.util.SystemUtils; import org.apache.depot.update.RuperException; import org.apache.depot.update.protocols.DefaultProtocolOperationsManager; import org.apache.depot.update.protocols.ProtocolOperationsManager; import org.apache.depot.update.util.RuperConstants; import org.apache.depot.update.util.identity.GenericIdentifier; import org.apache.depot.update.util.reference.IReferenceable; -import org.apache.depot.version.util.SystemUtils; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/messaging/ResourceResponse.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/messaging/ResourceResponse.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/messaging/ResourceResponse.java Fri Apr 2 05:43:09 2004 @@ -16,8 +16,8 @@ package org.apache.depot.update.messaging; +import org.apache.depot.common.util.note.AnnotationScratchpad; import org.apache.depot.update.query.ResourceResult; -import org.apache.depot.version.util.note.AnnotationScratchpad; /** Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/monitor/Monitor.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/monitor/Monitor.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/monitor/Monitor.java Fri Apr 2 05:43:09 2004 @@ -21,8 +21,8 @@ import java.util.List; import java.util.Stack; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.debug.DebugUtils; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/monitor/StatisticsMonitor.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/monitor/StatisticsMonitor.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/monitor/StatisticsMonitor.java Fri Apr 2 05:43:09 2004 @@ -21,9 +21,9 @@ import java.util.List; import java.util.StringTokenizer; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.Dumpable; import org.apache.depot.update.resource.Resource; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; /** * @author anou_mana 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 05:43:09 2004 @@ -16,10 +16,10 @@ package org.apache.depot.update.protocols; +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.impl.ResourceUpdaterContext; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.envsafe.ClassLoaderContext; /** * @author ajack 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 05:43:09 2004 @@ -24,6 +24,8 @@ import java.util.Map; import java.util.Set; +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.impl.ResourceUpdaterContext; import org.apache.depot.update.protocols.select.DestinationProtocolProviderSelector; @@ -35,8 +37,6 @@ import org.apache.depot.update.util.select.ISelector; import org.apache.depot.update.util.select.SelectorHandlerChain; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; /** * @author ajack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/protocols/impl/HttpClientProtocolOperationsProvider.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/protocols/impl/HttpClientProtocolOperationsProvider.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/protocols/impl/HttpClientProtocolOperationsProvider.java Fri Apr 2 05:43:09 2004 @@ -20,13 +20,13 @@ import java.io.FileOutputStream; import java.util.List; +import org.apache.depot.common.util.io.IOUtils; import org.apache.depot.update.impl.ResourceUpdaterContext; import org.apache.depot.update.protocols.Protocol; import org.apache.depot.update.util.io.HtmlUtils; import org.apache.depot.update.util.net.VirtualResourceLocator; import org.apache.depot.update.util.net.http.HttpClientUserAgent; import org.apache.depot.update.util.select.ISelector; -import org.apache.depot.version.util.io.IOUtils; /** * @author ajack 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 05:43:09 2004 @@ -22,6 +22,7 @@ import java.util.Iterator; import java.util.List; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.update.RuperException; import org.apache.depot.update.impl.RepositorySetWrapper; import org.apache.depot.update.impl.RepositoryWrapper; @@ -35,7 +36,6 @@ import org.apache.depot.update.util.text.MessageConstants; import org.apache.depot.update.util.text.Messages; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.debug.DebugUtils; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/query/ResourceQuery.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/query/ResourceQuery.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/query/ResourceQuery.java Fri Apr 2 05:43:09 2004 @@ -21,12 +21,12 @@ import java.util.Comparator; import java.util.List; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.Dumpable; import org.apache.depot.update.repository.RepositorySet; import org.apache.depot.update.repository.RepositorySetSortContext; import org.apache.depot.update.resource.ResourceGroup; import org.apache.depot.update.util.select.ISelector; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/query/ResourceResult.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/query/ResourceResult.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/query/ResourceResult.java Fri Apr 2 05:43:09 2004 @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.Collection; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.note.AnnotationScratchpad; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.Dumpable; +import org.apache.depot.common.util.note.AnnotationScratchpad; /** * @author arb_jack 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 05:43:09 2004 @@ -19,6 +19,8 @@ import java.io.PrintWriter; import java.util.List; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.Dumpable; import org.apache.depot.update.files.DefaultResourceFilenameAnalyzer; import org.apache.depot.update.files.DefaultResourceGroupFilenameAnalyzer; import org.apache.depot.update.files.IResourceFilenameAnalyzer; @@ -36,8 +38,6 @@ import org.apache.depot.update.util.select.ISelector; import org.apache.depot.update.util.select.logic.AndSelector; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositoryManifest.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositoryManifest.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/repository/RepositoryManifest.java Fri Apr 2 05:43:09 2004 @@ -21,12 +21,12 @@ import java.util.Iterator; import java.util.List; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.Dumpable; import org.apache.depot.update.resource.Resource; import org.apache.depot.update.resource.ResourceType; import org.apache.depot.update.util.identity.GenericIdentifier; import org.apache.depot.version.Version; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/Resource.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/Resource.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/Resource.java Fri Apr 2 05:43:09 2004 @@ -20,6 +20,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.Dumpable; import org.apache.depot.update.util.flag.Flag; import org.apache.depot.update.util.identity.GenericIdentifier; import org.apache.depot.update.util.net.VirtualResourceLocator; @@ -27,8 +29,6 @@ import org.apache.depot.update.util.select.ISelectable; import org.apache.depot.version.Version; import org.apache.depot.version.impl.ApacheVersion; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/ResourceLocator.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/ResourceLocator.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/ResourceLocator.java Fri Apr 2 05:43:09 2004 @@ -18,8 +18,8 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.update.util.net.VirtualResourceLocator; -import org.apache.depot.version.util.debug.DebugUtils; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/ResourceSpecifier.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/ResourceSpecifier.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/ResourceSpecifier.java Fri Apr 2 05:43:09 2004 @@ -18,9 +18,9 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.Dumpable; import org.apache.depot.version.Version; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/compare/VersionComparator.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/compare/VersionComparator.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/compare/VersionComparator.java Fri Apr 2 05:43:09 2004 @@ -15,6 +15,7 @@ */ package org.apache.depot.update.resource.compare; import java.util.Comparator; + import org.apache.depot.update.resource.Resource; import org.apache.depot.update.util.text.MessageConstants; import org.apache.depot.update.util.text.Messages; Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/select/AbstractResourceSelector.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/select/AbstractResourceSelector.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/resource/select/AbstractResourceSelector.java Fri Apr 2 05:43:09 2004 @@ -16,11 +16,11 @@ package org.apache.depot.update.resource.select; +import org.apache.depot.common.util.SystemUtils; import org.apache.depot.update.resource.Resource; import org.apache.depot.update.util.select.ISelector; import org.apache.depot.update.util.text.MessageConstants; import org.apache.depot.update.util.text.Messages; -import org.apache.depot.version.util.SystemUtils; /** * @author arb_jack 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 2 05:43:09 2004 @@ -16,14 +16,14 @@ 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.repository.DefaultRepository; import org.apache.depot.update.repository.IRepository; import org.apache.depot.update.repository.RepositorySet; import org.apache.depot.update.resource.ResourceGroup; -import org.apache.depot.version.util.cli.CommandLine; -import org.apache.depot.version.util.cli.Option; /** */ Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/RepositoriesTool.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/RepositoriesTool.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/RepositoriesTool.java Fri Apr 2 05:43:09 2004 @@ -16,11 +16,11 @@ 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.common.util.debug.DebugUtils; import org.apache.depot.update.repository.RepositorySet; import org.apache.depot.update.util.RuperConstants; -import org.apache.depot.version.util.cli.CommandLine; -import org.apache.depot.version.util.cli.Option; -import org.apache.depot.version.util.debug.DebugUtils; /** */ Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/RepositoryTool.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/RepositoryTool.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/RepositoryTool.java Fri Apr 2 05:43:09 2004 @@ -20,6 +20,10 @@ import java.util.Iterator; import java.util.List; +import org.apache.depot.common.util.SystemUtils; +import org.apache.depot.common.util.cli.CommandLine; +import org.apache.depot.common.util.cli.Option; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.update.ResourceUpdater; import org.apache.depot.update.impl.RepositoryWrapper; import org.apache.depot.update.impl.ResourceUpdaterContext; @@ -28,10 +32,6 @@ import org.apache.depot.update.resource.Resource; import org.apache.depot.update.resource.ResourceGroup; import org.apache.depot.update.util.select.AllSelector; -import org.apache.depot.version.util.SystemUtils; -import org.apache.depot.version.util.cli.CommandLine; -import org.apache.depot.version.util.cli.Option; -import org.apache.depot.version.util.debug.DebugUtils; /** */ Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/ResourceTool.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/ResourceTool.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/ResourceTool.java Fri Apr 2 05:43:09 2004 @@ -16,14 +16,14 @@ 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.common.util.debug.DebugUtils; import org.apache.depot.update.impl.ResourceUpdaterEngine; import org.apache.depot.update.messaging.ResourceRequest; import org.apache.depot.update.query.ResourceQueryHelper; import org.apache.depot.update.query.ResourceResult; import org.apache.depot.update.resource.ResourceSpecifier; -import org.apache.depot.version.util.cli.CommandLine; -import org.apache.depot.version.util.cli.Option; -import org.apache.depot.version.util.debug.DebugUtils; /** */ 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 2 05:43:09 2004 @@ -18,6 +18,13 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.SystemUtils; +import org.apache.depot.common.util.cli.CommandLine; +import org.apache.depot.common.util.cli.CommandLineParser; +import org.apache.depot.common.util.cli.Option; +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.monitor.Monitor; import org.apache.depot.update.monitor.StatisticsMonitor; @@ -25,13 +32,6 @@ import org.apache.depot.version.log.LogConstants; import org.apache.depot.version.log.Logger; import org.apache.depot.version.log.StandardLogListener; -import org.apache.depot.version.util.SystemUtils; -import org.apache.depot.version.util.cli.CommandLine; -import org.apache.depot.version.util.cli.CommandLineParser; -import org.apache.depot.version.util.cli.Option; -import org.apache.depot.version.util.cli.Options; -import org.apache.depot.version.util.cli.ParseException; -import org.apache.depot.version.util.debug.DebugUtils; /** * @author ajack 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 05:43:09 2004 @@ -25,9 +25,9 @@ import java.text.CharacterIterator; import java.text.StringCharacterIterator; +import org.apache.depot.common.util.io.IOUtils; import org.apache.depot.update.RuperRuntimeException; import org.apache.depot.update.util.RuperConstants; -import org.apache.depot.version.util.io.*; public class FileUtils { Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/io/ResolvedFile.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/io/ResolvedFile.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/io/ResolvedFile.java Fri Apr 2 05:43:09 2004 @@ -18,7 +18,7 @@ import java.io.File; -import org.apache.depot.version.util.SystemUtils; +import org.apache.depot.common.util.SystemUtils; /** * @author ajack 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 2 05:43:09 2004 @@ -25,10 +25,10 @@ import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.HeadMethod; import org.apache.commons.httpclient.util.HttpURLConnection; +import org.apache.depot.common.util.SystemUtils; +import org.apache.depot.common.util.io.IOUtils; import org.apache.depot.update.version.Version; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.SystemUtils; -import org.apache.depot.version.util.io.IOUtils; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/net/select/AbstractVrlSelector.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/net/select/AbstractVrlSelector.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/net/select/AbstractVrlSelector.java Fri Apr 2 05:43:09 2004 @@ -16,11 +16,11 @@ package org.apache.depot.update.util.net.select; +import org.apache.depot.common.util.SystemUtils; import org.apache.depot.update.util.net.VirtualResourceLocator; import org.apache.depot.update.util.select.ISelector; import org.apache.depot.update.util.text.MessageConstants; import org.apache.depot.update.util.text.Messages; -import org.apache.depot.version.util.SystemUtils; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/reference/ReferenceTable.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/reference/ReferenceTable.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/reference/ReferenceTable.java Fri Apr 2 05:43:09 2004 @@ -19,10 +19,10 @@ import java.io.PrintWriter; import java.util.HashMap; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.Dumpable; import org.apache.depot.update.util.identity.GenericIdentifier; import org.apache.depot.update.util.identity.GenericNamespace; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; /** * @author ajack 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 05:43:09 2004 @@ -22,7 +22,6 @@ import java.security.NoSuchProviderException; import org.apache.depot.update.RuperException; - import org.apache.depot.version.log.Logger; 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 05:43:09 2004 @@ -22,11 +22,12 @@ import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; - import java.security.DigestInputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; + +import org.apache.tools.ant.BuildException; //import org.apache.update.RuperException; Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/select/AllSelector.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/select/AllSelector.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/select/AllSelector.java Fri Apr 2 05:43:09 2004 @@ -16,7 +16,7 @@ package org.apache.depot.update.util.select; -import org.apache.depot.version.util.SystemUtils; +import org.apache.depot.common.util.SystemUtils; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/select/CompositeSelector.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/select/CompositeSelector.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/select/CompositeSelector.java Fri Apr 2 05:43:09 2004 @@ -21,9 +21,9 @@ import java.util.LinkedList; import java.util.List; -import org.apache.depot.version.util.SystemUtils; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; +import org.apache.depot.common.util.SystemUtils; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.Dumpable; public abstract class CompositeSelector implements ISelector, Dumpable { // Would be much easier if we could use a LinkedHashSet, but that 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 2 05:43:09 2004 @@ -24,7 +24,7 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; -import org.apache.depot.version.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.DebugUtils; /** * Formats messages. Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/xml/XMLHandler.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/xml/XMLHandler.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/xml/XMLHandler.java Fri Apr 2 05:43:09 2004 @@ -19,9 +19,9 @@ import java.lang.reflect.Method; import java.util.Stack; +import org.apache.depot.common.util.envsafe.ClassLoaderContext; import org.apache.depot.update.impl.ReferenceManager; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.envsafe.ClassLoaderContext; import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.xml.sax.SAXException; Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/xml/XMLParser.java ============================================================================== --- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/xml/XMLParser.java (original) +++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/xml/XMLParser.java Fri Apr 2 05:43:09 2004 @@ -24,8 +24,8 @@ import javax.xml.parsers.SAXParserFactory; +import org.apache.depot.common.util.envsafe.ClassLoaderContext; import org.apache.depot.update.util.io.FileUtils; -import org.apache.depot.version.util.envsafe.ClassLoaderContext; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/RuperSetTaskTest.java ============================================================================== --- incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/RuperSetTaskTest.java (original) +++ incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/RuperSetTaskTest.java Fri Apr 2 05:43:09 2004 @@ -16,6 +16,7 @@ */ package org.apache.depot.update.ant.sandbox.chalko; import java.io.File; + import org.apache.tools.ant.BuildFileTest; /** * @author <a href="http://incubator.apache.org/depot" 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 05:43:09 2004 @@ -20,13 +20,13 @@ import junit.framework.TestCase; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.update.RuperException; -import org.apache.depot.version.log.Logger; import org.apache.depot.update.resource.Resource; import org.apache.depot.update.resource.ResourceType; import org.apache.depot.update.util.net.VirtualResourceLocator; import org.apache.depot.version.impl.ApacheVersion; -import org.apache.depot.version.util.debug.DebugUtils; +import org.apache.depot.version.log.Logger; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/misc/VfsTests.java ============================================================================== --- incubator/depot/trunk/update/src/test/org/apache/depot/update/misc/VfsTests.java (original) +++ incubator/depot/trunk/update/src/test/org/apache/depot/update/misc/VfsTests.java Fri Apr 2 05:43:09 2004 @@ -19,8 +19,8 @@ import java.util.List; import org.apache.commons.vfs.FileObject; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.update.util.io.VfsUtils; -import org.apache.depot.version.util.debug.DebugUtils; /** * @author ajack 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 05:43:09 2004 @@ -18,6 +18,7 @@ import junit.framework.TestCase; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.update.RuperException; import org.apache.depot.update.config.RuperConfig; import org.apache.depot.update.impl.RepositorySetWrapper; @@ -34,7 +35,6 @@ import org.apache.depot.update.util.select.logic.OrSelector; import org.apache.depot.version.impl.ApacheVersion; import org.apache.depot.version.impl.data.ReleaseLevel; -import org.apache.depot.version.util.debug.DebugUtils; /** * @author arb_jack Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/usecases/SynchronizeTests.java ============================================================================== --- incubator/depot/trunk/update/src/test/org/apache/depot/update/usecases/SynchronizeTests.java (original) +++ incubator/depot/trunk/update/src/test/org/apache/depot/update/usecases/SynchronizeTests.java Fri Apr 2 05:43:09 2004 @@ -26,8 +26,8 @@ import org.apache.depot.update.FileUpdater; import org.apache.depot.update.ResourceUpdater; import org.apache.depot.update.impl.ResourceUpdaterIdentifier; -import org.apache.depot.update.repository.IRepository; import org.apache.depot.update.repository.DefaultRepository; +import org.apache.depot.update.repository.IRepository; import org.apache.depot.update.repository.RepositorySet; public class SynchronizeTests extends TestCase { 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 05:43:09 2004 @@ -21,7 +21,7 @@ import junit.framework.TestCase; -import org.apache.depot.version.util.envsafe.ClassLoaderContext; +import org.apache.depot.common.util.envsafe.ClassLoaderContext; public class XMLParserTests extends TestCase { Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/AntInterface.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/AntInterface.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/AntInterface.java Fri Apr 2 05:43:09 2004 @@ -18,14 +18,14 @@ import java.util.Iterator; +import org.apache.depot.common.util.note.Annotation; +import org.apache.depot.common.util.note.AnnotationScratchpad; +import org.apache.depot.version.constraint.ConstraintResult; +import org.apache.depot.version.constraint.ConstraintResultSet; import org.apache.tools.ant.Location; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.Task; -import org.apache.depot.version.constraint.ConstraintResult; -import org.apache.depot.version.constraint.ConstraintResultSet; -import org.apache.depot.version.util.note.Annotation; -import org.apache.depot.version.util.note.AnnotationScratchpad; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/AntTask.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/AntTask.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/AntTask.java Fri Apr 2 05:43:09 2004 @@ -16,12 +16,12 @@ package org.apache.depot.version.ant; +import org.apache.depot.common.util.note.AnnotationScratchpad; +import org.apache.depot.version.ant.util.AntLogListener; +import org.apache.depot.version.log.Logger; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.depot.version.ant.util.AntLogListener; -import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.note.AnnotationScratchpad; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/ClassGeneratorTask.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/ClassGeneratorTask.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/ClassGeneratorTask.java Fri Apr 2 05:43:09 2004 @@ -18,8 +18,8 @@ import java.io.File; -import org.apache.tools.ant.BuildException; import org.apache.depot.version.generation.source.ClassGenerator; +import org.apache.tools.ant.BuildException; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/VersionMarkerTask.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/VersionMarkerTask.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/VersionMarkerTask.java Fri Apr 2 05:43:09 2004 @@ -16,12 +16,12 @@ package org.apache.depot.version.ant; -import org.apache.tools.ant.BuildException; import org.apache.depot.version.CompoundVersion; import org.apache.depot.version.Version; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.ant.nested.VersionMarkerNestedElement; import org.apache.depot.version.ant.nested.VersionNestedElement; +import org.apache.tools.ant.BuildException; // // :TODO: Create a version-available task w/ actions (like set property) Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/about/AboutBoxClassGenerator.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/about/AboutBoxClassGenerator.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/about/AboutBoxClassGenerator.java Fri Apr 2 05:43:09 2004 @@ -19,8 +19,8 @@ import java.io.File; import java.io.IOException; +import org.apache.depot.common.util.IndentWriter; import org.apache.depot.version.generation.source.ClassGenerator; -import org.apache.depot.version.util.IndentWriter; /** * Generate a Swing about box. Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/about/AboutBoxGeneratorTask.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/about/AboutBoxGeneratorTask.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/about/AboutBoxGeneratorTask.java Fri Apr 2 05:43:09 2004 @@ -16,10 +16,10 @@ package org.apache.depot.version.ant.about; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; import org.apache.depot.version.ant.ClassGeneratorTask; import org.apache.depot.version.generation.source.ClassGenerator; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** * Generate a Swing about box. Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/available/AvailableTask.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/available/AvailableTask.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/available/AvailableTask.java Fri Apr 2 05:43:09 2004 @@ -18,14 +18,14 @@ import java.util.Comparator; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.VersionRuntime; import org.apache.depot.version.ant.VersionMarkerTask; import org.apache.depot.version.context.VersionInformation; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/available/SetPropertyTask.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/available/SetPropertyTask.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/available/SetPropertyTask.java Fri Apr 2 05:43:09 2004 @@ -16,12 +16,12 @@ package org.apache.depot.version.ant.available; -import org.apache.tools.ant.BuildException; import org.apache.depot.version.VersionException; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.VersionRuntime; import org.apache.depot.version.ant.VersionIdentifierTask; import org.apache.depot.version.context.VersionInformation; +import org.apache.tools.ant.BuildException; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintCheckTask.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintCheckTask.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintCheckTask.java Fri Apr 2 05:43:09 2004 @@ -19,8 +19,6 @@ import java.util.ArrayList; import java.util.Iterator; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; import org.apache.depot.version.VersionException; import org.apache.depot.version.ant.AntTask; import org.apache.depot.version.constraint.ConstraintConclusion; @@ -28,6 +26,8 @@ import org.apache.depot.version.constraint.IContextConstraint; import org.apache.depot.version.context.VersionContext; import org.apache.depot.version.context.VersionContextStore; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintClassGenerator.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintClassGenerator.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintClassGenerator.java Fri Apr 2 05:43:09 2004 @@ -22,10 +22,10 @@ import java.util.Iterator; import java.util.List; +import org.apache.depot.common.util.IndentWriter; import org.apache.depot.version.constraint.IContextConstraint; import org.apache.depot.version.generation.source.ClassGenerator; import org.apache.depot.version.impl.VersionImplementationConstants; -import org.apache.depot.version.util.IndentWriter; /** * Generate Constraints class. Version class contain information about Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintGeneratorTask.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintGeneratorTask.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintGeneratorTask.java Fri Apr 2 05:43:09 2004 @@ -18,10 +18,10 @@ import java.util.ArrayList; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; import org.apache.depot.version.ant.ClassGeneratorTask; import org.apache.depot.version.generation.source.ClassGenerator; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintInformationSet.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintInformationSet.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/ConstraintInformationSet.java Fri Apr 2 05:43:09 2004 @@ -21,13 +21,13 @@ import java.util.Iterator; import java.util.StringTokenizer; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; import org.apache.depot.version.ant.nested.NestedElement; import org.apache.depot.version.constraint.ConstraintSet; import org.apache.depot.version.constraint.IContextConstraint; import org.apache.depot.version.discovery.loading.TextConstraintLoader; import org.apache.depot.version.impl.data.util.VersionDataComparison; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/VersionRangeConstraintInformation.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/VersionRangeConstraintInformation.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/constraint/VersionRangeConstraintInformation.java Fri Apr 2 05:43:09 2004 @@ -16,13 +16,13 @@ package org.apache.depot.version.ant.constraint; -import org.apache.tools.ant.BuildException; import org.apache.depot.version.VersionException; import org.apache.depot.version.constraint.IContextConstraint; import org.apache.depot.version.constraint.impl.VersionRangeConstraint; import org.apache.depot.version.impl.ApacheVersion; import org.apache.depot.version.impl.data.VersionData; import org.apache.depot.version.impl.data.util.VersionDataRange; +import org.apache.tools.ant.BuildException; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/environment/EnvironmentCheckTask.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/environment/EnvironmentCheckTask.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/environment/EnvironmentCheckTask.java Fri Apr 2 05:43:09 2004 @@ -19,15 +19,15 @@ import java.io.File; import java.util.Iterator; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; +import org.apache.depot.common.util.note.AnnotationScratchpad; import org.apache.depot.version.VersionException; import org.apache.depot.version.VersionRuntime; import org.apache.depot.version.ant.AntTask; import org.apache.depot.version.constraint.ConstraintConclusion; import org.apache.depot.version.constraint.ConstraintResult; import org.apache.depot.version.constraint.ConstraintResultSet; -import org.apache.depot.version.util.note.AnnotationScratchpad; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/environment/EnvironmentTask.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/environment/EnvironmentTask.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/environment/EnvironmentTask.java Fri Apr 2 05:43:09 2004 @@ -22,9 +22,11 @@ import java.io.OutputStream; import java.util.Iterator; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.DOMElementWriter; +import org.apache.depot.common.util.classpath.PathContext; +import org.apache.depot.common.util.classpath.PathPart; +import org.apache.depot.common.util.classpath.PathSet; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.VersionException; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.VersionRuntime; @@ -39,11 +41,9 @@ import org.apache.depot.version.discovery.loading.VersionLoadContext; import org.apache.depot.version.extension.VirtualMachineExtension; import org.apache.depot.version.extension.VirtualMachineExtensionInformation; -import org.apache.depot.version.util.classpath.PathContext; -import org.apache.depot.version.util.classpath.PathPart; -import org.apache.depot.version.util.classpath.PathSet; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.dom.DOMUtils; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.util.DOMElementWriter; import org.w3c.dom.Document; /** Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/DefaultVersionMarkerAttributes.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/DefaultVersionMarkerAttributes.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/DefaultVersionMarkerAttributes.java Fri Apr 2 05:43:09 2004 @@ -24,9 +24,9 @@ import java.util.Iterator; import java.util.List; +import org.apache.depot.version.VersionConstants; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; -import org.apache.depot.version.VersionConstants; /** * @author $Author: arb_jack $ Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/NestedElement.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/NestedElement.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/NestedElement.java Fri Apr 2 05:43:09 2004 @@ -16,9 +16,9 @@ package org.apache.depot.version.ant.nested; +import org.apache.depot.version.ant.AntInterface; import org.apache.tools.ant.Location; import org.apache.tools.ant.ProjectComponent; -import org.apache.depot.version.ant.AntInterface; public class NestedElement { protected AntInterface m_ant = null; Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionFormatNestedElement.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionFormatNestedElement.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionFormatNestedElement.java Fri Apr 2 05:43:09 2004 @@ -16,10 +16,10 @@ package org.apache.depot.version.ant.nested; -import org.apache.tools.ant.ProjectComponent; import org.apache.depot.version.VersionException; import org.apache.depot.version.specification.formatting.VersionFormat; import org.apache.depot.version.specification.formatting.VersionFormatFactory; +import org.apache.tools.ant.ProjectComponent; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionMarkerNestedElement.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionMarkerNestedElement.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionMarkerNestedElement.java Fri Apr 2 05:43:09 2004 @@ -22,16 +22,16 @@ import java.util.Iterator; import java.util.List; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.ProjectComponent; -import org.apache.tools.ant.Task; import org.apache.depot.version.CompoundVersion; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.impl.ApacheVersion; import org.apache.depot.version.impl.ApacheVersionMarker; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.ProjectComponent; +import org.apache.tools.ant.Task; /** * Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionNestedElement.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionNestedElement.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionNestedElement.java Fri Apr 2 05:43:09 2004 @@ -18,14 +18,14 @@ import java.util.Date; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.ProjectComponent; import org.apache.depot.version.CompoundVersion; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; import org.apache.depot.version.impl.ApacheVersion; import org.apache.depot.version.impl.data.VersionDataElement; import org.apache.depot.version.specification.VersionSpecification; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.ProjectComponent; /** * Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionSpecificationNestedElement.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionSpecificationNestedElement.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/nested/VersionSpecificationNestedElement.java Fri Apr 2 05:43:09 2004 @@ -16,10 +16,10 @@ package org.apache.depot.version.ant.nested; -import org.apache.tools.ant.ProjectComponent; import org.apache.depot.version.VersionException; import org.apache.depot.version.specification.VersionSpecification; import org.apache.depot.version.specification.VersionSpecificationFactory; +import org.apache.tools.ant.ProjectComponent; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/stamp/VersionMarkerGeneratorTask.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/stamp/VersionMarkerGeneratorTask.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/stamp/VersionMarkerGeneratorTask.java Fri Apr 2 05:43:09 2004 @@ -19,13 +19,13 @@ import java.util.ArrayList; import java.util.List; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.ant.ClassGeneratorTask; import org.apache.depot.version.generation.source.ClassGenerator; import org.apache.depot.version.generation.source.DependentVersionMarkerClassGenerator; import org.apache.depot.version.generation.source.StandaloneVersionMarkerClassGenerator; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** * Generate Version class. Modified: incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/util/AntLogListener.java ============================================================================== --- incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/util/AntLogListener.java (original) +++ incubator/depot/trunk/version/src/java/ant/org/apache/depot/version/ant/util/AntLogListener.java Fri Apr 2 05:43:09 2004 @@ -16,10 +16,10 @@ package org.apache.depot.version.ant.util; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.ProjectComponent; import org.apache.depot.version.log.ILogger; import org.apache.depot.version.log.LogConstants; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.ProjectComponent; /** * @author arb_jack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionError.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionError.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionError.java Fri Apr 2 05:43:09 2004 @@ -16,12 +16,12 @@ package org.apache.depot.version; -import org.apache.depot.common.util.throwable.PortableError; +import org.apache.depot.common.DepotError; /** * @author ajack */ -public class VersionError extends PortableError { +public class VersionError extends DepotError { /** * Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionException.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionException.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionException.java Fri Apr 2 05:43:09 2004 @@ -16,12 +16,12 @@ package org.apache.depot.version; -import org.apache.depot.common.util.throwable.PortableException; +import org.apache.depot.common.DepotException; /** * @author ajack */ -public class VersionException extends PortableException { +public class VersionException extends DepotException { /** * Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntime.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntime.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntime.java Fri Apr 2 05:43:09 2004 @@ -24,7 +24,11 @@ import java.io.Writer; import java.util.HashMap; +import org.apache.depot.common.util.classpath.PathContext; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.common.util.dom.DOMUtils; +import org.apache.depot.common.util.io.IOUtils; +import org.apache.depot.common.util.note.AnnotationScratchpad; import org.apache.depot.version.analysis.Analyzer; import org.apache.depot.version.constraint.ConstraintEvaluator; import org.apache.depot.version.constraint.ConstraintResultSet; @@ -35,10 +39,6 @@ import org.apache.depot.version.context.VersionEnvironment; import org.apache.depot.version.context.VersionInformation; import org.apache.depot.version.context.VersionRegistry; -import org.apache.depot.version.util.classpath.PathContext; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.io.IOUtils; -import org.apache.depot.version.util.note.AnnotationScratchpad; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntimeException.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntimeException.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/VersionRuntimeException.java Fri Apr 2 05:43:09 2004 @@ -16,12 +16,13 @@ package org.apache.depot.version; -import org.apache.depot.common.util.throwable.PortableRuntimeException; +import org.apache.depot.common.DepotRuntimeException; + /** * @author ajack */ -public class VersionRuntimeException extends PortableRuntimeException { +public class VersionRuntimeException extends DepotRuntimeException { /** * Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/analysis/Analyzer.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/analysis/Analyzer.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/analysis/Analyzer.java Fri Apr 2 05:43:09 2004 @@ -18,12 +18,12 @@ import java.util.Iterator; +import org.apache.depot.common.util.note.AnnotationScratchpad; import org.apache.depot.version.Version; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.context.VersionEnvironment; import org.apache.depot.version.context.VersionInformation; import org.apache.depot.version.context.VersionRegistry; -import org.apache.depot.version.util.note.AnnotationScratchpad; /** * @author arb_jack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintEvaluator.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintEvaluator.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintEvaluator.java Fri Apr 2 05:43:09 2004 @@ -18,13 +18,13 @@ import java.util.Iterator; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; import org.apache.depot.version.VersionRuntime; import org.apache.depot.version.context.ConstraintRegistry; import org.apache.depot.version.context.VersionContext; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.debug.DebugUtils; /** * Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintResult.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintResult.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintResult.java Fri Apr 2 05:43:09 2004 @@ -18,8 +18,8 @@ import java.io.PrintWriter; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.Dumpable; /** * Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintResultSet.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintResultSet.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintResultSet.java Fri Apr 2 05:43:09 2004 @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.Iterator; -import org.apache.depot.version.util.collection.EntityList; +import org.apache.depot.common.util.collection.EntityList; /** * Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintSet.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintSet.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/ConstraintSet.java Fri Apr 2 05:43:09 2004 @@ -18,7 +18,7 @@ import java.util.Collection; -import org.apache.depot.version.util.collection.EntityList; +import org.apache.depot.common.util.collection.EntityList; /** * @author shelley94@example.net Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IContextConstraint.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IContextConstraint.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IContextConstraint.java Fri Apr 2 05:43:09 2004 @@ -16,10 +16,10 @@ package org.apache.depot.version.constraint; +import org.apache.depot.common.util.debug.Dumpable; import org.apache.depot.common.util.dom.DOMProducer; import org.apache.depot.version.VersionException; import org.apache.depot.version.context.VersionContext; -import org.apache.depot.version.util.debug.Dumpable; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IVersionConstraint.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IVersionConstraint.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/IVersionConstraint.java Fri Apr 2 05:43:09 2004 @@ -16,10 +16,10 @@ package org.apache.depot.version.constraint; +import org.apache.depot.common.util.debug.Dumpable; import org.apache.depot.common.util.dom.DOMProducer; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; -import org.apache.depot.version.util.debug.Dumpable; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionComparisonConstraint.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionComparisonConstraint.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionComparisonConstraint.java Fri Apr 2 05:43:09 2004 @@ -18,6 +18,7 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; @@ -28,7 +29,6 @@ import org.apache.depot.version.impl.ApacheVersion; import org.apache.depot.version.impl.VersionIdentifier; import org.apache.depot.version.impl.data.util.VersionDataComparison; -import org.apache.depot.version.util.debug.DebugUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionIdentifierConstraint.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionIdentifierConstraint.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionIdentifierConstraint.java Fri Apr 2 05:43:09 2004 @@ -19,6 +19,7 @@ import java.io.PrintWriter; import org.apache.depot.common.util.SystemUtils; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; import org.apache.depot.version.constraint.ConstraintConclusion; @@ -28,7 +29,6 @@ import org.apache.depot.version.context.VersionContext; import org.apache.depot.version.context.VersionInformation; import org.apache.depot.version.impl.VersionIdentifier; -import org.apache.depot.version.util.debug.DebugUtils; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionRangeConstraint.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionRangeConstraint.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionRangeConstraint.java Fri Apr 2 05:43:09 2004 @@ -19,6 +19,7 @@ import java.io.PrintWriter; import org.apache.depot.common.util.SystemUtils; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.Version; import org.apache.depot.version.VersionException; @@ -29,7 +30,6 @@ import org.apache.depot.version.impl.ApacheVersion; import org.apache.depot.version.impl.VersionIdentifier; import org.apache.depot.version.impl.data.util.VersionDataRange; -import org.apache.depot.version.util.debug.DebugUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionedConstraintResult.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionedConstraintResult.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/constraint/impl/VersionedConstraintResult.java Fri Apr 2 05:43:09 2004 @@ -18,12 +18,12 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.debug.DebugUtils; import org.apache.depot.version.Version; import org.apache.depot.version.constraint.ConstraintConclusion; import org.apache.depot.version.constraint.ConstraintResult; import org.apache.depot.version.constraint.IContextConstraint; import org.apache.depot.version.impl.VersionIdentifier; -import org.apache.depot.version.util.debug.DebugUtils; /** * Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/ConstraintRegistry.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/ConstraintRegistry.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/ConstraintRegistry.java Fri Apr 2 05:43:09 2004 @@ -17,9 +17,9 @@ package org.apache.depot.version.context; +import org.apache.depot.common.util.Registry; import org.apache.depot.version.constraint.ConstraintSet; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.Registry; /** Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/ExtensionRegistry.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/ExtensionRegistry.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/ExtensionRegistry.java Fri Apr 2 05:43:09 2004 @@ -17,9 +17,9 @@ package org.apache.depot.version.context; +import org.apache.depot.common.util.Registry; import org.apache.depot.version.extension.VirtualMachineExtensionInformation; import org.apache.depot.version.extension.VirtualMachineExtensionLoadContext; -import org.apache.depot.version.util.Registry; /** Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/Reviewer.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/Reviewer.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/Reviewer.java Fri Apr 2 05:43:09 2004 @@ -18,8 +18,8 @@ import java.util.Iterator; +import org.apache.depot.common.util.note.AnnotationScratchpad; import org.apache.depot.version.discovery.loading.VersionLoadContext; -import org.apache.depot.version.util.note.AnnotationScratchpad; /** * @author arb_jack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionContext.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionContext.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionContext.java Fri Apr 2 05:43:09 2004 @@ -18,6 +18,13 @@ import java.io.PrintWriter; +import org.apache.depot.common.util.classpath.PathContext; +import org.apache.depot.common.util.classpath.PathPart; +import org.apache.depot.common.util.classpath.PathSet; +import org.apache.depot.common.util.classpath.PathWalker; +import org.apache.depot.common.util.classpath.listener.DropListener; +import org.apache.depot.common.util.debug.Dumpable; +import org.apache.depot.common.util.envsafe.ClassLoaderContext; import org.apache.depot.version.discovery.collecting.FilenameCollector; import org.apache.depot.version.discovery.collecting.JarManifestExtensionCollector; import org.apache.depot.version.discovery.collecting.JarManifestVersionCollector; @@ -26,13 +33,6 @@ import org.apache.depot.version.discovery.collecting.TextFileConstraintCollector; import org.apache.depot.version.discovery.collecting.VersionStampCollector; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.classpath.PathContext; -import org.apache.depot.version.util.classpath.PathPart; -import org.apache.depot.version.util.classpath.PathSet; -import org.apache.depot.version.util.classpath.PathWalker; -import org.apache.depot.version.util.classpath.listener.DropListener; -import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.envsafe.ClassLoaderContext; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionContextStore.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionContextStore.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionContextStore.java Fri Apr 2 05:43:09 2004 @@ -20,10 +20,10 @@ import java.util.HashMap; import java.util.Iterator; +import org.apache.depot.common.util.classpath.PathContext; +import org.apache.depot.common.util.classpath.PathSet; +import org.apache.depot.common.util.debug.Dumpable; import org.apache.depot.version.VersionError; -import org.apache.depot.version.util.classpath.PathContext; -import org.apache.depot.version.util.classpath.PathSet; -import org.apache.depot.version.util.debug.Dumpable; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionEnvironment.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionEnvironment.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionEnvironment.java Fri Apr 2 05:43:09 2004 @@ -20,20 +20,20 @@ import java.util.HashMap; import java.util.Map; +import org.apache.depot.common.DepotException; +import org.apache.depot.common.util.classpath.PathContext; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.Dumpable; import org.apache.depot.common.util.dom.DOMConsumer; import org.apache.depot.common.util.dom.DOMProducer; import org.apache.depot.common.util.dom.DOMUtils; -import org.apache.depot.version.VersionException; +import org.apache.depot.common.util.note.AnnotationScratchpad; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.impl.VersionIdentifier; import org.apache.depot.version.impl.VersionIdentifierType; import org.apache.depot.version.impl.VersionImporter; import org.apache.depot.version.log.Logger; import org.apache.depot.version.specification.JavasoftVersionSpecification; -import org.apache.depot.version.util.classpath.PathContext; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; -import org.apache.depot.version.util.note.AnnotationScratchpad; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -241,7 +241,7 @@ m_extensions.iterator()); } - public VersionEnvironment(Element element) throws VersionException { + public VersionEnvironment(Element element) throws DepotException { // Any attributes we need? m_context = new VersionContext(); Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionInformation.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionInformation.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionInformation.java Fri Apr 2 05:43:09 2004 @@ -22,13 +22,15 @@ import java.util.List; import java.util.Map; +import org.apache.depot.common.DepotException; import org.apache.depot.common.util.SystemUtils; +import org.apache.depot.common.util.debug.DebugUtils; +import org.apache.depot.common.util.debug.Dumpable; import org.apache.depot.common.util.dom.DOMConsumer; import org.apache.depot.common.util.dom.DOMProducer; import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.Version; import org.apache.depot.version.VersionError; -import org.apache.depot.version.VersionException; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.VersionRuntimeException; import org.apache.depot.version.constraint.IContextConstraint; @@ -36,8 +38,6 @@ import org.apache.depot.version.discovery.loading.VersionLoadContext; import org.apache.depot.version.impl.ApacheVersionMarker; import org.apache.depot.version.impl.VersionIdentifier; -import org.apache.depot.version.util.debug.DebugUtils; -import org.apache.depot.version.util.debug.Dumpable; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -448,7 +448,7 @@ // XML handling // - public VersionInformation(Element element) throws VersionException { + public VersionInformation(Element element) throws DepotException { // // Any attributes we need? // Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionRegistry.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionRegistry.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/context/VersionRegistry.java Fri Apr 2 05:43:09 2004 @@ -20,14 +20,14 @@ import java.util.HashMap; import java.util.Map; -import org.apache.depot.version.VersionException; +import org.apache.depot.common.DepotException; +import org.apache.depot.common.util.Registry; +import org.apache.depot.common.util.dom.DOMConsumer; +import org.apache.depot.common.util.dom.DOMProducer; +import org.apache.depot.common.util.dom.DOMUtils; import org.apache.depot.version.VersionMarker; import org.apache.depot.version.discovery.loading.VersionLoadContext; import org.apache.depot.version.impl.VersionIdentifier; -import org.apache.depot.version.util.Registry; -import org.apache.depot.version.util.dom.DOMConsumer; -import org.apache.depot.version.util.dom.DOMProducer; -import org.apache.depot.version.util.dom.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -103,7 +103,7 @@ DOMUtils.produceDOM(document, element, VERSIONS_TAG, iterator()); } - public VersionRegistry(Element element) throws VersionException { + public VersionRegistry(Element element) throws DepotException { super(); // Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/ClassFormatList.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/ClassFormatList.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/ClassFormatList.java Fri Apr 2 05:43:09 2004 @@ -18,7 +18,7 @@ import java.util.Iterator; -import org.apache.depot.version.util.collection.EntityList; +import org.apache.depot.common.util.collection.EntityList; /** * Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/ClassFormatPartsList.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/ClassFormatPartsList.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/ClassFormatPartsList.java Fri Apr 2 05:43:09 2004 @@ -16,7 +16,7 @@ package org.apache.depot.version.discovery.collecting; -import org.apache.depot.version.util.collection.EntityList; +import org.apache.depot.common.util.collection.EntityList; /** * @author ajack Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/FilenameCollector.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/FilenameCollector.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/FilenameCollector.java Fri Apr 2 05:43:09 2004 @@ -18,13 +18,13 @@ import java.io.File; +import org.apache.depot.common.util.classpath.listener.DirectoryListener; +import org.apache.depot.common.util.classpath.listener.JarListener; import org.apache.depot.version.VersionException; import org.apache.depot.version.context.VersionContext; import org.apache.depot.version.discovery.loading.FilenameVersionLoader; import org.apache.depot.version.discovery.loading.VersionLoadContext; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.classpath.listener.DirectoryListener; -import org.apache.depot.version.util.classpath.listener.JarListener; // // :TODO: Rework this to use the ClassLoader to load the JAR resource, since file system access may not match what a classloader provides. Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/JarManifestExtensionCollector.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/JarManifestExtensionCollector.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/JarManifestExtensionCollector.java Fri Apr 2 05:43:09 2004 @@ -22,11 +22,10 @@ import java.util.jar.Attributes; import java.util.jar.Manifest; +import org.apache.depot.common.util.classpath.listener.ManifestListener; import org.apache.depot.version.context.VersionContext; import org.apache.depot.version.extension.VirtualMachineExtensionLoadContext; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.classpath.listener.ManifestListener; -import org.apache.depot.version.util.jar.JarManifestHelper; // // :TODO: Rework this to use the ClassLoader to load the JAR resource, since file system access may not match what a classloader provides. Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/JarManifestVersionCollector.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/JarManifestVersionCollector.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/JarManifestVersionCollector.java Fri Apr 2 05:43:09 2004 @@ -21,11 +21,11 @@ import java.util.List; import java.util.jar.Manifest; +import org.apache.depot.common.util.classpath.listener.ManifestListener; import org.apache.depot.version.context.VersionContext; import org.apache.depot.version.discovery.loading.JarManifestVersionLoader; import org.apache.depot.version.discovery.loading.VersionLoadContext; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.classpath.listener.ManifestListener; // // :TODO: Rework this to use the ClassLoader to load the JAR resource, since file system access may not match what a classloader provides. Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/TextFileConstraintCollector.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/TextFileConstraintCollector.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/TextFileConstraintCollector.java Fri Apr 2 05:43:09 2004 @@ -19,12 +19,12 @@ import java.io.File; import java.io.InputStream; +import org.apache.depot.common.util.classpath.listener.FileContentsListener; +import org.apache.depot.common.util.classpath.listener.NameFilter; import org.apache.depot.version.constraint.ConstraintSet; import org.apache.depot.version.context.VersionContext; import org.apache.depot.version.discovery.loading.TextConstraintLoader; import org.apache.depot.version.log.Logger; -import org.apache.depot.version.util.classpath.listener.FileContentsListener; -import org.apache.depot.version.util.classpath.listener.NameFilter; // // :TODO: Rework this to use the ClassLoader to load the JAR resource, since file system access may not match what a classloader provides. Modified: incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/VersionStampCollector.java ============================================================================== --- incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/VersionStampCollector.java (original) +++ incubator/depot/trunk/version/src/java/core/org/apache/depot/version/discovery/collecting/VersionStampCollector.java Fri Apr 2 05:43:09 2004 @@ -19,11
{'source': 'Apache Software Foundation Public Mail Archives'}