From depot-cvs-return-584-apmail-incubator-depot-cvs-archive=incubator.apache.org@incubator.apache.org Fri Jul 30 14:12:57 2004 Return-Path: Delivered-To: apmail-incubator-depot-cvs-archive@www.apache.org Received: (qmail 2380 invoked from network); 30 Jul 2004 14:12:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 30 Jul 2004 14:12:57 -0000 Received: (qmail 50396 invoked by uid 500); 30 Jul 2004 14:12:57 -0000 Delivered-To: apmail-incubator-depot-cvs-archive@incubator.apache.org Received: (qmail 50375 invoked by uid 500); 30 Jul 2004 14:12:57 -0000 Mailing-List: contact depot-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: depot-dev@incubator.apache.org Delivered-To: mailing list depot-cvs@incubator.apache.org Received: (qmail 50361 invoked by uid 99); 30 Jul 2004 14:12:56 -0000 X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Fri, 30 Jul 2004 07:12:56 -0700 Received: (qmail 2370 invoked by uid 65534); 30 Jul 2004 14:12:55 -0000 Date: 30 Jul 2004 14:12:55 -0000 Message-ID: <20040730141255.2366.qmail@minotaur.apache.org> From: ajack@apache.org To: depot-cvs@incubator.apache.org Subject: svn commit: rev 30996 - in incubator/depot/trunk/update/src/java/org/apache/depot/update: tool util/net/http version X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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; } - }