You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@depot.apache.org by aj...@apache.org on 2004/05/25 18:04:49 UTC

svn commit: rev 20438 - in incubator/depot/trunk/version: . src/documentation src/documentation/content src/documentation/content/ant src/documentation/content/xdocs src/documentation/content/xdocs/ant src/documentation/content/xdocs/ant/nested src/documentation/content/xdocs/antlib src/documentation/content/xdocs/api src/documentation/content/xdocs/eclipse src/documentation/content/xdocs/samples src/documentation/content/xdocs/standard src/documentation/content/xdocs/tool src/java/org/apache/depot/version/ant src/java/org/apache/depot/version/ant/util src/java/org/apache/depot/version/constraint/text

Author: ajack
Date: Tue May 25 11:04:49 2004
New Revision: 20438

Removed:
   incubator/depot/trunk/version/src/documentation/content/apache-depot-logo.svg
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/book.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/book.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/antlib/book.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/api/book.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/book.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/eclipse/book.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/samples/book.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/standard/book.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/tool/book.xml
   incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/util/
Modified:
   incubator/depot/trunk/version/build.xml
   incubator/depot/trunk/version/src/documentation/content/ant/constraints_sample.xml
   incubator/depot/trunk/version/src/documentation/content/ant/environment_sample.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/available.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/constraint-check.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/constraint.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/cut-n-paste.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/dependent.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/dest.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/environment-check.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/environment.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/faq.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/index.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/attribute.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/constraint.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/constraintSet.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/defaultAttributes.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/version.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/versionMarker.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/overWrite.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/overview.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/quickstart.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/sample_scripts.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/stamp.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/troubleshooting.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/ant/versionId.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/antlib/faq.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/antlib/index.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/api/faq.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/api/index.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/best_practices.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/compatibility.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/constraints.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/data.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/definitions.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/eclipse/index.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/eclipse/updates.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/examples.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/faq.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/index.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/jar-hell.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/overview.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/samples/index.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/standard/appendix.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/standard/basic.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/standard/index.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/tabs.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/tool/index.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/tool/quickstart.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/usage.xml
   incubator/depot/trunk/version/src/documentation/content/xdocs/versioning.xml
   incubator/depot/trunk/version/src/documentation/skinconf.xml
   incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/AntInterface.java
   incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/AntTask.java
   incubator/depot/trunk/version/src/java/org/apache/depot/version/constraint/text/ConstraintTextFactory.java
Log:
1) Attempt at conditional compilation (for taglibs)
2) Moved Antlogger to common.
3) Docs tweaks...


Modified: incubator/depot/trunk/version/build.xml
==============================================================================
--- incubator/depot/trunk/version/build.xml	(original)
+++ incubator/depot/trunk/version/build.xml	Tue May 25 11:04:49 2004
@@ -46,7 +46,16 @@
     
     But this is not gump friendly need to think about it .
     -->
-	<property name="antlets.repo" value="http://antworks.sourceforge.net/library/antlets/" />
+	<selector id="needs.taglibs">
+		<filename name="org/**/taglib/**" casesensitive="false" />
+	</selector>
+	
+	<available property="taglibs.present"
+	           classname="javax.servlet.jsp.tagext.Tag"
+	           classpathref="depot-version.classpath" />
+
+	<property name="antlets.repo" 
+			value="http://antworks.sourceforge.net/library/antlets/" />
 	
 	<importer name="init-0.1" href="${antlets.repo}" />
 	<importer name="makeantlet-0.2" href="${antlets.repo}" />
@@ -61,7 +70,15 @@
 		</fileset>
 	</path>
 
-
+	<!-- note this must  be after the java antlet-->
+	<selector id="conditional.compile">
+		<not>
+			<or>
+				<selector refid="needs.taglibs" unless="taglibs.present" />
+			</or>
+		</not>
+	</selector>
+	
 	<target name="all" depends="dist-jar,make-antlet" />
 
 	<target name="compile" depends="hand-stamp,java.antlet.compile" />
@@ -75,6 +92,7 @@
 			</filterset>
 		</copy>
 	</target>
+	
 	<target name="pre-make-antlet" depends="antlet-prep-makeantlet">
 		<mkdir dir="${makeantlet.antlet.namedbuild.dir}/lib" />
 		<copy todir="${makeantlet.antlet.namedbuild.dir}/lib">

Modified: incubator/depot/trunk/version/src/documentation/content/ant/constraints_sample.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/ant/constraints_sample.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/ant/constraints_sample.xml	Tue May 25 11:04:49 2004
@@ -17,7 +17,7 @@
 <project name="version-constraints" default="constraints">
 
 	<!-- Reference version ant tasks -->
-	<taskdef resource="version"/>
+	<taskdef resource="depot-version-antlib.xml"/>
 
 	<target name="constraints">
 

Modified: incubator/depot/trunk/version/src/documentation/content/ant/environment_sample.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/ant/environment_sample.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/ant/environment_sample.xml	Tue May 25 11:04:49 2004
@@ -17,7 +17,7 @@
 <project name="version-environment" default="env">
 
 	<!-- Reference version ant tasks -->
-	<taskdef resource="version"/>
+	<taskdef resource="depot-version-antlib.xml"/>
 
 	<target name="env">
 

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/available.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/available.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/available.xml	Tue May 25 11:04:49 2004
@@ -17,7 +17,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 <document>
   <header>
-    <title>Apache-Depot-Version: 'version-available' Ant Task</title>
+    <title>Depot Version: 'version-available' Ant Task</title>
     <authors>
       <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/constraint-check.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/constraint-check.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/constraint-check.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'version-constraint-check' Ant Task</title>
+    <title>Depot Version: 'version-constraint-check' Ant Task</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   <body>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/constraint.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/constraint.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/constraint.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'version-constraint' Ant Task</title>
+    <title>Depot Version: 'version-constraint' Ant Task</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   <body>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/cut-n-paste.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/cut-n-paste.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/cut-n-paste.xml	Tue May 25 11:04:49 2004
@@ -18,16 +18,16 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version Ant Tasks - Cut-n-Paste</title>
+    <title>Depot Version Ant Tasks - Cut-n-Paste</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   <body>  
 	<section><title>Generate a Version (into your source tree)</title>
     	<section><title>Formatted Version</title>
     	<source>
-&lt;taskdef resource="version"/&gt;
+&lt;taskdef resource="depot-version-antlib.xml"/&gt;
 &lt;version-stamp 
 		dest="src" 
 		versionId="personal.my.stuff" 
@@ -39,7 +39,7 @@
     		
     	<section><title>Compound Version</title>
     	<source>
-&lt;taskdef resource="version"/&gt;
+&lt;taskdef resource="depot-version-antlib.xml"/&gt;
 &lt;version-stamp 
 			dest="src" 
 			versionId="personal.my.stuff" 
@@ -55,7 +55,7 @@
 		<section><title>Version Environment</title>
 		<section><title>Log an Environment</title>
 <source>
-&lt;taskdef resource="version"/&gt;
+&lt;taskdef resource="depot-version-antlib.xml"/&gt;
 &lt;version-environment/&gt;
 </source>
 	<p>Get the <fork href="cut-n-paste-environment.txt">plain-text</fork>.</p>
@@ -63,7 +63,7 @@
 		</section>
 		<section><title>Log an Environment as XML to a file</title>
 <source>
-&lt;taskdef resource="version"/&gt;
+&lt;taskdef resource="depot-version-antlib.xml"/&gt;
 &lt;version-environment xml="true" output="build-environment.xml"/&gt;
 </source>
 		</section>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/dependent.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/dependent.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/dependent.xml	Tue May 25 11:04:49 2004
@@ -18,13 +18,13 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'dependent' Ant Task Attribute</title>
+    <title>Depot Version: 'dependent' Ant Task Attribute</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   <body>
-    	<p>dependent -- Allow a <strong>dependency</strong> on Apache-Depot-Version</p>
+    	<p>dependent -- Allow a <strong>dependency</strong> on Depot Version</p>
     	<p>
     		This is a <code>boolean</code> setting with "true" and "false" choices. <strong>Default</strong> is false.
     	</p>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/dest.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/dest.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/dest.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'dest' Ant Task Attribute</title>
+    <title>Depot Version: 'dest' Ant Task Attribute</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   <body>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/environment-check.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/environment-check.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/environment-check.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'version-environment-check' Ant Task</title>
+    <title>Depot Version: 'version-environment-check' Ant Task</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   <body>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/environment.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/environment.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/environment.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'version-environment' Ant Task</title>
+    <title>Depot Version: 'version-environment' Ant Task</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   <body>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/faq.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/faq.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/faq.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version Ant Tasks - FAQ</title>
+    <title>Depot Version Ant Tasks - FAQ</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   
@@ -28,11 +28,11 @@
   	<note>Ask and they'll be added...</note>
      	<section><title>How do I define these tasks to ant?</title>
     		<p>Use:</p>
-    			<source>&lt;taskdef resource="version"&gt;</source>
+    			<source>&lt;taskdef resource="depot-version-antlib.xml"&gt;</source>
     		<p>Basically this looks for a file called 'apache-version' in the classpath, and hopefully finds it in
-    			the Apache-Depot-Version JAR. That is a simple text file that defines the various tasks to ant.
+    			the Depot Version JAR. That is a simple text file that defines the various tasks to ant.
     			</p>
-    			<note>Apache-Depot-Version must be in your classpath, and available to be loaded.</note>
+    			<note>Depot Version must be in your classpath, and available to be loaded.</note>
     	</section> 	
     	<section><title>These ant tasks have so many parameters, how do I know what I need?</title>
     		<p>Although the tasks do have a lot of flexibility they are intended primarily for simple usage (with just a few parameters) and

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/index.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/index.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/index.xml	Tue May 25 11:04:49 2004
@@ -18,15 +18,15 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version Ant Tasks</title>
+    <title>Depot Version Ant Tasks</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   
   <body>
     <section><title>Ant Tasks</title>
-      <p>Apache-Depot-Version <fork href="http://ant.apache.org">Ant</fork> Tasks are designed to
+      <p>Depot Version <fork href="http://ant.apache.org">Ant</fork> Tasks are designed to
       enable <strong>versioning tasks</strong> with the minimal of developer effort. 
       Versioning is primarily of interest to users, not developers, so for developers to accomodate a perhaps unknown future operator things need to be <strong>easy, easy, easy.</strong>
       </p>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/attribute.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/attribute.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/attribute.xml	Tue May 25 11:04:49 2004
@@ -18,14 +18,14 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'attribute' Nested Ant Element</title>
+    <title>Depot Version: 'attribute' Nested Ant Element</title>
     <authors>
       <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   <body>
     	<section><title>Description</title>
-    	<p>Represent a named attribute value (e.g. org.apache.depot.version.build.user = 'arb_jack')</p>
+    	<p>Represent a named attribute value (e.g. org.apache.depot.version.build.user = 'ajack')</p>
     </section>
     	<section><title>Parameters</title>
     		<p>TODO</p>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/constraint.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/constraint.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/constraint.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: Constraint Nested Ant Elements</title>
+    <title>Depot Version: Constraint Nested Ant Elements</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   <body>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/constraintSet.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/constraintSet.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/constraintSet.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'constraintSet' Nested Ant Element</title>
+    <title>Depot Version: 'constraintSet' Nested Ant Element</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   <body>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/defaultAttributes.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/defaultAttributes.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/defaultAttributes.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'defaultAttributes' Nested Ant Element</title>
+    <title>Depot Version: 'defaultAttributes' Nested Ant Element</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   <body>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/version.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/version.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/version.xml	Tue May 25 11:04:49 2004
@@ -18,7 +18,7 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'version' Nested Ant Element</title>
+    <title>Depot Version: 'version' Nested Ant Element</title>
     <authors>
       <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/versionMarker.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/versionMarker.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/nested/versionMarker.xml	Tue May 25 11:04:49 2004
@@ -18,7 +18,7 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'versionMarker' Nested Ant Element</title>
+    <title>Depot Version: 'versionMarker' Nested Ant Element</title>
     <authors>
       <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/overWrite.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/overWrite.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/overWrite.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'overWrite' Ant Task Attribute</title>
+    <title>Depot Version: 'overWrite' Ant Task Attribute</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   <body>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/overview.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/overview.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/overview.xml	Tue May 25 11:04:49 2004
@@ -18,14 +18,14 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version Ant Tasks - Overview</title>
+    <title>Depot Version Ant Tasks - Overview</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   <body>
     <section><title>Overview</title>
-      <p>Apache-Depot-Version <link href="http://ant.apache.org">Ant</link> Tasks are designed to
+      <p>Depot Version <link href="http://ant.apache.org">Ant</link> Tasks are designed to
       enable <strong>versioning tasks</strong> with the minimal of developer effort, and the maximum of flexibility.</p>
       <p>The ant tasks fall roughly into two camps -- <strong>management</strong> (typically for developers to version their packages before distribution) and <strong>runtime</strong> (tools against versions in the current environment)</p>
     </section>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/quickstart.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/quickstart.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/quickstart.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version Ant Tasks - Overview</title>
+    <title>Depot Version Ant Tasks - Overview</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   
@@ -36,7 +36,7 @@
     <section>
     	<title>Register the tasks</title>
       <p>Entering this into your ant script (prior to calling any of the version tasks) to register them with Ant.</p>
-      <p><strong>&lt;taskdef resource="version"/&gt;</strong></p>
+      <p><strong>&lt;taskdef resource="depot-version-antlib.xml"/&gt;</strong></p>
     </section>
     <section>
     	<title>Call the tasks</title>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/sample_scripts.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/sample_scripts.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/sample_scripts.xml	Tue May 25 11:04:49 2004
@@ -21,9 +21,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version Samples</title>
+    <title>Depot Version Samples</title>
     <authors>
-      	<person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      	<person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/stamp.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/stamp.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/stamp.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'version-stamp' Ant Task</title>
+    <title>Depot Version: 'version-stamp' Ant Task</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   <body>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/troubleshooting.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/troubleshooting.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/troubleshooting.xml	Tue May 25 11:04:49 2004
@@ -18,7 +18,7 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version Ant Tasks - Troubleshooting</title>
+    <title>Depot Version Ant Tasks - Troubleshooting</title>
     <authors>
       <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/ant/versionId.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/ant/versionId.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/ant/versionId.xml	Tue May 25 11:04:49 2004
@@ -18,7 +18,7 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version: 'versionId' Ant Task Attribute</title>
+    <title>Depot Version: 'versionId' Ant Task Attribute</title>
     <authors>
       <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/antlib/faq.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/antlib/faq.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/antlib/faq.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version AntLib - FAQ</title>
+    <title>Depot Version AntLib - FAQ</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/antlib/index.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/antlib/index.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/antlib/index.xml	Tue May 25 11:04:49 2004
@@ -18,15 +18,15 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version AntLib</title>
+    <title>Depot Version AntLib</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   
   <body>
     <section><title>AntLib</title>
-      <p>Apache-Depot-Version <fork href="http://apache.org/centipede">AntLibs</fork> are designed to
+      <p>Depot Version <fork href="http://apache.org/centipede">AntLibs</fork> are designed to
       enable <strong>versioning tasks</strong> with the minimal of developer effort. 
       </p>
     </section>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/api/faq.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/api/faq.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/api/faq.xml	Tue May 25 11:04:49 2004
@@ -18,9 +18,9 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version API - FAQ</title>
+    <title>Depot Version API - FAQ</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/api/index.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/api/index.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/api/index.xml	Tue May 25 11:04:49 2004
@@ -18,15 +18,15 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version API</title>
+    <title>Depot Version API</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   
   <body>
     <section><title>API</title>
-      <p>The <strong>Apache-Depot-Version API</strong> is a work in progress. Today, primary clases are <code>org.apache.depot.version.Runtime</code> and <code>org.apache.depot.version.Manager</code>, although the former is far further along. Give us feedback, and tell us what you need, and we'll mature the API.</p>
+      <p>The <strong>Depot Version API</strong> is a work in progress. Today, primary clases are <code>org.apache.depot.version.Runtime</code> and <code>org.apache.depot.version.Manager</code>, although the former is far further along. Give us feedback, and tell us what you need, and we'll mature the API.</p>
       <p>For more information, review the <link href="../javadocs/index.html">API javadocs</link></p>
     </section>
   </body>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/best_practices.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/best_practices.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/best_practices.xml	Tue May 25 11:04:49 2004
@@ -17,15 +17,15 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version Best Practices</title>
+    <title>Depot Version Best Practices</title>
     <authors>
       <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
      </authors>
   </header>
   
   <body>
-    	<section><title>Apache-Depot-Version Best Practices</title>
-    		<fixme author="arb_jack">To be written... </fixme>
+    	<section><title>Depot Version Best Practices</title>
+    		<fixme author="ajack">To be written... </fixme>
     	</section>    	    	
   </body>
 </document>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/compatibility.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/compatibility.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/compatibility.xml	Tue May 25 11:04:49 2004
@@ -17,14 +17,14 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version Version Compatibility</title>
+    <title>Depot Version: Version Compatibility</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
      </authors>
   </header>
   
   <body>
-    	<section><title>Apache-Depot-Version Compatibility</title>
+    	<section><title>Depot Version Compatibility</title>
     		<p>Version <strong>compatability</strong> is typically used where one version of something is a <strong>suitable replacement</strong> for another.</p>
   
 <p> The aspects of a version that are utilized are:</p>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/constraints.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/constraints.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/constraints.xml	Tue May 25 11:04:49 2004
@@ -17,15 +17,15 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version: Constraints</title>
+    <title>Depot Version: Constraints</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   
   <body>
     <section><title>Version Constraints</title>
-      <p><strong>Apache-Depot-Version</strong> introduces <strong>constraints</strong> -- simple assertions, expressed as boolean expressions on versions.
+      <p><strong>Depot Version</strong> introduces <strong>constraints</strong> -- simple assertions, expressed as boolean expressions on versions.
       	</p>
       	<source>
 #

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/data.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/data.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/data.xml	Tue May 25 11:04:49 2004
@@ -17,14 +17,14 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version Overview</title>
+    <title>Depot Version Overview</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
      </authors>
   </header>
   
   <body>
-    	<section><title>Apache-Depot-Version Definitions</title>
+    	<section><title>Depot Version Definitions</title>
     	</section>
     	
     	<section><title>Version Data</title>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/definitions.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/definitions.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/definitions.xml	Tue May 25 11:04:49 2004
@@ -17,15 +17,15 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version Overview</title>
+    <title>Depot Version Overview</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
      </authors>
   </header>
   
   <body>
-    	<section><title>Apache-Depot-Version Definitions</title>
-    		<p>Apache-Depot-Version defines some basic aspects of versioning. They are...</p>
+    	<section><title>Depot Version Definitions</title>
+    		<p>Depot Version defines some basic aspects of versioning. They are...</p>
     	</section>
     	
     	<section><title>Version</title>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/eclipse/index.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/eclipse/index.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/eclipse/index.xml	Tue May 25 11:04:49 2004
@@ -18,16 +18,16 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version Eclipse Plug-in</title>
+    <title>Depot Version Eclipse Plug-in</title>
     <authors>
       <person id="anou_mana" name="Anou Manavalan" email="anou_mana@users.sourceforge.net"/>       
-      	<person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      	<person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   
   <body>
     <section><title>Eclipse Plug-in</title>
-      <p>Apache-Depot-Version <fork href="http://eclipse.org">Eclipse</fork> plug-ins are designed to
+      <p>Depot Version <fork href="http://eclipse.org">Eclipse</fork> plug-ins are designed to
       enable <strong>versioning tasks</strong> with the minimal of developer effort.       </p>
       <section><title>Version View</title>
       	<p>The plugin has a version view that shows the jars that are used during the development 

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/eclipse/updates.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/eclipse/updates.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/eclipse/updates.xml	Tue May 25 11:04:49 2004
@@ -18,7 +18,7 @@
 
 <document>
   <header>
-    <title>Apache-Depot-Version Eclipse Plug-in</title>
+    <title>Depot Version Eclipse Plug-in</title>
     <authors>
       <person id="anou_mana" name="Anou Manavalan" email="anou_mana@users.sourceforge.net"/>       
       	<person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
@@ -27,7 +27,7 @@
   
   <body>
     <section><title>Eclipse Plug-in: Update Site</title>
-      <p>Apache-Depot-Version <fork href="http://eclipse.org">Eclipse</fork> plug-ins can be automatically installed and maintain (up to date) 
+      <p>Depot Version <fork href="http://eclipse.org">Eclipse</fork> plug-ins can be automatically installed and maintain (up to date) 
       via an <strong>Eclipse Update Site</strong>. 
       </p>
       <p>Register the Apache Depot Version Eclipse Plugin Update Site with the <strong>'Install/Update' Perspective</strong>.

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/examples.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/examples.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/examples.xml	Tue May 25 11:04:49 2004
@@ -17,9 +17,9 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version Examples</title>
+    <title>Depot Version Examples</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/faq.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/faq.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/faq.xml	Tue May 25 11:04:49 2004
@@ -17,9 +17,9 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version Ant Tasks - FAQ</title>
+    <title>Depot Version Ant Tasks - FAQ</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/index.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/index.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/index.xml	Tue May 25 11:04:49 2004
@@ -17,10 +17,10 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version</title>
+    <title>Depot Version</title>
     <authors>
       <person id="anou_mana" name="Anou Manavalan" email="anou_mana@users.sourceforge.net"/>      
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
       <person id="chalko" name="Nick Chalko" email="nick@chalko.com"/>      
     </authors>
   </header>
@@ -33,15 +33,15 @@
       	Ever wanted to assert runtime dependency upon a version of a package, despite the classloader loading whatever it will? 
       	If so, that is what lead to Apache Depot Version, so please read on...
       </p>
-      <p><strong>Apache-Depot-Version</strong> is designed to
+      <p><strong>Depot Version</strong> is designed to
       enable package versioning (and version introspection) to attempt to reduce <link href="jar-hell.html">JAR-hell</link> through automation. 
       See some <link href="examples.html">examples</link></p> 
-      <note><strong>Apache-Depot-Version</strong> does not remove <link href="jar-hell.html">JAR-hell</link> but automates some of the tasks
-      		associated with envrionment debugging, to remove this task from the environment operators. <strong>Apache-Depot-Version</strong> attempts to allow operators to
+      <note><strong>Depot Version</strong> does not remove <link href="jar-hell.html">JAR-hell</link> but automates some of the tasks
+      		associated with envrionment debugging, to remove this task from the environment operators. <strong>Depot Version</strong> attempts to allow operators to
       		cooperate with developers and QA testers in <strong>actively documenting/asserting</strong> dependencies and contraints. 
       </note>
 	
-      <p><strong>Apache-Depot-Version</strong> automates the tasks of:
+      <p><strong>Depot Version</strong> automates the tasks of:
       	</p>
       	<ul>
       		<li>Stamping the <strong>version</strong> of a package into the package jar.</li>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/jar-hell.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/jar-hell.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/jar-hell.xml	Tue May 25 11:04:49 2004
@@ -19,7 +19,7 @@
   <header>
     <title>JAR Hell</title>
     <authors>     
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   
@@ -52,9 +52,9 @@
 			variety supported by a hierarchy of complex class loaders, is <strong>inhuman</strong>.
 			</p>
 			<p>Manual environment debugging is not something a human ought be forced to waste time
-			upon, let alone every time they deploy. With that thought ... <strong>Apache-Depot-Version was conceived</strong>.
+			upon, let alone every time they deploy. With that thought ... <strong>Depot Version was conceived</strong>.
 			</p>
-      <p><strong>Apache-Depot-Version</strong> is designed to
+      <p><strong>Depot Version</strong> is designed to
       enable package versioning (and version introspection) to attempt to reduce <strong>JAR-hell</strong> through automation. 
       </p> 
     </section>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/overview.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/overview.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/overview.xml	Tue May 25 11:04:49 2004
@@ -17,31 +17,31 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version Overview</title>
+    <title>Depot Version Overview</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
      </authors>
   </header>
   
   <body>
-    	<section><title>Apache-Depot-Version Overview</title>
-    		<p><strong>Apache-Depot-Version</strong> automates some of the manual checks that users to with versions. It introduces classes to <strong>represent versions "numbers"</strong> from <strong>1.0 to 1.0.1-rc6 to 2.0-20030221</strong>. 
-    			This is pretty much <strong>it</strong>, a generic version object, however with this we can start to discover/display/compare/test those versions. <strong>Apache-Depot-Version</strong> is a framework under which software can manipulate
+    	<section><title>Depot Version Overview</title>
+    		<p><strong>Depot Version</strong> automates some of the manual checks that users to with versions. It introduces classes to <strong>represent versions "numbers"</strong> from <strong>1.0 to 1.0.1-rc6 to 2.0-20030221</strong>. 
+    			This is pretty much <strong>it</strong>, a generic version object, however with this we can start to discover/display/compare/test those versions. <strong>Depot Version</strong> is a framework under which software can manipulate
     			version information. 		
     		</p>
-    		<note>Apache-Depot-Version does <strong>NOT</strong> do source control type versioning, it represents version information.</note>
+    		<note>Depot Version does <strong>NOT</strong> do source control type versioning, it represents version information.</note>
     		</section>
    		<section><title>Version Environment Introspection</title>
-    		<p><strong>Apache-Depot-Version</strong> extracts the versions from various sources in the <strong>runtime environment</strong>, perhaps extracting Jar manifest files from the Jars in the classpath. 
+    		<p><strong>Depot Version</strong> extracts the versions from various sources in the <strong>runtime environment</strong>, perhaps extracting Jar manifest files from the Jars in the classpath. 
     		It then allows users to display/debug this information and/or evaluate defined <strong>constraints</strong> upon this <strong>version environment</strong>. 
     		Users (be they developers, testers, operators or end users) can <strong>communicate</strong> version requirements amongst themselves via <link href="constraints.html">constraint</link> files. These sets of constraint are merged and evaluated as one.    		
     		</p>
     		<note>Versioning conventions are typically algorythmic, 1.2 ought be backwards compatibly with 1.1 say, however there are <strong>real-world</strong> impracticalities with that. Development discontinuities occur, stuff happens. Algorythms and good intentions just aren't enough.</note>
-    		<note>This ability to communicate/share dependency and/or real-world <link href="constraints.html">constraints</link> is a key benefit of Apache-Depot-Version. Too much <link href="jar-hell.html">Jar Hell</link> occurs when folks are first setting up an environment, or applying a patch/upgrade. Release notes are important, but being able to specify fuzzy requirements is better.</note>
+    		<note>This ability to communicate/share dependency and/or real-world <link href="constraints.html">constraints</link> is a key benefit of Depot Version. Too much <link href="jar-hell.html">Jar Hell</link> occurs when folks are first setting up an environment, or applying a patch/upgrade. Release notes are important, but being able to specify fuzzy requirements is better.</note>
     	</section>
     	
     	<section><title>Version Compatibility</title>
-    		<p>Version <strong>compatability</strong> is a concept where one version of something is "a suitable replacement" for another. Apache-Depot-Version supports this concept, in algorythm form, 
+    		<p>Version <strong>compatability</strong> is a concept where one version of something is "a suitable replacement" for another. Depot Version supports this concept, in algorythm form, 
     			however it builds upon it with the concept of version <link href="constraints.html">constraints</link> for real world discontinuities that an algorythm can't cover.</p>
     		<note><strong>Compatibility</strong> deserves it's own <link href="compatibility.html">page</link>, but is whether one version of something is a <strong>compatible replacement</strong> for this.</note>
     	</section>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/samples/index.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/samples/index.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/samples/index.xml	Tue May 25 11:04:49 2004
@@ -20,7 +20,7 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version Samples</title>
+    <title>Depot Version Samples</title>
     <authors>
       	<person id="chalko" name="Nick Chalko" email="nick@chalko.com"/>
     </authors>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/standard/appendix.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/standard/appendix.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/standard/appendix.xml	Tue May 25 11:04:49 2004
@@ -17,7 +17,7 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version: </title>
+    <title>Depot Version: </title>
     <authors>
       <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/standard/basic.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/standard/basic.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/standard/basic.xml	Tue May 25 11:04:49 2004
@@ -17,9 +17,9 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version: Basic Interface</title>
+    <title>Depot Version: Basic Interface</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="ajack@apache.org"/>
+      <person id="ajack" name="Adam R. B. Jack" email="ajack@apache.org"/>
     </authors>
   </header>
   

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/standard/index.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/standard/index.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/standard/index.xml	Tue May 25 11:04:49 2004
@@ -17,9 +17,9 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version: Dynamic Version Interface</title>
+    <title>Depot Version: Dynamic Version Interface</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   
@@ -173,8 +173,7 @@
 </section>
 <section><title>References</title>
 <table >
-<tr><th>Apache Depot Version</th><td><fork href="http://www.apache.org/cgi-bin/krywiki.pl?Version">http://www.apache.org/cgi-bin/krywiki.pl?Version</fork></td></tr>
-<tr><th>Apache Commons Versioning</th><td><fork href="http://jakarta.apache.org/commons/versioning.html">http://jakarta.apache.org/commons/versioning.html</fork></td></tr>
+<tr><th>Apache Commons Versioning</th><td><fork href="http://jakarta.apache.org/commons/releases/versioning.html">http://jakarta.apache.org/commons/versioning.html</fork></td></tr>
 <tr><th>Javasoft JAR (Manifest) Specification</th><td><fork href="http://java.sun.com/j2se/1.4.1/docs/api/java/util/jar/Manifest.html">http://java.sun.com/j2se/1.4.1/docs/api/java/util/jar/Manifest.html</fork></td></tr>
 <tr><th>Javasoft Optional Package Versioning</th><td><fork href="http://java.sun.com/j2se/1.4/docs/guide/extensions/versioning.html">http://java.sun.com/j2se/1.4/docs/guide/extensions/versioning.html</fork></td></tr>
 </table>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/tabs.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/tabs.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/tabs.xml	Tue May 25 11:04:49 2004
@@ -15,8 +15,9 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<tabs software="Apache Depot Version" title="Apache Depot Version"
-    copyright="2002-@year@ Apache Project" xmlns:xlink="http://www.w3.org/1999/xlink">
+<tabs software="Depot Version" title="Depot Version"
+    copyright="2002-@year@ Apache Project" 
+    xmlns:xlink="http://www.w3.org/1999/xlink">
     <tab label="Home" dir=""/>
     <tab label="Ant Tasks" dir="ant"/>
     <tab label="Tools" dir="tool"/>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/tool/index.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/tool/index.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/tool/index.xml	Tue May 25 11:04:49 2004
@@ -17,15 +17,15 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version: Command Line Tools</title>
+    <title>Depot Version: Command Line Tools</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   
   <body>
     <section><title>Command Line Tools</title>
-      <p>Apache-Depot-Version Command Line Tools are designed to
+      <p>Depot Version Command Line Tools are designed to
       enable <strong>versioning operations</strong> with the minimum of <strong>dependency</strong>. Minimum dependencies supports
       (amongst other things) environment debugging, since the tools are not subject to environmental instability.
       </p>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/tool/quickstart.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/tool/quickstart.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/tool/quickstart.xml	Tue May 25 11:04:49 2004
@@ -17,9 +17,9 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version Ant Tasks - Overview</title>
+    <title>Depot Version Ant Tasks - Overview</title>
     <authors>
-      <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
+      <person id="ajack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
   </header>
   

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/usage.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/usage.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/usage.xml	Tue May 25 11:04:49 2004
@@ -17,7 +17,7 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version Usage</title>
+    <title>Depot Version Usage</title>
     <authors>
        <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>      
     </authors>
@@ -25,11 +25,11 @@
   
   <body>
     <section><title>Usage</title>
-      <p><strong>Apache-Depot-Version</strong> attempts to be open; to work with existing mechanisms/tools. 
+      <p><strong>Depot Version</strong> attempts to be open; to work with existing mechanisms/tools. 
       	As such it support existing mechanisms, standards, formats, where at all possible. 
-      	Apache-Depot-Version 
+      	Depot Version 
       	</p>
-      	<p><strong>Apache-Depot-Version</strong> can be utilized in a variety of ways, as suits the user's interests and investment.
+      	<p><strong>Depot Version</strong> can be utilized in a variety of ways, as suits the user's interests and investment.
       The information here attempts to guide users to those areas that best suit them. Clearly this is just a recommended
       starting point.</p> 
       <section><title>End User</title>

Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/versioning.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/versioning.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/versioning.xml	Tue May 25 11:04:49 2004
@@ -17,7 +17,7 @@
 -->
 <document>
   <header>
-    <title>Apache-Depot-Version: Java Versioning</title>
+    <title>Depot Version: Java Versioning</title>
     <authors>
       <person id="arb_jack" name="Adam R. B. Jack" email="arb_jack@users.sourceforge.net"/>
     </authors>
@@ -25,7 +25,7 @@
   
   <body>
     <section><title>Versioning Approaches</title>
-      <p><strong>Apache-Depot-Version</strong> supports a number of versioning approaches. Manual versioning is available to all, with no requirements -- simply enter
+      <p><strong>Depot Version</strong> supports a number of versioning approaches. Manual versioning is available to all, with no requirements -- simply enter
 a correctly formatted version into a manifest, or code. Automated versioning is available to folk who
 invest in learning tools, such as Ant. Here are some supported methods:
       	</p>
@@ -37,7 +37,7 @@
       	</ul> 
      </section>
     <section><title>Version Management Approaches</title>
-      <p><strong>Apache-Depot-Version</strong> supports a variety of versioning management approaches, from the manual to the fully automated:
+      <p><strong>Depot Version</strong> supports a variety of versioning management approaches, from the manual to the fully automated:
       	</p>
       	<ul>
       		<li><strong>Manual management</strong> - one edits/increments the Manifest (or hand produces a Version class).</li>

Modified: incubator/depot/trunk/version/src/documentation/skinconf.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/skinconf.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/skinconf.xml	Tue May 25 11:04:49 2004
@@ -105,7 +105,7 @@
 
   <!-- mandatory project logo
        skin: forrest-site renders it at the top -->
-  <project-name>Apache Depot Version</project-name>
+  <project-name>Depot Version</project-name>
   <project-url>http://incubator.apache.org/depot/version/</project-url>
   <project-logo>images/apache-depot-version-logo.png</project-logo>
 
@@ -113,7 +113,7 @@
        skin: forrest-site renders it at the top-left corner -->
   <group-name>Apache Depot</group-name>
   <group-url>http://incubator.apache.org/depot/</group-url>
-  <group-logo>apache-depot-logo.png</group-logo>
+  <group-logo>images/apache-depot-logo.png</group-logo>
 
   <!-- optional host logo (e.g. sourceforge logo)
        skin: forrest-site renders it at the bottom-left corner -->

Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/AntInterface.java
==============================================================================
--- incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/AntInterface.java	(original)
+++ incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/AntInterface.java	Tue May 25 11:04:49 2004
@@ -91,8 +91,6 @@
 			String message = result.getLogMessage();
 
 			m_component.log(message, severity);
-			
-			//:TODO: Log pad?
 		}
 
 		if (0 == results)

Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/AntTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/AntTask.java	(original)
+++ incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/AntTask.java	Tue May 25 11:04:49 2004
@@ -18,7 +18,7 @@
 
 import org.apache.depot.common.log.Logger;
 import org.apache.depot.common.util.note.AnnotationScratchpad;
-import org.apache.depot.version.ant.util.AntLogListener;
+import org.apache.depot.common.ant.util.AntLogListener;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/constraint/text/ConstraintTextFactory.java
==============================================================================
--- incubator/depot/trunk/version/src/java/org/apache/depot/version/constraint/text/ConstraintTextFactory.java	(original)
+++ incubator/depot/trunk/version/src/java/org/apache/depot/version/constraint/text/ConstraintTextFactory.java	Tue May 25 11:04:49 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.depot.version.constraint.text;
+package org.apache.depot.version.constraint.xml;
 
 import java.util.StringTokenizer;
 
@@ -34,10 +34,8 @@
  * @version $Revision: 1.5 $
  * 
  */
-public class ConstraintTextFactory {
+public class ConstraintXmlFactory {
 
-	private final static String OPERATORS = "<=!~>";
-	private final static String OPERATOR_LIST = "<,<=,=,!=,~,>=,>";
 
 	/**
 	 *