Index: ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainer.java
===================================================================
--- ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainer.java	(revision 62784)
+++ ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainer.java	(working copy)
@@ -149,6 +149,7 @@
 import org.glassfish.api.naming.GlassfishNamingManager;
 import org.glassfish.deployment.common.DeploymentException;
 import org.glassfish.deployment.common.Descriptor;
+import org.glassfish.ejb.LogFacade;
 import org.glassfish.ejb.api.EjbEndpointFacade;
 import org.glassfish.ejb.deployment.descriptor.EjbApplicationExceptionInfo;
 import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl;
@@ -165,6 +166,7 @@
 import org.glassfish.flashlight.provider.ProbeProviderFactory;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.internal.api.Globals;
+import org.glassfish.logging.annotation.LogMessageInfo;
 import org.glassfish.ejb.spi.EjbContainerInterceptor;
 
 /**
@@ -186,6 +188,13 @@
 
     protected static final Logger _logger = EjbContainerUtilImpl.getLogger();
     
+    private static final Logger logger  = LogFacade.getLogger();
+
+    @LogMessageInfo(
+        message = "Internal Error",
+        level = "SEVERE")
+    private static final String INTERNAL_ERROR = "AS-EJB-00052";
+    
     protected static final Class[] NO_PARAMS = new Class[] {};
     
     protected Object[] logParams = null;
@@ -4087,7 +4096,7 @@
             try{
                 interceptor.preInvoke(ejbDescriptor);
             } catch (Throwable th) {
-                _logger.log(Level.SEVERE, "Internal Error", th);
+                logger.log(Level.SEVERE, INTERNAL_ERROR, th);
             }
         }
     }
@@ -4099,7 +4108,7 @@
             try{
                 interceptor.postInvoke(ejbDescriptor);
             } catch (Throwable th) {
-                _logger.log(Level.SEVERE, "Internal Error", th);
+                logger.log(Level.SEVERE, INTERNAL_ERROR, th);
             }
         }
     }
Index: web/web-core/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- web/web-core/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java	(revision 62784)
+++ web/web-core/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java	(working copy)
@@ -135,6 +135,18 @@
     )
     public static final String NO_HOST_MATCHES_SERVER_NAME_INFO = "AS-WEB-CORE-00040";
 
+    @LogMessageInfo(
+            message = "Internal Error",
+            level = "SEVERE"
+    )
+    public static final String INTERNAL_ERROR = "AS-WEB-CORE-00493";
+    
+    @LogMessageInfo(
+            message = "Failed to initialize the interceptor",
+            level = "SEVERE"
+    )
+    public static final String FAILED_TO_INITIALIZE_THE_INTERCEPTOR = "AS-WEB-CORE-00494";
+    
     // -------------------------------------------------------------- Constants
     private static final String POWERED_BY = "Servlet/3.1 JSP/2.3 " +
             "(" + ServerInfo.getServerInfo() + " Java/" +
@@ -279,7 +291,7 @@
             try{
                 interceptor.preInvoke(req, res);
             } catch (Throwable th) {
-                log.log(Level.SEVERE, "Internal Error", th);
+                log.log(Level.SEVERE, INTERNAL_ERROR, th);
             }
         }
     }
@@ -291,7 +303,7 @@
             try{
                 interceptor.postInvoke(req, res);
             } catch (Throwable th) {
-                log.log(Level.SEVERE, "Internal Error", th);
+                log.log(Level.SEVERE, INTERNAL_ERROR, th);
             }
         }
     }
@@ -301,7 +313,7 @@
             ServiceLocator services = org.glassfish.internal.api.Globals.getDefaultHabitat();
             interceptors = services.getAllServices(ServletContainerInterceptor.class);
         } catch (Throwable th) {
-            log.log(Level.SEVERE, "Failed to initialize the interceptor", th);
+            log.log(Level.SEVERE, FAILED_TO_INITIALIZE_THE_INTERCEPTOR, th);
         }
     }