You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/07/07 08:26:56 UTC

svn commit: rev 22669 - in avalon/trunk: central/site/src/xdocs/products/runtime/javadoc tools/magic/src/main/org/apache/avalon/tools/model

Author: mcconnell
Date: Tue Jul  6 23:26:55 2004
New Revision: 22669

Modified:
   avalon/trunk/central/site/src/xdocs/products/runtime/javadoc/index.xml
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Info.java
Log:
Add separate references to 3.3.0 versus SNAPSHOT javadocs.

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/javadoc/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/javadoc/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/javadoc/index.xml	Tue Jul  6 23:26:55 2004
@@ -7,10 +7,11 @@
 
   <body>
     <section name="JavaDoc">
+      <subsection name="3.3.0">
         <table>
           <tr><th>Group</th><th>Description</th></tr>
           <tr>
-            <td><a href="../../../avalon/runtime/@RUNTIME-VERSION@/api/index.html">Component API</a></td>
+            <td><a href="../../../avalon/runtime/3.3.0/api/index.html">Component API</a></td>
             <td>
               The set of interfaces included within the Component API define 
               the computational contract between a component and a container.
@@ -19,7 +20,7 @@
             </td>
           </tr>
           <tr>
-            <td><a href="../../../avalon/runtime/@RUNTIME-VERSION@/spi/index.html">Facilities SPI</a></td>
+            <td><a href="../../../avalon/runtime/3.3.0/spi/index.html">Facilities SPI</a></td>
             <td>
               The set of interfaces included within the Component SPI defines 
               the container meta-model within which component types are managed.
@@ -30,7 +31,7 @@
             </td>
           </tr>
           <tr>
-            <td><a href="../../../avalon/runtime/@RUNTIME-VERSION@/impl/index.html">Platform Implementation</a></td>
+            <td><a href="../../../avalon/runtime/3.3.0/impl/index.html">Platform Implementation</a></td>
             <td>
               The Platform Javadocs cover the full suite of API, SPI and the internal
               implementation systems.  This documentation is primarily of interest to
@@ -39,6 +40,21 @@
             </td>
           </tr>
         </table>
+      </subsection>
+      <subsection name="@RUNTIME-VERSION@">
+        <table>
+          <tr><th>Group</th><th>Description</th></tr>
+          <tr>
+            <td><a href="../../../avalon/runtime/@RUNTIME-VERSION@/api/index.html">Component API</a></td>
+          </tr>
+          <tr>
+            <td><a href="../../../avalon/runtime/@RUNTIME-VERSION@/spi/index.html">Facilities SPI</a></td>
+          </tr>
+          <tr>
+            <td><a href="../../../avalon/runtime/@RUNTIME-VERSION@/impl/index.html">Platform Implementation</a></td>
+          </tr>
+        </table>
+      </subsection>
     </section>
   </body>
 </document>

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Info.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Info.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Info.java	Tue Jul  6 23:26:55 2004
@@ -142,9 +142,7 @@
 
    /**
     * Return the version identifier. If the build policy is SNAPSHOT
-    * the version value returned is appended with "-DEV".  If the version is 
-    * is null and SNAPSHOT policy is enabled the returned version is DEV otherwise
-    * the versiojn returned is null.
+    * the version value returned is replaced with "SNAPSHOT".
     *
     * @return a string identifying the build version. 
     */
@@ -152,14 +150,7 @@
     {
         if( isaSnapshot() )
         {
-            if( null == m_version )
-            {
-                return "DEV";
-            }
-            else
-            {
-                return m_version + "-DEV";
-            }
+            return "SNAPSHOT";
         }
         else
         {

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org