Index: glassfish/appserv-core/src/java/com/sun/enterprise/web/PEWebContainer.java
===================================================================
RCS file: /cvs/glassfish/appserv-core/src/java/com/sun/enterprise/web/PEWebContainer.java,v
retrieving revision 1.114.2.5
diff -u -r1.114.2.5 PEWebContainer.java
--- PEWebContainer.java 9 Oct 2008 16:38:47 -0000       1.114.2.5
+++ PEWebContainer.java 18 Feb 2009 18:21:36 -0000
@@ -71,6 +71,7 @@
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.core.StandardEngine;
 import org.apache.catalina.core.StandardHost;
+import org.apache.catalina.util.ServerInfo;
 import org.apache.coyote.tomcat5.CoyoteConnector;
 import org.apache.tomcat.util.IntrospectionUtils;

@@ -786,7 +787,8 @@
      * Start the web container
      */
     public void startInstance() throws ServerLifecycleException {
-        _logger.log(Level.INFO, "pewebcontainer.start");
+        _logger.log(Level.INFO, "pewebcontainer.start",
+                    ServerInfo.getServerInfo());
         try {
             super.start();
          } catch (LifecycleException le) {
@@ -810,7 +812,8 @@
      * Stop the web container
      */
     public void stopInstance() throws ServerLifecycleException {
-        _logger.log(Level.INFO, "pewebcontainer.stop");
+        _logger.log(Level.INFO, "pewebcontainer.stop",
+                    ServerInfo.getServerInfo());
         try {
             super.stop();
         } catch (LifecycleException le) {

Index: glassfish/appserv-http-engine/src/java/com/sun/enterprise/web/connector/grizzly/GrizzlyHttpProtocol.java
===================================================================
RCS file: /cvs/glassfish/appserv-http-engine/src/java/com/sun/enterprise/web/connector/grizzly/GrizzlyHttpProtocol.java,v
retrieving revision 1.49.2.3
diff -u -r1.49.2.3 GrizzlyHttpProtocol.java
--- java/com/sun/enterprise/web/connector/grizzly/GrizzlyHttpProtocol.java      8 Jan 2008 16:33:59 -0000       1.49.2.3
+++ java/com/sun/enterprise/web/connector/grizzly/GrizzlyHttpProtocol.java      18 Feb 2009 18:23:03 -0000
@@ -67,6 +67,7 @@
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import org.apache.catalina.util.ServerInfo;
 import org.apache.coyote.http11.Http11Protocol;
 import org.apache.tomcat.util.net.SSLImplementation;
 import org.apache.tomcat.util.net.ServerSocketFactory;
@@ -262,16 +263,16 @@
             throw ex;
         }

-        SelectorThread.logger().log(Level.INFO,
-                   "grizzlyHttpProtocol.start", String.valueOf(getPort()));
+        SelectorThread.logger().log(Level.INFO, "grizzlyHttpProtocol.start",
+            new Object[] { ServerInfo.getServerInfo(),
+                           String.valueOf(getPort()) });
     }


     public void destroy() throws Exception {
-        SelectorThread.logger().log(Level.INFO,
-                   "grizzlyHttpProtocol.stop",
-                                String.valueOf(getPort()));
-
+        SelectorThread.logger().log(Level.INFO, "grizzlyHttpProtocol.stop",
+            new Object[] { ServerInfo.getServerInfo(),
+                           String.valueOf(getPort()) });
         if ( domain != null ){
            jmxManagement.
                     unregisterComponent(new ObjectName(domain,"type", "Selector"));

Index: glassfish/appserv-commons/src/java/com/sun/logging/enterprise/system/container/web/LogStrings.properties
===================================================================
RCS file: /cvs/glassfish/appserv-commons/src/java/com/sun/logging/enterprise/system/container/web/LogStrings.properties,v
retrieving revision 1.39.2.1
diff -u -r1.39.2.1 LogStrings.properties
--- java/com/sun/logging/enterprise/system/container/web/LogStrings.properties  1 May 2008 01:17:50 -0000       1.39.2.1
+++ java/com/sun/logging/enterprise/system/container/web/LogStrings.properties  18 Feb 2009 18:23:37 -0000
@@ -144,8 +144,8 @@
 #
 create.vs=WEB0300: Creating VS {0} @docroot {1}
 create.listenerport=WEB0301: Creating Listener @port {0} {1}
-pewebcontainer.start=WEB0302: Starting Sun-Java-System/Application-Server.
-pewebcontainer.stop=WEB0303: Stopping Sun-Java-System/Application-Server.
+pewebcontainer.start=WEB0302: Starting {0}
+pewebcontainer.stop=WEB0303: Stopping {0}
 pewebcontainer.invalid_http_service_property=WEB0304: Unsupported http-service property ({0}) is being ignored
 pewebcontainer.invalid_proxy_port=WEB0305: Unable to parse proxy port component ({0}) of server-name attribute of http-listener {1}
 WEB0305.diag.cause.1=HTTP listener's proxy port is not a numeric string
@@ -240,11 +240,11 @@
 grizzlyHttpProtocol.getattribute=WEB0709: Attribute [{0}]
 grizzlyHttpProtocol.setattribute=WEB0710: Attribute [{0}]: [{1}]
 grizzlyHttpProtocol.socketfactory.initerror=WEB07011: Error initializing socket factory
-grizzlyHttpProtocol.start=WEB0712: Starting Sun-Java-System/Application-Server HTTP/1.1 on {0}
-grizzlyHttpProtocol.stop=WEB0713: Stopping Sun-Java-System/Application-Server HTTP/1.1 on {0}
-grizzlyHttpProtocol.pause=WEB0714: Pausing Sun-Java-System/Application-Server HTTP/1.1 on {0}
+grizzlyHttpProtocol.start=WEB0712: Starting {0} HTTP/1.1 on {1}
+grizzlyHttpProtocol.stop=WEB0713: Stopping {0} HTTP/1.1 on {1}
+grizzlyHttpProtocol.pause=WEB0714: Pausing {0} HTTP/1.1 on {1}
 grizzlyHttpProtocol.endpoint.pauseerror=WEB0715: Error pausing endpoint
-grizzlyHttpProtocol.resume=WEB0716: Resuming Sun-Java-System/Application-Server HTTP/1.1 on {0}
+grizzlyHttpProtocol.resume=WEB0716: Resuming {0} HTTP/1.1 on {1}
 grizzlyHttpProtocol.endpoint.resumeerror=WEB0717: Error resuming endpoint

 selectorThread.invalidSelectorTimeout=WEB0750: Invalid selectorTimeout value