From depot-cvs-return-583-apmail-incubator-depot-cvs-archive=incubator.apache.org@incubator.apache.org Fri Jul 30 14:11:39 2004 Return-Path: Delivered-To: apmail-incubator-depot-cvs-archive@www.apache.org Received: (qmail 1318 invoked from network); 30 Jul 2004 14:11:39 -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:11:39 -0000 Received: (qmail 46719 invoked by uid 500); 30 Jul 2004 14:11:33 -0000 Delivered-To: apmail-incubator-depot-cvs-archive@incubator.apache.org Received: (qmail 46603 invoked by uid 500); 30 Jul 2004 14:11:32 -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 46498 invoked by uid 99); 30 Jul 2004 14:11:31 -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:11:31 -0700 Received: (qmail 1147 invoked by uid 65534); 30 Jul 2004 14:11:29 -0000 Date: 30 Jul 2004 14:11:29 -0000 Message-ID: <20040730141129.1141.qmail@minotaur.apache.org> From: ajack@apache.org To: depot-cvs@incubator.apache.org Subject: svn commit: rev 30995 - in incubator/depot/trunk/version/src: java/org/apache/depot/version/generation/source java/org/apache/depot/version/version test/java/org/apache/depot/version/interfacing test/java/org/apache/depot/version/interfacing/field X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: ajack Date: Fri Jul 30 07:11:28 2004 New Revision: 30995 Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/source/AbstractVersionMarkerClassGenerator.java incubator/depot/trunk/version/src/java/org/apache/depot/version/version/Version.java.txt incubator/depot/trunk/version/src/test/java/org/apache/depot/version/interfacing/InterfaceBase1.java incubator/depot/trunk/version/src/test/java/org/apache/depot/version/interfacing/field/FieldSampleTests.java Log: Tweaks to dependent format. [The need for these are and example of why I don't like dependent ;-) ] Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/source/AbstractVersionMarkerClassGenerator.java ============================================================================== --- incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/source/AbstractVersionMarkerClassGenerator.java (original) +++ incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/source/AbstractVersionMarkerClassGenerator.java Fri Jul 30 07:11:28 2004 @@ -25,10 +25,10 @@ import org.apache.depot.common.util.IndentWriter; import org.apache.depot.version.CompoundVersion; import org.apache.depot.version.VersionMarker; +import org.apache.depot.version.impl.ApacheVersion; import org.apache.depot.version.impl.ApacheVersionMarker; import org.apache.depot.version.impl.VersionImplementationConstants; import org.apache.depot.version.impl.data.ReleaseLevel; -import org.apache.depot.version.impl.data.VersionData; import org.apache.depot.version.interfacing.ApacheVersionMarkerInterfaceProxy; /** @@ -122,7 +122,7 @@ out.indent(); out.println("\"" + m_versionMarker.getId() + "\","); - out.println("new "+VersionData.class.getName()+"("); + out.println("new "+ApacheVersion.class.getName()+"("); out.indent(); out.println(m_compoundVersion.getMajor() + ","); out.println(m_compoundVersion.getMinor() + ","); Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/version/Version.java.txt ============================================================================== --- incubator/depot/trunk/version/src/java/org/apache/depot/version/version/Version.java.txt (original) +++ incubator/depot/trunk/version/src/java/org/apache/depot/version/version/Version.java.txt Fri Jul 30 07:11:28 2004 @@ -21,6 +21,6 @@ */ public class Version extends ApacheVersionMarker { public Version() throws VersionException { - super("org.apache.depot.version", "@project.version@"); + super(Version.class.getName(), "@project.version@"); } } Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/interfacing/InterfaceBase1.java ============================================================================== --- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/interfacing/InterfaceBase1.java (original) +++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/interfacing/InterfaceBase1.java Fri Jul 30 07:11:28 2004 @@ -49,8 +49,6 @@ protected void compare(Object direct, VersionLoadContext context) throws VersionException { // - // - // assertNotNull("Context Extracted for :" + direct, context); Version version = context.getVersionMarker().getVersion(); Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/interfacing/field/FieldSampleTests.java ============================================================================== --- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/interfacing/field/FieldSampleTests.java (original) +++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/interfacing/field/FieldSampleTests.java Fri Jul 30 07:11:28 2004 @@ -50,6 +50,5 @@ direct.getClass()); compare(direct, info); - } }