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 30996 - in incubator/depot/trunk/update/src/java/org/apache/depot/update: tool util/net/http version
Date Fri, 30 Jul 2004 14:12:55 GMT
Author: ajack
Date: Fri Jul 30 07:12:55 2004
New Revision: 30996

Modified:
   incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/Tool.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/util/net/http/HttpClientUserAgent.java
   incubator/depot/trunk/update/src/java/org/apache/depot/update/version/Version.java
Log:
Tweaks to use generated version.

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/Tool.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/Tool.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/tool/Tool.java	Fri Jul 30
07:12:55 2004
@@ -72,7 +72,7 @@
 	protected abstract String getTitle();
 	protected abstract void init();
 	protected void printVersion() {
-		String version = Version.VERSION.getLongVersion();
+		String version = Version.INSTANCE.getLongVersion();
 		System.out.println("Apache Depot " + getTitle() + " : " + version);
 	}
 	protected void printHelp() {

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/util/net/http/HttpClientUserAgent.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/util/net/http/HttpClientUserAgent.java
(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/util/net/http/HttpClientUserAgent.java
Fri Jul 30 07:12:55 2004
@@ -176,7 +176,7 @@
 		//
 		method.setRequestHeader(
 			"User-Agent",
-			"Apache-Depot-Update/" + Version.VERSION.getLongVersion());
+			"Apache-Depot-Update/" + Version.INSTANCE.getLongVersion());
 	}
 
 	public static void main(String args[]) throws Exception {

Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/version/Version.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/version/Version.java	(original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/version/Version.java	Fri
Jul 30 07:12:55 2004
@@ -33,13 +33,12 @@
         {
             super(
                 "org.apache.depot.update",
-                new org.apache.depot.version.impl.data.VersionData(
+                new org.apache.depot.version.impl.ApacheVersion(
                     0,
                     1,
                     org.apache.depot.version.impl.data.ReleaseLevel.DEVELOPMENT,
                     -1,
-                    -1,
-                    20040729
+                    -1
                     )
                 );
             
@@ -52,7 +51,7 @@
             attributes.put("org.apache.version.build.jvm","1.4.2_03-b02");
             
             try { 
-            importFromProperties(attributes);
+            importProperties(attributes);
              } catch ( Exception e ) {
             }
         }
@@ -60,6 +59,5 @@
         public static final org.apache.depot.version.VersionMarker getInstance() {
             return INSTANCE;
         }
-        
         
     } 

Mime
View raw message