[jboss-cvs] JBossAS SVN: r101249 - in projects/bootstrap/trunk: impl-as/src/test/java/org/jboss/bootstrap/impl/as/server and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2010-02-22 11:37:40 -0500 (Mon, 22 Feb 2010)
New Revision: 101249

Modified:
   projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/AbstractJBossASServerBase.java
   projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerVersionInformationTestCase.java
   projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractVersion.java
Log:
[JBBOOT-127] Restore Version Code name to the version information, and log less (ie. no build info) at INFO level

Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/AbstractJBossASServerBase.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/AbstractJBossASServerBase.java	2010-02-22 16:23:49 UTC (rev 101248)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/AbstractJBossASServerBase.java	2010-02-22 16:37:40 UTC (rev 101249)
@@ -397,6 +397,20 @@
    //-------------------------------------------------------------------------------||
 
    /**
+    * {@inheritDoc} 
+    * @see org.jboss.bootstrap.impl.mc.server.AbstractMCServerBase#start()
+    */
+   @Override
+   public void start() throws IllegalStateException, Exception
+   {
+      // Give some build-specific information in the log
+      log.debugf("Starting: %s", this.version.toString(true));
+
+      // Start
+      super.start();
+   }
+
+   /**
     * @param startDate the startDate to set
     */
    protected void setStartDate(final Date startDate)

Modified: projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerVersionInformationTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerVersionInformationTestCase.java	2010-02-22 16:23:49 UTC (rev 101248)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerVersionInformationTestCase.java	2010-02-22 16:37:40 UTC (rev 101249)
@@ -264,7 +264,24 @@
       TestCase.assertTrue("toString() of " + server.getClass().getName() + " does not container version information",
             serverInfo.contains(versionInfo));
    }
+   
+   /**
+    * Test that the {@link AbstractJBossASServerBase#toString()} contains the
+    * code name of the server
+    * 
+    * JBBOOT-127
+    */
+   @Test
+   public void testServerToStringReportsVersionName()
+   {
+      String serverInfo = server.toString();
+      String versionName = server.getVersionName();
 
+      TestCase.assertNotNull("Version name not available in server", versionName);
+      TestCase.assertTrue("toString() of " + server.getClass().getName() + " does not container version name information",
+            serverInfo.contains(versionName));
+   }
+
    /**
     * Ensures that the server config "getSpecificationVersion" reports
     * the correct version of the AS Server

Modified: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractVersion.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractVersion.java	2010-02-22 16:23:49 UTC (rev 101248)
+++ projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractVersion.java	2010-02-22 16:37:40 UTC (rev 101249)
@@ -66,6 +66,10 @@
    public final static String BUILD_OS_VERSION = "os.version";
 
    public static final char DELIMITER_VERSION = '.';
+   
+   public static final char DOUBLE_QUOTE = '"';
+   
+   public static final char SPACE = ' ';
 
    /**
     * The version properties.
@@ -223,35 +227,62 @@
     */
    public String getVersionNumber()
    {
-      StringBuffer buff = new StringBuffer();
+      StringBuilder builder = new StringBuilder();
 
-      buff.append(getMajor()).append(DELIMITER_VERSION);
-      buff.append(getMinor()).append(DELIMITER_VERSION);
-      buff.append(getRevision()).append(DELIMITER_VERSION);
-      buff.append(getTag());
+      builder.append(getMajor()).append(DELIMITER_VERSION);
+      builder.append(getMinor()).append(DELIMITER_VERSION);
+      builder.append(getRevision()).append(DELIMITER_VERSION);
+      builder.append(getTag());
 
-      return buff.toString();
+      return builder.toString();
    }
 
    /**
     * Returns the version information as a string.
     * 
-    * Must contain the version number by contract.
+    * Equivalent to calling {@link AbstractVersion#toString(boolean)}
+    * passing in an argument of <code>false</code>
     *
     * @return Basic information as a string.
     */
    public String toString()
    {
-      StringBuffer buff = new StringBuffer();
+      return this.toString(false);
+   }
+   
+   /**
+    * Returns the version information as a string.
+    * 
+    * Must contain the version number and name by contract.
+    *
+    * @param includeBuildInformation Whether or not a more full description 
+    *   of the build ID and tags should be used
+    * @return Basic information as a string.
+    */
+   public String toString(final boolean includeBuildInformation)
+   {
+      final StringBuilder builder = new StringBuilder();
 
-      buff.append(getVersionNumber());
-      buff.append(" (build: SVNTag=");
-      buff.append(getCvsTag());
-      buff.append(" date=");
-      buff.append(getBuildID());
-      buff.append(")");
+      builder.append(getVersionNumber());
+      builder.append(SPACE);
+      builder.append(DOUBLE_QUOTE);
+      builder.append(getName());
+      builder.append(DOUBLE_QUOTE);
 
-      return buff.toString();
+      // Include build info?
+      if (includeBuildInformation)
+      {
+         builder.append(SPACE);
+         builder.append(" (build: SVNTag=");
+         builder.append(getCvsTag());
+         builder.append(" date=");
+         builder.append(getBuildID());
+         builder.append(")");
+      }
+
+      // Return
+      return builder.toString();
+
    }
 
    /**