incubator-depot-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: rev 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
Date Fri, 02 Apr 2004 00:40:45 GMT
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 arb_jack@users.sourceforge.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;
 

Mime
View raw message