[Smartfrog-checkins] SF.net SVN: smartfrog: [5254] trunk/core/smartfrog

[<ju...@us...>]

Revision: 5254
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=5254&view=rev
Author:   julgui
Date:     2007-10-11 12:07:38 -0700 (Thu, 11 Oct 2007)

Log Message:
-----------
More version info.

Modified Paths:
--------------
    trunk/core/smartfrog/build.xml
    trunk/core/smartfrog/src/org/smartfrog/Version.java
    trunk/core/smartfrog/src/org/smartfrog/version.sf.build

Modified: trunk/core/smartfrog/build.xml
===================================================================
--- trunk/core/smartfrog/build.xml	2007-10-11 18:02:40 UTC (rev 5253)
+++ trunk/core/smartfrog/build.xml	2007-10-11 19:07:38 UTC (rev 5254)
@@ -247,6 +247,7 @@
 	  <entry key="sf.build.java.vendor" value="${java.vendor}"/>
 	  <entry key="sf.build.os.name" value="${os.name}"/>
 	  <entry key="sf.build.os.version" value="${os.version}"/>
+	  	  
     </propertyfile>
     <property file="${sf.version.file}"/>
     <copy file="${sf.version.file}" todir="${build.classes.dir}/org/smartfrog" />
@@ -262,6 +263,11 @@
         <replacefilter token="@build@" value="${sf.build}"/>
         <replacefilter token="@status@" value="${sf.status}"/>
         <replacefilter token="@buildDate@" value="${sf.build.date}"/>
+		
+		<replacefilter token="@buildJavaVersion@" value="${sf.build.java.version}"/>
+		<replacefilter token="@buildJavaVendor@" value="${sf.build.java.vendor}"/>
+		<replacefilter token="@buildOSName@" value="${sf.build.os.name}"/>
+		<replacefilter token="@buildOSVersion@" value="${sf.build.os.version}"/>
     </replace>
 
     <echo level="verbose">version=${sfversion}</echo>

Modified: trunk/core/smartfrog/src/org/smartfrog/Version.java
===================================================================
--- trunk/core/smartfrog/src/org/smartfrog/Version.java	2007-10-11 18:02:40 UTC (rev 5253)
+++ trunk/core/smartfrog/src/org/smartfrog/Version.java	2007-10-11 19:07:38 UTC (rev 5254)
@@ -53,6 +53,14 @@
      * Used to determine the maximum core version compatible with this instance*/
     final static String ATR_MAX_CORE_VERSION = "majorRelease";
 
+    /** SmartFrog attribute name. Value = {@value} */
+    final static String ATR_BUILD_OSVERSION = "buildOSVersion";
+    /** SmartFrog attribute name. Value = {@value} */
+    final static String ATR_BUILD_OSNAME = "buildOSName";
+    /** SmartFrog attribute name. Value = {@value} */
+    final static String ATR_BUILD_JAVAVENDOR = "buildJavaVendor";
+    /** SmartFrog attribute name. Value = {@value} */
+    final static String ATR_BUILD_JAVAVERSION = "buildJavaVersion";
 
     // Dont' change this. MODIFY version.sf in same package!!!!!!!!!!!!!!!!!!!
     private static String name=        "SmartFrog";
@@ -67,6 +75,12 @@
 
     private static String buildDate= "buildDate";
 
+    private static String buildOSName ="@buildOSName@";
+    private static String buildOSVersion = "@buildOSVersion@";
+    private static String buildJavaVersion = "@buildJavaVersion@";
+    private static String buildJavaVendor = "@buildJavaVendor@";
+
+
     // Don't change this. MODIFY version.sf in same package!!!!!!!!!!!!!!!!!!!
     /** The copyright String for the SmartFrog system. */
     private static String copyright = "(C) Copyright 1998-2006 HP Development Company, LP";
@@ -93,6 +107,10 @@
             minCoreVersion = classComponentDescription.sfResolve(ATR_MIN_CORE_VERSION, minCoreVersion , false);
             maxCoreVersion = classComponentDescription.sfResolve(ATR_MAX_CORE_VERSION, maxCoreVersion , false);
             buildDate = classComponentDescription.sfResolve(ATR_BUILD_DATE, buildDate , false);
+            buildOSName = classComponentDescription.sfResolve(ATR_BUILD_OSNAME, buildDate , false);
+            buildOSVersion = classComponentDescription.sfResolve(ATR_BUILD_OSVERSION, buildDate , false);
+            buildJavaVersion = classComponentDescription.sfResolve(ATR_BUILD_JAVAVERSION, buildDate , false);
+            buildJavaVendor = classComponentDescription.sfResolve(ATR_BUILD_JAVAVENDOR, buildDate , false);
             initialized=true;
 
         } catch (Exception ex) {

Modified: trunk/core/smartfrog/src/org/smartfrog/version.sf.build
===================================================================
--- trunk/core/smartfrog/src/org/smartfrog/version.sf.build	2007-10-11 18:02:40 UTC (rev 5253)
+++ trunk/core/smartfrog/src/org/smartfrog/version.sf.build	2007-10-11 19:07:38 UTC (rev 5254)
@@ -27,5 +27,9 @@
   status "@status@"; //alpha, beta, (stable), rc (release candidate)
   copyright "(C) Copyright 1998-2007 Hewlett-Packard Development Company, LP";
   buildDate "@buildDate@";
+  buildOSName "@buildOSName@";
+  buildOSVersion "@buildOSVersion@";
+  buildJavaVersion "@buildJavaVersion@";
+  buildJavaVendor "@buildJavaVendor@";
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.