You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2009/07/03 02:09:12 UTC

svn commit: r790767 - in /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main: java/org/apache/catalina/util/ServerInfo.java resources/org/apache/catalina/util/ServerInfo.properties

Author: kevan
Date: Fri Jul  3 00:09:12 2009
New Revision: 790767

URL: http://svn.apache.org/viewvc?rev=790767&view=rev
Log:
GERONIMO-4685 Some customizations of Tomcat properties. Server info is now: Apache Geronimo (Embedded Tomcat). Will want to merge in the future.

Modified:
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/util/ServerInfo.java
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties

Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/util/ServerInfo.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/util/ServerInfo.java?rev=790767&r1=790766&r2=790767&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/util/ServerInfo.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/util/ServerInfo.java Fri Jul  3 00:09:12 2009
@@ -67,7 +67,7 @@
             ;
         }
         if (serverInfo == null)
-            serverInfo = "Apache Tomcat";
+            serverInfo = "Apache Geronimo (Embedded Tomcat)";
         if (serverBuilt == null)
             serverBuilt = "unknown";
         if (serverNumber == null)

Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties?rev=790767&r1=790766&r2=790767&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties Fri Jul  3 00:09:12 2009
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-server.info=Apache Tomcat/@VERSION@
+server.info=Apache Geronimo (Embedded Tomcat/@VERSION@)
 server.number=@VERSION_NUMBER@
 server.built=@VERSION_BUILT@
\ No newline at end of file