You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@depot.apache.org by aj...@apache.org on 2004/07/30 14:11:29 UTC
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
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);
-
}
}