From depot-cvs-return-361-apmail-incubator-depot-cvs-archive=incubator.apache.org@incubator.apache.org Fri Apr 30 16:41:43 2004
Return-Path: <depot-cvs-return-361-apmail-incubator-depot-cvs-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-depot-cvs-archive@www.apache.org
Received: (qmail 41402 invoked from network); 30 Apr 2004 16:41:43 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 30 Apr 2004 16:41:43 -0000
Received: (qmail 84964 invoked by uid 500); 30 Apr 2004 16:41:28 -0000
Delivered-To: apmail-incubator-depot-cvs-archive@incubator.apache.org
Received: (qmail 84918 invoked by uid 500); 30 Apr 2004 16:41:27 -0000
Mailing-List: contact depot-cvs-help@incubator.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:depot-cvs-help@incubator.apache.org>
list-unsubscribe: <mailto:depot-cvs-unsubscribe@incubator.apache.org>
list-post: <mailto:depot-cvs@incubator.apache.org>
Reply-To: depot-dev@incubator.apache.org
Delivered-To: mailing list depot-cvs@incubator.apache.org
Received: (qmail 84857 invoked from network); 30 Apr 2004 16:41:27 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 30 Apr 2004 16:41:27 -0000
Received: (qmail 41218 invoked by uid 65534); 30 Apr 2004 16:41:34 -0000
Date: 30 Apr 2004 16:41:34 -0000
Message-ID: <20040430164134.41205.qmail@minotaur.apache.org>
From: ajack@apache.org
To: depot-cvs@incubator.apache.org
Subject: svn commit: rev 10452 - in incubator/depot/trunk/version: . src/antlet src/documentation/content/ant src/java src/test/java/org/apache/depot/version/ant/constraint src/test/java/org/apache/depot/version/ant/environment src/test/java/org/apache/depot/version/ant/stamp
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: ajack
Date: Fri Apr 30 09:41:32 2004
New Revision: 10452

Modified:
   incubator/depot/trunk/version/build-ant-sample.xml
   incubator/depot/trunk/version/build-ant-test-optional-missing.xml
   incubator/depot/trunk/version/src/antlet/xbuild.xml
   incubator/depot/trunk/version/src/documentation/content/ant/antlib_sample.xml
   incubator/depot/trunk/version/src/documentation/content/ant/stamp_sample.xml
   incubator/depot/trunk/version/src/java/depot-version-antlib.xml
   incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint-check.xml
   incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint.xml
   incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/environment/environment.xml
   incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/version.xml
Log:
Adding version- where needed.


Modified: incubator/depot/trunk/version/build-ant-sample.xml
==============================================================================
--- incubator/depot/trunk/version/build-ant-sample.xml	(original)
+++ incubator/depot/trunk/version/build-ant-sample.xml	Fri Apr 30 09:41:32 2004
@@ -31,13 +31,13 @@
 	<target name="version-optional" if="version.available"
 			description="versioning">
 		<taskdef resource="depot-version-antlib.xml" />		
-		<environment />
+		<version-environment />
 	</target>
 	
 	<!-- Use this for a mandatory dependency -->
 	<target name="version-mandatory" description="versioning">
 		<taskdef resource="depot-version-antlib.xml" />		
-		<environment />
+		<version-environment />
 	</target>
 
 	<target name="gump" depends="version-optional,version-mandatory" />

Modified: incubator/depot/trunk/version/build-ant-test-optional-missing.xml
==============================================================================
--- incubator/depot/trunk/version/build-ant-test-optional-missing.xml	(original)
+++ incubator/depot/trunk/version/build-ant-test-optional-missing.xml	Fri Apr 30 09:41:32 2004
@@ -31,7 +31,7 @@
 			description="versioning">
 		<taskdef resource="depot-version-antlib.xml"  />
 		
-		<environment />
+		<version-environment />
 	</target>
 
 	<target name="no-version" unless="version.available"

Modified: incubator/depot/trunk/version/src/antlet/xbuild.xml
==============================================================================
--- incubator/depot/trunk/version/src/antlet/xbuild.xml	(original)
+++ incubator/depot/trunk/version/src/antlet/xbuild.xml	Fri Apr 30 09:41:32 2004
@@ -41,10 +41,10 @@
     <target name="version-stamp" depends="version.init">
         <description> Stamp a project with a version identifier/version
             data/attributes. </description>
-        <stamp dest="${project.src.dir}" overWrite="true">
+        <version-stamp dest="${project.src.dir}" overWrite="true">
             <versionMarker versionId="${project.package}" version="${project.version}">
                 <defaultAttributes/>
             </versionMarker>
-        </stamp>
+        </version-stamp>
     </target>
 </project>

Modified: incubator/depot/trunk/version/src/documentation/content/ant/antlib_sample.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/ant/antlib_sample.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/ant/antlib_sample.xml	Fri Apr 30 09:41:32 2004
@@ -21,13 +21,12 @@
 
 	<!-- Reference version ant tasks -->
 	<taskdef 
-		resource="depot-version-antlib.xml" 
-		uri="ver:/version.apache.org" />
+		resource="depot-version-antlib.xml" />
 
 	<!-- Call the antlibs -->
 	<target name="env" >
-		<ver:environment/>
-		<ver:environment-check/>
+		<version-environment/>
+		<version-environment-check/>
 	</target>
 
 </project>

Modified: incubator/depot/trunk/version/src/documentation/content/ant/stamp_sample.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/ant/stamp_sample.xml	(original)
+++ incubator/depot/trunk/version/src/documentation/content/ant/stamp_sample.xml	Fri Apr 30 09:41:32 2004
@@ -17,7 +17,7 @@
 <project name="version-stamp" default="stamp">
 
 	<!-- Reference version ant tasks -->
-	<taskdef resource="version"/>
+	<taskdef resource="depot-version-antlib"/>
 
 	<target name="stamp">
 

Modified: incubator/depot/trunk/version/src/java/depot-version-antlib.xml
==============================================================================
--- incubator/depot/trunk/version/src/java/depot-version-antlib.xml	(original)
+++ incubator/depot/trunk/version/src/java/depot-version-antlib.xml	Fri Apr 30 09:41:32 2004
@@ -11,15 +11,15 @@
 -->
 <antlib>
 	<!-- Generate a version class in a *.java (does NOT compile it) -->
-   	<taskdef name="stamp" 
+   	<taskdef name="version-stamp" 
 		classname="org.apache.depot.version.ant.stamp.VersionMarkerGeneratorTask"/>
 
 	<!-- Document an environment -->
-	<taskdef name="environment"
+	<taskdef name="version-environment"
 		classname="org.apache.depot.version.ant.environment.EnvironmentTask"/>
 
 	<!-- Runtime env checking (fails if constraints fail) -->
-	<taskdef name="environment-check"
+	<taskdef name="version-environment-check"
 		classname="org.apache.depot.version.ant.environment.EnvironmentCheckTask"/>
 
 	<!-- Set a property if a version is available -->
@@ -27,10 +27,10 @@
 		classname="org.apache.depot.version.ant.available.AvailableTask"/>
 
 	<!-- Generate a constraint class (does NOT compile it) -->
-	<taskdef name="constraint"
+	<taskdef name="version-constraint"
 		classname="org.apache.depot.version.ant.constraint.ConstraintGeneratorTask"/>
 
 	<!-- Constraint checking -->
-	<taskdef name="constraint-check"
+	<taskdef name="version-constraint-check"
 		classname="org.apache.depot.version.ant.constraint.ConstraintCheckTask"/>
 </antlib>

Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint-check.xml
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint-check.xml	(original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint-check.xml	Fri Apr 30 09:41:32 2004
@@ -4,7 +4,7 @@
 	<taskdef resource="depot-version-antlib.xml"/>
 	
 	<target name="testSimple">
-		<constraint-check>
+		<version-constraint-check>
          	<constraintSet severity="error">
                  <lessThan versionId="org.apache.log4j"
                                  version="1.5" />
@@ -13,18 +13,18 @@
                          upperVersion="2.5" />
                  <exists versionId="org.apache.log4j" />
         	</constraintSet>
-	 	</constraint-check>
+	 	</version-constraint-check>
 	</target>
 	
 	<target name="testText">
-		<constraint-check>
-         	<constraintSet>
+		<version-constraint-check>
+         	<version-constraintSet>
          			org.apache.acorn &lt; 1
          			org.apache.acorn &lt;= 1
          			org.apache.acorn EqualTo 1
          			org.apache.acorn GreaterThanOrEqualTo 1
         	</constraintSet>
-	 	</constraint-check>
+	 	</version-constraint-check>
 	</target>
 	
 	<target name="test" depends="testSimple, testText" />	

Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint.xml
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint.xml	(original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint.xml	Fri Apr 30 09:41:32 2004
@@ -4,7 +4,7 @@
 	<taskdef resource="depot-version-antlib.xml"/>
 	
 	<target name="testSimple">
-		<constraint versionId="org.apache.acorn" dest="transient/test" overWrite="true">
+		<version-constraint versionId="org.apache.acorn" dest="transient/test" overWrite="true">
          	<constraintSet severity="error">
                  <lessThan versionId="org.apache.log4j"
                                  version="1.5" />
@@ -13,17 +13,17 @@
                          upperVersion="2.5" />
                  <exists versionId="org.apache.log4j" />
         	</constraintSet>
-	 	</constraint>
+	 	</version-constraint>
 	</target>
 	
 	
 	<target name="testText">
-		<constraint versionId="org.apache.acorn" dest="transient/test" overWrite="true">
+		<version-constraint versionId="org.apache.acorn" dest="transient/test" overWrite="true">
          	<constraintSet>
          			org.apache.acorn &lt; 1
          			org.apache.acorn &lt;= 1
         	</constraintSet>
-	 	</constraint>
+	 	</version-constraint>
 	</target>
 		
 	<target name="test" depends="testSimple, testText" />

Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/environment/environment.xml
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/environment/environment.xml	(original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/environment/environment.xml	Fri Apr 30 09:41:32 2004
@@ -4,15 +4,15 @@
 	<taskdef resource="depot-version-antlib.xml"/>
 	
 	<target name="testEnv">
-		<environment />
+		<version-environment />
 	</target>
 	
 	<target name="testAnnotated">
-		<environment annotated="true"/>
+		<version-environment annotated="true"/>
 	</target>
 	
 	<target name="checkCheck">
-		<environment-check />
+		<version-environment-check />
 	</target>
 	
 	<target name="test" depends="testEnv, testAnnotated, testCheck" />

Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/version.xml
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/version.xml	(original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/version.xml	Fri Apr 30 09:41:32 2004
@@ -11,63 +11,63 @@
 	</target>
 	
 	<target name="testComplex" depends="init" >
-		<stamp dest="transient/test" overWrite="true">
+		<version-stamp dest="transient/test" overWrite="true">
 			<versionMarker
 				versionId="org.apache.acorn">
 				<version major ="1" minor="2"/>
 			</versionMarker>
-		</stamp>
+		</version-stamp>
 		<antcall target="compile" />
 	</target>
 	
 	<target name="testComplexAttributed" depends="init" >
-		<stamp dest="transient/test" overWrite="true">
+		<version-stamp dest="transient/test" overWrite="true">
 			<versionMarker 
 				versionId="org.apache.acorn.attr">
 				<version major ="1" minor="2" />
 				<attribute name="foo" value="bar"/>
 			</versionMarker>
-		</stamp>
+		</version-stamp>
 		<antcall target="compile" />
 	</target>
 
     <target name="testVersionString" depends="init"> 
-		<stamp dest="transient/test" overWrite="true" >
+		<version-stamp dest="transient/test" overWrite="true" >
 			<versionMarker
 				versionId="org.apache.acorn.version"
 				version ="1.2">
 				<attribute name="foo" value="bar"/>
 			</versionMarker>
-		</stamp>
+		</version-stamp>
 		<antcall target="compile" />
 	</target>
 	
     <target name="testVersionString2"  depends="init">
-		<stamp dest="transient/test" versionId="org.apache.acorn.version"
+		<version-stamp dest="transient/test" versionId="org.apache.acorn.version"
 				version ="1.2" overWrite="true" />
 				<antcall target="compile" />
 	</target>
 
     <target name="testVersionString3"  depends="init">
-		<stamp dest="transient/test" versionId="org.apache.acorn.version"
+		<version-stamp dest="transient/test" versionId="org.apache.acorn.version"
 				version ="1.2" overWrite="true">
 			<versionMarker>
 					<attribute name="foo" value="bar"/>
 			</versionMarker>
-		</stamp>
+		</version-stamp>
 		<antcall target="compile" />
 	</target>
 
     <target name="testDefaultedAttributes" depends="init">
         
-		<stamp dest="transient/test"  overWrite="true">
+		<version-stamp dest="transient/test"  overWrite="true">
 			<versionMarker
 				versionId="org.apache.acorn.defaulted"
 				version ="1.2">
 				<defaultAttributes />
 				<attribute name="foo" value="bar"/>
 			</versionMarker>
-		</stamp>
+		</version-stamp>
 		<antcall target="compile" />
 	</target>