[MMBASE SCM] r35102 - mmbase/trunk/src/org/mmbase

[michiel]

Author: michiel
Date: 2009-05-12 18:34:53 +0200 (Tue, 12 May 2009)
New Revision: 35102

Modified:
   mmbase/trunk/src/org/mmbase/Version.java
Log:
Made also SCM Revision available

Modified: mmbase/trunk/src/org/mmbase/Version.java
===================================================================
--- mmbase/trunk/src/org/mmbase/Version.java    2009-05-12 16:33:52 UTC (rev 
35101)
+++ mmbase/trunk/src/org/mmbase/Version.java    2009-05-12 16:34:53 UTC (rev 
35102)
@@ -102,6 +102,20 @@
     }
 
     /**
+     * Returns the SubVersion version from which the current jar was built.
+     *
+     * @since MMBase-1.9.1
+     */
+    public static String getSCMRevision() {
+        Manifest man = getManifest();
+        if (man != null) {
+            return man.getAttributes("org/mmbase").getValue("SCM-Revision");
+        } else {
+            return "?";
+        }
+    }
+
+    /**
      * Returns the version number of this MMBase.
      * @return version number
      * @since MMBase-1.6
@@ -137,9 +151,9 @@
     public static String get() {
         String tag = getTag();
         if (tag.startsWith("MMBase")) {
-            return tag + " " + getBuildDate();
+            return tag + " " + getBuildDate() + " (r" + getSCMRevision() + ")";
         } else {
-            return getName() + " " + getNumber();
+            return getName() + " " + getNumber() + " (r" + getSCMRevision() + 
")";
         }
     }
 

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs