From 67395e5de80a8b187b746884b9f897d97ded8486 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Thu, 27 Jul 2006 14:09:19 +0000
Subject: [PATCH] - Incorporated build number into version number messages i.e.
 at server startup, in about dialog and in database.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3428 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/web/bean/AboutBean.java | 43 +++++++++++++++++++
 source/web/WEB-INF/faces-config-beans.xml     | 11 +++++
 source/web/jsp/dialog/about.jsp               |  2 +-
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 source/java/org/alfresco/web/bean/AboutBean.java

diff --git a/source/java/org/alfresco/web/bean/AboutBean.java b/source/java/org/alfresco/web/bean/AboutBean.java
new file mode 100644
index 0000000000..83f9d26916
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/AboutBean.java
@@ -0,0 +1,43 @@
+package org.alfresco.web.bean;
+
+import org.alfresco.service.descriptor.DescriptorService;
+
+/**
+ * Simple backing bean used by the about page to display the version.
+ * 
+ * @author gavinc
+ */
+public class AboutBean
+{
+   DescriptorService descriptorService;
+   
+   /**
+    * Retrieves the version of the repository.
+    * 
+    * @return The version string
+    */
+   public String getVersion()
+   {
+      return this.descriptorService.getServerDescriptor().getVersion();
+   }
+   
+   /**
+    * Retrieves the edition of the repository.
+    * 
+    * @return The edition
+    */
+   public String getEdition()
+   {
+      return this.descriptorService.getServerDescriptor().getEdition();
+   }
+   
+   /**
+    * Sets the DescriptorService.
+    * 
+    * @param descriptorService The DescriptorService
+    */
+   public void setDescriptorService(DescriptorService descriptorService)
+   {
+      this.descriptorService = descriptorService;
+   }
+}
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index 66f69811e0..ca8f971e75 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -95,6 +95,17 @@
       </managed-property>
    </managed-bean>
 
+   <managed-bean>
+      <description>Bean that provides information for the About page</description>
+      <managed-bean-name>AboutBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.AboutBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>descriptorService</property-name>
+         <value>#{DescriptorService}</value>
+      </managed-property>
+   </managed-bean>
+
 	<managed-bean>
 		<description>Bean that manages the dialog framework</description>
 		<managed-bean-name>DialogManager</managed-bean-name>
diff --git a/source/web/jsp/dialog/about.jsp b/source/web/jsp/dialog/about.jsp
index 34669e0241..dfcf4bb32a 100644
--- a/source/web/jsp/dialog/about.jsp
+++ b/source/web/jsp/dialog/about.jsp
@@ -71,7 +71,7 @@
                            </td>
                            <td>
                               <div class="mainTitle"><h:outputText value="#{msg.title_about}" /></div>
-                              <div class="mainSubText"><h:outputText value="#{msg.version}" />: <h:outputText value='#{version["version.edition"]} - v#{version["version.major"]}.#{version["version.minor"]}.#{version["version.revision"]}' /> <h:outputText rendered='#{version["version.label"] != ""}' value='(#{version["version.label"]})' /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.version}" />:&nbsp;<h:outputText value="#{AboutBean.edition}" />&nbsp;-&nbsp;v<h:outputText value="#{AboutBean.version}" /></div>
                            </td>
                         </tr>
                      </table>