svn commit: rev 10487 - in incubator/depot/trunk/update: . src/java/org/apache/depot/update/monitor

[aj...@apache.org]

Author: ajack
Date: Sun May  2 09:24:35 2004
New Revision: 10487

Modified:
   incubator/depot/trunk/update/build-ant-sample.xml
   incubator/depot/trunk/update/build.xml
   incubator/depot/trunk/update/src/java/org/apache/depot/update/monitor/StatisticsMonitor.java
Log:
1) Add a 'test' target to update build.
2) Add an (optional) version environment to the script,
since we are now running it in three different envs
(with VFS, with HttpClient, without either) we ought
get good information (assuming version env can give it).


Modified: incubator/depot/trunk/update/build-ant-sample.xml
==============================================================================
--- incubator/depot/trunk/update/build-ant-sample.xml	(original)
+++ incubator/depot/trunk/update/build-ant-sample.xml	Sun May  2 09:24:35 2004
@@ -25,6 +25,14 @@
 -->
 
 <project name="depot-update-ant-sample" default="gump" basedir=".">
+		
+	<!-- Use this for an optional dependency -->
+	<available file="depot-version-antlib.xml" property="version.available" />
+	<target name="version-optional" if="version.available"
+			description="versioning">
+		<taskdef resource="depot-version-antlib.xml" />		
+		<version-environment />
+	</target>
 	
 	<!-- Display the contents of a repository -->
 	<target name="repo" description="Display Contents of a Repostiory">
@@ -32,6 +40,6 @@
 		<repotool />
 	</target>
 
-	<target name="gump" depends="repo" />
+	<target name="gump" depends="version-optional, repo" />
 	
 </project>

Modified: incubator/depot/trunk/update/build.xml
==============================================================================
--- incubator/depot/trunk/update/build.xml	(original)
+++ incubator/depot/trunk/update/build.xml	Sun May  2 09:24:35 2004
@@ -58,4 +58,5 @@
 		<move file="${dist.dir}/${project.name}-${project.version}.jar"
 		      tofile="${dist.dir}/${project.name}-gump-${DSTAMP}.jar" />
 	</target>
+	<target name="test" depends="junit.test"/>
 </project>

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/monitor/StatisticsMonitor.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/monitor/StatisticsMonitor.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/monitor/StatisticsMonitor.java	Sun May  2 09:24:35 2004
@@ -197,24 +197,24 @@
 
 		if (verbose) {
 			DebugUtils.printSeparator(out, depth);
-			DebugUtils.dump(out, depth, verbose, m_resources);
+			DebugUtils.dump(out, depth, "Resources", verbose, m_resources);
 
 			DebugUtils.printSeparator(out, depth);
-			DebugUtils.dump(out, depth, verbose, m_parsedObjects);
+			DebugUtils.dump(out, depth, "Parsed", verbose, m_parsedObjects);
 		}
 
 		DebugUtils.printSeparator(out, depth);
-		DebugUtils.dump(out, depth, verbose, m_failedObjects);
+		DebugUtils.dump(out, depth, "Failed", verbose, m_failedObjects);
 
 		DebugUtils.printSeparator(out, depth);
-		DebugUtils.dump(out, depth, verbose, m_ignoredObjects);
+		DebugUtils.dump(out, depth, "Ignored", verbose, m_ignoredObjects);
 
 		DebugUtils.printSeparator(out, depth);
-		DebugUtils.dump(out, depth, verbose, m_misgrouped);
+		DebugUtils.dump(out, depth, "Mis-grouped", verbose, m_misgrouped);
+		
 		if (verbose) {
-
 			DebugUtils.printSeparator(out, depth);
-			DebugUtils.dump(out, depth, verbose, m_namegrouped);
+			DebugUtils.dump(out, depth, "Complete", verbose, m_namegrouped);
 		}
 	}
 }