Bug 375874 - Include build Id in AboutServlet

2 files changed, 14 insertions, 2 deletions

diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.properties b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.properties
index a26c1d278..2383b923e 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.properties
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2011 IBM Corporation and others.
+# Copyright (c) 2000, 2012 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -14,6 +14,8 @@
 # in this file. For example locale=fr in the French translation of this file 
 locale=en
 
+application=Application: {0}
+buildId=Build id: {0}
 browserTitle = Help - {0}
 SearchLabel=&Search:
 SearchResults=Search Results
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/AboutServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/AboutServlet.java
index 30e4c4e24..f69da7437 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/AboutServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/AboutServlet.java
@@ -100,8 +100,18 @@ public class AboutServlet extends HttpServlet {
 		String title = WebappResources.getString("aboutPlugins", locale); //$NON-NLS-1$
 		buf.append(UrlUtil.htmlEncode(title));
 		buf.append(XHTML_2);
-		buf.append("<table>"); //$NON-NLS-1$
+		String app = System.getProperty("eclipse.application", null); //$NON-NLS-1$
+		String build = System.getProperty("eclipse.buildId", null); //$NON-NLS-1$
+		if (app != null || build != null) {
+			buf.append("<p>"); //$NON-NLS-1$
+			if (app != null)
+				buf.append(WebappResources.getString("application", locale, app) + "<br/>");//$NON-NLS-1$ //$NON-NLS-2$
+			if (build != null)
+				buf.append(WebappResources.getString("buildId", locale, build) + "<br/>");//$NON-NLS-1$ //$NON-NLS-2$
+			buf.append("</p>"); //$NON-NLS-1$
+		}
 
+		buf.append("<table>"); //$NON-NLS-1$
 		List plugins = new ArrayList();
 
 		Bundle[] bundles = HelpWebappPlugin.getContext().getBundles();