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/05/10 19:55:41 UTC
svn commit: rev 10584 - in incubator/depot/trunk/version/src: documentation/content/xdocs java/org/apache/depot/version/ant/environment java/org/apache/depot/version/impl/data test/java/org/apache/depot/version/impl/data
Author: ajack
Date: Mon May 10 12:55:39 2004
New Revision: 10584
Modified:
incubator/depot/trunk/version/src/documentation/content/xdocs/index.xml
incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/environment/EnvironmentTask.java
incubator/depot/trunk/version/src/java/org/apache/depot/version/impl/data/ReleaseLevel.java
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/impl/data/ReleaseLevelTests.java
Log:
Allow 'gump' as a release level.
Modified: incubator/depot/trunk/version/src/documentation/content/xdocs/index.xml
==============================================================================
--- incubator/depot/trunk/version/src/documentation/content/xdocs/index.xml (original)
+++ incubator/depot/trunk/version/src/documentation/content/xdocs/index.xml Mon May 10 12:55:39 2004
@@ -41,8 +41,6 @@
cooperate with developers and QA testers in <strong>actively documenting/asserting</strong> dependencies and contraints.
</note>
- <p><strong>Just want a download?</strong> Look <link href="http://sourceforge.net/project/showfiles.php?group_id=36516#apache-version">here</link></p>
-
<p><strong>Apache-Version</strong> automates the tasks of:
</p>
<ul>
@@ -56,11 +54,11 @@
</ul>
<p>As such it implements the following components (cents, ant tasks, tools and plug-ins) on top of it's own API:</p>
<ul>
- <li><link href="antlib/index.html">Centipede AntLib</link> -- scriptlets (for high-level ant build scripts)</li>
<li><link href="ant/index.html">Ant tasks</link> -- building blocks (for lower-level ant build scripts)</li>
<li><link href="eclipse/index.html">Eclipse Plugin</link> -- IDE integration</li>
<li><link href="tool/index.html">Command Line Tools</link> -- zero-dependency debugging utilities</li>
<li><link href="api/index.html">APIs</link> -- extension and integration</li>
+ <li><link href="antlib/index.html">AntWorks AntLet</link> -- scriptlets (for high-level ant build scripts)</li>
</ul>
</section>
</body>
Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/environment/EnvironmentTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/environment/EnvironmentTask.java (original)
+++ incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/environment/EnvironmentTask.java Mon May 10 12:55:39 2004
@@ -154,7 +154,7 @@
if (versions.hasEntries()) {
- log("Versions", Project.MSG_INFO);
+ log("*** Versions:", Project.MSG_INFO);
boolean evenNotOdd = true;
for (Iterator i = versions.iterator();
@@ -197,7 +197,7 @@
if (extensions.hasEntries()) {
- log("Virtual Machine Extensions", Project.MSG_INFO);
+ log("*** Virtual Machine Extensions:", Project.MSG_INFO);
boolean evenNotOdd = true;
for (Iterator i = extensions.iterator();
@@ -270,7 +270,7 @@
if (constraints.hasEntries()) {
- log("Constraints", Project.MSG_INFO);
+ log("*** Constraints:", Project.MSG_INFO);
boolean evenNotOdd = true;
for (Iterator i = constraints.iterator();
Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/impl/data/ReleaseLevel.java
==============================================================================
--- incubator/depot/trunk/version/src/java/org/apache/depot/version/impl/data/ReleaseLevel.java (original)
+++ incubator/depot/trunk/version/src/java/org/apache/depot/version/impl/data/ReleaseLevel.java Mon May 10 12:55:39 2004
@@ -36,69 +36,77 @@
private static final String UNSET_WORD = "unset";
private static final String UNSET_ABRV = "?";
+ /** Gump */
+ private static final int LEVEL_GUMP = 1;
+ private static final String GUMP_WORD = "gump";
+ private static final String GUMP_ABRV = "g";
+
/** Nightly */
- private static final int LEVEL_NIGHTLY = 1;
+ private static final int LEVEL_NIGHTLY = 2;
private static final String NIGHTLY_WORD = "nightly";
private static final String NIGHTLY_ABRV = "n";
/** Snapshot */
- private static final int LEVEL_SNAPSHOT = 2;
+ private static final int LEVEL_SNAPSHOT = 3;
private static final String SNAPSHOT_WORD = "snapshot";
private static final String SNAPSHOT_ABRV = "s";
-
/** Development */
- private static final int LEVEL_DEVELOPMENT = 3;
+ private static final int LEVEL_DEVELOPMENT = 4;
private static final String DEVELOPMENT_WORD = "dev";
private static final String DEVELOPMENT_ABRV = "d";
/** Alpha */
- private static final int LEVEL_ALPHA = 4;
+ private static final int LEVEL_ALPHA = 5;
private static final String ALPHA_WORD = "alpha";
private static final String ALPHA_ABRV = "a";
/** Beta */
- private static final int LEVEL_BETA = 5;
+ private static final int LEVEL_BETA = 6;
private static final String BETA_WORD = "beta";
private static final String BETA_ABRV = "b";
/** Milestone */
- private static final int LEVEL_MILESTONE = 6;
+ private static final int LEVEL_MILESTONE = 7;
private static final String MILESTONE_WORD = "mile";
private static final String MILESTONE_ABRV = "m";
/** Early Access */
- private static final int LEVEL_EARLY_ACCESS = 7;
+ private static final int LEVEL_EARLY_ACCESS = 8;
private static final String EARLY_ACCESS_WORD = "ea";
private static final String EARLY_ACCESS_ABRV = "ea";
/** Release Candidate */
- private static final int LEVEL_RELEASE_CANDIDATE = 8;
+ private static final int LEVEL_RELEASE_CANDIDATE = 9;
private static final String RELEASE_CANDIDATE_WORD = "rc";
private static final String RELEASE_CANDIDATE_ABRV = "rc";
/** Release*/
- private static final int LEVEL_RELEASE = 9;
+ private static final int LEVEL_RELEASE = 10;
private static final String RELEASE_WORD = "release";
private static final String RELEASE_ABRV = "rel";
/** HotFix */
- private static final int LEVEL_HOTFIX = 10;
+ private static final int LEVEL_HOTFIX = 11;
private static final String HOTFIX_WORD = "hotfix";
private static final String HOTFIX_ABRV = "fix";
/** MIN_LEVEL */
- public static final int MIN_RELEASE_LEVEL = ReleaseLevel.LEVEL_DEVELOPMENT;
+ public static final int MIN_RELEASE_LEVEL = ReleaseLevel.LEVEL_GUMP;
/** MAX_LEVEL */
public static final int MAX_RELEASE_LEVEL = ReleaseLevel.LEVEL_HOTFIX;
/** Unset */
public static final ReleaseLevel UNSET = new ReleaseLevel(LEVEL_UNSET);
+ /** Gump */
+ public static final ReleaseLevel GUMP =
+ new ReleaseLevel(LEVEL_GUMP);
+ public static final ReleaseLevel MIN = GUMP;
+
/** Nightly */
public static final ReleaseLevel NIGHTLY =
new ReleaseLevel(LEVEL_NIGHTLY);
- public static final ReleaseLevel MIN = NIGHTLY;
//** Snapshot */
public static final ReleaseLevel SNAPSHOT =
@@ -141,6 +149,7 @@
private final int m_level;
static {
+ RELEASE_LEVELS.add(ReleaseLevel.GUMP);
RELEASE_LEVELS.add(ReleaseLevel.NIGHTLY);
RELEASE_LEVELS.add(ReleaseLevel.SNAPSHOT);
RELEASE_LEVELS.add(ReleaseLevel.ALPHA);
@@ -158,6 +167,12 @@
ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.UNSET, ReleaseLevel.UNSET_ABRV);
LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.UNSET_ABRV, ReleaseLevel.UNSET);
+
+ WORD_FOR_LEVEL.put(ReleaseLevel.GUMP, ReleaseLevel.GUMP_WORD);
+ LEVEL_FOR_WORD.put(ReleaseLevel.GUMP_WORD, ReleaseLevel.GUMP);
+
+ ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.GUMP, ReleaseLevel.GUMP_ABRV);
+ LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.GUMP_ABRV, ReleaseLevel.GUMP);
WORD_FOR_LEVEL.put(ReleaseLevel.NIGHTLY, ReleaseLevel.NIGHTLY_WORD);
LEVEL_FOR_WORD.put(ReleaseLevel.NIGHTLY_WORD, ReleaseLevel.NIGHTLY);
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/impl/data/ReleaseLevelTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/impl/data/ReleaseLevelTests.java (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/impl/data/ReleaseLevelTests.java Mon May 10 12:55:39 2004
@@ -34,12 +34,18 @@
junit.textui.TestRunner.run(ReleaseLevelTests.class);
}
- public void testApacheFormatIsDefaulted() throws VersionException {
+ public void testStringParseAlpha() throws VersionException {
ReleaseLevel alpha = ReleaseLevel.ALPHA;
ReleaseLevel other = ReleaseLevel.getFromString("alpha");
-
assertEquals("ALPHA = from(\"alpha\")", alpha, other);
+ }
+
+ public void testStringParseGump() throws VersionException {
+
+ ReleaseLevel gump = ReleaseLevel.GUMP;
+ ReleaseLevel other = ReleaseLevel.getFromString("gump");
+ assertEquals("GUMP = from(\"gump\")", gump, other);
}
public void testReleaseLevels() throws VersionException {
Re: svn commit: rev 10584 - in incubator/depot/trunk/version/src:
documentation/content/xdocs java/org/apache/depot/version/ant/environment
java/org/apache/depot/version/impl/data test/java/org/apache/depot/version/impl/data
Posted by Nick Chalko <ni...@chalko.com>.
ajack@apache.org wrote:
>Author: ajack
>Date: Mon May 10 12:55:39 2004
>New Revision: 10584
>
>Modified:
> incubator/depot/trunk/version/src/documentation/content/xdocs/index.xml
> incubator/depot/trunk/version/src/java/org/apache/depot/version/ant/environment/EnvironmentTask.java
> incubator/depot/trunk/version/src/java/org/apache/depot/version/impl/data/ReleaseLevel.java
> incubator/depot/trunk/version/src/test/java/org/apache/depot/version/impl/data/ReleaseLevelTests.java
>Log:
>Allow 'gump' as a release level.
>
>
>
THANKS