From 22879c645bd0b26be1885dc1373316ca1540353b Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 6 Sep 2010 09:23:16 +0000
Subject: [PATCH] git-svn-id:
 https://svn.apache.org/repos/asf/tomcat/trunk@992981
 13f79535-47bb-0310-9956-ffa450edef68

---
 java/org/apache/catalina/util/ServerInfo.java | 4 ++--
 webapps/docs/changelog.xml                    | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/util/ServerInfo.java b/java/org/apache/catalina/util/ServerInfo.java
index 0aa1c3841..348a13ed4 100644
--- a/java/org/apache/catalina/util/ServerInfo.java
+++ b/java/org/apache/catalina/util/ServerInfo.java
@@ -67,11 +67,11 @@ public class ServerInfo {
             //Ignore
         }
         if (serverInfo == null)
-            serverInfo = "Apache Tomcat";
+            serverInfo = "Apache Tomcat 7.0.x-dev";
         if (serverBuilt == null)
             serverBuilt = "unknown";
         if (serverNumber == null)
-            serverNumber = "5.5.0.0";
+            serverNumber = "7.0.x";
         
     }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fe3d64bf8..551d5e9f6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,10 @@
         in log messages rather than throwing an
         <code>UnsupportedOperationException</code>. (markt)
       </fix>
+      <fix>
+        Update the version numbers in ServerInfo defaults to Tomact 7.0.x.
+        (markt) 
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
-- 
2.11.0