From 1db50720f7f7d04d2683b8962935e70e03609193 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Mon, 25 Feb 2002 16:02:10 +0000
Subject: [PATCH] Use Server name and version directly from
 helma.main.Server.version instead of having a separate server anme and
 version fields.

---
 src/Acme/Serve/Serve.java      | 5 ++---
 src/Acme/Serve/ServeUtils.java | 7 ++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Acme/Serve/Serve.java b/src/Acme/Serve/Serve.java
index e12d3e16..ec00980e 100644
--- a/src/Acme/Serve/Serve.java
+++ b/src/Acme/Serve/Serve.java
@@ -457,8 +457,7 @@ public class Serve implements ServletContext, Runnable
     // Same as the CGI variable SERVER_SOFTWARE.
     public String getServerInfo()
 	{
-	return ServeUtils.serverName + " " + ServeUtils.serverVersion +
-	       " (" + ServeUtils.serverUrl + ")";
+	return helma.main.Server.version + " (" + ServeUtils.serverUrl + ")";
 	}
 
     /// Returns the value of the named attribute of the network service, or
@@ -685,7 +684,7 @@ class ServeConnection implements Runnable, HttpServletRequest, HttpServletRespon
 	setStatus( SC_OK );
 	setDateHeader( "Date", System.currentTimeMillis() );
 	setHeader(
-	    "Server", ServeUtils.serverName + "/" + ServeUtils.serverVersion );
+	    "Server", helma.main.Server.version );
 	setHeader( "Connection", "close" );
 	try
 	    {
diff --git a/src/Acme/Serve/ServeUtils.java b/src/Acme/Serve/ServeUtils.java
index 80224635..e7c11b36 100644
--- a/src/Acme/Serve/ServeUtils.java
+++ b/src/Acme/Serve/ServeUtils.java
@@ -42,8 +42,9 @@ public class ServeUtils
     {
 
     // Server identification.
-    public static final String serverName = "Helma";
-    public static final String serverVersion = "1.2 p1";
+    // public static final String serverName = "Helma";
+    // public static final String serverVersion = "1.2 p1";
+    // we're using the server version from helma.main.Server class.
     public static final String serverUrl = "http://helma.org/";
 
     /// Write a standard-format HTML address for this server.
@@ -52,7 +53,7 @@ public class ServeUtils
 	PrintStream p = new PrintStream( o );
 	p.println(
 	    "<ADDRESS><A HREF=\"" + serverUrl + "\">" +
-	    serverName + " " + serverVersion + "</A></ADDRESS>" );
+	    helma.main.Server.version + "</A></ADDRESS>" );
 	}