jbossweb-commits September 2012

jbossweb-commits@lists.jboss.org

1 participants
14 discussions

JBossWeb SVN: r2082 - in trunk/src/main/java/org: jboss/web and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2012-09-14 08:33:07 -0400 (Fri, 14 Sep 2012) New Revision: 2082 Modified: trunk/src/main/java/org/apache/catalina/core/ApplicationContext.java trunk/src/main/java/org/apache/catalina/core/AprLifecycleListener.java trunk/src/main/java/org/jboss/web/CatalinaLogger.java trunk/src/main/java/org/jboss/web/CatalinaMessages.java trunk/src/main/java/org/jboss/web/CoyoteMessages.java Log: Fix minor issues with the various messages. Modified: trunk/src/main/java/org/apache/catalina/core/ApplicationContext.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/ApplicationContext.java 2012-09-13 16:47:04 UTC (rev 2081) +++ trunk/src/main/java/org/apache/catalina/core/ApplicationContext.java 2012-09-14 12:33:07 UTC (rev 2082) @@ -1134,7 +1134,7 @@ Class<?> clazz = context.getLoader().getClassLoader().loadClass(className); listenerInstance = (EventListener) context.getInstanceManager().newInstance(clazz); } catch (Throwable t) { - throw MESSAGES.invalidContextListener(className, getContextPath(), t); + throw MESSAGES.invalidContextListenerWithException(className, getContextPath(), t); } checkListenerType(listenerInstance); if (context.getApplicationLifecycleListeners() != null && listenerInstance instanceof ServletContextListener) { @@ -1170,7 +1170,7 @@ try { listenerInstance = (EventListener) context.getInstanceManager().newInstance(listenerClass); } catch (Exception e) { - throw MESSAGES.invalidContextListener(listenerClass.getName(), getContextPath(), e); + throw MESSAGES.invalidContextListenerWithException(listenerClass.getName(), getContextPath(), e); } checkListenerType(listenerInstance); if (context.getApplicationLifecycleListeners() != null && listenerInstance instanceof ServletContextListener) { Modified: trunk/src/main/java/org/apache/catalina/core/AprLifecycleListener.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/AprLifecycleListener.java 2012-09-13 16:47:04 UTC (rev 2081) +++ trunk/src/main/java/org/apache/catalina/core/AprLifecycleListener.java 2012-09-14 12:33:07 UTC (rev 2082) @@ -75,7 +75,7 @@ if (!CatalinaLogger.CORE_LOGGER.isDebugEnabled()) { CatalinaLogger.CORE_LOGGER.aprSslEngineInitFailed(); } else { - CatalinaLogger.CORE_LOGGER.aprSslEngineInitFailed(t); + CatalinaLogger.CORE_LOGGER.aprSslEngineInitFailedWithThrowable(t); } } } @@ -105,9 +105,9 @@ patch = clazz.getField("TCN_PATCH_VERSION").getInt(null); } catch (Throwable t) { if (!CatalinaLogger.CORE_LOGGER.isDebugEnabled()) { - CatalinaLogger.CORE_LOGGER.aprInitFailed(); + CatalinaLogger.CORE_LOGGER.aprInitFailed(System.getProperty("java.library.path")); } else { - CatalinaLogger.CORE_LOGGER.aprInitFailed(t); + CatalinaLogger.CORE_LOGGER.aprInitFailedWithThrowable(System.getProperty("java.library.path"), t); } return false; } Modified: trunk/src/main/java/org/jboss/web/CatalinaLogger.java =================================================================== --- trunk/src/main/java/org/jboss/web/CatalinaLogger.java 2012-09-13 16:47:04 UTC (rev 2081) +++ trunk/src/main/java/org/jboss/web/CatalinaLogger.java 2012-09-14 12:33:07 UTC (rev 2082) @@ -141,10 +141,6 @@ @Message(id = 1012, value = "The connector has already been started") void connectorAlreadyStarted(); - @LogMessage(level = ERROR) - @Message(id = 1012, value = "Failed protocol handler [%s] JMX registration.") - void failedProtocolJmxRegistration(Object objectName, @Cause Throwable t); - @LogMessage(level = INFO) @Message(id = 1013, value = "Cannot proceed with protocol handler JMX registration.") void failedProtocolJmxRegistration(); @@ -343,7 +339,7 @@ @LogMessage(level = DEBUG) @Message(id = 1062, value = "Failed to initialize the SSLEngine") - void aprSslEngineInitFailed(@Cause Throwable t); + void aprSslEngineInitFailedWithThrowable(@Cause Throwable t); @LogMessage(level = INFO) @Message(id = 1063, value = "Failed to initialize the SSLEngine") @@ -351,11 +347,11 @@ @LogMessage(level = DEBUG) @Message(id = 1064, value = "The native library which allows optimal performance in production environments was not found on the java.library.path: %s") - void aprInitFailed(@Cause Throwable t); + void aprInitFailedWithThrowable(String libraryPath, @Cause Throwable t); @LogMessage(level = INFO) @Message(id = 1065, value = "The native library which allows optimal performance in production environments was not found on the java.library.path: %s") - void aprInitFailed(); + void aprInitFailed(String libraryPath); @LogMessage(level = ERROR) @Message(id = 1066, value = "An incompatible version %s.%s.%s of the native library is installed, while JBoss Web requires version %s.%s.%s") @@ -478,11 +474,11 @@ void missingJspServlet(); @LogMessage(level = ERROR) - @Message(id = 1096, value = "Error stopping context") + @Message(id = 1096, value = "Error stopping context %s") void errorStoppingContext(String name, @Cause Throwable t); @LogMessage(level = ERROR) - @Message(id = 1097, value = "Error starting context") + @Message(id = 1097, value = "Error starting context %s") void errorStartingContext(String name, @Cause Throwable t); @LogMessage(level = DEBUG) @@ -506,15 +502,15 @@ void errorInitializingResources(@Cause Throwable t); @LogMessage(level = ERROR) - @Message(id = 1103, value = "Error detected during context start, will stop it") + @Message(id = 1103, value = "Error detected during context %s start, will stop it") void errorStartingContextWillStop(String name); @LogMessage(level = ERROR) - @Message(id = 1104, value = "Error performing failed context start cleanup") + @Message(id = 1104, value = "Error performing failed context %s start cleanup") void errorStartingContextCleanup(String name, @Cause Throwable t); @LogMessage(level = ERROR) - @Message(id = 1105, value = "Error resetting context") + @Message(id = 1105, value = "Error resetting context %s") void errorResettingContext(String name, @Cause Throwable t); @LogMessage(level = DEBUG) @@ -529,10 +525,6 @@ @Message(id = 1108, value = "Context %s object name creation failed") void contextObjectNameCreationFailed(String contextName, @Cause Throwable t); - @LogMessage(level = INFO) - @Message(id = 1108, value = "Context %s JMX registration failed") - void contextJmxRegistrationFailed(String contextName, @Cause Throwable t); - @LogMessage(level = ERROR) @Message(id = 1109, value = "Cannot find context %s parent Host JMX name") void cannotFindContextJmxParentName(String name); @@ -653,4 +645,12 @@ @Message(id = 1138, value = "Failed server [%s] JMX registration.") void failedServerJmxRegistration(Object objectName, @Cause Throwable t); + @LogMessage(level = INFO) + @Message(id = 1139, value = "Context %s JMX registration failed") + void contextJmxRegistrationFailed(String contextName, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1140, value = "Failed protocol handler [%s] JMX registration.") + void failedProtocolJmxRegistration(Object objectName, @Cause Throwable t); + } Modified: trunk/src/main/java/org/jboss/web/CatalinaMessages.java =================================================================== --- trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-13 16:47:04 UTC (rev 2081) +++ trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-14 12:33:07 UTC (rev 2082) @@ -193,7 +193,7 @@ @Message(id = 50, value = "Cannot start async") IllegalStateException cannotStartAsync(); - @Message(id = 51, value = "Error invoking onStartAsync on listener of class {0}") + @Message(id = 51, value = "Error invoking onStartAsync on listener of class %s") IllegalStateException errorStartingAsync(String listenerClassName, @Cause Throwable t); @Message(id = 52, value = "No authenticator available for programmatic login") @@ -292,12 +292,6 @@ @Message(id = 87, value = "Duration unit not found after amount %s in directive %s") IllegalStateException expiresDurationUnitNotFound(int amount, String line); - @Message(id = 86, value = "Invalid duration unit (years|months|weeks|days|hours|minutes|seconds) %s in directive %s") - IllegalStateException expiresInvalidDurationUnit(String token, String line); - - @Message(id = 87, value = "Request filter invalid pattern %s") - IllegalArgumentException requestFilterInvalidPattern(String pattern, @Cause Throwable t); - @Message(id = 88, value = "The requested resource (%s) is not available") String resourceNotAvailable(String resource); @@ -379,7 +373,7 @@ @Message(id = 114, value = "The requested resource has moved temporarily to a new location.") String http302(); - @Message(id = 115, value = "The response to this request can be found under a different URI (%s).") + @Message(id = 115, value = "The response to this request can be found under a different URI.") String http303(); @Message(id = 116, value = "The requested resource is available and has not been modified.") @@ -526,24 +520,6 @@ @Message(id = 207, value = "JDBC Store SQL exception") String jdbcStoreDatabaseError(); - @Message(id = 202, value = "Loading Session %s from file %s") - String jdbcStoreSessionLoad(String sessionId, String table); - - @Message(id = 203, value = "Saving Session %s to file %s") - String jdbcStoreSessionSave(String sessionId, String table); - - @Message(id = 204, value = "Removing Session %s at file %s") - String jdbcStoreSessionRemove(String sessionId, String table); - - @Message(id = 205, value = "No persisted data object found") - String jdbcStoreIdNotFound(); - - @Message(id = 206, value = "The database connection is null or was found to be closed. Trying to re-open it.") - String jdbcStoreConnectionWasClosed(); - - @Message(id = 207, value = "The re-open on the database failed. The database could be down.") - String jdbcStoreConnectionReopenFailed(); - @Message(id = 208, value = "JDBC driver class not found %s") String jdbcStoreDriverFailure(String className); @@ -605,7 +581,7 @@ IllegalArgumentException invalidContextListener(String className, String path); @Message(id = 228, value = "Bad listener class %s for context %s") - IllegalArgumentException invalidContextListener(String className, String path, @Cause Throwable t); + IllegalArgumentException invalidContextListenerWithException(String className, String path, @Cause Throwable t); @Message(id = 229, value = "The session tracking mode %s requested for context %s is not supported by that context") IllegalArgumentException unsupportedSessionTrackingMode(String sessionTracking, String path); @@ -784,9 +760,6 @@ @Message(id = 287, value = "Exception sending context initialized event to listener instance of class %s") String errorSendingContextInitializedEvent(String listenerClass); - @Message(id = 287, value = "Exception sending context destroyed event to listener instance of class %s") - String errorSendingContextDestroyedEvent(String listenerClass); - @Message(id = 288, value = "Error destroying application listener of class %s") String errorDestroyingApplicationListener(String listenerClass); @@ -823,4 +796,31 @@ @Message(id = 299, value = "Async dispatch processing for servlet %s threw exception") String asyncDispatchError(String servletName); + @Message(id = 300, value = "Loading Session %s from file %s") + String jdbcStoreSessionLoad(String sessionId, String table); + + @Message(id = 301, value = "Saving Session %s to file %s") + String jdbcStoreSessionSave(String sessionId, String table); + + @Message(id = 302, value = "Removing Session %s at file %s") + String jdbcStoreSessionRemove(String sessionId, String table); + + @Message(id = 303, value = "No persisted data object found") + String jdbcStoreIdNotFound(); + + @Message(id = 304, value = "The database connection is null or was found to be closed. Trying to re-open it.") + String jdbcStoreConnectionWasClosed(); + + @Message(id = 305, value = "The re-open on the database failed. The database could be down.") + String jdbcStoreConnectionReopenFailed(); + + @Message(id = 306, value = "Exception sending context destroyed event to listener instance of class %s") + String errorSendingContextDestroyedEvent(String listenerClass); + + @Message(id = 307, value = "Invalid duration unit (years|months|weeks|days|hours|minutes|seconds) %s in directive %s") + IllegalStateException expiresInvalidDurationUnit(String token, String line); + + @Message(id = 308, value = "Request filter invalid pattern %s") + IllegalArgumentException requestFilterInvalidPattern(String pattern, @Cause Throwable t); + } Modified: trunk/src/main/java/org/jboss/web/CoyoteMessages.java =================================================================== --- trunk/src/main/java/org/jboss/web/CoyoteMessages.java 2012-09-13 16:47:04 UTC (rev 2081) +++ trunk/src/main/java/org/jboss/web/CoyoteMessages.java 2012-09-14 12:33:07 UTC (rev 2082) @@ -101,7 +101,7 @@ @Message(id = 2019, value = "Invalid CRLF") IOException invalidCrlf(); - @Message(id = 2019, value = "Invalid chunk header") + @Message(id = 2020, value = "Invalid chunk header") IOException invalidChunkHeader(); }

12 years, 3 months

1
0
0 / 0

JBossWeb SVN: r2081 - in trunk/src/main/java/org: apache/catalina/core and 6 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2012-09-13 12:47:04 -0400 (Thu, 13 Sep 2012) New Revision: 2081 Added: trunk/src/main/java/org/jboss/web/WebLogger.java trunk/src/main/java/org/jboss/web/WebMessages.java Removed: trunk/src/main/java/org/apache/catalina/core/LocalStrings.properties trunk/src/main/java/org/apache/catalina/core/LocalStrings_es.properties trunk/src/main/java/org/apache/catalina/core/LocalStrings_fr.properties trunk/src/main/java/org/apache/catalina/core/LocalStrings_ja.properties trunk/src/main/java/org/apache/catalina/util/StringManager.java trunk/src/main/java/org/jboss/web/php/LocalStrings.properties Modified: trunk/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java trunk/src/main/java/org/apache/catalina/core/JasperListener.java trunk/src/main/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java trunk/src/main/java/org/apache/catalina/core/StandardContextValve.java trunk/src/main/java/org/apache/catalina/core/StandardEngineValve.java trunk/src/main/java/org/apache/catalina/core/StandardHostValve.java trunk/src/main/java/org/apache/catalina/core/StandardPipeline.java trunk/src/main/java/org/apache/catalina/core/StandardServer.java trunk/src/main/java/org/apache/catalina/core/StandardService.java trunk/src/main/java/org/apache/catalina/core/StandardWrapperFacade.java trunk/src/main/java/org/apache/catalina/core/StandardWrapperValve.java trunk/src/main/java/org/apache/catalina/security/SecurityUtil.java trunk/src/main/java/org/apache/catalina/util/DateTool.java trunk/src/main/java/org/apache/catalina/valves/PersistentValve.java trunk/src/main/java/org/apache/catalina/valves/RemoteIpValve.java trunk/src/main/java/org/apache/catalina/valves/RequestDumperValve.java trunk/src/main/java/org/apache/catalina/valves/StuckThreadDetectionValve.java trunk/src/main/java/org/apache/catalina/valves/ValveBase.java trunk/src/main/java/org/jboss/web/CatalinaLogger.java trunk/src/main/java/org/jboss/web/CatalinaMessages.java trunk/src/main/java/org/jboss/web/php/Handler.java trunk/src/main/java/org/jboss/web/php/LifecycleListener.java trunk/src/main/java/org/jboss/web/rewrite/RewriteValve.java Log: Part 2 of the core package, plus missing items. Modified: trunk/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java =================================================================== --- trunk/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -19,6 +19,8 @@ package org.apache.catalina.authenticator; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.IOException; import java.security.Principal; import java.util.HashMap; @@ -37,7 +39,6 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.util.LifecycleSupport; -import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; @@ -105,13 +106,6 @@ /** - * The string manager for this package. - */ - protected final static StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * Component started flag. */ protected boolean started = false; @@ -277,8 +271,7 @@ // Validate and update our current component state if (started) - throw new LifecycleException - (sm.getString("authenticator.alreadyStarted")); + throw new LifecycleException(MESSAGES.valveAlreadyStarted()); lifecycle.fireLifecycleEvent(START_EVENT, null); started = true; @@ -297,8 +290,7 @@ // Validate and update our current component state if (!started) - throw new LifecycleException - (sm.getString("authenticator.notStarted")); + throw new LifecycleException(MESSAGES.valveNotStarted()); lifecycle.fireLifecycleEvent(STOP_EVENT, null); started = false; Modified: trunk/src/main/java/org/apache/catalina/core/JasperListener.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/JasperListener.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/JasperListener.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -21,8 +21,7 @@ import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; -import org.apache.catalina.util.StringManager; -import org.jboss.logging.Logger; +import org.jboss.web.CatalinaLogger; /** @@ -37,15 +36,6 @@ public class JasperListener implements LifecycleListener { - private static Logger log = Logger.getLogger(JasperListener.class); - - /** - * The string manager for this package. - */ - protected StringManager sm = - StringManager.getManager(Constants.Package); - - // ---------------------------------------------- LifecycleListener Methods @@ -64,7 +54,7 @@ this.getClass().getClassLoader()); } catch (Throwable t) { // Should not occur, obviously - log.warn("Couldn't initialize Jasper", t); + CatalinaLogger.CORE_LOGGER.jspContainerInitializationFailed(t); } // Another possibility is to do directly: // JspFactory.setDefaultFactory(new JspFactoryImpl()); Modified: trunk/src/main/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -33,7 +33,7 @@ import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; -import org.apache.catalina.util.StringManager; +import org.jboss.web.CatalinaLogger; /** * Provide a workaround for known places where the Java Runtime environment can @@ -51,11 +51,6 @@ */ public class JreMemoryLeakPreventionListener implements LifecycleListener { - private static org.jboss.logging.Logger log = - org.jboss.logging.Logger.getLogger(JreMemoryLeakPreventionListener.class); - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - /** * Protect against the memory leak caused when the first call to * <code>sun.awt.AppContext.getAppContext()</code> is triggered by a web @@ -293,27 +288,18 @@ } catch (ClassNotFoundException e) { if (System.getProperty("java.vendor").startsWith( "Sun")) { - log.error(sm.getString( - "jreLeakListener.gcDaemonFail"), e); - } else { - log.debug(sm.getString( - "jreLeakListener.gcDaemonFail"), e); + CatalinaLogger.CORE_LOGGER.errorCreatingGcDaemon(e); } } catch (SecurityException e) { - log.error(sm.getString("jreLeakListener.gcDaemonFail"), - e); + CatalinaLogger.CORE_LOGGER.errorCreatingGcDaemon(e); } catch (NoSuchMethodException e) { - log.error(sm.getString("jreLeakListener.gcDaemonFail"), - e); + CatalinaLogger.CORE_LOGGER.errorCreatingGcDaemon(e); } catch (IllegalArgumentException e) { - log.error(sm.getString("jreLeakListener.gcDaemonFail"), - e); + CatalinaLogger.CORE_LOGGER.errorCreatingGcDaemon(e); } catch (IllegalAccessException e) { - log.error(sm.getString("jreLeakListener.gcDaemonFail"), - e); + CatalinaLogger.CORE_LOGGER.errorCreatingGcDaemon(e); } catch (InvocationTargetException e) { - log.error(sm.getString("jreLeakListener.gcDaemonFail"), - e); + CatalinaLogger.CORE_LOGGER.errorCreatingGcDaemon(e); } } @@ -334,17 +320,13 @@ // Ignore. Don't need call to getPolicy() to be // successful, just need to trigger static initializer. } catch (NoSuchMethodException e) { - log.warn(sm.getString("jreLeakListener.authPolicyFail"), - e); + CatalinaLogger.CORE_LOGGER.errorLoadingPolicy(e); } catch (IllegalArgumentException e) { - log.warn(sm.getString("jreLeakListener.authPolicyFail"), - e); + CatalinaLogger.CORE_LOGGER.errorLoadingPolicy(e); } catch (IllegalAccessException e) { - log.warn(sm.getString("jreLeakListener.authPolicyFail"), - e); + CatalinaLogger.CORE_LOGGER.errorLoadingPolicy(e); } catch (InvocationTargetException e) { - log.warn(sm.getString("jreLeakListener.authPolicyFail"), - e); + CatalinaLogger.CORE_LOGGER.errorLoadingPolicy(e); } } @@ -394,11 +376,9 @@ URLConnection uConn = url.openConnection(); uConn.setDefaultUseCaches(false); } catch (MalformedURLException e) { - log.error(sm.getString( - "jreLeakListener.jarUrlConnCacheFail"), e); + CatalinaLogger.CORE_LOGGER.errorDisablingUrlConnectionCaching(e); } catch (IOException e) { - log.error(sm.getString( - "jreLeakListener.jarUrlConnCacheFail"), e); + CatalinaLogger.CORE_LOGGER.errorDisablingUrlConnectionCaching(e); } } @@ -413,8 +393,7 @@ try { factory.newDocumentBuilder(); } catch (ParserConfigurationException e) { - log.error(sm.getString("jreLeakListener.xmlParseFail"), - e); + CatalinaLogger.CORE_LOGGER.errorLoadingJaxp(e); } } @@ -424,11 +403,7 @@ } catch (ClassNotFoundException e) { if (System.getProperty("java.vendor").startsWith( "Sun")) { - log.error(sm.getString( - "jreLeakListener.ldapPoolManagerFail"), e); - } else { - log.debug(sm.getString( - "jreLeakListener.ldapPoolManagerFail"), e); + CatalinaLogger.CORE_LOGGER.errorLoadingLdapPoolManager(e); } } } @@ -441,9 +416,7 @@ try { Class.forName(classNameToLoad); } catch (ClassNotFoundException e) { - log.error( - sm.getString("jreLeakListener.classToInitializeFail", - classNameToLoad), e); + CatalinaLogger.CORE_LOGGER.errorLoadingLeakClass(classNameToLoad, e); // continue with next class to load } } Deleted: trunk/src/main/java/org/apache/catalina/core/LocalStrings.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/core/LocalStrings.properties 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/LocalStrings.properties 2012-09-13 16:47:04 UTC (rev 2081) @@ -1,222 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -filterChain.filter=Filter execution threw an exception -filterChain.servlet=Servlet execution threw an exception - -applicationRequest.badParent=Cannot locate parent Request implementation -applicationRequest.badRequest=Request is not a javax.servlet.ServletRequestWrapper -applicationResponse.badParent=Cannot locate parent Response implementation -applicationResponse.badResponse=Response is not a javax.servlet.ServletResponseWrapper - -aprListener.aprInit=The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: {0} -aprListener.tcnInvalid=An incompatible version {0} of the Apache Tomcat Native library is installed, while Tomcat requires version {1} -aprListener.tcnVersion=An older version {0} of the Apache Tomcat Native library is installed, while Tomcat recommends version greater then {1} -aprListener.aprDestroy=Failed shutdown of Apache Portable Runtime -aprListener.sslInit=Failed to initialize the SSLEngine. -aprListener.tcnValid=Loaded Apache Tomcat Native library {0}. -aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], random [{2}]. - -containerBase.addDefaultMapper=Exception configuring default mapper of class {0} -containerBase.alreadyStarted=Container {0} has already been started -containerBase.notConfigured=No basic Valve has been configured -containerBase.notStarted=Container {0} has not been started -containerBase.backgroundProcess.cluster=Exception processing cluster {0} background process -containerBase.backgroundProcess.loader=Exception processing loader {0} background process -containerBase.backgroundProcess.manager=Exception processing manager {0} background process -containerBase.backgroundProcess.realm=Exception processing realm {0} background process -containerBase.backgroundProcess.valve=Exception processing valve {0} background process -containerBase.backgroundProcess.jarRepository=Exception processing jar repository {0} background process -containerBase.addChild.nullName=Child container name cannot be null -containerBase.addChild.notUnique=Child container with name {0} already exists -containerBase.addChild.start=Failed to start child container {0} - -fastEngineMapper.alreadyStarted=FastEngineMapper {0} has already been started -fastEngineMapper.notStarted=FastEngineMapper {0} has not yet been started -httpContextMapper.container=This container is not a StandardContext -httpEngineMapper.container=This container is not a StandardEngine -httpHostMapper.container=This container is not a StandardHost -interceptorValve.alreadyStarted=InterceptorValve has already been started -interceptorValve.notStarted=InterceptorValve has not yet been started -naming.wsdlFailed=Failed to find wsdl file: {0} -naming.bindFailed=Failed to bind object: {0} -naming.jmxRegistrationFailed=Failed to register in JMX: {0} -naming.unbindFailed=Failed to unbind object: {0} -naming.invalidEnvEntryType=Environment entry {0} has an invalid type -naming.invalidEnvEntryValue=Environment entry {0} has an invalid value -naming.namingContextCreationFailed=Creation of the naming context failed: {0} -standardContext.invalidWrapperClass={0} is not a subclass of StandardWrapper -standardContext.alreadyStarted=Context has already been started -standardContext.applicationListener=Error configuring application listener of class {0} -standardContext.applicationSkipped=Skipped installing application listeners due to previous error(s) -standardContext.badRequest=Invalid request path ({0}). -standardContext.createWrapper.failed=Create wrapper failed. -standardContext.crlfinurl=The URL pattern "{0}" contains a CR or LF and so can never be matched. -standardContext.duplicateListener=The listener "{0}" is already configured for this context. The duplicate definition has been ignored. -standardContext.errorPage.error=Error page location {0} must start with a ''/'' -standardContext.errorPage.required=ErrorPage cannot be null -standardContext.errorPage.warning=WARNING: Error page location {0} must start with a ''/'' in Servlet 2.4 -standardContext.filterMap.either=Filter mapping must specify either a <url-pattern> or a <servlet-name> -standardContext.filterMap.name=Filter mapping specifies an unknown filter name {0} -standardContext.filterMap.pattern=Invalid <url-pattern> {0} in filter mapping -standardContext.filterStart=Exception starting filter {0} -standardContext.filterStartFailed=Failed to start application Filters successfully -standardContext.requestListener.requestInit=Exception sending request initialized lifecycle event to listener instance of class {0} -standardContext.requestListener.requestDestroy=Exception sending request destroyed lifecycle event to listener instance of class {0} -standardContext.requestListenerStartFailed=Failed to start request listener valve successfully -standardContext.requestListenerConfig.added=Added request listener Valve -standardContext.requestListenerConfig.error=Exception adding request listener Valve: {0} -standardContext.isUnavailable=This application is not currently available -standardContext.listenerStart=Exception sending context initialized event to listener instance of class {0} -standardContext.listenerStartFailed=Failed to start application Listeners successfully -standardContext.listenerStop=Exception sending context destroyed event to listener instance of class {0} -standardContext.loginConfig.errorPage=Form error page {0} must start with a ''/' -standardContext.loginConfig.errorWarning=WARNING: Form error page {0} must start with a ''/'' in Servlet 2.4 -standardContext.loginConfig.loginPage=Form login page {0} must start with a ''/' -standardContext.loginConfig.loginWarning=WARNING: Form login page {0} must start with a ''/'' in Servlet 2.4 -standardContext.loginConfig.required=LoginConfig cannot be null -standardContext.mappingError=MAPPING configuration error for relative URI {0} -standardContext.notFound=The requested resource ({0}) is not available. -standardContext.notReloadable=Reloading is disabled on this Context -standardContext.notStarted=Context has not yet been started -standardContext.notWrapper=Child of a Context must be a Wrapper -standardContext.parameter.duplicate=Duplicate context initialization parameter {0} -standardContext.parameter.required=Both parameter name and parameter value are required -standardContext.reloadingCompleted=Reloading this Context is completed -standardContext.reloadingFailed=Reloading this Context failed due to previous errors -standardContext.reloadingStarted=Reloading this Context has started -standardContext.resourcesStart=Error starting static Resources -standardContext.securityConstraint.pattern=Invalid <url-pattern> {0} in security constraint -standardContext.servletMap.name=Servlet mapping specifies an unknown servlet name {0} -standardContext.servletMap.pattern=Invalid <url-pattern> {0} in servlet mapping -standardContext.startCleanup=Exception during cleanup after start failed -standardContext.startFailed=Context [{0}] startup failed due to previous errors -standardContext.startingLoader=Exception starting Loader -standardContext.startingManager=Exception starting Manager -standardContext.startingWrapper=Exception starting Wrapper for servlet {0} -standardContext.stoppingContext=Exception stopping Context -standardContext.stoppingLoader=Exception stopping Loader -standardContext.stoppingManager=Exception stopping Manager -standardContext.stoppingWrapper=Exception stopping Wrapper for servlet {0} -standardContext.urlDecode=Cannot URL decode request path {0} -standardContext.urlPattern.patternWarning=WARNING: URL pattern {0} must start with a ''/'' in Servlet 2.4 -standardContext.urlValidate=Cannot validate URL decoded request path {0} -standardContext.wrapper.error=JSP file {0} must start with a ''/' -standardContext.wrapper.warning=WARNING: JSP file {0} must start with a ''/'' in Servlet 2.4 -standardEngine.alreadyStarted=Engine has already been started -standardEngine.mappingError=MAPPING configuration error for server name {0} -standardEngine.noHost=No Host matches server name {0} -standardEngine.noHostHeader=HTTP/1.1 request with no Host: header -standardEngine.notHost=Child of an Engine must be a Host -standardEngine.notParent=Engine cannot have a parent Container -standardEngine.notStarted=Engine has not yet been started -standardEngine.unfoundHost=Virtual host {0} not found -standardEngine.unknownHost=No server host specified in this request -standardEngine.unregister.mbeans.failed=Error in destroy() for mbean file {0} -standardHost.accessBase=Cannot access document base directory {0} -standardHost.alreadyStarted=Host has already been started -standardHost.appBase=Application base directory {0} does not exist -standardHost.clientAbort=Remote Client Aborted Request, IOException: {0} -standardHost.configRequired=URL to configuration file is required -standardHost.configNotAllowed=Use of configuration file is not allowed -standardHost.installBase=Only web applications in the Host web application directory can be installed -standardHost.installing=Installing web application at context path {0} from URL {1} -standardHost.installingWAR=Installing web application from URL {0} -standardHost.installingXML=Processing Context configuration file URL {0} -standardHost.installError=Error deploying application at context path {0} -standardHost.invalidErrorReportValveClass=Couldn''t load specified error report valve class: {0} -standardHost.docBase=Document base directory {0} already exists -standardHost.mappingError=MAPPING configuration error for request URI {0} -standardHost.noContext=No Context configured to process this request -standardHost.noHost=No Host configured to process this request -standardHost.notContext=Child of a Host must be a Context -standardHost.notStarted=Host has not yet been started -standardHost.nullName=Host name is required -standardHost.pathFormat=Invalid context path: {0} -standardHost.pathMatch=Context path {0} must match the directory or WAR file name: {1} -standardHost.pathMissing=Context path {0} is not currently in use -standardHost.pathRequired=Context path is required -standardHost.pathUsed=Context path {0} is already in use -standardHost.removing=Removing web application at context path {0} -standardHost.removeError=Error removing application at context path {0} -standardHost.start=Starting web application at context path {0} -standardHost.stop=Stopping web application at context path {0} -standardHost.unfoundContext=Cannot find context for request URI {0} -standardHost.warRequired=URL to web application archive is required -standardHost.warURL=Invalid URL for web application archive: {0} -standardHost.validationEnabled=XML validation enabled -standardHost.validationDisabled=XML validation disabled -standardPipeline.alreadyStarted=Pipeline has already been started -standardPipeline.notStarted=Pipeline has not been started -standardPipeline.noValve=No more Valves in the Pipeline processing this request -standardServer.addContainer.ise=No connectors available to associate this container with -standardServer.initialize.initialized=This server has already been initialized -standardServer.start.connectors=At least one connector is not associated with any container -standardServer.start.started=This server has already been started -standardServer.stop.notStarted=This server has not yet been started -standardService.initialize.initialized=This service has already been initialized -standardService.initialize.failed=Service initializing at {0} failed -standardService.register.failed=Error registering Service at domain {0} -standardService.start.name=Starting service {0} -standardService.start.started=This service has already been started -standardService.stop.name=Stopping service {0} -standardService.stop.notStarted=This service has not yet been started -standardWrapper.allocate=Error allocating a servlet instance -standardWrapper.allocateException=Allocate exception for servlet {0} -standardWrapper.containerServlet=Loading container servlet {0} -standardWrapper.createFilters=Create filters exception for servlet {0} -standardWrapper.deallocateException=Deallocate exception for servlet {0} -standardWrapper.destroyException=Servlet.destroy() for servlet {0} threw exception -standardWrapper.exception0=Tomcat Exception Report -standardWrapper.exception1=A Servlet Exception Has Occurred -standardWrapper.exception2=Exception Report: -standardWrapper.exception3=Root Cause: -standardWrapper.initException=Servlet.init() for servlet {0} threw exception -standardWrapper.instantiate=Error instantiating servlet class {0} -standardWrapper.isUnavailable=Servlet {0} is currently unavailable -standardWrapper.jasperLoader=Using Jasper classloader for servlet {0} -standardWrapper.jspFile.format=JSP file {0} does not start with a ''/'' character -standardWrapper.loadException=Servlet {0} threw load() exception -standardWrapper.missingClass=Wrapper cannot find servlet class {0} or a class it depends on -standardWrapper.missingLoader=Wrapper cannot find Loader for servlet {0} -standardWrapper.noInstanceSupport=Servlet {0} does not have any instance support -standardWrapper.notChild=Wrapper container may not have child containers -standardWrapper.notClass=No servlet class has been specified for servlet {0} -standardWrapper.notContext=Parent container of a Wrapper must be a Context -standardWrapper.notFound=Servlet {0} is not available -standardWrapper.notServlet=Class {0} is not a Servlet -standardWrapper.releaseFilters=Release filters exception for servlet {0} -standardWrapper.serviceException=Servlet.service() for servlet {0} threw exception -standardWrapper.statusHeader=HTTP Status {0} - {1} -standardWrapper.statusTitle=Tomcat Error Report -standardWrapper.unavailable=Marking servlet {0} as unavailable -standardWrapper.unloadException=Servlet {0} threw unload() exception -standardWrapper.unloading=Cannot allocate servlet {0} because it is being unloaded -standardWrapper.waiting=Waiting for {0} instance(s) to be deallocated -standardWrapper.async.listenerError=Listener processing for servlet {0} threw exception -standardWrapper.async.runnableError=Runnable for servlet {0} threw exception -standardWrapper.async.dispatchError=Async dispatcher for servlet {0} threw exception -standardWrapper.async.invalidContext=Invalid async context for servlet {0} - -defaultInstanceManager.restrictedServletsResource=Restricted servlets property file not found -defaultInstanceManager.privilegedServlet=Servlet of class {0} is privileged and cannot be loaded by this web application -defaultInstanceManager.restrictedFiltersResource=Restricted filters property file not found -defaultInstanceManager.privilegedFilter=Filter of class {0} is privileged and cannot be loaded by this web application -defaultInstanceManager.restrictedListenersResources="Restricted listeners property file not found - -filterRegistration.ise=Context {0} has already been initialized. -filterRegistration.iae=Illegal null or empty argument specified -servletRegistration.ise=Context {0} has already been initialized. -servletRegistration.iae=Illegal null or empty argument specified Deleted: trunk/src/main/java/org/apache/catalina/core/LocalStrings_es.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/core/LocalStrings_es.properties 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/LocalStrings_es.properties 2012-09-13 16:47:04 UTC (rev 2081) @@ -1,214 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -applicationContext.attributeEvent = Excepci\u00F3n lanzada por escuchador de eventos de atributos -applicationContext.mapping.error = Error durante mapeo -applicationContext.requestDispatcher.iae = La Trayectoria {0} no comienza con car\u00E1cter "/" -applicationContext.resourcePaths.iae = La Trayectoria {0} no comienza con car\u00E1cter "/" -applicationContext.setAttribute.namenull = El nombre no puede ser nulo -applicationDispatcher.allocateException = Excepci\u00F3n de reserva de espacio para servlet {0} -applicationDispatcher.deallocateException = Excepci\u00F3n de recuperaci\u00F3n de espacio para servlet {0} -applicationDispatcher.forward.ise = No puedo reenviar despu\u00E9s de que la respuesta se haya llevado a cabo. -applicationDispatcher.forward.throw = El recurso reenviado lanz\u00F3 un excepci\u00F3n -applicationDispatcher.include.throw = El recurso inclu\u00EDdo lanz\u00F3 una excepci\u00F3n -applicationDispatcher.isUnavailable = El Servlet {0} no est\u00E1 disponible en este momento -applicationDispatcher.serviceException = El Servlet.service() para servlet {0} lanz\u00F3 una excepci\u00F3n -applicationDispatcher.specViolation.request = SevletRequest original o ServletRequest original arropado no pas\u00F3 a RequestDispatcher en violaci\u00F3n de SRV.8.2 y SRV.14.2.5.1 -applicationDispatcher.specViolation.response = SevletResponse original o ServletResponse original arropado no pas\u00F3 a RequestDispatcher en violaci\u00F3n de SRV.8.2 y SRV.14.2.5.1 -applicationRequest.badParent = No puedo localizar la implementaci\u00F3n de Requerimiento padre -applicationRequest.badRequest = El requerimiento no es un javax.servlet.ServletRequestWrapper -applicationResponse.badParent = No puedo localizar implementaci\u00F3n de Respuesta padre -applicationResponse.badResponse = La Respuesta no es un javax.servlet.ServletResponseWrapper -aprListener.aprInit = La biblioteca nativa de Apache Tomcat basada en ARP que permite un rendimiento \u00F3ptimo en entornos de desarrollo no ha sido hallada en java.library.path\: {0} -aprListener.tcnInvalid = Se encuentra instalada una versi\u00F3n incompatible {0} de la biblioteca nativa APR de Apache Tomcat, mientras que Tomcat necesita la versi\u00F3n {1} -aprListener.tcnVersion = Se encuentra instalada una versi\u00F3n muy vieja {0} de la biblioteca nativa APR de Apache Tomcat, mientras que Tomcat recomienda una versi\u00F3n mayor de {1} -aprListener.aprDestroy = No pude apagar la biblioteca nativa de Apache Tomcat -aprListener.sslInit = No pude inicializar el SSLEngine (Motor SSL) -aprListener.tcnValid = Cargada la biblioteca nativa APR de Apache Tomcat {0} -aprListener.flags = Capacidades APR\: IPv6 [{0}], enviar fichero [{1}], aceptar filtros [{2}], aleatorio [{3}]. -containerBase.addDefaultMapper = Excepci\u00F3n configurando mapeador por defecto de clase {0} -containerBase.alreadyStarted = Ya ha sido arrancado el Contenedor {0} -containerBase.notConfigured = No se ha configurado V\u00E1lvula b\u00E1sica -containerBase.notStarted = No se ha arrancado el Contenedor {0} -containerBase.backgroundProcess.cluster = Excepci\u00F3n al procesar cl\u00FAster {0} de proceso en segundo plano -containerBase.backgroundProcess.loader = Excepci\u00F3n al procesar cargador {0} de proceso en segundo plano -containerBase.backgroundProcess.manager = Excepci\u00F3n al procesar gestor {0} de proceso en segundo plano -containerBase.backgroundProcess.realm = Excepci\u00F3n al procesar reino {0} de proceso en segundo plano -containerBase.backgroundProcess.valve = Excepci\u00F3n al procesar v\u00E1lvula {0} de proceso en segundo plano -fastEngineMapper.alreadyStarted = Ya se ha arrancado el FastEngineMapper {0} -fastEngineMapper.notStarted = No se ha arrancado a\u00FAn el FastEngineMapper {0} -filterChain.filter = La ejecuci\u00F3n del Filtro lanz\u00F3 una excepci\u00F3n -filterChain.servlet = La ejecuci\u00F3n del Servlet lanz\u00F3 una excepci\u00F3n -httpContextMapper.container = Este Contenedor no es un StandardContext -httpEngineMapper.container = Este Contenedor no es un StandardEngine -httpHostMapper.container = Esta Contenedor no es una StandardHost -interceptorValve.alreadyStarted = Ya ha sido arrancada la InterceptorValve -interceptorValve.notStarted = A\u00FAn no ha sido arrancada la InterceptorValve -naming.wsdlFailed = No pude hallar fichero wsdl\: {0} -naming.bindFailed = No pude cambiar (bind) objeto\: {0} -naming.jmxRegistrationFailed = No pude registrar en JMX\: {0} -naming.unbindFailed = No pude descambiar (unbind) objecto\: {0} -naming.invalidEnvEntryType = La entrada de Entorno {0} tiene un tipo inv\u00E1lido -naming.invalidEnvEntryValue = La entrada de Entorno {0} tiene un valor inv\u00E1lido -naming.namingContextCreationFailed = Fall\u00F3 la creaci\u00F3n del contexto de nombres (naming)\: {0} -standardContext.invalidWrapperClass = {0} no es una subclase de StandardWrapper -standardContext.alreadyStarted = Ya se ha arrancado el Contexto -standardContext.applicationListener = Error configurando escuchador de aplicaci\u00F3n de clase {0} -standardContext.applicationSkipped = Se ha saltado la instalaci\u00F3n de escuchadores de aplicaci\u00F3n debido a error(es) previo(s) -standardContext.badRequest = Trayectoria de requerimiento inv\u00E1lida ({0}). -standardContext.crlfinurl = El modelo URL "{0}" contiene un CR o LR y por ello nunca coincidir\u00E1. -standardContext.duplicateListener = El escuchador "{0}" ya est\u00E1 configurado para este contexto. La definici\u00F3n duplicada ha sido ignorada. -standardContext.errorPage.error = La localizaci\u00F3n de la p\u00E1gina de error 0} debe de comenzar con ''/'' -standardContext.errorPage.required = ErrorPage no puede ser nulo -standardContext.errorPage.warning = AVISO\: La localizaci\u00F3n de la p\u00E1gina de error {0} debe de comenzar con ''/'' en Servlet 2.4 -standardContext.filterMap.either = El mapeo de filtro debe de especificar o un <url-pattern> o un <servlet-name> -standardContext.filterMap.name = El mapeo de filtro especifica un nombre desconocido de filtro {0} -standardContext.filterMap.pattern = <url-pattern> {0} inv\u00E1lido en mapeo de filtro -standardContext.filterStart = Excepci\u00F3n arrancando filtro {0} -standardContext.filterStartFailed = No pude arrancar Filtros de aplicaci\u00F3n con \u00E9xito -standardContext.requestListener.requestInit = Una excepci\u00F3n durante el env\u00EDo de requerimiento ha iniciado un evento de ciclo de vida (lifecycle event) para la instancia de clase a la escucha (listener) {0} -standardContext.requestListener.requestDestroy = Una excepci\u00F3n durante el env\u00EDo de requerimiento ha destru\u00EDdo un evento de ciclo de vida (lifecycle event) para la instancia de clase a la escucha (listener) {0} -standardContext.requestListenerStartFailed = No pude arrancar v\u00E1lvula de escuchador de requerimiento con exito -standardContext.requestListenerConfig.added = A\u00F1adida V\u00E1lvula de escuchador de requerimiento -standardContext.requestListenerConfig.error = Excepci\u00F3n a\u00F1adiendo V\u00E1lvula de escuchador de requerimiento\: {0} -standardContext.isUnavailable = Esta aplicaci\u00F3n no est\u00E1 disponible en este momento -standardContext.listenerStart = Excepci\u00F3n enviando evento inicializado de contexto a instancia de escuchador de clase {0} -standardContext.listenerStartFailed = No pude arrancar Escuchadores de aplicaci\u00F3n con \u00E9xito -standardContext.listenerStop = Excepci\u00F3n enviando evento de contexto destru\u00EDdo a instancia de escuchador de clase {0} -standardContext.loginConfig.errorPage = La P\u00E1gina de error de Formulario {0} debe de comenzar con ''/' -standardContext.loginConfig.errorWarning = AVISO\: La p\u00E1gina de error de Formulario {0} debe de comenzar con ''/'' en Servlet 2.4 -standardContext.loginConfig.loginPage = La p\u00E1gina de login de Formulario {0} debe de comenzar con ''/' -standardContext.loginConfig.loginWarning = AVISO\: La p\u00E1gina de login de Formulario {0} debe de comenzar con ''/'' en Servlet 2.4 -standardContext.loginConfig.required = LoginConfig no puede ser nula -standardContext.mappingError = Error de configuraci\u00F3n de MAPEO para URI relativa {0} -standardContext.notFound = El recurso requerido ({0}) no se encuentra disponible -standardContext.notReloadable = Est\u00E1 desactivada la recarga en este Contexto -standardContext.notStarted = A\u00FAn no se ha arrancado el Contexto -standardContext.notWrapper = El Hijo de un Contexto debe de ser un Arropador (Wrapper) -standardContext.parameter.duplicate = Duplicado par\u00E1metro de inicializaci\u00F3n de contexto {0} -standardContext.parameter.required = Es necesario poner nombre de par\u00E1metro y valor de par\u00E1metro -standardContext.reloadingCompleted = Se ha completado la Regarga de este Contexto -standardContext.reloadingFailed = Fall\u00F3 la recarga de este Contexto debido a errores previos -standardContext.reloadingStarted = Ha comenzado la recarga de este Contexto -standardContext.resourcesStart = Error arrancando Recursos est\u00E1ticos -standardContext.securityConstraint.pattern = <url-pattern> {0} inv\u00E1lida en restricci\u00F3n de seguridad -standardContext.servletMap.name = El mapeo de Servlet especifica un nombre de servlet desconocido {0} -standardContext.servletMap.pattern = <url-pattern> {0} inv\u00E1lida en mapeo de servlet -standardContext.startCleanup = Excepci\u00F3n durante la limpieza tras no poder arrancar -standardContext.startFailed = Fall\u00F3 en arranque del Contexto [{0}] debido a errores previos -standardContext.startingLoader = Excepci\u00F3n arrancando Cargador -standardContext.startingManager = Excepci\u00F3n arrancando Gestor -standardContext.startingWrapper = Excepci\u00F3n arrancando Arropador (Wrapper) para servlet {0} -standardContext.stoppingContext = Excepci?n parando Context -standardContext.stoppingLoader = Excepci\u00F3n parando Cargador -standardContext.stoppingManager = Excepci\u00F3n parando Gestor -standardContext.stoppingWrapper = Excepci\u00F3n parando Arropador (Wrapper) para servlet {0} -standardContext.urlDecode = No puedo decodificar URL de trayectoria de requerimiento {0} -standardContext.urlPattern.patternWarning = AVISO\: el patr\u00F3n URL {0} debe de comenzar con ''/'' en Servlet 2.4 -standardContext.urlValidate = No puedo validar trayectoria de requerimiento de URL decodificada {0} -standardContext.wrapper.error = El archivo JSP {0} debe de comenzar con ''/' -standardContext.wrapper.warning = AVISO\: El archivo JSP {0} debe de comenzar con ''/'' en Servlet 2.4 -standardEngine.alreadyStarted = Ya ha sido arrancado el Motor -standardEngine.mappingError = Error de configuraci\u00F3n de MAPEO para nombre de servidor {0} -standardEngine.noHost = No hay M\u00E1quina que coincida con nombre de servidor {0} -standardEngine.noHostHeader = Requerimiento HTTP/1.1 sin M\u00E1quina\: cabecera -standardEngine.notHost = El Hijo de un Motor debe de ser un M\u00E1quina -standardEngine.notParent = El Motor no puede tener un Contenedor padre -standardEngine.notStarted = A\u00FAn no se ha arrancado el Motor -standardEngine.unfoundHost = M\u00E1quina virtual {0} no hallada -standardEngine.unknownHost = No se ha especificado m\u00E1quina servidora en este requerimiento -standardEngine.unregister.mbeans.failed = Error al destruir (destroy()) para fichero mbean {0} -standardHost.accessBase = No puedo acceder a directorio base de documento {0} -standardHost.alreadyStarted = Ya ha sido arrancada la M\u00E1quina -standardHost.appBase = No existe el directorio base de aplicaci\u00F3n {0} -standardHost.clientAbort = El Cliente Remoto Abort\u00F3 el Requerimiento, IOException\: {0} -standardHost.configRequired = Es necesario poner la URL a archivo de configuraci\u00F3n -standardHost.configNotAllowed = No se permite el uso del archivo de configuraci\u00F3n -standardHost.installBase = S\u00F3lo se pueden instalar aplicaciones web en el directorio de aplicaciones web de M\u00E1quina -standardHost.installing = Instalando aplicaciones web en trayectoria de contexto {0} desde URL {1} -standardHost.installingWAR = Instalando aplicaci\u00F3n web desde URL {0} -standardHost.installingXML = Procesando URL de archivo de configuraci\u00F3n de Contexto {0} -standardHost.installError = Error desplegando aplicaci\u00F3n en trayectoria de contexto {0} -standardHost.invalidErrorReportValveClass = No pude cargar clase especifiada de v\u00E1lvula de informe de error\: {0} -standardHost.docBase = Ya existe el directorio base de documento {0} -standardHost.mappingError = Error de configuraci\u00F3n de MAPEO para URI de requerimiento {0} -standardHost.noContext = No se ha configurado Contexto para procesar este requerimiento -standardHost.noHost = No se ha configurado M\u00E1quina para procesar este requerimiento -standardHost.notContext = El Hijo de una M\u00E1quina debe de ser un Contexto -standardHost.notStarted = A\u00FAn no se ha arrancado la M\u00E1quina -standardHost.nullName = Es necesario poner el nombre de M\u00E1quina -standardHost.pathFormat = Trayectoria de contexto inv\u00E1lida\: {0} -standardHost.pathMatch = La trayectoria de Contexto {0} debe de coincidir con el nombre de directorio o de archivo WAR\: {1} -standardHost.pathMissing = La trayectoria de Contexto {0} no est\u00E1 en uso en este momento -standardHost.pathRequired = Es necesario poner la trayectoria de Contexto -standardHost.pathUsed = Ya est\u00E1 en uso la trayectoria de Contexto {0} -standardHost.removing = Quitando aplicaci\u00F3n web en trayectoria de contexto {0} -standardHost.removeError = Error quitando aplicaci\u00F3n en trayectoria de contexto {0} -standardHost.start = Arrancando aplicaci\u00F3n web en trayectoria de contexto {0} -standardHost.stop = Parando aplicaci\u00F3n web en trayectoria de contexto {0} -standardHost.unfoundContext = No puedo hallar contexto para URI de requerimiento {0} -standardHost.warRequired = Es necesario poner la URL a archivo de aplicaci\u00F3n web -standardHost.warURL = URL inv\u00E1lida para archivo de aplicaci\u00F3n web\: {0} -standardHost.validationEnabled = Activada la validaci\u00F3n XML -standardHost.validationDisabled = Desactivada la validaci\u00F3n XML -standardPipeline.alreadyStarted = Ya se ha arrancado la Tuber\u00EDa (Pipeline) -standardPipeline.notStarted = No se ha arrancado la Tuber\u00EDa (Pipeline) -standardPipeline.noValve = No hay m\u00E1s V\u00E1lvulas en la Tuber\u00EDa (Pipeline) procesando este requerimiento -standardServer.addContainer.ise = No hay conectores disponibles para ser asociados con este contenedor -standardServer.initialize.initialized = Ya se ha inicializado este servidor -standardServer.start.connectors = Al menos un conector no est\u00E1 asociado con cualquier contenedor -standardServer.start.started = Ya ha sido arrancado este servidor -standardServer.stop.notStarted = A\u00FAn no ha sido arrancado este servidor -standardService.initialize.initialized = Ya ha sido inicializado este servicio -standardService.initialize.failed = Servicio inicializando en {0} fall\u00F3 -standardService.register.failed = Error registrando servicio en dominio {0} -standardService.start.name = Arrancando servicio {0} -standardService.start.started = Ya ha sido arrancado este sercicio -standardService.stop.name = Parando servicio {0} -standardService.stop.notStarted = A\u00FAn no se ha arrancado este servicio -standardWrapper.allocate = Error reservando espacio para una instancia de servlet -standardWrapper.allocateException = Excepci\u00F3n de reserva de espacio para servlet {0} -standardWrapper.containerServlet = Cargando servlet de contenedor {0} -standardWrapper.createFilters = Excepci\u00F3n de creaci\u00F3n de filtros para servlet {0} -standardWrapper.deallocateException = Excepci\u00F3n de recuperaci\u00F3n de espacio para servlet {0} -standardWrapper.destroyException = Servlet.destroy() para servlet {0} lanz\u00F3 excepci\u00F3n -standardWrapper.exception0 = Informe de Excepci\u00F3n de Tomcat -standardWrapper.exception1 = Ha tenido lugar una Excepci\u00F3n de Servlet -standardWrapper.exception2 = Informe de Excepci\u00F3n\: -standardWrapper.exception3 = Causa Ra\u00EDz\: -standardWrapper.initException = Servlet.init() para servlet {0} lanz\u00F3 excepci\u00F3n -standardWrapper.instantiate = Error instanciando clase de servlet {0} -standardWrapper.isUnavailable = El Servlet {0} no est\u00E1 disponible en este momento -standardWrapper.jasperLoader = Usando cargador de clases (classloader) de Jasper para servlet {0} -standardWrapper.jspFile.format = El archivo JSP {0} no comienza con car\u00E1cter ''/'' -standardWrapper.loadException = El Servlet {0} lanz\u00F3 excepci\u00F3n de load() -standardWrapper.missingClass = El Arropador (Wrapper) no puede hallar clase de servlet {0} o una clase de la que depende -standardWrapper.missingLoader = El Arropador (Wrapper) no puede hallar Cargador para servlet {0} -standardWrapper.notChild = El contenedor de Arropador (Wrapper) no puede tener contenedores hijo -standardWrapper.notClass = No se ha especificado clase de servlet para servlet {0} -standardWrapper.notContext = El contenedor padre para un Arropador (Wrapper) debe de ser un Contexto -standardWrapper.notFound = No est\u00E1 disponible el Servlet {0} -standardWrapper.notServlet = La Clase {0} no es un Servlet -standardWrapper.privilegedServlet = El Servlet de clase {0} es privilegiado y no puede ser cargado mediante esta aplicaci\u00F3n web -standardWrapper.releaseFilters = Excepci\u00F3n de Liberaci\u00F3n de filtros para servlet {0} -standardWrapper.serviceException = Servlet.service() para servlet {0} lanz\u00F3 excepci\u00F3n -standardWrapper.statusHeader = HTTP Estado {0} - {1} -standardWrapper.statusTitle = Informe de Error de Tomcat -standardWrapper.unavailable = Marcando el servlet {0} como no disponible -standardWrapper.unloadException = El Servlet {0} lanz\u00F3 excepci\u00F3n unload() -standardWrapper.unloading = No puedo reservar espacio para servlet {0} porque est\u00E1 siendo descargado -standardWrapper.waiting = Esperando por {0} instancia(s) para recuperar su espacio reservado -standardWrapper.restrictedServletsResource = No hallado fichero de propiedad de Servlets Restringidos -applicationFilterConfig.restrictedFiltersResource = No hallado fichero de filtros Restringidos -applicationFilterConfig.privilegedFilter = El filtro de clase {0} es privilegiado y no puede ser cargado por esta aplicaci\u00F3n web Deleted: trunk/src/main/java/org/apache/catalina/core/LocalStrings_fr.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/core/LocalStrings_fr.properties 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/LocalStrings_fr.properties 2012-09-13 16:47:04 UTC (rev 2081) @@ -1,166 +0,0 @@ -applicationContext.attributeEvent=Exception lanc�e par l''�couteur (listener) d''�v�nement attributs -applicationContext.requestDispatcher.iae=Le chemin {0} ne commence pas par le caract�re "/" -applicationContext.setAttribute.namenull=le nom ne peut �tre nul -applicationDispatcher.allocateException=Exception d''allocation pour la servlet {0} -applicationDispatcher.deallocateException=Exception de d�sallocation pour la servlet {0} -applicationDispatcher.forward.ise=Impossible d''utiliser faire-suivre (forward) apr�s que la r�ponse ait �t� envoy�e -applicationDispatcher.forward.throw=La ressource faire-suivre (forwarded) a lanc� une exception -applicationDispatcher.include.throw=La ressource incluse (included) a lanc� une exception -applicationDispatcher.isUnavailable=La servlet {0} est actuellement indisponible -applicationDispatcher.serviceException="Servlet.service()" pour la servlet {0} a lanc� une exception -applicationRequest.badParent=Impossible de trouver l''implementation requ�te apparent�e (parent request) -applicationRequest.badRequest=La requ�te n''est pas une "javax.servlet.ServletRequestWrapper" -applicationResponse.badParent=Impossible de trouver une impl�mentation r�ponse apparent�e (parent response) -applicationResponse.badResponse=La r�ponse n''est pas une "javax.servlet.ServletResponseWrapper" -containerBase.addDefaultMapper=Exception lors de la configuration du routeur par d�faut (default mapper) pour la classe {0} -containerBase.alreadyStarted=Le conteneur {0} a d�j� �t� d�marr� -containerBase.notConfigured=Aucune Valve basique (basic valve) n''a �t� configur�e -containerBase.notStarted=Le conteneur {0} n''a pas �t� d�marr� -fastEngineMapper.alreadyStarted=le "FastEngineMapper" {0} a d�j� �t� d�marr� -fastEngineMapper.notStarted=Le "FastEngineMapper" {0} n''a pas encore �t� d�marr� -filterChain.filter=L''ex�cution du filtre (Filter) a lanc� une exception -filterChain.servlet=L''ex�cution de la servlet a lanc� une exception -httpContextMapper.container=Ce conteneur n''est pas un "StandardContext" -httpEngineMapper.container=Ce conteneur n''est pas un "StandardEngine" -httpHostMapper.container=Ce conteneur n''est pas un "StandardHost" -interceptorValve.alreadyStarted=La valve d''interception (InterceptorValve) a d�j� �t� d�marr�e -interceptorValve.notStarted=La valve d''interception (InterceptorValve) n''a pas encore �t� d�marr�e -naming.bindFailed=Echec lors du liage � l''objet: {0} -naming.unbindFailed=Echec lors du d�liage � l''objet : {0} -naming.invalidEnvEntryType=L''entr�e environnement {0} a un type invalide -naming.invalidEnvEntryValue=L''entr�e environnement {0} a une valeur invalide -naming.namingContextCreationFailed=La cr�ation du context de nommage (naming context) a �chou� : {0} -standardContext.alreadyStarted=Le contexte a d�j� �t� d�marr� -standardContext.applicationListener=Erreur lors de la configuration de la classe d''�coute de l''application (application listener) {0} -standardContext.applicationSkipped=L''installation des �couteurs (listeners) de l''application a �t� saut�e suite aux erreurs pr�c�dentes -standardContext.badRequest=Chemin de requ�te invalide ({0}). -standardContext.errorPage.error=La position de la page d''erreur (ErrorPage) {0} doit commencer par un ''/' -standardContext.errorPage.required=La page d''erreur (ErrorPage) ne peut �tre nulle -standardContext.errorPage.warning=ATTENTION: La position de la page d''erreur (ErrorPage) {0} doit commencer par un ''/'' dans l''API Servlet 2.4 -standardContext.filterMap.either=L''association de filtre (filter mapping) doit indiqu� soit une <url-pattern> ou une <servlet-name> -standardContext.filterMap.name=L''association de filtre (filter mapping) indique un nom de filtre inconnu {0} -standardContext.filterMap.pattern=<url-pattern> {0} invalide dans l''association de filtre (filter mapping) -standardContext.filterStart=Exception au d�marrage du filtre {0} -standardContext.filterStartFailed=Echec du d�marrage des filtres d''application -standardContext.requestListenerStartFailed=Echec d�marrage des Valves d''�coute -standardContext.requestListenerConfig.added=Ajout de la valve d''�coute -standardContext.requestListenerConfig.error=Exception lors de l''ajout de la valve d''�coute de requ�te: {0} -standardContext.isUnavailable=Cette application n''est pas disponible actuellement -standardContext.listenerStart=Exception lors de l''envoi de l''�v�nement contexte initialis� (context initialized) � l''instance de classe d''�coute (listener) {0} -standardContext.listenerStartFailed=Echec du d�marrage des �couteurs (listeners) d''application -standardContext.listenerStop=Exception lors de l''envoi de l''�v�nement contexte d�truit (context destroyed) � l''instance de classe d''�coute {0} -standardContext.loginConfig.errorPage=La forme de page d''erreur (form error page) {0} doit commencer par un ''/'' -standardContext.loginConfig.errorWarning=ATTENTION: La forme de page d''erreur (form error page) {0} doit commencer par un ''/'' dans l''API Servlet 2.4 -standardContext.loginConfig.loginPage=La forme de page de connexion (form login page) {0} doit commencer par un ''/'' -standardContext.loginConfig.loginWarning=ATTENTION: La forme de page de connexion (form login page) {0} doit commencer par un ''/'' dans l''API Servlet 2.4 -standardContext.loginConfig.required="LoginConfig" ne peut �tre nul -standardContext.mappingError=Erreur dans la configuration d''association (mapping configuration) pour l''URI relative {0} -standardContext.notFound=La ressource demand�e ({0}) n''est pas disponible. -standardContext.notReloadable=Le rechargement est d�sactiv� pour ce contexte -standardContext.notStarted=Le contexte n''a pas encore �t� d�marr� -standardContext.notWrapper=Le fils du contexte (child of context) doit �tre un enrobeur (wrapper) -standardContext.parameter.duplicate=Param�tre d''initialisation de contexte dupliqu� {0} -standardContext.parameter.required=Le nom de param�tre ainsi que la valeur du param�tre sont requis -standardContext.reloadingCompleted=Le rechargement de ce contexte est termin� -standardContext.reloadingFailed=Le rechargement de ce contexte a �chou� suite � une erreur pr�c�dente -standardContext.reloadingStarted=Le rechargement de ce contexte a d�marr� -standardContext.requestListener.requestInit=Une exception lors de l''envoi de requ�te a initi� un �v�nement cycle de vie (lifecycle event) pour l''instance de classe � l''�coute (listener) {0} -standardContext.requestListener.requestDestroy=Une exception lors de l''envoi de requ�te a d�truit un �v�nement cycle de vie (lifecycle event) pour l''instance de classe � l''�coute (listener) {0} -standardContext.securityConstraint.pattern=<url-pattern> {0} invalide d''apr�s les contraintes de s�curit� (security constraint) -standardContext.servletMap.name=L''association de servlet (servlet mapping) indique un nom de servlet inconnu {0} -standardContext.servletMap.pattern=<url-pattern> {0} invalide dans l''association de servlet (servlet mapping) -standardContext.startCleanup=Exception lors du nettoyage apr�s que le d�marrage ait �chou� -standardContext.startFailed=Erreur de d�marrage du contexte [{0}] suite aux erreurs pr�c�dentes -standardContext.startingLoader=Exception an d�marrage du "Loader" -standardContext.startingManager=Exception an d�marrage du "Manager" -standardContext.startingWrapper=Exception an d�marrage de l''enrobeur (wrapper) de la servlet {0} -standardContext.stoppingContext=Exception ? l''arr?t du "Context" -standardContext.stoppingLoader=Exception � l''arr�t du "Loader" -standardContext.stoppingManager=Exception � l''arr�t du "Manager" -standardContext.stoppingWrapper=Exception � l''arr�t de l''enrobeur (wrapper) de la servlet {0} -standardContext.resourcesStart=Erreur lors du d�marrage des Resources statiques -standardContext.urlDecode=Impossible de d�coder le chemin de requ�te encod� dans l''URL {0} -standardContext.urlPattern.patternWarning=ATTENTION: Le mod�le (pattern) URL {0} doit commencer par un ''/'' dans l''API Servlet 2.4 -standardContext.urlValidate=Impossible de valider le chemin de requ�te encod� dans l''URL {0} -standardContext.wrapper.error=Le fichier JSP {0} doit commencer par un ''/'' -standardContext.wrapper.warning=ATTENTION: Le fichier JSP {0} doit commencer par un ''/'' dans l''API Servlet 2.4 -standardEngine.alreadyStarted=Le moteur a d�j� �t� d�marr� -standardEngine.mappingError=Erreur de configuration d''association (mapping configuration) pour le serveur {0} -standardEngine.noHost=Aucune h�te (host) ne correspond au nom de serveur {0} -standardEngine.noHostHeader=requ�te HTTP/1.1 sans ent�te Host: -standardEngine.notHost=Le fils d''un moteur (child of an Engine) doit �tre un h�te -standardEngine.notParent=Les moteurs (engine) ne peuvent avoir de parent conteneur (container) -standardEngine.notStarted=Le moteur n''a pas encore �t� d�marr� -standardEngine.unfoundHost=L''h�te virtuel (virtual host) {0} est introuvable -standardEngine.unknownHost=Aucun serveur h�te n''est indiqu� pour cette requ�te -standardHost.accessBase=Impossible d''acc�der le r�pertoire "document base" {0} -standardHost.alreadyStarted=L''h�te a d�j� �t� d�marr� -standardHost.appBase=Le r�pertoire de base de l''application {0} n''existe pas -standardHost.configRequired=Une URL vers le fichier de configuration est obligatoire -standardHost.configNotAllowed=L''utilisation d''un fichier de configuration file n''est pas autoris� -standardHost.installing=Installation d''une application pour le chemin de contexte {0} depuis l''URL {1} -standardHost.installingWAR=Installation d''une application depuis l''URL {0} -standardHost.installError=Erreur lors du d�ploiement de l''application pour le chemin de contexte {0} -standardHost.invalidErrorReportValveClass=Impossible de charger la classe valve de rapport d''erreur: {0} -standardHost.docBase=Le r�pertoire "document base" {0} existe d�j� -standardHost.mappingError=Erreur d''association de configuration (mapping configuration) pour l''URI demand�e {0} -standardHost.noContext=Aucune contexte n''est configur� pour traiter cette requ�te -standardHost.noHost=Aucun h�te n''est configur� pour traiter cette requ�te -standardHost.notContext=Le fils d''un h�te (child of a Host) doit �tre un contexte -standardHost.notStarted=l''h�te n''a pas encore �t� d�marr� -standardHost.nullName=Le nom d''h�te est requis -standardHost.pathFormat=Chemin de contexte invalide: {0} -standardHost.pathMissing=Le chemin de contexte {0} n''est pas utilis� actuellement -standardHost.pathRequired=Le chemin de contexte est requis -standardHost.pathUsed=Le chemin de contexte {0} est d�j� utilis� -standardHost.removing=Retrait de l''application web pour le chemin de contexte {0} -standardHost.removeError=Erreur lors du retrait de l''application web pour le chemin de contexte {0} -standardHost.start=D�marrage de l''application web application pour le chemin de contexte {0} -standardHost.stop=Arr�t de l''application web application pour le chemin de contexte {0} -standardHost.unfoundContext=Impossible de trouver un contexte pour l''URI {0} demand�e -standardHost.warRequired=Une URL vers l''archive d''application web (war) est n�cessaire -standardHost.warURL=URL vers l''archive d''application web (war) invalide: {0} -standardPipeline.alreadyStarted=Le "Pipeline" a d�j� �t� d�marr� -standardPipeline.notStarted=le "Pipeline" n''a pas �t� d�marr� -standardPipeline.noValve=Plus aucune Valves dans le "Pipeline" traitant cette requ�te -standardServer.addContainer.ise=Aucun connecteur disponible � associer avec ce conteneur (container) -standardServer.initialize.initialized=Ce serveur a d�j� �t� initialis� -standardServer.start.connectors=Au moins un connecteur n''est pas associ� � aucun conteneur (container) -standardServer.start.started=Ce serveur a d�j� �t� d�marr� -standardServer.stop.notStarted=Ce serveur n''a pas encore �t� d�marr� -standardService.initialize.initialized=Ce service a d�j� �t� initialis� -standardService.start.name=D�marrage du service {0} -standardService.start.started=Ce service a d�j� �t� d�marr� -standardService.stop.name=Arr�t du service {0} -standardService.stop.notStarted=Ce service n''a pas encore �t� d�marr� -standardWrapper.allocate=Erreur d''allocation � une instance de servlet -standardWrapper.allocateException=Exception lors de l''allocation pour la servlet {0} -standardWrapper.containerServlet=Chargement du conteneur (container) de servlet {0} -standardWrapper.createFilters=Exception � la cr�ation de filtres pour la servlet {0} -standardWrapper.deallocateException=Exception � la d�sallocation pour la servlet {0} -standardWrapper.destroyException="Servlet.destroy()" de la servlet {0} a g�n�r� une exception -standardWrapper.exception0=Rapport d''exception Tomcat -standardWrapper.exception1=Une exception Servlet s''est produite -standardWrapper.exception2=Rapport d''exception: -standardWrapper.exception3=Cause m�re: -standardWrapper.initException="Servlet.init()" pour la servlet {0} a g�n�r� une exception -standardWrapper.instantiate=Erreur � l''instantiation de la classe servlet {0} -standardWrapper.isUnavailable=La servlet {0} est actuellement indisponible -standardWrapper.jasperLoader=Utilisation du chargeur de classe Jasper (classloader) pour la servlet {0} -standardWrapper.jspFile.format=Le fichier JSP {0} ne commence par par un caract�re ''/'' -standardWrapper.loadException=La servlet {0} a g�n�r� une exception "load()" -standardWrapper.missingClass=L''enrobeur (wrapper) ne peut trouver la classe servlet {0} ou une classe dont elle d�pend -standardWrapper.missingLoader=L''enrobeur (wrapper) ne peut trouver de chargeur (loader) pour la servlet {0} -standardWrapper.notChild=L''enrobeur de conteneur (wrapper container) peut ne pas avoir de conteneurs fils -standardWrapper.notClass=Aucune classe servlet n''a �t� sp�cifi�e pour la servlet {0} -standardWrapper.notContext=Le conteneur parent d''un enrobeur (wrapper) doit �tre un contexte -standardWrapper.notFound=Servlet {0} n''est pas disponible. -standardWrapper.notServlet=La classe {0} n''est pas une servlet -standardWrapper.privilegedServlet=La servlet de classe {0} est privil�gi�e (privileged) et ne peut �tre charg� par cette application web -standardWrapper.releaseFilters=Exception des filtres de sortie (release filters) pour la servlet {0} -standardWrapper.serviceException="Servlet.service()" pour la servlet {0} a g�n�r� une exception -standardWrapper.statusHeader=Etat HTTP {0} - {1} -standardWrapper.statusTitle=Rapport d''erreur Tomcat -standardWrapper.unavailable=La servlet {0} est marqu� comme indisponible -standardWrapper.unloadException=La servlet {0} a g�n�r� une exception "unload()" -standardWrapper.unloading=Impossible d''allouer la servlet {0} car elle a �t� d�charg�e Deleted: trunk/src/main/java/org/apache/catalina/core/LocalStrings_ja.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/core/LocalStrings_ja.properties 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/LocalStrings_ja.properties 2012-09-13 16:47:04 UTC (rev 2081) @@ -1,174 +0,0 @@ -applicationContext.attributeEvent=\u5c5e\u6027\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u306b\u3088\u3063\u3066\u4f8b\u5916\u304c\u6295\u3052\u3089\u308c\u307e\u3057\u305f -applicationContext.mapping.error=\u30de\u30c3\u30d4\u30f3\u30b0\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059 -applicationContext.requestDispatcher.iae=\u30d1\u30b9 {0} \u304c"/"\u6587\u5b57\u3067\u59cb\u307e\u308a\u307e\u305b\u3093 -applicationContext.setAttribute.namenull=name\u304cnull\u3067\u306f\u3044\u3051\u307e\u305b\u3093 -applicationDispatcher.allocateException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306b\u4f8b\u5916\u3092\u5272\u308a\u5f53\u3066\u307e\u3059 -applicationDispatcher.deallocateException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306e\u4f8b\u5916\u3092\u89e3\u9664\u3057\u307e\u3059 -applicationDispatcher.forward.ise=\u30ec\u30b9\u30dd\u30f3\u30b9\u3092\u30b3\u30df\u30c3\u30c8\u3057\u305f\u5f8c\u3067\u30d5\u30a9\u30ef\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093 -applicationDispatcher.forward.throw=\u30d5\u30a9\u30ef\u30fc\u30c9\u3057\u305f\u30ea\u30bd\u30fc\u30b9\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -applicationDispatcher.include.throw=\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u3057\u305f\u30ea\u30bd\u30fc\u30b9\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -applicationDispatcher.isUnavailable=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306f\u73fe\u5728\u5229\u7528\u3067\u304d\u307e\u305b\u3093 -applicationDispatcher.serviceException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306eServlet.service()\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -applicationRequest.badParent=\u89aa\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u5b9f\u88c5\u3092\u914d\u7f6e\u3067\u304d\u307e\u305b\u3093 -applicationRequest.badRequest=\u30ea\u30af\u30a8\u30b9\u30c8\u304cjavax.servlet.ServletRequestWrapper\u3067\u306f\u3042\u308a\u307e\u305b\u3093 -applicationResponse.badParent=\u89aa\u306e\u30ec\u30b9\u30dd\u30f3\u30b9\u5b9f\u88c5\u3092\u914d\u7f6e\u3067\u304d\u307e\u305b\u3093 -applicationResponse.badResponse=\u30ec\u30b9\u30dd\u30f3\u30b9\u304cjavax.servlet.ServletResponseWrapper\u3067\u306f\u3042\u308a\u307e\u305b\u3093 -containerBase.addDefaultMapper=\u30af\u30e9\u30b9 {0} \u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30de\u30c3\u30d1\u3092\u8a2d\u5b9a\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f -containerBase.alreadyStarted=\u30b3\u30f3\u30c6\u30ca {0} \u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -containerBase.notConfigured=\u57fa\u672c\u30d0\u30eb\u30d6\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -containerBase.notStarted=\u30b3\u30f3\u30c6\u30ca {0} \u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -fastEngineMapper.alreadyStarted=FastEngineMapper {0} \u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -fastEngineMapper.notStarted=FastEngineMapper {0} \u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -filterChain.filter=\u30d5\u30a3\u30eb\u30bf\u306e\u5b9f\u884c\u306b\u3088\u308a\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -filterChain.servlet=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u5b9f\u884c\u306b\u3088\u308a\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -httpContextMapper.container=\u3053\u306e\u30b3\u30f3\u30c6\u30ca\u306fStandardContext\u3067\u306f\u3042\u308a\u307e\u305b\u3093 -httpEngineMapper.container=\u3053\u306e\u30b3\u30f3\u30c6\u30ca\u306fStandardEngine\u3067\u306f\u3042\u308a\u307e\u305b\u3093 -httpHostMapper.container=\u3053\u306e\u30b3\u30f3\u30c6\u30ca\u306fStandardHost\u3067\u306f\u3042\u308a\u307e\u305b\u3093 -interceptorValve.alreadyStarted=InterceptorValve\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -interceptorValve.notStarted=InterceptorValve\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -naming.bindFailed=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u30d0\u30a4\u30f3\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0} -naming.unbindFailed=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u30a2\u30f3\u30d0\u30a4\u30f3\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0} -naming.invalidEnvEntryType=\u74b0\u5883\u30a8\u30f3\u30c8\u30ea {0} \u306f\u7121\u52b9\u306a\u578b\u3092\u6301\u3063\u3066\u3044\u307e\u3059 -naming.invalidEnvEntryValue=\u74b0\u5883\u30a8\u30f3\u30c8\u30ea {0} \u306f\u7121\u52b9\u306a\u5024\u3092\u6301\u3063\u3066\u3044\u307e\u3059 -naming.namingContextCreationFailed=\u540d\u524d\u4ed8\u304d\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u751f\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0} -standardContext.alreadyStarted=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -standardContext.applicationListener=\u30af\u30e9\u30b9 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30ea\u30b9\u30ca\u306e\u8a2d\u5b9a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f -standardContext.applicationSkipped=\u524d\u306e\u30a8\u30e9\u30fc\u306e\u305f\u3081\u306b\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30ea\u30b9\u30ca\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3092\u30b9\u30ad\u30c3\u30d7\u3057\u307e\u3059 -standardContext.badRequest=\u7121\u52b9\u306a\u30ea\u30af\u30a8\u30b9\u30c8\u30d1\u30b9\u3067\u3059 ({0})\u3002 -standardContext.errorPage.error=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8\u306e\u4f4d\u7f6e {0} \u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardContext.errorPage.required=ErrorPage\u304cnull\u3067\u306f\u3044\u3051\u307e\u305b\u3093 -standardContext.errorPage.warning=\u8b66\u544a: Servlet 2.4\u3067\u306f\u30a8\u30e9\u30fc\u30da\u30fc\u30b8\u306e\u4f4d\u7f6e {0} \u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardContext.filterMap.either=\u30d5\u30a3\u30eb\u30bf\u30de\u30c3\u30d4\u30f3\u30b0\u306f<url-pattern>\u53c8\u306f<servlet-name>\u306e\u3069\u3061\u3089\u304b\u3092\u6307\u5b9a\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardContext.filterMap.name=\u30d5\u30a3\u30eb\u30bf\u30de\u30c3\u30d4\u30f3\u30b0\u306f\u672a\u77e5\u306e\u30d5\u30a3\u30eb\u30bf\u540d {0} \u3092\u6307\u5b9a\u3057\u307e\u3057\u305f -standardContext.filterMap.pattern=\u30d5\u30a3\u30eb\u30bf\u30de\u30c3\u30d4\u30f3\u30b0\u4e2d\u306b\u7121\u52b9\u306a <url-pattern> {0} \u304c\u3042\u308a\u307e\u3059 -standardContext.filterStart=\u30d5\u30a3\u30eb\u30bf {0} \u306e\u8d77\u52d5\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardContext.filterStartFailed=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d5\u30a3\u30eb\u30bf\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u307e\u3057\u305f -standardContext.requestListenerStartFailed=\u30ea\u30af\u30a8\u30b9\u30c8\u30ea\u30b9\u30ca\u30d0\u30eb\u30d6\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u307e\u3057\u305f -standardContext.requestListenerConfig.added=\u30ea\u30af\u30a8\u30b9\u30c8\u30ea\u30b9\u30ca\u30d0\u30eb\u30d6\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f -standardContext.requestListenerConfig.error=\u30ea\u30af\u30a8\u30b9\u30c8\u30ea\u30b9\u30ca\u30d0\u30eb\u30d6\u8ffd\u52a0\u4e2d\u306e\u4f8b\u5916\u3067\u3059: {0} -standardContext.isUnavailable=\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u73fe\u5728\u5229\u7528\u3067\u304d\u307e\u305b\u3093 -standardContext.listenerStart=\u30af\u30e9\u30b9 {0} \u306e\u30ea\u30b9\u30ca\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u521d\u671f\u5316\u30a4\u30d9\u30f3\u30c8\u3092\u9001\u4fe1\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardContext.listenerStartFailed=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30ea\u30b9\u30ca\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u307e\u3057\u305f -standardContext.listenerStop=\u30af\u30e9\u30b9 {0} \u306e\u30ea\u30b9\u30ca\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u7834\u68c4\u30a4\u30d9\u30f3\u30c8\u3092\u9001\u4fe1\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardContext.loginConfig.errorPage=\u30d5\u30a9\u30fc\u30e0\u306e\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 {0} \u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardContext.loginConfig.errorWarning=\u8b66\u544a: Servlet 2.4\u3067\u306f\u30d5\u30a9\u30fc\u30e0\u306e\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 {0} \u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardContext.loginConfig.loginPage=\u30d5\u30a9\u30fc\u30e0\u306e\u30ed\u30b0\u30a4\u30f3\u30da\u30fc\u30b8 {0} \u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardContext.loginConfig.loginWarning=\u8b66\u544a: Servlet 2.4\u3067\u306f\u30d5\u30a9\u30fc\u30e0\u306e\u30ed\u30b0\u30a4\u30f3\u30da\u30fc\u30b8 {0} \u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardContext.loginConfig.required=LoginConfig\u306fnull\u3067\u306f\u3044\u3051\u307e\u305b\u3093 -standardContext.mappingError=\u76f8\u5bfeURI {0} \u306e\u30de\u30c3\u30d4\u30f3\u30b0\u8a2d\u5b9a\u30a8\u30e9\u30fc\u3067\u3059 -standardContext.notFound=\u30ea\u30af\u30a8\u30b9\u30c8\u3055\u308c\u305f\u30ea\u30bd\u30fc\u30b9 ({0}) \u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002 -standardContext.notReloadable=\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3067\u306f\u518d\u30ed\u30fc\u30c9\u306f\u7121\u52b9\u3067\u3059 -standardContext.notStarted=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -standardContext.notWrapper=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u5b50\u4f9b\u306f\u30e9\u30c3\u30d1\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardContext.parameter.duplicate=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u521d\u671f\u5316\u30d1\u30e9\u30e1\u30bf {0} \u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059 -standardContext.parameter.required=\u30d1\u30e9\u30e1\u30bf\u540d\u3068\u30d1\u30e9\u30e1\u30bf\u5024\u306e\u4e21\u65b9\u304c\u5fc5\u8981\u3067\u3059 -standardContext.reloadingCompleted=\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u518d\u30ed\u30fc\u30c9\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f -standardContext.reloadingFailed=\u4ee5\u524d\u306e\u30a8\u30e9\u30fc\u306e\u305f\u3081\u306b\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u518d\u30ed\u30fc\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f -standardContext.reloadingStarted=\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u518d\u30ed\u30fc\u30c9\u3092\u958b\u59cb\u3057\u307e\u3057\u305f -standardContext.requestListener.requestInit=\u30af\u30e9\u30b9 {0} \u306e\u30ea\u30b9\u30ca\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b\u521d\u671f\u5316\u3059\u308b\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u30a4\u30d9\u30f3\u30c8\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u9001\u4fe1\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardContext.requestListener.requestDestroy=\u30af\u30e9\u30b9 {0} \u306e\u30ea\u30b9\u30ca\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b\u5ec3\u68c4\u3059\u308b\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u30a4\u30d9\u30f3\u30c8\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u9001\u4fe1\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardContext.resourcesStart=\u9759\u7684\u30ea\u30bd\u30fc\u30b9\u306e\u8d77\u52d5\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059 -standardContext.securityConstraint.pattern=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u5236\u7d04\u306e\u4e2d\u306b\u7121\u52b9\u306a <url-pattern> {0} \u304c\u3042\u308a\u307e\u3059 -standardContext.servletMap.name=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30de\u30c3\u30d4\u30f3\u30b0\u306f\u672a\u77e5\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u540d {0} \u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059 -standardContext.servletMap.pattern=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30de\u30c3\u30d4\u30f3\u30b0\u4e2d\u306b\u7121\u52b9\u306a <url-pattern> {0} \u304c\u3042\u308a\u307e\u3059 -standardContext.startCleanup=\u8d77\u52d5\u304c\u5931\u6557\u3057\u305f\u5f8c\u306e\u30af\u30ea\u30fc\u30f3\u30ca\u30c3\u30d7\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f -standardContext.startFailed=\u4ee5\u524d\u306e\u30a8\u30e9\u30fc\u306e\u305f\u3081\u306b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u8d77\u52d5\u304c\u5931\u6557\u3057\u307e\u3057\u305f [{0}] -standardContext.startingLoader=\u30ed\u30fc\u30c0\u3092\u8d77\u52d5\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardContext.startingManager=\u30de\u30cd\u30fc\u30b8\u30e3\u3092\u8d77\u52d5\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardContext.startingWrapper=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306e\u30e9\u30c3\u30d1\u3092\u8d77\u52d5\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardContext.stoppingContext=\u30ed\u30fc\u30c0\u3092\u505c\u6b62\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardContext.stoppingLoader=\u30ed\u30fc\u30c0\u3092\u505c\u6b62\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardContext.stoppingManager=\u30de\u30cd\u30fc\u30b8\u30e3\u3092\u505c\u6b62\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardContext.stoppingWrapper=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306e\u30e9\u30c3\u30d1\u3092\u505c\u6b62\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardContext.urlDecode=\u30ea\u30af\u30a8\u30b9\u30c8\u30d1\u30b9 {0} \u306eURL\u30c7\u30b3\u30fc\u30c9\u304c\u3067\u304d\u307e\u305b\u3093 -standardContext.urlPattern.patternWarning=\u8b66\u544a: Servlet 2.4\u3067\u306fURL\u30d1\u30bf\u30fc\u30f3 {0} \u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardContext.urlValidate=URL\u30c7\u30b3\u30fc\u30c9\u3055\u308c\u305f\u30ea\u30af\u30a8\u30b9\u30c8\u30d1\u30b9 {0} \u3092\u691c\u8a3c\u3067\u304d\u307e\u305b\u3093 -standardContext.wrapper.error=JSP\u30d5\u30a1\u30a4\u30eb {0} \u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardContext.wrapper.warning=\u8b66\u544a: Servlet 2.4\u3067\u306fJSP\u30d5\u30a1\u30a4\u30eb {0} \u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardEngine.alreadyStarted=\u30a8\u30f3\u30b8\u30f3\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -standardEngine.mappingError=\u30b5\u30fc\u30d0\u540d {0} \u306e\u30de\u30c3\u30d4\u30f3\u30b0\u8a2d\u5b9a\u30a8\u30e9\u30fc\u3067\u3059 -standardEngine.noHost=\u30b5\u30fc\u30d0\u540d {0} \u306b\u4e00\u81f4\u3059\u308b\u30db\u30b9\u30c8\u304c\u5b58\u5728\u3057\u307e\u305b\u3093 -standardEngine.noHostHeader=Host:\u30d8\u30c3\u30c0\u3092\u6301\u305f\u306a\u3044 HTTP/1.1 \u30ea\u30af\u30a8\u30b9\u30c8\u3067\u3059 -standardEngine.notHost=\u30a8\u30f3\u30b8\u30f3\u306e\u5b50\u4f9b\u306f\u30db\u30b9\u30c8\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardEngine.notParent=\u30a8\u30f3\u30b8\u30f3\u306f\u89aa\u306e\u30b3\u30f3\u30c6\u30ca\u3092\u6301\u3064\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093 -standardEngine.notStarted=\u30a8\u30f3\u30b8\u30f3\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -standardEngine.unfoundHost=\u30d0\u30fc\u30c1\u30e3\u30eb\u30db\u30b9\u30c8 {0} \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093 -standardEngine.unknownHost=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u4e2d\u306b\u30b5\u30fc\u30d0\u30db\u30b9\u30c8\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -standardHost.accessBase=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30d9\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea {0} \u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093 -standardHost.alreadyStarted=\u30db\u30b9\u30c8\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -standardHost.appBase=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d9\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea {0} \u304c\u5b58\u5728\u3057\u307e\u305b\u3093 -standardHost.clientAbort=\u30ea\u30e2\u30fc\u30c8\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u304c\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u4e2d\u6b62\u3057\u307e\u3057\u305f, IOException: {0} -standardHost.configRequired=\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u3078\u306eURL\u304c\u5fc5\u8981\u3067\u3059 -standardHost.configNotAllowed=\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u304c\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093 -standardHost.installBase=\u30db\u30b9\u30c8Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u4e2d\u306eWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3060\u3051\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3067\u304d\u307e\u3059 -standardHost.installing=URL {1} \u304b\u3089\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306bWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3059 -standardHost.installingWAR=URL {0} \u304b\u3089Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3059 -standardHost.installingXML=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u306eURL {0} \u3092\u51e6\u7406\u3057\u3066\u3044\u307e\u3059 -standardHost.installError=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306b\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059 -standardHost.invalidErrorReportValveClass=\u6307\u5b9a\u3055\u308c\u305f\u30a8\u30e9\u30fc\u30ea\u30dd\u30fc\u30c8\u30d0\u30eb\u30d6\u30af\u30e9\u30b9\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093: {0} -standardHost.docBase=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30d9\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea {0} \u304c\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059 -standardHost.mappingError=\u30ea\u30af\u30a8\u30b9\u30c8URI {0} \u306e\u30de\u30c3\u30d4\u30f3\u30b0\u8a2d\u5b9a\u30a8\u30e9\u30fc\u3067\u3059 -standardHost.noContext=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u51e6\u7406\u3059\u308b\u305f\u3081\u306b\u8a2d\u5b9a\u3055\u308c\u305f\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u304c\u3042\u308a\u307e\u305b\u3093 -standardHost.noHost=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u51e6\u7406\u3059\u308b\u305f\u3081\u306b\u8a2d\u5b9a\u3055\u308c\u305f\u30db\u30b9\u30c8\u304c\u3042\u308a\u307e\u305b\u3093 -standardHost.notContext=\u30db\u30b9\u30c8\u306e\u5b50\u4f9b\u306f\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardHost.notStarted=\u30db\u30b9\u30c8\u304c\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -standardHost.nullName=\u30db\u30b9\u30c8\u540d\u304c\u5fc5\u8981\u3067\u3059 -standardHost.pathFormat=\u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9\u3067\u3059: {0} -standardHost.pathMatch=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u53c8\u306fWAR\u30d5\u30a1\u30a4\u30eb\u540d\u306b\u4e00\u81f4\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093: {1} -standardHost.pathMissing=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306f\u73fe\u5728\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -standardHost.pathRequired=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9\u304c\u5fc5\u8981\u3067\u3059 -standardHost.pathUsed=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306f\u65e2\u306b\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u3059 -standardHost.removing=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306eWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3059 -standardHost.removeError=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u524a\u9664\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f -standardHost.start=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306eWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u8d77\u52d5\u3057\u307e\u3059 -standardHost.stop=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306eWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u505c\u6b62\u3057\u307e\u3059 -standardHost.unfoundContext=\u30ea\u30af\u30a8\u30b9\u30c8URI {0} \u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093 -standardHost.warRequired=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30fc\u30ab\u30a4\u30d6\u306eURL\u304c\u5fc5\u8981\u3067\u3059 -standardHost.warURL=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30fc\u30ab\u30a4\u30d6\u306b\u5bfe\u3059\u308b\u7121\u52b9\u306aURL\u3067\u3059: {0} -standardHost.validationEnabled=XML\u691c\u8a3c\u306f\u6709\u52b9\u3067\u3059 -standardHost.validationDisabled=XML\u691c\u8a3c\u306f\u7121\u52b9\u3067\u3059 -standardPipeline.alreadyStarted=\u30d1\u30a4\u30d7\u30e9\u30a4\u30f3\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -standardPipeline.notStarted=\u30d1\u30a4\u30d7\u30e9\u30a4\u30f3\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -standardPipeline.noValve=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u51e6\u7406\u3059\u308b\u30d1\u30a4\u30d7\u30e9\u30a4\u30f3\u4e2d\u306b\u3053\u308c\u4ee5\u4e0a\u306e\u30d0\u30eb\u30d6\u306f\u3042\u308a\u307e\u305b\u3093 -standardServer.addContainer.ise=\u3053\u306e\u30b3\u30f3\u30c6\u30ca\u3092\u95a2\u9023\u3065\u3051\u308b\u305f\u3081\u306e\u30b3\u30cd\u30af\u30bf\u304c\u5229\u7528\u3067\u304d\u307e\u305b\u3093 -standardServer.initialize.initialized=\u3053\u306e\u30b5\u30fc\u30d0\u306f\u65e2\u306b\u521d\u671f\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardServer.start.connectors=\u30b3\u30f3\u30c6\u30ca\u306b\u4e00\u3064\u3082\u30b3\u30cd\u30af\u30bf\u304c\u95a2\u9023\u3065\u3051\u3089\u308c\u3066\u3044\u307e\u305b\u3093 -standardServer.start.started=\u3053\u306e\u30b5\u30fc\u30d0\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -standardServer.stop.notStarted=\u3053\u306e\u30b5\u30fc\u30d0\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -standardService.initialize.initialized=\u3053\u306e\u30b5\u30fc\u30d3\u30b9\u306f\u65e2\u306b\u521d\u671f\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardService.start.name=\u30b5\u30fc\u30d3\u30b9 {0} \u3092\u8d77\u52d5\u3057\u307e\u3059 -standardService.start.started=\u3053\u306e\u30b5\u30fc\u30d3\u30b9\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -standardService.stop.name=\u30b5\u30fc\u30d3\u30b9 {0} \u3092\u505c\u6b62\u3057\u307e\u3059 -standardService.stop.notStarted=\u3053\u306e\u30b5\u30fc\u30d3\u30b9\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -standardWrapper.allocate=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u5272\u308a\u5f53\u3066\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059 -standardWrapper.allocateException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306b\u4f8b\u5916\u3092\u5272\u308a\u5f53\u3066\u307e\u3059 -standardWrapper.containerServlet=\u30b3\u30f3\u30c6\u30ca\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u3092\u30ed\u30fc\u30c9\u3057\u307e\u3059 -standardWrapper.createFilters=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0}\u306b\u5bfe\u3059\u308b\u30d5\u30a3\u30eb\u30bf\u4f8b\u5916\u3092\u4f5c\u6210\u3057\u307e\u3059 -standardWrapper.deallocateException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306b\u5bfe\u3059\u308b\u4f8b\u5916\u306e\u5272\u308a\u5f53\u3066\u3092\u89e3\u9664\u3057\u307e\u3059 -standardWrapper.destroyException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306eServlet.destroy()\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -standardWrapper.exception0=Tomcat\u306e\u4f8b\u5916\u306e\u5831\u544a -standardWrapper.exception1=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f -standardWrapper.exception2=\u4f8b\u5916\u306e\u5831\u544a: -standardWrapper.exception3=\u6839\u672c\u306e\u539f\u56e0: -standardWrapper.initException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306eServlet.init()\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -standardWrapper.instantiate=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30af\u30e9\u30b9 {0} \u3092\u521d\u671f\u5316\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f -standardWrapper.isUnavailable=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306f\u73fe\u5728\u5229\u7528\u3067\u304d\u307e\u305b\u3093 -standardWrapper.jasperLoader=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306bJasper\u30af\u30e9\u30b9\u30ed\u30fc\u30c0\u3092\u4f7f\u7528\u3057\u307e\u3059 -standardWrapper.jspFile.format=JSP\u30d5\u30a1\u30a4\u30eb {0} \u304c''/''\u6587\u5b57\u3067\u59cb\u307e\u3063\u3066\u3044\u307e\u305b\u3093 -standardWrapper.loadException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u304cload()\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -standardWrapper.missingClass=\u30e9\u30c3\u30d1\u304c\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30af\u30e9\u30b9 {0} \u53c8\u306f\u305d\u308c\u304c\u4f9d\u5b58\u3059\u308b\u30af\u30e9\u30b9\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093 -standardWrapper.missingLoader=\u30e9\u30c3\u30d1\u304c\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306e\u30ed\u30fc\u30c0\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093 -standardWrapper.notChild=\u30e9\u30c3\u30d1\u30b3\u30f3\u30c6\u30ca\u306f\u5b50\u4f9b\u306e\u30b3\u30f3\u30c6\u30ca\u3092\u6301\u3064\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093 -standardWrapper.notClass=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306b\u6307\u5b9a\u3055\u308c\u305f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30af\u30e9\u30b9\u304c\u3042\u308a\u307e\u305b\u3093 -standardWrapper.notContext=\u30e9\u30c3\u30d1\u306e\u89aa\u306e\u30b3\u30f3\u30c6\u30ca\u306f\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -standardWrapper.notFound=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u304c\u5229\u7528\u3067\u304d\u307e\u305b\u3093 -standardWrapper.notServlet=\u30af\u30e9\u30b9 {0} \u306f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3067\u306f\u3042\u308a\u307e\u305b\u3093 -standardWrapper.privilegedServlet=\u30af\u30e9\u30b9 {0} \u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306f\u7279\u6a29\u3092\u4e0e\u3048\u3089\u308c\u3066\u3044\u308b\u306e\u3067\u3001\u3053\u306eWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u3088\u3063\u3066\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093 -standardWrapper.releaseFilters=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306e\u30d5\u30a3\u30eb\u30bf\u4f8b\u5916\u3092\u89e3\u9664\u3057\u307e\u3059 -standardWrapper.serviceException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306eServlet.service()\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -standardWrapper.statusHeader=HTTP\u30b9\u30c6\u30fc\u30bf\u30b9 {0} - {1} -standardWrapper.statusTitle=Tomcat\u306e\u30a8\u30e9\u30fc\u306e\u5831\u544a -standardWrapper.unavailable=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u3092\u5229\u7528\u4e0d\u53ef\u80fd\u306b\u30de\u30fc\u30af\u3057\u307e\u3059 -standardWrapper.unloadException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u304cunload()\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -standardWrapper.unloading=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u304c\u30ed\u30fc\u30c9\u3055\u308c\u3066\u3044\u306a\u3044\u306e\u3067\u3001\u5272\u308a\u5f53\u3066\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093 -standardWrapper.waiting={0} \u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u5272\u308a\u5f53\u3066\u89e3\u9664\u3055\u308c\u308b\u306e\u3092\u5f85\u3063\u3066\u3044\u307e\u3059 Modified: trunk/src/main/java/org/apache/catalina/core/StandardContextValve.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/StandardContextValve.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/StandardContextValve.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -21,18 +21,13 @@ import java.io.IOException; -import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletRequestEvent; -import javax.servlet.ServletRequestListener; import javax.servlet.http.HttpServletResponse; import org.apache.catalina.Container; import org.apache.catalina.Wrapper; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; import org.apache.tomcat.util.buf.MessageBytes; import org.jboss.servlet.http.HttpEvent; @@ -62,13 +57,6 @@ "org.apache.catalina.core.StandardContextValve/1.0"; - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - private StandardContext context = null; Modified: trunk/src/main/java/org/apache/catalina/core/StandardEngineValve.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/StandardEngineValve.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/StandardEngineValve.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -19,6 +19,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.IOException; import javax.servlet.ServletException; @@ -27,7 +29,6 @@ import org.apache.catalina.Host; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; import org.jboss.servlet.http.HttpEvent; @@ -57,13 +58,6 @@ "org.apache.catalina.core.StandardEngineValve/1.0"; - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - // ------------------------------------------------------------- Properties @@ -100,8 +94,7 @@ if (host == null) { response.sendError (HttpServletResponse.SC_BAD_REQUEST, - sm.getString("standardEngine.noHost", - request.getServerName())); + MESSAGES.noHost(request.getServerName())); return; } Modified: trunk/src/main/java/org/apache/catalina/core/StandardHostValve.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/StandardHostValve.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/StandardHostValve.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -19,6 +19,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.IOException; import javax.servlet.RequestDispatcher; @@ -36,11 +38,10 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.deploy.ErrorPage; -import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.jboss.logging.Logger; import org.jboss.servlet.http.HttpEvent; import org.jboss.servlet.http.HttpEvent.EventType; +import org.jboss.web.CatalinaLogger; /** @@ -58,9 +59,6 @@ final class StandardHostValve extends ValveBase { - - private static Logger log = Logger.getLogger(StandardHostValve.class); - // ----------------------------------------------------- Instance Variables @@ -71,13 +69,6 @@ "org.apache.catalina.core.StandardHostValve/1.0"; - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - // ------------------------------------------------------------- Properties @@ -114,7 +105,7 @@ if (context == null) { response.sendError (HttpServletResponse.SC_INTERNAL_SERVER_ERROR, - sm.getString("standardHost.noContext")); + MESSAGES.noContext()); return; } @@ -142,8 +133,7 @@ try { listener.requestInitialized(event); } catch (Throwable t) { - container.getLogger().error(sm.getString("standardContext.requestListener.requestInit", - instances[i].getClass().getName()), t); + container.getLogger().error(MESSAGES.requestListenerInitException(instances[i].getClass().getName()), t); ServletRequest sreq = request.getRequest(); sreq.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t); return; @@ -184,8 +174,7 @@ try { listener.requestDestroyed(event); } catch (Throwable t2) { - container.getLogger().error(sm.getString("standardContext.requestListener.requestDestroy", - instances[i].getClass().getName()), t2); + container.getLogger().error(MESSAGES.requestListenerDestroyException(instances[i].getClass().getName()), t2); ServletRequest sreq = request.getRequest(); sreq.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t2); } @@ -245,8 +234,7 @@ try { listener.requestInitialized(event2); } catch (Throwable t) { - container.getLogger().error(sm.getString("requestListenerValve.requestInit", - instances[i].getClass().getName()), t); + container.getLogger().error(MESSAGES.requestListenerInitException(instances[i].getClass().getName()), t); ServletRequest sreq = request.getRequest(); sreq.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t); Thread.currentThread().setContextClassLoader(StandardHostValve.class.getClassLoader()); @@ -303,8 +291,7 @@ try { listener.requestDestroyed(event2); } catch (Throwable t) { - container.getLogger().error(sm.getString("requestListenerValve.requestDestroy", - instances[i].getClass().getName()), t); + container.getLogger().error(MESSAGES.requestListenerDestroyException(instances[i].getClass().getName()), t); ServletRequest sreq = request.getRequest(); sreq.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t); } @@ -349,11 +336,7 @@ // If this is an aborted request from a client just log it and return if (realError instanceof ClientAbortException ) { - if (log.isDebugEnabled()) { - log.debug - (sm.getString("standardHost.clientAbort", - realError.getCause().getMessage())); - } + CatalinaLogger.CORE_LOGGER.clientAbortException(realError.getCause().getMessage()); return; } Modified: trunk/src/main/java/org/apache/catalina/core/StandardPipeline.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/StandardPipeline.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/StandardPipeline.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -31,11 +31,9 @@ import org.apache.catalina.Pipeline; import org.apache.catalina.Valve; import org.apache.catalina.util.LifecycleSupport; -import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; import org.apache.tomcat.util.modeler.Registry; -import org.jboss.logging.Logger; -import org.jboss.logging.Logger; +import org.jboss.web.CatalinaLogger; /** @@ -55,8 +53,6 @@ implements Pipeline, Contained, Lifecycle { - private static Logger log = Logger.getLogger(StandardPipeline.class); - // ----------------------------------------------------------- Constructors @@ -112,13 +108,6 @@ /** - * The string manager for this package. - */ - protected static StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * Has this component been started yet? */ protected boolean started = false; @@ -215,8 +204,7 @@ // Validate and update our current component state if (started) { - if(log.isDebugEnabled()) - log.debug(sm.getString("standardPipeline.alreadyStarted")); + CatalinaLogger.CORE_LOGGER.pipelineAlreadyStarted(); return; } @@ -258,8 +246,7 @@ // Validate and update our current component state if (!started) { - if(log.isDebugEnabled()) - log.debug(sm.getString("standardPipeline.notStarted")); + CatalinaLogger.CORE_LOGGER.pipelineNotStarted(); return; } @@ -311,7 +298,7 @@ (((ContainerBase)container).getJmxName()); } } catch( Throwable t ) { - log.info( "Can't register valve " + valve , t ); + CatalinaLogger.CORE_LOGGER.failedValveJmxRegistration(valve, t); } } } @@ -331,7 +318,7 @@ ((ValveBase)valve).setObjectName(null); } } catch( Throwable t ) { - log.info( "Can't unregister valve " + valve , t ); + CatalinaLogger.CORE_LOGGER.failedValveJmxUnregistration(valve, t); } } } @@ -376,7 +363,7 @@ try { ((Lifecycle) oldBasic).stop(); } catch (LifecycleException e) { - log.error("StandardPipeline.setBasic: stop", e); + CatalinaLogger.CORE_LOGGER.errorStoppingValve(e); } } if (oldBasic instanceof Contained) { @@ -398,7 +385,7 @@ try { ((Lifecycle) valve).start(); } catch (LifecycleException e) { - log.error("StandardPipeline.setBasic: start", e); + CatalinaLogger.CORE_LOGGER.errorStartingValve(e); return; } } @@ -449,7 +436,7 @@ try { ((Lifecycle) valve).start(); } catch (LifecycleException e) { - log.error("StandardPipeline.addValve: start: ", e); + CatalinaLogger.CORE_LOGGER.errorStartingValve(e); } } // Register the newly added valve @@ -552,7 +539,7 @@ try { ((Lifecycle) valve).stop(); } catch (LifecycleException e) { - log.error("StandardPipeline.removeValve: stop: ", e); + CatalinaLogger.CORE_LOGGER.errorStoppingValve(e); } } // Unregister the removed valave Modified: trunk/src/main/java/org/apache/catalina/core/StandardServer.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/StandardServer.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/StandardServer.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -33,10 +33,9 @@ import org.apache.catalina.Service; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.ServerInfo; -import org.apache.catalina.util.StringManager; import org.apache.tomcat.util.buf.StringCache; import org.apache.tomcat.util.modeler.Registry; -import org.jboss.logging.Logger; +import org.jboss.web.CatalinaLogger; @@ -50,8 +49,6 @@ public final class StandardServer implements Lifecycle, Server, MBeanRegistration { - private static Logger log = Logger.getLogger(StandardServer.class); - // ------------------------------------------------------------ Constructor @@ -86,13 +83,6 @@ /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * Has this component been started? */ private boolean started = false; @@ -156,7 +146,7 @@ try { service.initialize(); } catch (LifecycleException e) { - log.error(e); + CatalinaLogger.CORE_LOGGER.errorInitializingService(e); } } @@ -164,7 +154,7 @@ try { ((Lifecycle) service).start(); } catch (LifecycleException e) { - ; + CatalinaLogger.CORE_LOGGER.errorStartingService(e); } } @@ -344,7 +334,6 @@ // Validate and update our current component state if (started) { - log.debug(sm.getString("standardServer.start.started")); return; } @@ -412,7 +401,6 @@ throws LifecycleException { if (initialized) { - log.info(sm.getString("standardServer.initialize.initialized")); return; } lifecycle.fireLifecycleEvent(INIT_EVENT, null); @@ -425,7 +413,7 @@ Registry.getRegistry(null, null) .registerComponent(this, oname, null ); } catch (Exception e) { - log.error("Error registering ",e); + CatalinaLogger.CORE_LOGGER.failedServerJmxRegistration(oname, e); } } @@ -436,7 +424,7 @@ Registry.getRegistry(null, null) .registerComponent(new StringCache(), oname2, null ); } catch (Exception e) { - log.error("Error registering ",e); + CatalinaLogger.CORE_LOGGER.failedServerJmxRegistration(oname, e); } } Modified: trunk/src/main/java/org/apache/catalina/core/StandardService.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/StandardService.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/StandardService.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -19,6 +19,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.lang.reflect.Method; @@ -40,10 +42,9 @@ import org.apache.catalina.connector.Connector; import org.apache.catalina.util.Base64; import org.apache.catalina.util.LifecycleSupport; -import org.apache.catalina.util.StringManager; import org.apache.tomcat.util.http.mapper.Mapper; import org.apache.tomcat.util.modeler.Registry; -import org.jboss.logging.Logger; +import org.jboss.web.CatalinaLogger; /** @@ -57,8 +58,6 @@ public class StandardService implements Lifecycle, Service, MBeanRegistration { - private static Logger log = Logger.getLogger(StandardService.class); - /** * Alternate flag to enable delaying startup of connectors in embedded mode. @@ -66,7 +65,6 @@ public static final boolean DELAY_CONNECTOR_STARTUP = Boolean.valueOf(System.getProperty("org.apache.catalina.core.StandardService.DELAY_CONNECTOR_STARTUP", "true")).booleanValue(); - // ----------------------------------------------------- Instance Variables @@ -88,14 +86,7 @@ */ private LifecycleSupport lifecycle = new LifecycleSupport(this); - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - /** * The <code>Server</code> that owns this Service, if any. */ private Server server = null; @@ -351,7 +342,7 @@ try { connector.init(); } catch (LifecycleException e) { - log.error("Connector.initialize", e); + CatalinaLogger.CORE_LOGGER.errorInitializingConnector(e); } } @@ -359,7 +350,7 @@ try { ((Lifecycle) connector).start(); } catch (LifecycleException e) { - log.error("Connector.start", e); + CatalinaLogger.CORE_LOGGER.errorStartingConnector(e); } } } @@ -425,7 +416,7 @@ try { ((Lifecycle) connectors[j]).stop(); } catch (LifecycleException e) { - log.error("Connector.stop", e); + CatalinaLogger.CORE_LOGGER.errorStoppingConnector(e); } } } @@ -520,7 +511,7 @@ try { ex.start(); } catch (LifecycleException x) { - log.error("Executor.start", x); + CatalinaLogger.CORE_LOGGER.errorStartingExecutor(x); } } } @@ -563,7 +554,7 @@ try { ex.stop(); } catch (LifecycleException e) { - log.error("Executor.stop", e); + CatalinaLogger.CORE_LOGGER.errorStoppingExecutor(e); } } } @@ -583,8 +574,9 @@ public void start() throws LifecycleException { // Validate and update our current component state - if (log.isInfoEnabled() && started) { - log.info(sm.getString("standardService.start.started")); + if (started) { + CatalinaLogger.CORE_LOGGER.serviceAlreadyStarted(); + return; } if( ! initialized ) @@ -592,8 +584,7 @@ // Notify our interested LifecycleListeners lifecycle.fireLifecycleEvent(BEFORE_START_EVENT, null); - if(log.isDebugEnabled()) - log.debug(sm.getString("standardService.start.name", this.name)); + CatalinaLogger.CORE_LOGGER.startingService(name); lifecycle.fireLifecycleEvent(START_EVENT, null); started = true; @@ -641,6 +632,7 @@ // Validate and update our current component state if (!started) { + CatalinaLogger.CORE_LOGGER.serviceNotStarted(); return; } @@ -657,8 +649,7 @@ } lifecycle.fireLifecycleEvent(STOP_EVENT, null); - if(log.isDebugEnabled()) - log.debug(sm.getString("standardService.stop.name", this.name)); + CatalinaLogger.CORE_LOGGER.stoppingService(name); started = false; // Stop our defined Container second @@ -720,8 +711,6 @@ { // Service shouldn't be used with embeded, so it doesn't matter if (initialized) { - if(log.isInfoEnabled()) - log.info(sm.getString("standardService.initialize.initialized")); return; } initialized = true; @@ -746,7 +735,7 @@ } } catch (Exception e) { - log.error(sm.getString("standardService.register.failed",domain),e); + CatalinaLogger.CORE_LOGGER.failedServiceJmxRegistration(domain, e); } } } @@ -786,7 +775,7 @@ try { initialize(); } catch( Throwable t ) { - log.error(sm.getString("standardService.initialize.failed",domain),t); + CatalinaLogger.CORE_LOGGER.errorInitializingService(t); } } Modified: trunk/src/main/java/org/apache/catalina/core/StandardWrapperFacade.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/StandardWrapperFacade.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/StandardWrapperFacade.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -47,6 +47,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.util.Collection; import java.util.Collections; import java.util.Enumeration; @@ -64,7 +66,6 @@ import org.apache.catalina.Context; import org.apache.catalina.deploy.Multipart; -import org.apache.catalina.util.StringManager; /** @@ -78,13 +79,6 @@ implements ServletRegistration, ServletConfig { - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - public static class Dynamic extends StandardWrapperFacade implements ServletRegistration.Dynamic { @@ -155,11 +149,10 @@ public Set<String> addMapping(String... urlPatterns) { Set<String> conflicts = new HashSet<String>(); if (!((Context) wrapper.getParent()).isStarting()) { - throw new IllegalStateException(sm.getString - ("servletRegistration.ise", ((Context) wrapper.getParent()).getPath())); + throw MESSAGES.cannotAddServletRegistrationAfterInit(((Context) wrapper.getParent()).getPath()); } if (urlPatterns == null || urlPatterns.length == 0) { - throw new IllegalArgumentException(sm.getString("servletRegistration.iae")); + throw MESSAGES.invalidServletRegistrationArguments(); } for (String urlPattern : urlPatterns) { if (((Context) wrapper.getParent()).findServletMapping(urlPattern) != null) { @@ -177,8 +170,7 @@ public void setAsyncSupported(boolean asyncSupported) { if (!((Context) wrapper.getParent()).isStarting()) { - throw new IllegalStateException(sm.getString - ("servletRegistration.ise", ((Context) wrapper.getParent()).getPath())); + throw MESSAGES.cannotAddServletRegistrationAfterInit(((Context) wrapper.getParent()).getPath()); } wrapper.setAsyncSupported(asyncSupported); } @@ -191,11 +183,10 @@ public boolean setInitParameter(String name, String value) { if (!((Context) wrapper.getParent()).isStarting()) { - throw new IllegalStateException(sm.getString - ("servletRegistration.ise", ((Context) wrapper.getParent()).getPath())); + throw MESSAGES.cannotAddServletRegistrationAfterInit(((Context) wrapper.getParent()).getPath()); } if (name == null || value == null) { - throw new IllegalArgumentException(sm.getString("servletRegistration.iae")); + throw MESSAGES.invalidServletRegistrationArguments(); } if (wrapper.findInitParameter(name) == null) { wrapper.addInitParameter(name, value); @@ -208,11 +199,10 @@ public Set<String> setInitParameters(Map<String, String> initParameters) { if (!((Context) wrapper.getParent()).isStarting()) { - throw new IllegalStateException(sm.getString - ("servletRegistration.ise", ((Context) wrapper.getParent()).getPath())); + throw MESSAGES.cannotAddServletRegistrationAfterInit(((Context) wrapper.getParent()).getPath()); } if (initParameters == null) { - throw new IllegalArgumentException(sm.getString("servletRegistration.iae")); + throw MESSAGES.invalidServletRegistrationArguments(); } Set<String> conflicts = new HashSet<String>(); Iterator<String> parameterNames = initParameters.keySet().iterator(); @@ -223,7 +213,7 @@ } else { String value = initParameters.get(parameterName); if (value == null) { - throw new IllegalArgumentException(sm.getString("servletRegistration.iae")); + throw MESSAGES.invalidServletRegistrationArguments(); } wrapper.addInitParameter(parameterName, value); } @@ -234,8 +224,7 @@ public void setLoadOnStartup(int loadOnStartup) { if (!((Context) wrapper.getParent()).isStarting()) { - throw new IllegalStateException(sm.getString - ("servletRegistration.ise", ((Context) wrapper.getParent()).getPath())); + throw MESSAGES.cannotAddServletRegistrationAfterInit(((Context) wrapper.getParent()).getPath()); } wrapper.setLoadOnStartup(loadOnStartup); } @@ -277,33 +266,30 @@ public void setRunAsRole(String roleName) { if (!((Context) wrapper.getParent()).isStarting()) { - throw new IllegalStateException(sm.getString - ("servletRegistration.ise", ((Context) wrapper.getParent()).getPath())); + throw MESSAGES.cannotAddServletRegistrationAfterInit(((Context) wrapper.getParent()).getPath()); } if (roleName == null) { - throw new IllegalArgumentException(sm.getString("servletRegistration.iae")); + throw MESSAGES.invalidServletRegistrationArguments(); } wrapper.setRunAs(roleName); } public Set<String> setServletSecurity(ServletSecurityElement servletSecurity) { if (!((Context) wrapper.getParent()).isStarting()) { - throw new IllegalStateException(sm.getString - ("servletRegistration.ise", ((Context) wrapper.getParent()).getPath())); + throw MESSAGES.cannotAddServletRegistrationAfterInit(((Context) wrapper.getParent()).getPath()); } if (servletSecurity == null) { - throw new IllegalArgumentException(sm.getString("servletRegistration.iae")); + throw MESSAGES.invalidServletRegistrationArguments(); } return wrapper.setServletSecurity(servletSecurity); } public void setMultipartConfig(MultipartConfigElement multipartConfig) { if (!((Context) wrapper.getParent()).isStarting()) { - throw new IllegalStateException(sm.getString - ("servletRegistration.ise", ((Context) wrapper.getParent()).getPath())); + throw MESSAGES.cannotAddServletRegistrationAfterInit(((Context) wrapper.getParent()).getPath()); } if (multipartConfig == null) { - throw new IllegalArgumentException(sm.getString("servletRegistration.iae")); + throw MESSAGES.invalidServletRegistrationArguments(); } Multipart multipart = new Multipart(); multipart.setLocation(multipartConfig.getLocation()); Modified: trunk/src/main/java/org/apache/catalina/core/StandardWrapperValve.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/StandardWrapperValve.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/core/StandardWrapperValve.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -47,6 +47,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.IOException; import java.util.Iterator; @@ -72,7 +74,6 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.connector.Request.AsyncListenerRegistration; import org.apache.catalina.util.InstanceSupport; -import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; import org.jboss.servlet.http.HttpEvent; import org.jboss.servlet.http.HttpEventServlet; @@ -110,13 +111,6 @@ private InstanceSupport support; - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - // --------------------------------------------------------- Public Methods @@ -126,7 +120,7 @@ support = ((Wrapper) container).getInstanceSupport(); } if (support == null) { - throw new IllegalStateException(sm.getString("standardWrapper.noInstanceSupport", container.getName())); + throw MESSAGES.missingInstanceSupport(container.getName()); } } @@ -160,24 +154,21 @@ // Check for the application being marked unavailable if (!context.getAvailable()) { response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, - sm.getString("standardContext.isUnavailable")); + MESSAGES.unavailable()); unavailable = true; } // Check for the servlet being marked unavailable if (!unavailable && wrapper.isUnavailable()) { - container.getLogger().info(sm.getString("standardWrapper.isUnavailable", - wrapper.getName())); + container.getLogger().info(MESSAGES.servletIsUnavailable(wrapper.getName())); long available = wrapper.getAvailable(); if ((available > 0L) && (available < Long.MAX_VALUE)) { response.setDateHeader("Retry-After", available); response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, - sm.getString("standardWrapper.isUnavailable", - wrapper.getName())); + MESSAGES.servletIsUnavailable(wrapper.getName())); } else if (available == Long.MAX_VALUE) { response.sendError(HttpServletResponse.SC_NOT_FOUND, - sm.getString("standardWrapper.notFound", - wrapper.getName())); + MESSAGES.servletIsUnavailable(wrapper.getName())); } unavailable = true; } @@ -188,29 +179,23 @@ servlet = wrapper.allocate(); } } catch (UnavailableException e) { - container.getLogger().error( - sm.getString("standardWrapper.allocateException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.servletAllocateException(wrapper.getName()), e); long available = wrapper.getAvailable(); if ((available > 0L) && (available < Long.MAX_VALUE)) { response.setDateHeader("Retry-After", available); response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, - sm.getString("standardWrapper.isUnavailable", - wrapper.getName())); + MESSAGES.servletIsUnavailable(wrapper.getName())); } else if (available == Long.MAX_VALUE) { response.sendError(HttpServletResponse.SC_NOT_FOUND, - sm.getString("standardWrapper.notFound", - wrapper.getName())); + MESSAGES.servletIsUnavailable(wrapper.getName())); } } catch (ServletException e) { - container.getLogger().error(sm.getString("standardWrapper.allocateException", - wrapper.getName()), StandardWrapper.getRootCause(e)); + container.getLogger().error(MESSAGES.servletAllocateException(wrapper.getName()), StandardWrapper.getRootCause(e)); throwable = e; exception(request, response, e); servlet = null; } catch (Throwable e) { - container.getLogger().error(sm.getString("standardWrapper.allocateException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.servletAllocateException(wrapper.getName()), e); throwable = e; exception(request, response, e); servlet = null; @@ -230,13 +215,11 @@ response.sendAcknowledgement(); } catch (IOException e) { request.removeAttribute(Globals.JSP_FILE_ATTR); - container.getLogger().warn(sm.getString("standardWrapper.acknowledgeException", - wrapper.getName()), e); + container.getLogger().warn(MESSAGES.errorAcknowledgingRequest(wrapper.getName()), e); throwable = e; exception(request, response, e); } catch (Throwable e) { - container.getLogger().error(sm.getString("standardWrapper.acknowledgeException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.errorAcknowledgingRequest(wrapper.getName()), e); throwable = e; exception(request, response, e); servlet = null; @@ -280,13 +263,11 @@ throwable = e; exception(request, response, e); } catch (IOException e) { - container.getLogger().error(sm.getString("standardWrapper.serviceException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.servletServiceException(wrapper.getName()), e); throwable = e; exception(request, response, e); } catch (UnavailableException e) { - container.getLogger().error(sm.getString("standardWrapper.serviceException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.servletServiceException(wrapper.getName()), e); // throwable = e; // exception(request, response, e); wrapper.unavailable(e); @@ -294,26 +275,22 @@ if ((available > 0L) && (available < Long.MAX_VALUE)) { response.setDateHeader("Retry-After", available); response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, - sm.getString("standardWrapper.isUnavailable", - wrapper.getName())); + MESSAGES.servletIsUnavailable(wrapper.getName())); } else if (available == Long.MAX_VALUE) { response.sendError(HttpServletResponse.SC_NOT_FOUND, - sm.getString("standardWrapper.notFound", - wrapper.getName())); + MESSAGES.servletIsUnavailable(wrapper.getName())); } // Do not save exception in 'throwable', because we // do not want to do exception(request, response, e) processing } catch (ServletException e) { Throwable rootCause = StandardWrapper.getRootCause(e); if (!(rootCause instanceof ClientAbortException)) { - container.getLogger().error(sm.getString("standardWrapper.serviceException", - wrapper.getName()), rootCause); + container.getLogger().error(MESSAGES.servletServiceException(wrapper.getName()), rootCause); } throwable = e; exception(request, response, e); } catch (Throwable e) { - container.getLogger().error(sm.getString("standardWrapper.serviceException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.servletServiceException(wrapper.getName()), e); throwable = e; exception(request, response, e); } finally { @@ -341,8 +318,7 @@ wrapper.deallocate(servlet); } } catch (Throwable e) { - container.getLogger().error(sm.getString("standardWrapper.deallocateException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.servletDeallocateException(wrapper.getName()), e); if (throwable == null) { throwable = e; exception(request, response, e); @@ -357,8 +333,7 @@ wrapper.unload(); } } catch (Throwable e) { - container.getLogger().error(sm.getString("standardWrapper.unloadException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.errorUnloadingServlet(wrapper.getName()), e); if (throwable == null) { throwable = e; exception(request, response, e); @@ -426,14 +401,12 @@ } catch (UnavailableException e) { // The response is already committed, so it's not possible to do anything } catch (ServletException e) { - container.getLogger().error(sm.getString("standardWrapper.allocateException", - wrapper.getName()), StandardWrapper.getRootCause(e)); + container.getLogger().error(MESSAGES.servletAllocateException(wrapper.getName()), StandardWrapper.getRootCause(e)); throwable = e; exception(request, response, e); servlet = null; } catch (Throwable e) { - container.getLogger().error(sm.getString("standardWrapper.allocateException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.servletAllocateException(wrapper.getName()), e); throwable = e; exception(request, response, e); servlet = null; @@ -467,26 +440,22 @@ throwable = e; exception(request, response, e); } catch (IOException e) { - container.getLogger().error(sm.getString("standardWrapper.serviceException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.servletServiceException(wrapper.getName()), e); throwable = e; exception(request, response, e); } catch (UnavailableException e) { - container.getLogger().error(sm.getString("standardWrapper.serviceException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.servletServiceException(wrapper.getName()), e); // Do not save exception in 'throwable', because we // do not want to do exception(request, response, e) processing } catch (ServletException e) { Throwable rootCause = StandardWrapper.getRootCause(e); if (!(rootCause instanceof ClientAbortException)) { - container.getLogger().error(sm.getString("standardWrapper.serviceException", - wrapper.getName()), rootCause); + container.getLogger().error(MESSAGES.servletServiceException(wrapper.getName()), rootCause); } throwable = e; exception(request, response, e); } catch (Throwable e) { - container.getLogger().error(sm.getString("standardWrapper.serviceException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.servletServiceException(wrapper.getName()), e); throwable = e; exception(request, response, e); } finally { @@ -512,8 +481,7 @@ wrapper.deallocate(servlet); } } catch (Throwable e) { - container.getLogger().error(sm.getString("standardWrapper.deallocateException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.servletDeallocateException(wrapper.getName()), e); if (throwable == null) { throwable = e; exception(request, response, e); @@ -528,8 +496,7 @@ wrapper.unload(); } } catch (Throwable e) { - container.getLogger().error(sm.getString("standardWrapper.unloadException", - wrapper.getName()), e); + container.getLogger().error(MESSAGES.errorUnloadingServlet(wrapper.getName()), e); if (throwable == null) { throwable = e; exception(request, response, e); @@ -592,8 +559,7 @@ asyncListener.onComplete(asyncEvent); } } catch (Throwable e) { - container.getLogger().error(sm.getString("standardWrapper.async.listenerError", - getContainer().getName()), e); + container.getLogger().error(MESSAGES.asyncListenerError(getContainer().getName()), e); exception(request, response, e); } } @@ -608,8 +574,7 @@ try { asyncContext.getRunnable().run(); } catch (Throwable e) { - container.getLogger().error(sm.getString("standardWrapper.async.runnableError", - getContainer().getName()), e); + container.getLogger().error(MESSAGES.asyncRunnableError(getContainer().getName()), e); asyncContext.setError(e); } } else if (asyncContext.getPath() != null) { @@ -631,8 +596,7 @@ dispatcher.async(asyncContext.getRequest(), asyncContext.getResponse(), asyncContext.getUseAttributes()); } catch (Throwable e) { - container.getLogger().error(sm.getString("standardWrapper.async.dispatchError", - getContainer().getName()), e); + container.getLogger().error(MESSAGES.asyncDispatchError(getContainer().getName()), e); asyncContext.setError(e); } request.setCanStartAsync(false); Modified: trunk/src/main/java/org/apache/catalina/security/SecurityUtil.java =================================================================== --- trunk/src/main/java/org/apache/catalina/security/SecurityUtil.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/security/SecurityUtil.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -34,7 +34,7 @@ import javax.servlet.http.HttpSession; import org.apache.catalina.Globals; -import org.apache.catalina.util.StringManager; + /** * This utility class associates a <code>Subject</code> to the current * <code>AccessControlContext</code>. When a <code>SecurityManager</code> is Modified: trunk/src/main/java/org/apache/catalina/util/DateTool.java =================================================================== --- trunk/src/main/java/org/apache/catalina/util/DateTool.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/util/DateTool.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -33,9 +33,6 @@ */ public class DateTool { - private static StringManager sm = - StringManager.getManager("org.apache.catalina.util"); - /** * US locale - all HTTP dates are in english */ Deleted: trunk/src/main/java/org/apache/catalina/util/StringManager.java =================================================================== --- trunk/src/main/java/org/apache/catalina/util/StringManager.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/util/StringManager.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -1,263 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.apache.catalina.util; - -import java.text.MessageFormat; -import java.util.Hashtable; -import java.util.Locale; -import java.util.MissingResourceException; -import java.util.ResourceBundle; -import java.net.URLClassLoader; - -/** - * An internationalization / localization helper class which reduces - * the bother of handling ResourceBundles and takes care of the - * common cases of message formating which otherwise require the - * creation of Object arrays and such. - * - * The StringManager operates on a package basis. One StringManager - * per package can be created and accessed via the getManager method - * call. - * - * The StringManager will look for a ResourceBundle named by - * the package name given plus the suffix of "LocalStrings". In - * practice, this means that the localized information will be contained - * in a LocalStrings.properties file located in the package - * directory of the classpath. - * - * Please see the documentation for java.util.ResourceBundle for - * more information. - * - * @author James Duncan Davidson [duncan(a)eng.sun.com] - * @author James Todd [gonzo(a)eng.sun.com] - */ - -public class StringManager { - - /** - * The ResourceBundle for this StringManager. - */ - - private ResourceBundle bundle; - - private static org.jboss.logging.Logger log= - org.jboss.logging.Logger.getLogger( StringManager.class ); - - /** - * Creates a new StringManager for a given package. This is a - * private method and all access to it is arbitrated by the - * static getManager method call so that only one StringManager - * per package will be created. - * - * @param packageName Name of package to create StringManager for. - */ - - private StringManager(String packageName) { - String bundleName = packageName + ".LocalStrings"; - try { - bundle = ResourceBundle.getBundle(bundleName); - return; - } catch( MissingResourceException ex ) { - // Try from the current loader ( that's the case for trusted apps ) - ClassLoader cl=Thread.currentThread().getContextClassLoader(); - if( cl != null ) { - try { - bundle=ResourceBundle.getBundle(bundleName, Locale.getDefault(), cl); - return; - } catch(MissingResourceException ex2) { - } - } - if( cl==null ) - cl=this.getClass().getClassLoader(); - - if (log.isDebugEnabled()) - log.debug("Can't find resource " + bundleName + - " " + cl); - if( cl instanceof URLClassLoader ) { - if (log.isDebugEnabled()) - log.debug( ((URLClassLoader)cl).getURLs()); - } - } - } - - /** - * Get a string from the underlying resource bundle. - * - * @param key The resource name - */ - public String getString(String key) { - return MessageFormat.format(getStringInternal(key), (Object [])null); - } - - - protected String getStringInternal(String key) { - if (key == null) { - String msg = "key is null"; - - throw new NullPointerException(msg); - } - - String str = null; - - if( bundle==null ) - return key; - try { - str = bundle.getString(key); - } catch (MissingResourceException mre) { - str = "Cannot find message associated with key '" + key + "'"; - } - - return str; - } - - /** - * Get a string from the underlying resource bundle and format - * it with the given set of arguments. - * - * @param key The resource name - * @param args Formatting directives - */ - - public String getString(String key, Object[] args) { - String iString = null; - String value = getStringInternal(key); - - // this check for the runtime exception is some pre 1.1.6 - // VM's don't do an automatic toString() on the passed in - // objects and barf out - - try { - // ensure the arguments are not null so pre 1.2 VM's don't barf - Object nonNullArgs[] = args; - for (int i=0; i<args.length; i++) { - if (args[i] == null) { - if (nonNullArgs==args) nonNullArgs=(Object[])args.clone(); - nonNullArgs[i] = "null"; - } - } - - iString = MessageFormat.format(value, nonNullArgs); - } catch (IllegalArgumentException iae) { - StringBuffer buf = new StringBuffer(); - buf.append(value); - for (int i = 0; i < args.length; i++) { - buf.append(" arg[" + i + "]=" + args[i]); - } - iString = buf.toString(); - } - return iString; - } - - /** - * Get a string from the underlying resource bundle and format it - * with the given object argument. This argument can of course be - * a String object. - * - * @param key The resource name - * @param arg Formatting directive - */ - - public String getString(String key, Object arg) { - Object[] args = new Object[] {arg}; - return getString(key, args); - } - - /** - * Get a string from the underlying resource bundle and format it - * with the given object arguments. These arguments can of course - * be String objects. - * - * @param key The resource name - * @param arg1 Formatting directive - * @param arg2 Formatting directive - */ - - public String getString(String key, Object arg1, Object arg2) { - Object[] args = new Object[] {arg1, arg2}; - return getString(key, args); - } - - /** - * Get a string from the underlying resource bundle and format it - * with the given object arguments. These arguments can of course - * be String objects. - * - * @param key The resource name - * @param arg1 Formatting directive - * @param arg2 Formatting directive - * @param arg3 Formatting directive - */ - - public String getString(String key, Object arg1, Object arg2, - Object arg3) { - Object[] args = new Object[] {arg1, arg2, arg3}; - return getString(key, args); - } - - /** - * Get a string from the underlying resource bundle and format it - * with the given object arguments. These arguments can of course - * be String objects. - * - * @param key The resource name - * @param arg1 Formatting directive - * @param arg2 Formatting directive - * @param arg3 Formatting directive - * @param arg4 Formatting directive - */ - - public String getString(String key, Object arg1, Object arg2, - Object arg3, Object arg4) { - Object[] args = new Object[] {arg1, arg2, arg3, arg4}; - return getString(key, args); - } - public String getString(String key, Object arg1, Object arg2, - Object arg3, Object arg4, Object arg5) { - Object[] args = new Object[] {arg1, arg2, arg3, arg4, arg5}; - return getString(key, args); - } - public String getString(String key, Object arg1, Object arg2, - Object arg3, Object arg4, Object arg5, Object arg6) { - Object[] args = new Object[] {arg1, arg2, arg3, arg4, arg5, arg6}; - return getString(key, args); - } - // -------------------------------------------------------------- - // STATIC SUPPORT METHODS - // -------------------------------------------------------------- - - private static Hashtable managers = new Hashtable(); - - /** - * Get the StringManager for a particular package. If a manager for - * a package already exists, it will be reused, else a new - * StringManager will be created and returned. - * - * @param packageName The package name - */ - - public synchronized static StringManager getManager(String packageName) { - StringManager mgr = (StringManager)managers.get(packageName); - - if (mgr == null) { - mgr = new StringManager(packageName); - managers.put(packageName, mgr); - } - return mgr; - } -} Modified: trunk/src/main/java/org/apache/catalina/valves/PersistentValve.java =================================================================== --- trunk/src/main/java/org/apache/catalina/valves/PersistentValve.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/valves/PersistentValve.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -19,6 +19,8 @@ package org.apache.catalina.valves; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.IOException; import javax.servlet.ServletException; @@ -31,7 +33,6 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.session.PersistentManager; -import org.apache.catalina.util.StringManager; /** @@ -61,13 +62,6 @@ "org.apache.catalina.valves.PersistentValve/1.0"; - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - // ------------------------------------------------------------- Properties @@ -101,9 +95,8 @@ // Select the Context to be used for this Request Context context = request.getContext(); if (context == null) { - response.sendError - (HttpServletResponse.SC_INTERNAL_SERVER_ERROR, - sm.getString("standardHost.noContext")); + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, + MESSAGES.noContext()); return; } Modified: trunk/src/main/java/org/apache/catalina/valves/RemoteIpValve.java =================================================================== --- trunk/src/main/java/org/apache/catalina/valves/RemoteIpValve.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/valves/RemoteIpValve.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -17,6 +17,8 @@ package org.apache.catalina.valves; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; @@ -28,12 +30,11 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; -import org.apache.catalina.util.StringManager; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.catalina.valves.Constants; import org.apache.catalina.valves.RequestFilterValve; import org.apache.catalina.valves.ValveBase; +import org.jboss.web.CatalinaLogger; /** * @@ -357,17 +358,6 @@ private static final String info = "org.apache.catalina.connector.RemoteIpValve/1.0"; /** - * Logger - */ - private static org.jboss.logging.Logger log = - org.jboss.logging.Logger.getLogger(RemoteIpValve.class); - - /** - * The StringManager for this package. - */ - protected static final StringManager sm = StringManager.getManager(Constants.Package); - - /** * Convert a given comma delimited list of regular expressions into an array of compiled {@link Pattern} * * @return array of patterns (not <code>null</code>) @@ -379,7 +369,7 @@ try { patternsList.add(Pattern.compile(pattern)); } catch (PatternSyntaxException e) { - throw new IllegalArgumentException(sm.getString("remoteIpValve.syntax", pattern), e); + throw MESSAGES.remoteIpValvePatternError(pattern, e); } } return patternsList.toArray(new Pattern[0]); @@ -620,8 +610,8 @@ } } - if (log.isDebugEnabled()) { - log.debug("Incoming request " + request.getRequestURI() + " with originalRemoteAddr '" + originalRemoteAddr + if (CatalinaLogger.VALVES_LOGGER.isDebugEnabled()) { + CatalinaLogger.VALVES_LOGGER.debug("Incoming request " + request.getRequestURI() + " with originalRemoteAddr '" + originalRemoteAddr + "', originalRemoteHost='" + originalRemoteHost + "', originalSecure='" + originalSecure + "', originalScheme='" + originalScheme + "' will be seen as newRemoteAddr='" + request.getRemoteAddr() + "', newRemoteHost='" + request.getRemoteHost() + "', newScheme='" + request.getScheme() + "', newSecure='" + request.isSecure() + "'"); Modified: trunk/src/main/java/org/apache/catalina/valves/RequestDumperValve.java =================================================================== --- trunk/src/main/java/org/apache/catalina/valves/RequestDumperValve.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/valves/RequestDumperValve.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -27,7 +27,6 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.catalina.util.StringManager; import org.jboss.logging.Logger; @@ -58,13 +57,6 @@ "org.apache.catalina.valves.RequestDumperValve/1.0"; - /** - * The StringManager for this package. - */ - protected static StringManager sm = - StringManager.getManager(Constants.Package); - - // ------------------------------------------------------------- Properties Modified: trunk/src/main/java/org/apache/catalina/valves/StuckThreadDetectionValve.java =================================================================== --- trunk/src/main/java/org/apache/catalina/valves/StuckThreadDetectionValve.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/valves/StuckThreadDetectionValve.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -29,9 +29,8 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.catalina.util.StringManager; -import org.jboss.logging.Logger; import org.jboss.servlet.http.HttpEvent; +import org.jboss.web.CatalinaLogger; /** * This valve allows to detect requests that take a long time to process, which might @@ -44,17 +43,6 @@ public class StuckThreadDetectionValve extends ValveBase { /** - * Logger - */ - private static Logger log = Logger.getLogger(StuckThreadDetectionValve.class); - - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - /** * Keeps count of the number of stuck threads detected */ private final AtomicInteger stuckCount = new AtomicInteger(0); @@ -100,27 +88,17 @@ private void notifyStuckThreadDetected(MonitoredThread monitoredThread, long activeTime, int numStuckThreads) { - String msg = sm.getString( - "stuckThreadDetectionValve.notifyStuckThreadDetected", - monitoredThread.getThread().getName(), Long.valueOf(activeTime), - monitoredThread.getStartTime(), - Integer.valueOf(numStuckThreads), - monitoredThread.getRequestUri(), Integer.valueOf(threshold)); - // msg += "\n" + getStackTraceAsString(trace); Throwable th = new Throwable(); th.setStackTrace(monitoredThread.getThread().getStackTrace()); - log.warn(msg, th); + CatalinaLogger.VALVES_LOGGER.stuckThreadDetected + (monitoredThread.getThread().getName(), monitoredThread.getThread().getId(), + activeTime, monitoredThread.getStartTime(), monitoredThread.getRequestUri(), threshold, numStuckThreads, th); } - private void notifyStuckThreadCompleted(String threadName, - long activeTime, int numStuckThreads) { - String msg = sm.getString( - "stuckThreadDetectionValve.notifyStuckThreadCompleted", - threadName, Long.valueOf(activeTime), - Integer.valueOf(numStuckThreads)); - // Since the "stuck thread notification" is warn, this should also - // be warn - log.warn(msg); + private void notifyStuckThreadCompleted(CompletedStuckThread thread, + int numStuckThreads) { + CatalinaLogger.VALVES_LOGGER.stuckThreadCompleted + (thread.getName(), thread.getId(), thread.getTotalActiveTime(), numStuckThreads); } /** @@ -156,7 +134,7 @@ activeThreads.remove(key); if (monitoredThread.markAsDone() == MonitoredThreadState.STUCK) { completedStuckThreadsQueue.add( - new CompletedStuckThread(monitoredThread.getThread().getName(), + new CompletedStuckThread(monitoredThread.getThread(), monitoredThread.getActiveTimeInMillis())); } } @@ -192,7 +170,7 @@ activeThreads.remove(key); if (monitoredThread.markAsDone() == MonitoredThreadState.STUCK) { completedStuckThreadsQueue.add( - new CompletedStuckThread(monitoredThread.getThread().getName(), + new CompletedStuckThread(monitoredThread.getThread(), monitoredThread.getActiveTimeInMillis())); } } @@ -219,8 +197,7 @@ completedStuckThread != null; completedStuckThread = completedStuckThreadsQueue.poll()) { int numStuckThreads = stuckCount.decrementAndGet(); - notifyStuckThreadCompleted(completedStuckThread.getName(), - completedStuckThread.getTotalActiveTime(), numStuckThreads); + notifyStuckThreadCompleted(completedStuckThread, numStuckThreads); } } @@ -290,10 +267,12 @@ private static class CompletedStuckThread { private final String threadName; + private final long threadId; private final long totalActiveTime; - public CompletedStuckThread(String threadName, long totalActiveTime) { - this.threadName = threadName; + public CompletedStuckThread(Thread thread, long totalActiveTime) { + this.threadName = thread.getName(); + this.threadId = thread.getId(); this.totalActiveTime = totalActiveTime; } @@ -301,6 +280,10 @@ return this.threadName; } + public long getId() { + return this.threadId; + } + public long getTotalActiveTime() { return this.totalActiveTime; } Modified: trunk/src/main/java/org/apache/catalina/valves/ValveBase.java =================================================================== --- trunk/src/main/java/org/apache/catalina/valves/ValveBase.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/apache/catalina/valves/ValveBase.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -38,7 +38,6 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.core.ContainerBase; -import org.apache.catalina.util.StringManager; import org.jboss.servlet.http.HttpEvent; Modified: trunk/src/main/java/org/jboss/web/CatalinaLogger.java =================================================================== --- trunk/src/main/java/org/jboss/web/CatalinaLogger.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/jboss/web/CatalinaLogger.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -28,6 +28,7 @@ import static org.jboss.logging.Logger.Level.DEBUG; import java.io.File; +import java.util.Date; import org.jboss.logging.BasicLogger; import org.jboss.logging.Cause; @@ -536,4 +537,120 @@ @Message(id = 1109, value = "Cannot find context %s parent Host JMX name") void cannotFindContextJmxParentName(String name); + @LogMessage(level = WARN) + @Message(id = 1110, value = "JSP container initialization failed") + void jspContainerInitializationFailed(@Cause Throwable t); + + @LogMessage(level = WARN) + @Message(id = 1111, value = "Thread %s (id=%s) has been active for %s milliseconds (since %s) to serve the same request for %s and may be stuck (configured threshold for this StuckThreadDetectionValve is %s seconds). There is/are %s thread(s) in total that are monitored by this Valve and may be stuck.") + void stuckThreadDetected(String threadName, long threadId, long active, Date start, String requestUri, int threshold, int stuckCount, @Cause Throwable stackTrace); + + @LogMessage(level = WARN) + @Message(id = 1112, value = "Thread %s (id=%s) was previously reported to be stuck but has completed. It was active for approximately %s milliseconds. There is/are still %s thread(s) that are monitored by this Valve and may be stuck.") + void stuckThreadCompleted(String threadName, long threadId, long active, int stuckCount); + + @LogMessage(level = WARN) + @Message(id = 1113, value = "Failed to trigger creation of the GC Daemon thread during start to prevent possible memory leaks. This is expected on non-Sun JVMs.") + void errorCreatingGcDaemon(@Cause Throwable t); + + @LogMessage(level = WARN) + @Message(id = 1114, value = "Error whilst attempting to prevent memory leak in javax.security.auth.Policy class") + void errorLoadingPolicy(@Cause Throwable t); + + @LogMessage(level = WARN) + @Message(id = 1115, value = "Failed to disable Jar URL connection caching by default") + void errorDisablingUrlConnectionCaching(@Cause Throwable t); + + @LogMessage(level = WARN) + @Message(id = 1116, value = "Error whilst attempting to prevent memory leaks during XML parsing") + void errorLoadingJaxp(@Cause Throwable t); + + @LogMessage(level = WARN) + @Message(id = 1117, value = "Failed to trigger creation of the com.sun.jndi.ldap.LdapPoolManager class during Tomcat start to prevent possible memory leaks. This is expected on non-Sun JVMs.") + void errorLoadingLdapPoolManager(@Cause Throwable t); + + @LogMessage(level = WARN) + @Message(id = 1118, value = "Failed to load class %s during Tomcat start to prevent possible memory leaks.") + void errorLoadingLeakClass(String className, @Cause Throwable t); + + @LogMessage(level = DEBUG) + @Message(id = 1119, value = "Client abort exception: %s") + void clientAbortException(String message); + + @LogMessage(level = DEBUG) + @Message(id = 1120, value = "Pipeline already started") + void pipelineAlreadyStarted(); + + @LogMessage(level = DEBUG) + @Message(id = 1121, value = "Pipeline has not been started") + void pipelineNotStarted(); + + @LogMessage(level = ERROR) + @Message(id = 1122, value = "Failed valve [%s] JMX registration.") + void failedValveJmxRegistration(Object valve, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1123, value = "Failed valve [%s] JMX unregistration.") + void failedValveJmxUnregistration(Object valve, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1124, value = "Error stopping valve") + void errorStoppingValve(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1125, value = "Error starting valve") + void errorStartingValve(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1126, value = "Error starting service") + void errorStartingService(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1127, value = "Error initializing service") + void errorInitializingService(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1128, value = "Failed service [%s] JMX registration.") + void failedServiceJmxRegistration(Object objectName, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1129, value = "Error starting connector") + void errorStartingConnector(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1130, value = "Error initializing connector") + void errorInitializingConnector(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1131, value = "Error stopping connector") + void errorStoppingConnector(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1132, value = "Error starting executor") + void errorStartingExecutor(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1133, value = "Error stopping executor") + void errorStoppingExecutor(@Cause Throwable t); + + @LogMessage(level = DEBUG) + @Message(id = 1134, value = "This service has already been started") + void serviceAlreadyStarted(); + + @LogMessage(level = DEBUG) + @Message(id = 1135, value = "This service has not been started") + void serviceNotStarted(); + + @LogMessage(level = DEBUG) + @Message(id = 1136, value = "Starting service %s") + void startingService(String serviceName); + + @LogMessage(level = DEBUG) + @Message(id = 1137, value = "Stopping service %s") + void stoppingService(String serviceName); + + @LogMessage(level = ERROR) + @Message(id = 1138, value = "Failed server [%s] JMX registration.") + void failedServerJmxRegistration(Object objectName, @Cause Throwable t); + } Modified: trunk/src/main/java/org/jboss/web/CatalinaMessages.java =================================================================== --- trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -796,4 +796,31 @@ @Message(id = 290, value = "Error initializing context") String errorInitializingContext(); + @Message(id = 291, value = "No Context was mapped to process this request") + String noContext(); + + @Message(id = 292, value = "Syntax error in IP filter pattern %s") + IllegalArgumentException remoteIpValvePatternError(String pattern, @Cause Throwable t); + + @Message(id = 293, value = "No host [%s] mapped") + String noHost(String host); + + @Message(id = 294, value = "Servlet %s does not have any instance support") + IllegalStateException missingInstanceSupport(String servletName); + + @Message(id = 295, value = "This application is not currently available") + String unavailable(); + + @Message(id = 296, value = "Error acknowledging request for Servlet %s") + String errorAcknowledgingRequest(String servletName); + + @Message(id = 297, value = "Async listener processing for servlet %s threw exception") + String asyncListenerError(String servletName); + + @Message(id = 298, value = "Async runnable processing for servlet %s threw exception") + String asyncRunnableError(String servletName); + + @Message(id = 299, value = "Async dispatch processing for servlet %s threw exception") + String asyncDispatchError(String servletName); + } Added: trunk/src/main/java/org/jboss/web/WebLogger.java =================================================================== --- trunk/src/main/java/org/jboss/web/WebLogger.java (rev 0) +++ trunk/src/main/java/org/jboss/web/WebLogger.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.web; + +import static org.jboss.logging.Logger.Level.ERROR; +import static org.jboss.logging.Logger.Level.INFO; +import static org.jboss.logging.Logger.Level.WARN; + +import org.jboss.logging.BasicLogger; +import org.jboss.logging.Cause; +import org.jboss.logging.LogMessage; +import org.jboss.logging.Logger; +import org.jboss.logging.Message; +import org.jboss.logging.MessageLogger; + +/** + * Logging IDs 7500-8000 + * @author remm + */ +@MessageLogger(projectCode = "JBWEB") +public interface WebLogger extends BasicLogger { + + /** + * A logger with the category of the package name. + */ + WebLogger ROOT_LOGGER = Logger.getMessageLogger(WebLogger.class, "org.jboss.web"); + + @LogMessage(level = ERROR) + @Message(id = 7500, value = "Error initializing PHP library with library path: %s") + void errorInitializingPhpLibrary(String libraryPath, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 7501, value = "Error terminating PHP library") + void errorTerminatingPhpLibrary(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 7502, value = "Invalid PHP library %s.%s.%s, required version is %s.%s.%s") + void invalidPhpLibrary(int major, int minor, int patch, int requiredMajor, int requiredMinor, int requiredPatch); + +} Added: trunk/src/main/java/org/jboss/web/WebMessages.java =================================================================== --- trunk/src/main/java/org/jboss/web/WebMessages.java (rev 0) +++ trunk/src/main/java/org/jboss/web/WebMessages.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.web; + +import org.jboss.logging.Cause; +import org.jboss.logging.Message; +import org.jboss.logging.MessageBundle; +import org.jboss.logging.Messages; + +/** + * Logging IDs 7000-7500 + * @author remm + */ +@MessageBundle(projectCode = "JBWEB") +public interface WebMessages { + + /** + * The messages + */ + WebMessages MESSAGES = Messages.getBundle(WebMessages.class); + + @Message(id = 7000, value = "Cannot load native PHP library") + String errorLoadingPhp(); + + @Message(id = 7001, value = "Error opening rewrite configuration") + String errorOpeningRewriteConfiguration(); + + @Message(id = 7002, value = "Error reading rewrite configuration") + String errorReadingRewriteConfiguration(); + + @Message(id = 7003, value = "Error reading rewrite configuration: %s") + IllegalArgumentException invalidRewriteConfiguration(String line); + + @Message(id = 7004, value = "Invalid rewrite map class: %s") + IllegalArgumentException invalidRewriteMap(String className); + + @Message(id = 7005, value = "Error reading rewrite flags in line %s as %s") + IllegalArgumentException invalidRewriteFlags(String line, String flags); + + @Message(id = 7006, value = "Error reading rewrite flags in line %s") + IllegalArgumentException invalidRewriteFlags(String line); + +} Modified: trunk/src/main/java/org/jboss/web/php/Handler.java =================================================================== --- trunk/src/main/java/org/jboss/web/php/Handler.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/jboss/web/php/Handler.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -22,6 +22,8 @@ package org.jboss.web.php; +import static org.jboss.web.WebMessages.MESSAGES; + import java.io.IOException; import javax.servlet.ServletConfig; @@ -31,8 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.Globals; -import org.apache.catalina.util.StringManager; +import org.jboss.web.WebLogger; /** * Handler. @@ -56,13 +57,6 @@ */ private ServletConfig servletConfig = null; - /** - * The string manager for this package. - */ - private StringManager sm = - StringManager.getManager(Constants.Package); - - /** Are doing source sysntax highlight. */ protected boolean syntaxHighlight = false; @@ -102,26 +96,16 @@ // try to load the library. try { Library.initialize(null); - } catch(Exception e) { - e.printStackTrace(); + } catch(Throwable t) { + WebLogger.ROOT_LOGGER.errorInitializingPhpLibrary(System.getProperty("java.library.path"), t); } } if (!Library.isInitialized()) - throw new UnavailableException - (sm.getString("handler.missing")); + throw new UnavailableException(MESSAGES.errorLoadingPhp()); this.servletConfig = servletConfig; - // Verify that we were not accessed using the invoker servlet - String servletName = servletConfig.getServletName(); - if (servletName == null) - servletName = ""; - if (servletName.startsWith("org.apache.catalina.INVOKER.")) - throw new UnavailableException - ("Cannot invoke Handler through the invoker"); - - // Set our properties from the initialization parameters String value = null; try { @@ -139,7 +123,6 @@ } catch (Throwable t) { // Nothing. } - log("init: loglevel set to " + debug); value = servletConfig.getInitParameter("parameterEncoding"); if (value != null) { Modified: trunk/src/main/java/org/jboss/web/php/LifecycleListener.java =================================================================== --- trunk/src/main/java/org/jboss/web/php/LifecycleListener.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/jboss/web/php/LifecycleListener.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -25,9 +25,7 @@ import java.lang.reflect.Method; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; -import org.apache.catalina.util.StringManager; -import org.jboss.logging.Logger; -import org.jboss.logging.Logger; +import org.jboss.web.WebLogger; /** * Implementation of <code>LifecycleListener</code> that will init and @@ -41,14 +39,6 @@ public class LifecycleListener implements org.apache.catalina.LifecycleListener { - private static Logger log = Logger.getLogger(LifecycleListener.class); - - /** - * The string manager for this package. - */ - protected StringManager sm = - StringManager.getManager(Constants.Package); - // -------------------------------------------------------------- Constants @@ -85,24 +75,15 @@ minor = clazz.getField("PHP_MINOR_VERSION").getInt(null); patch = clazz.getField("PHP_PATCH_VERSION").getInt(null); } catch (Throwable t) { - if (!log.isDebugEnabled()) { - log.info(sm.getString("listener.initialize", - System.getProperty("java.library.path"))); - } - else { - log.debug(sm.getString("listener.initialize", - System.getProperty("java.library.path")), t); - } + WebLogger.ROOT_LOGGER.errorInitializingPhpLibrary(System.getProperty("java.library.path"), t); return; } // Check if the PHP Native module matches required version. if ((major != REQUIRED_MAJOR) || (minor != REQUIRED_MINOR) || (patch < REQUIRED_PATCH)) { - log.error(sm.getString("listener.invalid", major + "." - + minor + "." + patch, REQUIRED_MAJOR + "." - + REQUIRED_MINOR + "." - + REQUIRED_PATCH)); + WebLogger.ROOT_LOGGER.invalidPhpLibrary(major, minor, patch, + REQUIRED_MAJOR, REQUIRED_MINOR, REQUIRED_PATCH); } } else if (Lifecycle.AFTER_STOP_EVENT.equals(event.getType())) { @@ -113,12 +94,7 @@ method.invoke(null, (Object []) null); } catch (Throwable t) { - if (!log.isDebugEnabled()) { - log.info(sm.getString("listener.terminate")); - } - else { - log.debug(sm.getString("listener.terminate"), t); - } + WebLogger.ROOT_LOGGER.errorTerminatingPhpLibrary(t); } } } Deleted: trunk/src/main/java/org/jboss/web/php/LocalStrings.properties =================================================================== --- trunk/src/main/java/org/jboss/web/php/LocalStrings.properties 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/jboss/web/php/LocalStrings.properties 2012-09-13 16:47:04 UTC (rev 2081) @@ -1,4 +0,0 @@ -listener.initialize=The PHP Native library which allows executing PHP scripts was not found on the java.library.path: {0} -listener.invalid=An incompatible version {0} of the PHP Native library is installed, while Tomcat requires version {1} -listener.terminate=Failed shutdown of PHP Module -handler.missing=The PHP Native library which allows executing PHP scripts was not loaded Modified: trunk/src/main/java/org/jboss/web/rewrite/RewriteValve.java =================================================================== --- trunk/src/main/java/org/jboss/web/rewrite/RewriteValve.java 2012-09-12 16:44:27 UTC (rev 2080) +++ trunk/src/main/java/org/jboss/web/rewrite/RewriteValve.java 2012-09-13 16:47:04 UTC (rev 2081) @@ -23,6 +23,8 @@ package org.jboss.web.rewrite; +import static org.jboss.web.WebMessages.MESSAGES; + import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -149,7 +151,7 @@ " in " + getConfigBase() + " or in the classloader"); } } catch (Exception e) { - container.getLogger().error("Error opening configuration", e); + container.getLogger().error(MESSAGES.errorOpeningRewriteConfiguration(), e); } } @@ -166,14 +168,12 @@ try { reader.close(); } catch (IOException e) { - container.getLogger().error("Error closing configuration", e); } try { if (is != null) { is.close(); } } catch (IOException e) { - container.getLogger().error("Error closing configuration", e); } } @@ -242,7 +242,7 @@ } } } catch (IOException e) { - container.getLogger().error("Error reading configuration", e); + container.getLogger().error(MESSAGES.errorReadingRewriteConfiguration(), e); } } this.rules = (RewriteRule[]) rules.toArray(new RewriteRule[0]); @@ -532,7 +532,7 @@ // RewriteCond TestString CondPattern [Flags] RewriteCond condition = new RewriteCond(); if (tokenizer.countTokens() < 2) { - throw new IllegalArgumentException("Invalid line: " + line); + throw MESSAGES.invalidRewriteConfiguration(line); } condition.setTestString(tokenizer.nextToken()); condition.setCondPattern(tokenizer.nextToken()); @@ -551,7 +551,7 @@ // RewriteRule Pattern Substitution [Flags] RewriteRule rule = new RewriteRule(); if (tokenizer.countTokens() < 2) { - throw new IllegalArgumentException("Invalid line: " + line); + throw MESSAGES.invalidRewriteConfiguration(line); } rule.setPatternString(tokenizer.nextToken()); rule.setSubstitutionString(tokenizer.nextToken()); @@ -569,7 +569,7 @@ } else if (token.equals("RewriteMap")) { // RewriteMap name rewriteMapClassName whateverOptionalParameterInWhateverFormat if (tokenizer.countTokens() < 2) { - throw new IllegalArgumentException("Invalid line: " + line); + throw MESSAGES.invalidRewriteConfiguration(line); } String name = tokenizer.nextToken(); String rewriteMapClassName = tokenizer.nextToken(); @@ -577,7 +577,7 @@ try { map = (RewriteMap) (Class.forName(rewriteMapClassName).newInstance()); } catch (Exception e) { - throw new IllegalArgumentException("Invalid map className: " + line); + throw MESSAGES.invalidRewriteMap(rewriteMapClassName); } if (tokenizer.hasMoreTokens()) { map.setParameters(tokenizer.nextToken()); @@ -589,7 +589,7 @@ } else if (token.startsWith("#")) { // it's a comment, ignore it } else { - throw new IllegalArgumentException("Invalid line: " + line); + throw MESSAGES.invalidRewriteConfiguration(line); } } return null; @@ -608,7 +608,7 @@ } else if (flag.equals("OR") || flag.equals("ornext")) { condition.setOrnext(true); } else { - throw new IllegalArgumentException("Invalid flag in: " + line + " flags: " + flag); + throw MESSAGES.invalidRewriteFlags(line, flag); } } @@ -631,7 +631,7 @@ } StringTokenizer tokenizer = new StringTokenizer(flag, ":"); if (tokenizer.countTokens() < 2) { - throw new IllegalArgumentException("Invalid flag in: " + line); + throw MESSAGES.invalidRewriteFlags(line); } rule.setCookieName(tokenizer.nextToken()); rule.setCookieValue(tokenizer.nextToken()); @@ -642,7 +642,7 @@ try { rule.setCookieLifetime(Integer.parseInt(tokenizer.nextToken())); } catch (NumberFormatException e) { - throw new IllegalArgumentException("Invalid flag in: " + line, e); + throw MESSAGES.invalidRewriteFlags(line); } } if (tokenizer.hasMoreTokens()) { @@ -663,7 +663,7 @@ } int pos = flag.indexOf(':'); if (pos == -1 || (pos + 1) == flag.length()) { - throw new IllegalArgumentException("Invalid flag in: " + line); + throw MESSAGES.invalidRewriteFlags(line); } rule.addEnvName(flag.substring(0, pos)); rule.addEnvValue(flag.substring(pos + 1)); @@ -715,7 +715,7 @@ rule.setType(true); rule.setTypeValue(flag); } else { - throw new IllegalArgumentException("Invalid flag in: " + line + " flag: " + flag); + throw MESSAGES.invalidRewriteFlags(line, flag); } }

12 years, 3 months

1
0
0 / 0

JBossWeb SVN: r2080 - in trunk/src/main/java/org: jboss/web and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2012-09-12 12:44:27 -0400 (Wed, 12 Sep 2012) New Revision: 2080 Modified: trunk/src/main/java/org/apache/catalina/core/ApplicationContext.java trunk/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java trunk/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java trunk/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java trunk/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java trunk/src/main/java/org/apache/catalina/core/ApplicationHttpResponse.java trunk/src/main/java/org/apache/catalina/core/ApplicationRequest.java trunk/src/main/java/org/apache/catalina/core/ApplicationResponse.java trunk/src/main/java/org/apache/catalina/core/AprLifecycleListener.java trunk/src/main/java/org/apache/catalina/core/ContainerBase.java trunk/src/main/java/org/apache/catalina/core/LocalStrings.properties trunk/src/main/java/org/apache/catalina/core/StandardContext.java trunk/src/main/java/org/apache/catalina/core/StandardEngine.java trunk/src/main/java/org/apache/catalina/core/StandardHost.java trunk/src/main/java/org/apache/catalina/core/StandardWrapper.java trunk/src/main/java/org/jboss/web/CatalinaLogger.java trunk/src/main/java/org/jboss/web/CatalinaMessages.java Log: Part 1 of the core package. Modified: trunk/src/main/java/org/apache/catalina/core/ApplicationContext.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/ApplicationContext.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/ApplicationContext.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -47,6 +47,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.File; import java.io.InputStream; import java.net.MalformedURLException; @@ -97,7 +99,6 @@ import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.ResourceSet; import org.apache.catalina.util.ServerInfo; -import org.apache.catalina.util.StringManager; import org.apache.naming.resources.DirContextURLStreamHandler; import org.apache.naming.resources.Resource; import org.apache.tomcat.util.buf.CharChunk; @@ -175,13 +176,6 @@ /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * Base path. */ private String basePath = null; @@ -436,9 +430,7 @@ if (path.startsWith("?")) path = "/" + path; if (!path.startsWith("/")) - throw new IllegalArgumentException - (sm.getString - ("applicationContext.requestDispatcher.iae", path)); + throw MESSAGES.invalidDispatcherPath(path); // Get query string String queryString = null; @@ -494,7 +486,7 @@ } } catch (Exception e) { // Should never happen - log(sm.getString("applicationContext.mapping.error"), e); + log(MESSAGES.dispatcherMappingError(), e); return (null); } @@ -528,7 +520,7 @@ throws MalformedURLException { if (path == null || (Globals.STRICT_SERVLET_COMPLIANCE && !path.startsWith("/"))) { - throw new MalformedURLException(sm.getString("applicationContext.requestDispatcher.iae", path)); + throw new MalformedURLException(MESSAGES.invalidDispatcherPathString(path)); } path = RequestUtil.normalize(path); @@ -615,8 +607,7 @@ return null; } if (!path.startsWith("/")) { - throw new IllegalArgumentException - (sm.getString("applicationContext.resourcePaths.iae", path)); + throw MESSAGES.invalidDispatcherPath(path); } path = RequestUtil.normalize(path); @@ -783,7 +774,7 @@ context.fireContainerEvent("afterContextAttributeRemoved", listener); // FIXME - should we do anything besides log these? - log(sm.getString("applicationContext.attributeEvent"), t); + log(MESSAGES.servletContextAttributeListenerException(), t); } } @@ -801,8 +792,7 @@ // Name cannot be null if (name == null) - throw new IllegalArgumentException - (sm.getString("applicationContext.setAttribute.namenull")); + throw new IllegalArgumentException(MESSAGES.servletContextAttributeNameIsNull()); // Null value is the same as removeAttribute() if (value == null) { @@ -863,7 +853,7 @@ context.fireContainerEvent("afterContextAttributeAdded", listener); // FIXME - should we do anything besides log these? - log(sm.getString("applicationContext.attributeEvent"), t); + log(MESSAGES.servletContextAttributeListenerException(), t); } } @@ -873,11 +863,10 @@ public FilterRegistration.Dynamic addFilter(String filterName, String className) throws IllegalArgumentException, IllegalStateException { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("applicationContext.alreadyInitialized", - getContextPath())); + throw MESSAGES.contextAlreadyInitialized(getContextPath()); } if (context.findFilterDef(filterName) != null) { return null; @@ -895,11 +884,10 @@ public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("applicationContext.alreadyInitialized", - getContextPath())); + throw MESSAGES.contextAlreadyInitialized(getContextPath()); } if (context.findFilterDef(filterName) != null) { return null; @@ -935,11 +923,10 @@ public ServletRegistration.Dynamic addServlet(String servletName, String className) throws IllegalArgumentException, IllegalStateException { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("applicationContext.alreadyInitialized", - getContextPath())); + throw MESSAGES.contextAlreadyInitialized(getContextPath()); } if (context.findChild(servletName) != null) { return null; @@ -962,11 +949,10 @@ public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("applicationContext.alreadyInitialized", - getContextPath())); + throw MESSAGES.contextAlreadyInitialized(getContextPath()); } if (context.findChild(servletName) != null) { return null; @@ -991,7 +977,7 @@ public FilterRegistration getFilterRegistration(String filterName) { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } ApplicationFilterConfig filterConfig = context.findApplicationFilterConfig(filterName); if (filterConfig == null) { @@ -1009,7 +995,7 @@ public ServletRegistration getServletRegistration(String servletName) { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } Wrapper wrapper = (Wrapper) context.findChild(servletName); if (wrapper != null) { @@ -1022,7 +1008,7 @@ public Map<String, FilterRegistration> getFilterRegistrations() { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } HashMap<String, FilterRegistration> result = new HashMap<String, FilterRegistration>(); @@ -1036,7 +1022,7 @@ public Map<String, ServletRegistration> getServletRegistrations() { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } HashMap<String, ServletRegistration> result = new HashMap<String, ServletRegistration>(); @@ -1051,14 +1037,14 @@ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } return context.getDefaultSessionTrackingModes(); } public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } return context.getSessionTrackingModes(); } @@ -1066,7 +1052,7 @@ public SessionCookieConfig getSessionCookieConfig() { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } return context.getSessionCookie(); } @@ -1075,12 +1061,12 @@ public <T extends Filter> T createFilter(Class<T> c) throws ServletException { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } try { return (T) context.getInstanceManager().newInstance(c); } catch (Throwable e) { - throw new ServletException(sm.getString("applicationContext.create"), e); + throw new ServletException(MESSAGES.contextObjectCreationError(), e); } } @@ -1088,23 +1074,22 @@ public <T extends Servlet> T createServlet(Class<T> c) throws ServletException { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } try { return (T) context.getInstanceManager().newInstance(c); } catch (Throwable e) { - throw new ServletException(sm.getString("applicationContext.create"), e); + throw new ServletException(MESSAGES.contextObjectCreationError(), e); } } public boolean setInitParameter(String name, String value) { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("applicationContext.alreadyInitialized", - getContextPath())); + throw MESSAGES.contextAlreadyInitialized(getContextPath()); } mergeParameters(); if (parameters.get(name) != null) { @@ -1118,24 +1103,20 @@ public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("applicationContext.alreadyInitialized", - getContextPath())); + throw MESSAGES.contextAlreadyInitialized(getContextPath()); } // Check that only supported tracking modes have been requested for (SessionTrackingMode sessionTrackingMode : sessionTrackingModes) { if (!getDefaultSessionTrackingModes().contains(sessionTrackingMode)) { - throw new IllegalArgumentException(sm.getString( - "applicationContext.setSessionTracking.iae", - sessionTrackingMode.toString(), getContextPath())); + throw MESSAGES.unsupportedSessionTrackingMode(sessionTrackingMode.toString(), getContextPath()); } } // If SSL is specified, it should be the only one used if (sessionTrackingModes.contains(SessionTrackingMode.SSL) && sessionTrackingModes.size() > 1) { - throw new IllegalArgumentException(sm.getString( - "applicationContext.setSessionTracking.ssl", getContextPath())); + throw MESSAGES.sslSessionTrackingModeIsExclusive(getContextPath()); } context.setSessionTrackingModes(sessionTrackingModes); } @@ -1143,24 +1124,21 @@ public void addListener(String className) { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("applicationContext.alreadyInitialized", - getContextPath())); + throw MESSAGES.contextAlreadyInitialized(getContextPath()); } EventListener listenerInstance = null; try { Class<?> clazz = context.getLoader().getClassLoader().loadClass(className); listenerInstance = (EventListener) context.getInstanceManager().newInstance(clazz); } catch (Throwable t) { - throw new IllegalArgumentException(sm.getString("applicationContext.badListenerClass", - className, getContextPath()), t); + throw MESSAGES.invalidContextListener(className, getContextPath(), t); } checkListenerType(listenerInstance); if (context.getApplicationLifecycleListeners() != null && listenerInstance instanceof ServletContextListener) { - throw new IllegalArgumentException(sm.getString("applicationContext.badListenerClass", - className, getContextPath())); + throw MESSAGES.invalidContextListener(className, getContextPath()); } context.addApplicationListenerInstance(listenerInstance); } @@ -1168,16 +1146,14 @@ public <T extends EventListener> void addListener(T listener) { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("applicationContext.alreadyInitialized", - getContextPath())); + throw MESSAGES.contextAlreadyInitialized(getContextPath()); } checkListenerType(listener); if (context.getApplicationLifecycleListeners() != null && listener instanceof ServletContextListener) { - throw new IllegalArgumentException(sm.getString("applicationContext.badListenerClass", - listener.getClass().getName(), getContextPath())); + throw MESSAGES.invalidContextListener(listener.getClass().getName(), getContextPath()); } context.addApplicationListenerInstance(listener); } @@ -1185,23 +1161,20 @@ public void addListener(Class<? extends EventListener> listenerClass) { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("applicationContext.alreadyInitialized", - getContextPath())); + throw MESSAGES.contextAlreadyInitialized(getContextPath()); } EventListener listenerInstance = null; try { listenerInstance = (EventListener) context.getInstanceManager().newInstance(listenerClass); } catch (Exception e) { - throw new IllegalArgumentException(sm.getString("applicationContext.badListenerClass", - listenerClass.getName(), getContextPath()), e); + throw MESSAGES.invalidContextListener(listenerClass.getName(), getContextPath(), e); } checkListenerType(listenerInstance); if (context.getApplicationLifecycleListeners() != null && listenerInstance instanceof ServletContextListener) { - throw new IllegalArgumentException(sm.getString("applicationContext.badListenerClass", - listenerClass.getName(), getContextPath())); + throw MESSAGES.invalidContextListener(listenerClass.getName(), getContextPath()); } context.addApplicationListenerInstance(listenerInstance); } @@ -1210,17 +1183,16 @@ public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("applicationContext.alreadyInitialized", - getContextPath())); + throw MESSAGES.contextAlreadyInitialized(getContextPath()); } T listenerInstance = null; try { listenerInstance = (T) context.getInstanceManager().newInstance(clazz); } catch (Throwable t) { - throw new ServletException(sm.getString("applicationContext.create"), t); + throw new ServletException(MESSAGES.contextObjectCreationError(), t); } checkListenerType(listenerInstance); return listenerInstance; @@ -1229,7 +1201,7 @@ public ClassLoader getClassLoader() { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } return context.getLoader().getClassLoader(); } @@ -1237,7 +1209,7 @@ public JspConfigDescriptor getJspConfigDescriptor() { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } ArrayList<TaglibDescriptor> taglibDescriptors = new ArrayList<TaglibDescriptor>(); String[] taglibURIs = context.findTaglibs(); @@ -1259,7 +1231,7 @@ public int getEffectiveMajorVersion() { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } return context.getVersionMajor(); } @@ -1267,23 +1239,21 @@ public int getEffectiveMinorVersion() { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } return context.getVersionMinor(); } public void declareRoles(String... roleNames) { if (restricted) { - throw new UnsupportedOperationException(sm.getString("applicationContext.restricted")); + throw MESSAGES.restrictedListenerCannotCallMethod(); } if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("applicationContext.alreadyInitialized", - getContextPath())); + throw MESSAGES.contextAlreadyInitialized(getContextPath()); } for (String role: roleNames) { if (role == null || "".equals(role)) { - throw new IllegalArgumentException(sm.getString("applicationContext.emptyRole", - getContextPath())); + throw MESSAGES.invalidEmptyRole(getContextPath()); } context.addSecurityRole(role); } @@ -1298,8 +1268,7 @@ && !(listener instanceof ServletRequestAttributeListener) && !(listener instanceof HttpSessionListener) && !(listener instanceof HttpSessionAttributeListener)) { - throw new IllegalArgumentException(sm.getString("applicationContext.badListenerClass", - listener.getClass().getName(), getContextPath())); + throw MESSAGES.invalidContextListener(listener.getClass().getName(), getContextPath()); } } Modified: trunk/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -18,6 +18,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.IOException; import java.io.PrintWriter; import java.security.AccessController; @@ -49,7 +51,6 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.connector.ResponseFacade; import org.apache.catalina.util.InstanceSupport; -import org.apache.catalina.util.StringManager; /** * Standard implementation of <code>RequestDispatcher</code> that allows a @@ -280,13 +281,6 @@ /** - * The StringManager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * The InstanceSupport instance associated with our Wrapper (used to * send "before dispatch" and "after dispatch" events. */ @@ -495,8 +489,7 @@ // Reset any output that has been buffered, but keep headers/cookies if (response.isCommitted()) { - throw new IllegalStateException - (sm.getString("applicationDispatcher.forward.ise")); + throw MESSAGES.cannotForwardAfterCommit(); } try { response.resetBuffer(); @@ -776,12 +769,11 @@ try { listener.requestInitialized(event); } catch (Throwable t) { - context.getLogger().error(sm.getString("requestListenerValve.requestInit", - instances[i].getClass().getName()), t); + context.getLogger().error + (MESSAGES.requestListenerInitException(instances[i].getClass().getName()), t); request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t); servletException = new ServletException - (sm.getString("requestListenerValve.requestInit", - wrapper.getName()), t); + (MESSAGES.requestListenerInitException(instances[i].getClass().getName()), t); } } } @@ -791,15 +783,12 @@ // Check for the servlet being marked unavailable if (wrapper.isUnavailable()) { - wrapper.getLogger().warn( - sm.getString("applicationDispatcher.isUnavailable", - wrapper.getName())); + wrapper.getLogger().warn(MESSAGES.servletIsUnavailable(wrapper.getName())); long available = wrapper.getAvailable(); if ((available > 0L) && (available < Long.MAX_VALUE)) hresponse.setDateHeader("Retry-After", available); - hresponse.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, sm - .getString("applicationDispatcher.isUnavailable", wrapper - .getName())); + hresponse.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, + MESSAGES.servletIsUnavailable(wrapper.getName())); unavailable = true; } @@ -809,16 +798,14 @@ servlet = wrapper.allocate(); } } catch (ServletException e) { - wrapper.getLogger().error(sm.getString("applicationDispatcher.allocateException", - wrapper.getName()), StandardWrapper.getRootCause(e)); + wrapper.getLogger().error(MESSAGES.servletAllocateException(wrapper.getName()), + StandardWrapper.getRootCause(e)); servletException = e; servlet = null; } catch (Throwable e) { - wrapper.getLogger().error(sm.getString("applicationDispatcher.allocateException", - wrapper.getName()), e); + wrapper.getLogger().error(MESSAGES.servletAllocateException(wrapper.getName()), e); servletException = new ServletException - (sm.getString("applicationDispatcher.allocateException", - wrapper.getName()), e); + (MESSAGES.servletAllocateException(wrapper.getName()), e); servlet = null; } @@ -843,24 +830,20 @@ } catch (ClientAbortException e) { ioException = e; } catch (IOException e) { - wrapper.getLogger().error(sm.getString("applicationDispatcher.serviceException", - wrapper.getName()), e); + wrapper.getLogger().error(MESSAGES.servletServiceException(wrapper.getName()), e); ioException = e; } catch (UnavailableException e) { - wrapper.getLogger().error(sm.getString("applicationDispatcher.serviceException", - wrapper.getName()), e); + wrapper.getLogger().error(MESSAGES.servletServiceException(wrapper.getName()), e); servletException = e; wrapper.unavailable(e); } catch (ServletException e) { Throwable rootCause = StandardWrapper.getRootCause(e); if (!(rootCause instanceof ClientAbortException)) { - wrapper.getLogger().error(sm.getString("applicationDispatcher.serviceException", - wrapper.getName()), rootCause); + wrapper.getLogger().error(MESSAGES.servletServiceException(wrapper.getName()), rootCause); } servletException = e; } catch (RuntimeException e) { - wrapper.getLogger().error(sm.getString("applicationDispatcher.serviceException", - wrapper.getName()), e); + wrapper.getLogger().error(MESSAGES.servletServiceException(wrapper.getName()), e); runtimeException = e; } finally { if (jspFile != null) { @@ -880,15 +863,12 @@ wrapper.deallocate(servlet); } } catch (ServletException e) { - wrapper.getLogger().error(sm.getString("applicationDispatcher.deallocateException", - wrapper.getName()), e); + wrapper.getLogger().error(MESSAGES.servletDeallocateException(wrapper.getName()), e); servletException = e; } catch (Throwable e) { - wrapper.getLogger().error(sm.getString("applicationDispatcher.deallocateException", - wrapper.getName()), e); + wrapper.getLogger().error(MESSAGES.servletDeallocateException(wrapper.getName()), e); servletException = new ServletException - (sm.getString("applicationDispatcher.deallocateException", - wrapper.getName()), e); + (MESSAGES.servletDeallocateException(wrapper.getName()), e); } @@ -906,12 +886,10 @@ try { listener.requestDestroyed(event); } catch (Throwable t) { - context.getLogger().error(sm.getString("requestListenerValve.requestDestroy", - instances[i].getClass().getName()), t); + context.getLogger().error(MESSAGES.requestListenerDestroyException(instances[i].getClass().getName()), t); request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t); servletException = new ServletException - (sm.getString("requestListenerValve.requestDestroy", - wrapper.getName()), t); + (MESSAGES.requestListenerDestroyException(instances[i].getClass().getName()), t); } } } @@ -1143,8 +1121,7 @@ } } if (!same) { - throw new ServletException(sm.getString( - "applicationDispatcher.specViolation.request")); + throw new ServletException(MESSAGES.notOriginalRequestInDispatcher()); } same = false; @@ -1172,8 +1149,7 @@ } if (!same) { - throw new ServletException(sm.getString( - "applicationDispatcher.specViolation.response")); + throw new ServletException(MESSAGES.notOriginalResponseInDispatcher()); } } Modified: trunk/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -47,6 +47,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.IOException; import java.security.Principal; import java.security.PrivilegedActionException; @@ -66,7 +68,6 @@ import org.apache.catalina.connector.RequestFacade; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.InstanceSupport; -import org.apache.catalina.util.StringManager; import org.jboss.servlet.http.HttpEvent; import org.jboss.servlet.http.HttpEventFilter; import org.jboss.servlet.http.HttpEventFilterChain; @@ -166,13 +167,6 @@ private Servlet servlet = null; - /** - * The string manager for our package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - /** * Static class array used when the SecurityManager is turned on and * <code>doFilter</code> is invoked. @@ -290,7 +284,7 @@ throw e; } catch (Throwable e) { throwable = e; - throw new ServletException(sm.getString("filterChain.filter"), e); + throw new ServletException(MESSAGES.filterException(), e); } finally { pointer--; if (filter != null) { @@ -343,8 +337,7 @@ throw e; } catch (Throwable e) { throwable = e; - throw new ServletException - (sm.getString("filterChain.servlet"), e); + throw new ServletException(MESSAGES.servletException(), e); } finally { pointer--; if (Globals.STRICT_SERVLET_COMPLIANCE) { @@ -462,8 +455,7 @@ throw e; } catch (Throwable e) { throwable = e; - throw new ServletException - (sm.getString("filterChain.filter"), e); + throw new ServletException(MESSAGES.filterException(), e); } finally { pointer--; if (filter != null) { @@ -504,8 +496,7 @@ throw e; } catch (Throwable e) { throwable = e; - throw new ServletException - (sm.getString("filterChain.servlet"), e); + throw new ServletException(MESSAGES.servletException(), e); } finally { pointer--; support.fireInstanceEvent(InstanceEvent.AFTER_SERVICE_EVENT, Modified: trunk/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -47,6 +47,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -74,8 +76,8 @@ import org.apache.catalina.deploy.FilterMap; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.Enumerator; -import org.apache.catalina.util.StringManager; import org.apache.tomcat.util.modeler.Registry; +import org.jboss.web.CatalinaLogger; /** @@ -90,12 +92,6 @@ public final class ApplicationFilterConfig implements FilterConfig, Serializable { - protected static org.jboss.logging.Logger log= - org.jboss.logging.Logger.getLogger( ApplicationFilterConfig.class ); - - protected static StringManager sm = - StringManager.getManager(Constants.Package); - // ----------------------------------------------------------- Constructors @@ -258,10 +254,10 @@ public boolean addMappingForServletNames(EnumSet<DispatcherType> dispatcherTypes, boolean isMatchAfter, String... servletNames) { if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("filterRegistration.ise", context.getPath())); + throw MESSAGES.cannotAddFilterRegistrationAfterInit(context.getPath()); } if (servletNames == null || servletNames.length == 0) { - throw new IllegalArgumentException(sm.getString("filterRegistration.iae")); + throw MESSAGES.invalidFilterRegistrationArguments(); } FilterMap filterMap = new FilterMap(); for (String servletName : servletNames) { @@ -286,10 +282,10 @@ EnumSet<DispatcherType> dispatcherTypes, boolean isMatchAfter, String... urlPatterns) { if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("filterRegistration.ise", context.getPath())); + throw MESSAGES.cannotAddFilterRegistrationAfterInit(context.getPath()); } if (urlPatterns == null || urlPatterns.length == 0) { - throw new IllegalArgumentException(sm.getString("filterRegistration.iae")); + throw MESSAGES.invalidFilterRegistrationArguments(); } FilterMap filterMap = new FilterMap(); for (String urlPattern : urlPatterns) { @@ -350,7 +346,7 @@ public void setAsyncSupported(boolean asyncSupported) { if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("filterRegistration.ise", context.getPath())); + throw MESSAGES.cannotAddFilterRegistrationAfterInit(context.getPath()); } filterDef.setAsyncSupported(asyncSupported); context.addFilterDef(filterDef); @@ -365,10 +361,10 @@ public boolean setInitParameter(String name, String value) { if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("filterRegistration.ise", context.getPath())); + throw MESSAGES.cannotAddFilterRegistrationAfterInit(context.getPath()); } if (name == null || value == null) { - throw new IllegalArgumentException(sm.getString("filterRegistration.iae")); + throw MESSAGES.invalidFilterRegistrationArguments(); } if (filterDef.getInitParameter(name) != null) { return false; @@ -381,10 +377,10 @@ public Set<String> setInitParameters(Map<String, String> initParameters) { if (!context.isStarting()) { - throw new IllegalStateException(sm.getString("filterRegistration.ise", context.getPath())); + throw MESSAGES.cannotAddFilterRegistrationAfterInit(context.getPath()); } if (initParameters == null) { - throw new IllegalArgumentException(sm.getString("filterRegistration.iae")); + throw MESSAGES.invalidFilterRegistrationArguments(); } Set<String> conflicts = new HashSet<String>(); Iterator<String> parameterNames = initParameters.keySet().iterator(); @@ -395,7 +391,7 @@ } else { String value = initParameters.get(parameterName); if (value == null) { - throw new IllegalArgumentException(sm.getString("filterRegistration.iae")); + throw MESSAGES.invalidFilterRegistrationArguments(); } filterDef.addInitParameter(parameterName, value); } @@ -497,7 +493,7 @@ try { SecurityUtil.doAsPrivilege("destroy", filter); } catch(java.lang.Exception ex){ - context.getLogger().error("ApplicationFilterConfig.doAsPrivilege", ex); + context.getLogger().error(MESSAGES.doAsPrivilegeException(), ex); } SecurityUtil.remove(filter); } else { @@ -506,7 +502,7 @@ try { ((StandardContext) context).getInstanceManager().destroyInstance(this.filter); } catch (Exception e) { - context.getLogger().error("ApplicationFilterConfig.preDestroy", e); + context.getLogger().error(MESSAGES.preDestroyException(), e); } } this.filter = null; @@ -545,8 +541,7 @@ Registry.getRegistry(null, null).registerComponent(this, oname, null); } catch (Exception ex) { - log.info(sm.getString("applicationFilterConfig.jmxRegsiterFail", - getFilterClass(), getFilterName()), ex); + CatalinaLogger.CORE_LOGGER.filterJmxRegistrationFailed(getFilterClass(), getFilterName(), ex); } } @@ -555,14 +550,8 @@ if (oname != null) { try { Registry.getRegistry(null, null).unregisterComponent(oname); - if(log.isDebugEnabled()) - log.debug(sm.getString( - "applicationFilterConfig.jmxUnregsiter", - getFilterClass(), getFilterName())); } catch(Exception ex) { - log.error(sm.getString( - "applicationFilterConfig.jmxUnregsiterFail", - getFilterClass(), getFilterName()), ex); + CatalinaLogger.CORE_LOGGER.filterJmxUnregistrationFailed(getFilterClass(), getFilterName(), ex); } } Modified: trunk/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -40,7 +40,6 @@ import org.apache.catalina.Session; import org.apache.catalina.util.Enumerator; import org.apache.catalina.util.RequestUtil; -import org.apache.catalina.util.StringManager; /** @@ -80,13 +79,6 @@ AsyncContext.ASYNC_QUERY_STRING }; - /** - * The string manager for this package. - */ - protected static StringManager sm = - StringManager.getManager(Constants.Package); - - // ----------------------------------------------------------- Constructors Modified: trunk/src/main/java/org/apache/catalina/core/ApplicationHttpResponse.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/ApplicationHttpResponse.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/ApplicationHttpResponse.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -26,9 +26,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import org.apache.catalina.util.StringManager; - - /** * Wrapper around a <code>javax.servlet.http.HttpServletResponse</code> * that transforms an application response object (which might be the original @@ -96,13 +93,6 @@ "org.apache.catalina.core.ApplicationHttpResponse/1.0"; - /** - * The string manager for this package. - */ - protected static StringManager sm = - StringManager.getManager(Constants.Package); - - // ------------------------------------------------ ServletResponse Methods Modified: trunk/src/main/java/org/apache/catalina/core/ApplicationRequest.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/ApplicationRequest.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/ApplicationRequest.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -28,7 +28,6 @@ import javax.servlet.ServletRequestWrapper; import org.apache.catalina.util.Enumerator; -import org.apache.catalina.util.StringManager; /** @@ -93,13 +92,6 @@ protected HashMap attributes = new HashMap(); - /** - * The string manager for this package. - */ - protected static StringManager sm = - StringManager.getManager(Constants.Package); - - // ------------------------------------------------- ServletRequest Methods Modified: trunk/src/main/java/org/apache/catalina/core/ApplicationResponse.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/ApplicationResponse.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/ApplicationResponse.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -24,9 +24,7 @@ import javax.servlet.ServletResponse; import javax.servlet.ServletResponseWrapper; -import org.apache.catalina.util.StringManager; - /** * Wrapper around a <code>javax.servlet.ServletResponse</code> * that transforms an application response object (which might be the original @@ -86,13 +84,6 @@ protected boolean included = false; - /** - * The string manager for this package. - */ - protected static StringManager sm = - StringManager.getManager(Constants.Package); - - // ------------------------------------------------ ServletResponse Methods Modified: trunk/src/main/java/org/apache/catalina/core/AprLifecycleListener.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/AprLifecycleListener.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/AprLifecycleListener.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -24,9 +24,8 @@ import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; -import org.apache.catalina.util.StringManager; import org.apache.tomcat.jni.Library; -import org.jboss.logging.Logger; +import org.jboss.web.CatalinaLogger; @@ -43,15 +42,6 @@ public class AprLifecycleListener implements LifecycleListener { - private static Logger log = Logger.getLogger(AprLifecycleListener.class); - - /** - * The string manager for this package. - */ - protected StringManager sm = - StringManager.getManager(Constants.Package); - - // ---------------------------------------------- Constants @@ -82,10 +72,10 @@ try { initializeSSL(); } catch (Throwable t) { - if (!log.isDebugEnabled()) { - log.info(sm.getString("aprListener.sslInit")); + if (!CatalinaLogger.CORE_LOGGER.isDebugEnabled()) { + CatalinaLogger.CORE_LOGGER.aprSslEngineInitFailed(); } else { - log.debug(sm.getString("aprListener.sslInit"), t); + CatalinaLogger.CORE_LOGGER.aprSslEngineInitFailed(t); } } } @@ -114,47 +104,26 @@ minor = clazz.getField("TCN_MINOR_VERSION").getInt(null); patch = clazz.getField("TCN_PATCH_VERSION").getInt(null); } catch (Throwable t) { - if (!log.isDebugEnabled()) { - log.info(sm.getString("aprListener.aprInit", - System.getProperty("java.library.path"))); + if (!CatalinaLogger.CORE_LOGGER.isDebugEnabled()) { + CatalinaLogger.CORE_LOGGER.aprInitFailed(); } else { - log.debug(sm.getString("aprListener.aprInit", - System.getProperty("java.library.path")), t); + CatalinaLogger.CORE_LOGGER.aprInitFailed(t); } return false; } if ((major != TCN_REQUIRED_MAJOR) || (minor != TCN_REQUIRED_MINOR) || (patch < TCN_REQUIRED_PATCH)) { - log.error(sm.getString("aprListener.tcnInvalid", major + "." - + minor + "." + patch, - TCN_REQUIRED_MAJOR + "." + - TCN_REQUIRED_MINOR + "." + - TCN_REQUIRED_PATCH)); + CatalinaLogger.CORE_LOGGER.aprInvalidVersion(major, minor, patch, + TCN_REQUIRED_MAJOR, TCN_REQUIRED_MINOR, TCN_REQUIRED_PATCH); return false; } if (patch < TCN_RECOMMENDED_PV) { - if (!log.isDebugEnabled()) { - log.info(sm.getString("aprListener.tcnVersion", major + "." - + minor + "." + patch, - TCN_REQUIRED_MAJOR + "." + - TCN_REQUIRED_MINOR + "." + - TCN_RECOMMENDED_PV)); - } else { - log.debug(sm.getString("aprListener.tcnVersion", major + "." - + minor + "." + patch, - TCN_REQUIRED_MAJOR + "." + - TCN_REQUIRED_MINOR + "." + - TCN_RECOMMENDED_PV)); - } + CatalinaLogger.CORE_LOGGER.aprRecommendedVersion(major, minor, patch, + TCN_REQUIRED_MAJOR, TCN_REQUIRED_MINOR, TCN_RECOMMENDED_PV); } - if (log.isDebugEnabled()) { - log.debug(sm.getString("aprListener.tcnValid", major + "." - + minor + "." + patch)); - // Log APR flags - log.debug(sm.getString("aprListener.flags", Library.APR_HAVE_IPV6, Library.APR_HAS_SENDFILE, - Library.APR_HAS_RANDOM)); - } + CatalinaLogger.CORE_LOGGER.aprInit(major, minor, patch, Library.APR_HAVE_IPV6, Library.APR_HAS_SENDFILE, + Library.APR_HAS_RANDOM); return true; } Modified: trunk/src/main/java/org/apache/catalina/core/ContainerBase.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/ContainerBase.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/ContainerBase.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -19,6 +19,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.IOException; @@ -55,10 +57,10 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.util.LifecycleSupport; -import org.apache.catalina.util.StringManager; import org.apache.naming.resources.ProxyDirContext; import org.apache.tomcat.util.modeler.Registry; import org.jboss.logging.Logger; +import org.jboss.web.CatalinaLogger; /** @@ -124,9 +126,6 @@ public abstract class ContainerBase implements Container, Lifecycle, Pipeline, MBeanRegistration { - private static org.jboss.logging.Logger log= - org.jboss.logging.Logger.getLogger( ContainerBase.class ); - /** * Container array type. */ @@ -256,13 +255,6 @@ /** - * The string manager for this package. - */ - protected static StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * Has this component been started? */ protected boolean started = false; @@ -375,7 +367,7 @@ try { ((Lifecycle) oldLoader).stop(); } catch (LifecycleException e) { - log.error("ContainerBase.setLoader: stop: ", e); + CatalinaLogger.CORE_LOGGER.errorStoppingLoader(e); } } @@ -387,7 +379,7 @@ try { ((Lifecycle) loader).start(); } catch (LifecycleException e) { - log.error("ContainerBase.setLoader: start: ", e); + CatalinaLogger.CORE_LOGGER.errorStartingLoader(e); } } @@ -447,7 +439,7 @@ try { ((Lifecycle) oldManager).stop(); } catch (LifecycleException e) { - log.error("ContainerBase.setManager: stop: ", e); + CatalinaLogger.CORE_LOGGER.errorStoppingManager(e); } } @@ -459,7 +451,7 @@ try { ((Lifecycle) manager).start(); } catch (LifecycleException e) { - log.error("ContainerBase.setManager: start: ", e); + CatalinaLogger.CORE_LOGGER.errorStartingManager(e); } } @@ -511,7 +503,7 @@ try { ((Lifecycle) oldCluster).stop(); } catch (LifecycleException e) { - log.error("ContainerBase.setCluster: stop: ", e); + CatalinaLogger.CORE_LOGGER.errorStoppingCluster(e); } } @@ -524,7 +516,7 @@ try { ((Lifecycle) cluster).start(); } catch (LifecycleException e) { - log.error("ContainerBase.setCluster: start: ", e); + CatalinaLogger.CORE_LOGGER.errorStartingCluster(e); } } @@ -700,7 +692,7 @@ try { ((Lifecycle) oldRealm).stop(); } catch (LifecycleException e) { - log.error("ContainerBase.setRealm: stop: ", e); + CatalinaLogger.CORE_LOGGER.errorStoppingRealm(e); } } @@ -712,7 +704,7 @@ try { ((Lifecycle) realm).start(); } catch (LifecycleException e) { - log.error("ContainerBase.setRealm: start: ", e); + CatalinaLogger.CORE_LOGGER.errorStartingRealm(e); } } @@ -796,13 +788,10 @@ private synchronized void addChildInternal(Container child) { - if( log.isDebugEnabled() ) - log.debug("Add child " + child + " " + this); - if (child.getName() == null) - throw new IllegalArgumentException(sm.getString("containerBase.addChild.nullName")); + throw MESSAGES.containerChildWithNullName(); if (children.get(child.getName()) != null) - throw new IllegalArgumentException(sm.getString("containerBase.addChild.notUnique", child.getName())); + throw MESSAGES.containerChildNameNotUnique(child.getName()); child.setParent(this); // May throw IAE children.put(child.getName(), child); @@ -814,7 +803,7 @@ ((Lifecycle) child).start(); success = true; } catch (LifecycleException e) { - throw new IllegalStateException(sm.getString("containerBase.addChild.start", child.getName()), e); + throw MESSAGES.containerChildStartFailed(child.getName(), e); } finally { if (!success) { children.remove(child.getName()); @@ -930,7 +919,7 @@ ((Lifecycle) child).stop(); } } catch (LifecycleException e) { - log.error("ContainerBase.removeChild: stop: ", e); + CatalinaLogger.CORE_LOGGER.errorStoppingChild(e); } } @@ -1011,8 +1000,7 @@ // Validate and update our current component state if (started) { - if(log.isInfoEnabled()) - log.info(sm.getString("containerBase.alreadyStarted", logName())); + CatalinaLogger.CORE_LOGGER.containerAlreadyStarted(logName()); return; } @@ -1070,8 +1058,7 @@ // Validate and update our current component state if (!started) { - if(log.isInfoEnabled()) - log.info(sm.getString("containerBase.notStarted", logName())); + CatalinaLogger.CORE_LOGGER.containerNotStarted(logName()); return; } @@ -1139,16 +1126,17 @@ */ public void init() throws Exception { - if( this.getParent() == null ) { - // "Life" update - ObjectName parentName=getParentName(); + if (org.apache.tomcat.util.Constants.ENABLE_MODELER) { + if( this.getParent() == null ) { + // "Life" update + ObjectName parentName=getParentName(); - //log.info("Register " + parentName ); - if( parentName != null && - mserver.isRegistered(parentName)) - { - mserver.invoke(parentName, "addChild", new Object[] { this }, - new String[] {"org.apache.catalina.Container"}); + if( parentName != null && + mserver.isRegistered(parentName)) + { + mserver.invoke(parentName, "addChild", new Object[] { this }, + new String[] {"org.apache.catalina.Container"}); + } } } initialized=true; @@ -1169,13 +1157,10 @@ if ( oname != null ) { try { if( controller == oname ) { - Registry.getRegistry(null, null) - .unregisterComponent(oname); - if(log.isDebugEnabled()) - log.debug("unregistering " + oname); + Registry.getRegistry(null, null).unregisterComponent(oname); } } catch( Throwable t ) { - log.error("Error unregistering ", t ); + CatalinaLogger.CORE_LOGGER.failedContainerJmxUnregistration(oname, t); } } } @@ -1302,28 +1287,28 @@ try { cluster.backgroundProcess(); } catch (Exception e) { - log.warn(sm.getString("containerBase.backgroundProcess.cluster", cluster), e); + CatalinaLogger.CORE_LOGGER.backgroundProcessingError(cluster, e); } } if (loader != null) { try { loader.backgroundProcess(); } catch (Exception e) { - log.warn(sm.getString("containerBase.backgroundProcess.loader", loader), e); + CatalinaLogger.CORE_LOGGER.backgroundProcessingError(loader, e); } } if (manager != null) { try { manager.backgroundProcess(); } catch (Exception e) { - log.warn(sm.getString("containerBase.backgroundProcess.manager", manager), e); + CatalinaLogger.CORE_LOGGER.backgroundProcessingError(manager, e); } } if (realm != null) { try { realm.backgroundProcess(); } catch (Exception e) { - log.warn(sm.getString("containerBase.backgroundProcess.realm", realm), e); + CatalinaLogger.CORE_LOGGER.backgroundProcessingError(realm, e); } } Valve current = pipeline.getFirst(); @@ -1331,7 +1316,7 @@ try { current.backgroundProcess(); } catch (Exception e) { - log.warn(sm.getString("containerBase.backgroundProcess.valve", current), e); + CatalinaLogger.CORE_LOGGER.backgroundProcessingError(current, e); } current = current.getNext(); } @@ -1486,8 +1471,6 @@ public ObjectName createObjectName(String domain, ObjectName parent) throws Exception { - if( log.isDebugEnabled()) - log.debug("Create ObjectName " + domain + " " + parent ); return null; } @@ -1604,7 +1587,7 @@ } container.backgroundProcess(); } catch (Throwable t) { - log.error("Exception invoking periodic operation: ", t); + CatalinaLogger.CORE_LOGGER.errorInPeriodicOperation(t); } finally { if (container instanceof Context) { ((Context) container).getThreadBindingListener().unbind(); Modified: trunk/src/main/java/org/apache/catalina/core/LocalStrings.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/core/LocalStrings.properties 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/LocalStrings.properties 2012-09-12 16:44:27 UTC (rev 2080) @@ -13,34 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -applicationContext.alreadyInitialized=Context {0} is already initialized. -applicationContext.restricted=Listener that attempted to call this method is restricted. -applicationContext.attributeEvent=Exception thrown by attributes event listener -applicationContext.create=Error creating instance -applicationContext.emptyRole=Invalid empty role specified for context {0} -applicationContext.mapping.error=Error during mapping -applicationContext.requestDispatcher.iae=Path {0} does not start with a "/" character -applicationContext.resourcePaths.iae=Path {0} does not start with a "/" character -applicationContext.setAttribute.namenull=Name cannot be null -applicationContext.setSessionTracking.iae=The session tracking mode {0} requested for context {1} is not supported by that context -applicationContext.setSessionTracking.ssl=The session tracking mode SSL requested for context {1} cannot be combined with other tracking modes -applicationContext.badListenerClass=Bad listener class {0} for context {1} -applicationDispatcher.allocateException=Allocate exception for servlet {0} -applicationDispatcher.deallocateException=Deallocate exception for servlet {0} -applicationDispatcher.forward.ise=Cannot forward after response has been committed -applicationDispatcher.forward.throw=Forwarded resource threw an exception -applicationDispatcher.include.throw=Included resource threw an exception -applicationDispatcher.isUnavailable=Servlet {0} is currently unavailable -applicationDispatcher.serviceException=Servlet.service() for servlet {0} threw exception -applicationDispatcher.specViolation.request=Original SevletRequest or wrapped original ServletRequest not passed to RequestDispatcher in violation of SRV.8.2 and SRV.14.2.5.1 -applicationDispatcher.specViolation.response=Original SevletResponse or wrapped original ServletResponse not passed to RequestDispatcher in violation of SRV.8.2 and SRV.14.2.5.1 -applicationFilterConfig.jmxRegisterFail=JMX registration failed for filter of type [{0}] and name [{1}] -applicationFilterConfig.jmxUnregister=JMX de-registration complete for filter of type [{0}] and name [{1}] -applicationFilterConfig.jmxUnregisterFail=JMX de-registration failed for filter of type [{0}] and name [{1}] +filterChain.filter=Filter execution threw an exception +filterChain.servlet=Servlet execution threw an exception + applicationRequest.badParent=Cannot locate parent Request implementation applicationRequest.badRequest=Request is not a javax.servlet.ServletRequestWrapper applicationResponse.badParent=Cannot locate parent Response implementation applicationResponse.badResponse=Response is not a javax.servlet.ServletResponseWrapper + aprListener.aprInit=The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: {0} aprListener.tcnInvalid=An incompatible version {0} of the Apache Tomcat Native library is installed, while Tomcat requires version {1} aprListener.tcnVersion=An older version {0} of the Apache Tomcat Native library is installed, while Tomcat recommends version greater then {1} @@ -48,6 +28,7 @@ aprListener.sslInit=Failed to initialize the SSLEngine. aprListener.tcnValid=Loaded Apache Tomcat Native library {0}. aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], random [{2}]. + containerBase.addDefaultMapper=Exception configuring default mapper of class {0} containerBase.alreadyStarted=Container {0} has already been started containerBase.notConfigured=No basic Valve has been configured @@ -61,10 +42,9 @@ containerBase.addChild.nullName=Child container name cannot be null containerBase.addChild.notUnique=Child container with name {0} already exists containerBase.addChild.start=Failed to start child container {0} + fastEngineMapper.alreadyStarted=FastEngineMapper {0} has already been started fastEngineMapper.notStarted=FastEngineMapper {0} has not yet been started -filterChain.filter=Filter execution threw an exception -filterChain.servlet=Servlet execution threw an exception httpContextMapper.container=This container is not a StandardContext httpEngineMapper.container=This container is not a StandardEngine httpHostMapper.container=This container is not a StandardHost Modified: trunk/src/main/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/StandardContext.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/StandardContext.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -18,6 +18,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -36,7 +38,6 @@ import java.util.Set; import java.util.TreeMap; -import javax.management.AttributeNotFoundException; import javax.management.ListenerNotFoundException; import javax.management.MBeanNotificationInfo; import javax.management.MBeanRegistrationException; @@ -97,7 +98,7 @@ import org.apache.naming.resources.WARDirContext; import org.apache.tomcat.InstanceManager; import org.apache.tomcat.util.modeler.Registry; -import org.jboss.logging.Logger; +import org.jboss.web.CatalinaLogger; /** * Standard implementation of the Context interface. Each @@ -113,7 +114,6 @@ extends ContainerBase implements Context, NotificationEmitter { - protected static Logger log = Logger.getLogger(StandardContext.class); // ----------------------------------------------------------- Constructors @@ -1269,32 +1269,23 @@ // Validate the incoming property value if (config == null) - throw new IllegalArgumentException - (sm.getString("standardContext.loginConfig.required")); + throw MESSAGES.nullLoginConfig(); String loginPage = config.getLoginPage(); if ((loginPage != null) && !loginPage.startsWith("/")) { if (isServlet22()) { - if(log.isDebugEnabled()) - log.debug(sm.getString("standardContext.loginConfig.loginWarning", - loginPage)); + CatalinaLogger.CORE_LOGGER.loginPageStartsWithSlash(loginPage); config.setLoginPage("/" + loginPage); } else { - throw new IllegalArgumentException - (sm.getString("standardContext.loginConfig.loginPage", - loginPage)); + throw MESSAGES.loginPageMustStartWithSlash(loginPage); } } String errorPage = config.getErrorPage(); if ((errorPage != null) && !errorPage.startsWith("/")) { if (isServlet22()) { - if(log.isDebugEnabled()) - log.debug(sm.getString("standardContext.loginConfig.errorWarning", - errorPage)); + CatalinaLogger.CORE_LOGGER.errorPageStartsWithSlash(errorPage); config.setErrorPage("/" + errorPage); } else { - throw new IllegalArgumentException - (sm.getString("standardContext.loginConfig.errorPage", - errorPage)); + throw MESSAGES.errorPageMustStartWithSlash(errorPage); } } @@ -1604,9 +1595,7 @@ try { wrapperClass = Class.forName(wrapperClassName); if (!StandardWrapper.class.isAssignableFrom(wrapperClass)) { - throw new IllegalArgumentException( - sm.getString("standardContext.invalidWrapperClass", - wrapperClassName)); + throw MESSAGES.invalidWrapperClass(wrapperClassName); } } catch (ClassNotFoundException cnfe) { throw new IllegalArgumentException(cnfe.getMessage()); @@ -1623,8 +1612,7 @@ public void setResources(DirContext resources) { if (started) { - throw new IllegalStateException - (sm.getString("standardContext.resources.started")); + throw MESSAGES.cannotSetResourcesAfterStart(); } DirContext oldResources = this.webappResources; @@ -1712,7 +1700,7 @@ workDir = new File(catalinaHomePath, getWorkDir()); } catch (IOException e) { - log.warn("Exception obtaining work path for " + getPath()); + CatalinaLogger.CORE_LOGGER.failedObtainingWorkDirectory(getPath(), e); } } return workDir.getAbsolutePath(); @@ -1763,7 +1751,7 @@ String results[] = new String[applicationListeners.length + 1]; for (int i = 0; i < applicationListeners.length; i++) { if (listener.equals(applicationListeners[i])) { - log.info(sm.getString("standardContext.duplicateListener", listener)); + CatalinaLogger.CORE_LOGGER.duplicateListener(listener); if (!restricted && restrictedApplicationListeners.contains(listener)) { restrictedApplicationListeners.remove(listener); } @@ -1799,7 +1787,7 @@ EventListener results[] = new EventListener[applicationListenerInstances.length + 1]; for (int i = 0; i < applicationListenerInstances.length; i++) { if (listener.equals(applicationListenerInstances[i])) { - log.info(sm.getString("standardContext.duplicateListener", listener)); + CatalinaLogger.CORE_LOGGER.duplicateListener(listener.getClass().getName()); return; } results[i] = applicationListenerInstances[i]; @@ -1847,8 +1835,7 @@ Wrapper oldJspServlet = null; if (!(child instanceof Wrapper)) { - throw new IllegalArgumentException - (sm.getString("standardContext.notWrapper")); + throw MESSAGES.contextChildMustBeWrapper(); } Wrapper wrapper = (Wrapper) child; @@ -1865,13 +1852,10 @@ String jspFile = wrapper.getJspFile(); if ((jspFile != null) && !jspFile.startsWith("/")) { if (isServlet22()) { - if(log.isDebugEnabled()) - log.debug(sm.getString("standardContext.wrapper.warning", - jspFile)); + CatalinaLogger.CORE_LOGGER.jspFileStartsWithSlash(jspFile); wrapper.setJspFile("/" + jspFile); } else { - throw new IllegalArgumentException - (sm.getString("standardContext.wrapper.error", jspFile)); + throw MESSAGES.jspFileMustStartWithSlash(jspFile); } } @@ -1902,10 +1886,7 @@ for (int j = 0; j < patterns.length; j++) { patterns[j] = adjustURLPattern(patterns[j]); if (!validateURLPattern(patterns[j])) - throw new IllegalArgumentException - (sm.getString - ("standardContext.securityConstraint.pattern", - patterns[j])); + throw MESSAGES.invalidSecurityConstraintUrlPattern(patterns[j]); } } @@ -1929,19 +1910,14 @@ public void addErrorPage(ErrorPage errorPage) { // Validate the input parameters if (errorPage == null) - throw new IllegalArgumentException - (sm.getString("standardContext.errorPage.required")); + throw MESSAGES.nullErrorPage(); String location = errorPage.getLocation(); if ((location != null) && !location.startsWith("/")) { if (isServlet22()) { - if(log.isDebugEnabled()) - log.debug(sm.getString("standardContext.errorPage.warning", - location)); + CatalinaLogger.CORE_LOGGER.errorPageStartsWithSlash(location); errorPage.setLocation("/" + location); } else { - throw new IllegalArgumentException - (sm.getString("standardContext.errorPage.error", - location)); + throw MESSAGES.errorPageMustStartWithSlash(location); } } @@ -2037,14 +2013,12 @@ String[] servletNames = filterMap.getServletNames(); String[] urlPatterns = filterMap.getURLPatterns(); if (findFilterDef(filterName) == null) - throw new IllegalArgumentException - (sm.getString("standardContext.filterMap.name", filterName)); + throw MESSAGES.unknownFilterNameInMapping(filterName); if (!filterMap.getMatchAllServletNames() && !filterMap.getMatchAllUrlPatterns() && (servletNames.length == 0) && (urlPatterns.length == 0)) - throw new IllegalArgumentException - (sm.getString("standardContext.filterMap.either")); + throw MESSAGES.missingFilterMapping(); // FIXME: Older spec revisions may still check this /* if ((servletNames.length != 0) && (urlPatterns.length != 0)) @@ -2053,9 +2027,7 @@ */ for (int i = 0; i < urlPatterns.length; i++) { if (!validateURLPattern(urlPatterns[i])) { - throw new IllegalArgumentException - (sm.getString("standardContext.filterMap.pattern", - urlPatterns[i])); + throw MESSAGES.invalidFilterMappingUrlPattern(urlPatterns[i]); } } } @@ -2095,8 +2067,7 @@ if( findChild(servletName) != null) { addServletMapping(pattern, servletName, true); } else { - if(log.isDebugEnabled()) - log.debug("Skiping " + pattern + " , no servlet " + servletName); + CatalinaLogger.CORE_LOGGER.missingJspServlet(); } } @@ -2180,11 +2151,9 @@ public void addParameter(String name, String value) { // Validate the proposed context initialization parameter if ((name == null) || (value == null)) - throw new IllegalArgumentException - (sm.getString("standardContext.parameter.required")); + throw MESSAGES.missingParameterNameOrValue(); if (parameters.get(name) != null) - throw new IllegalArgumentException - (sm.getString("standardContext.parameter.duplicate", name)); + throw MESSAGES.duplicateContextParameters(name); // Add this parameter to our defined set parameters.put(name, value); @@ -2252,12 +2221,10 @@ // Validate the proposed mapping Wrapper wrapper = (Wrapper) findChild(name); if (findChild(name) == null) - throw new IllegalArgumentException - (sm.getString("standardContext.servletMap.name", name)); + throw MESSAGES.unknownServletNameInMapping(name); pattern = adjustURLPattern(RequestUtil.URLDecode(pattern)); if (!validateURLPattern(pattern)) - throw new IllegalArgumentException - (sm.getString("standardContext.servletMap.pattern", pattern)); + throw MESSAGES.invalidServletMappingUrlPattern(pattern); // Add this mapping to our registered set String name2 = (String) servletMappings.get(pattern); @@ -2363,7 +2330,7 @@ try { wrapper = (Wrapper) wrapperClass.newInstance(); } catch (Throwable t) { - throw new IllegalStateException(sm.getString("standardContext.createWrapper.failed"), t); + throw MESSAGES.errorCreatingWrapper(t); } } else { wrapper = new StandardWrapper(); @@ -2376,7 +2343,7 @@ (InstanceListener) clazz.newInstance(); wrapper.addInstanceListener(listener); } catch (Throwable t) { - throw new IllegalStateException(sm.getString("standardContext.createWrapper.failed"), t); + throw MESSAGES.errorCreatingWrapper(t); } } @@ -2388,7 +2355,7 @@ if (wrapper instanceof Lifecycle) ((Lifecycle) wrapper).addLifecycleListener(listener); } catch (Throwable t) { - throw new IllegalStateException(sm.getString("standardContext.createWrapper.failed"), t); + throw MESSAGES.errorCreatingWrapper(t); } } @@ -2399,7 +2366,7 @@ (ContainerListener) clazz.newInstance(); wrapper.addContainerListener(listener); } catch (Throwable t) { - throw new IllegalStateException(sm.getString("standardContext.createWrapper.failed"), t); + throw MESSAGES.errorCreatingWrapper(t); } } @@ -2751,29 +2718,21 @@ // Validate our current component state if (!started) - throw new IllegalStateException - (sm.getString("containerBase.notStarted", logName())); + return; - // Make sure reloading is enabled - // if (!reloadable) - // throw new IllegalStateException - // (sm.getString("standardContext.notReloadable")); - if(log.isInfoEnabled()) - log.info(sm.getString("standardContext.reloadingStarted")); - // Stop accepting requests temporarily setPaused(true); try { stop(); } catch (LifecycleException e) { - log.error(sm.getString("standardContext.stoppingContext"), e); + CatalinaLogger.CORE_LOGGER.errorStoppingContext(getName(), e); } try { start(); } catch (LifecycleException e) { - log.error(sm.getString("standardContext.startingContext"), e); + CatalinaLogger.CORE_LOGGER.errorStartingContext(getName(), e); } setPaused(false); @@ -2864,8 +2823,7 @@ public void removeChild(Container child) { if (!(child instanceof Wrapper)) { - throw new IllegalArgumentException - (sm.getString("standardContext.notWrapper")); + throw MESSAGES.contextChildMustBeWrapper(); } super.removeChild(child); @@ -3241,8 +3199,6 @@ */ protected boolean filterStart() { - if (getLogger().isDebugEnabled()) - getLogger().debug("Starting filters"); // Instantiate and record a FilterConfig for each defined filter boolean ok = true; Iterator<ApplicationFilterConfig> filterConfigsIterator = @@ -3252,25 +3208,23 @@ try { filterConfig.getFilter(); } catch (Throwable t) { - getLogger().error - (sm.getString("standardContext.filterStart", name), t); + getLogger().error(MESSAGES.errorStartingFilter(filterConfig.getFilterName()), t); ok = false; } } Iterator<String> names = filterDefs.keySet().iterator(); while (names.hasNext()) { String name = names.next(); + CatalinaLogger.CORE_LOGGER.startingFilter(name); if (getLogger().isDebugEnabled()) getLogger().debug(" Starting filter '" + name + "'"); ApplicationFilterConfig filterConfig = null; try { - filterConfig = new ApplicationFilterConfig - (this, (FilterDef) filterDefs.get(name)); + filterConfig = new ApplicationFilterConfig(this, (FilterDef) filterDefs.get(name)); filterConfig.getFilter(); filterConfigs.put(name, filterConfig); } catch (Throwable t) { - getLogger().error - (sm.getString("standardContext.filterStart", name), t); + getLogger().error(MESSAGES.errorStartingFilter(name), t); ok = false; } } @@ -3287,15 +3241,11 @@ */ protected boolean filterStop() { - if (getLogger().isDebugEnabled()) - getLogger().debug("Stopping filters"); - // Release all Filter and FilterConfig instances Iterator<String> names = filterConfigs.keySet().iterator(); while (names.hasNext()) { String name = names.next(); - if (getLogger().isDebugEnabled()) - getLogger().debug(" Stopping filter '" + name + "'"); + CatalinaLogger.CORE_LOGGER.stoppingFilter(name); ApplicationFilterConfig filterConfig = (ApplicationFilterConfig) filterConfigs.get(name); filterConfig.release(); @@ -3326,24 +3276,16 @@ */ public boolean contextListenerStart() { - if (log.isDebugEnabled()) - log.debug("Configuring application event listeners"); - // Instantiate the required listeners String listeners[] = findApplicationListeners(); EventListener listenerInstances[] = applicationListenerInstances; EventListener results[] = new EventListener[listeners.length + listenerInstances.length]; boolean ok = true; for (int i = 0; i < listeners.length; i++) { - if (getLogger().isDebugEnabled()) - getLogger().debug(" Configuring event listener class '" + - listeners[i] + "'"); try { results[i] = (EventListener) instanceManager.newInstance(listeners[i]); } catch (Throwable t) { - getLogger().error - (sm.getString("standardContext.applicationListener", - listeners[i]), t); + getLogger().error(MESSAGES.errorInstatiatingApplicationListener(listeners[i]), t); ok = false; } } @@ -3352,7 +3294,7 @@ } applicationListenerInstances = new EventListener[0]; if (!ok) { - getLogger().error(sm.getString("standardContext.applicationSkipped")); + getLogger().error(MESSAGES.skippingApplicationListener()); return (false); } @@ -3371,9 +3313,6 @@ // Send application start events - if (getLogger().isDebugEnabled()) - getLogger().debug("Sending application start events"); - Object instances[] = getApplicationLifecycleListeners(); if (instances == null || instances.length == 0) return (ok); @@ -3394,8 +3333,7 @@ } catch (Throwable t) { fireContainerEvent("afterContextInitialized", listener); getLogger().error - (sm.getString("standardContext.listenerStart", - instances[i].getClass().getName()), t); + (MESSAGES.errorSendingContextInitializedEvent(instances[i].getClass().getName()), t); ok = false; } finally { context.setRestricted(false); @@ -3413,9 +3351,6 @@ */ public boolean listenerStart() { - if (log.isDebugEnabled()) - log.debug("Configuring application event listeners"); - // Instantiate the required listeners Object listeners[] = listenersInstances; EventListener listenerInstances[] = applicationListenerInstances; @@ -3425,9 +3360,7 @@ try { results[i] = (EventListener) listeners[i]; } catch (Throwable t) { - getLogger().error - (sm.getString("standardContext.applicationListener", - listeners[i]), t); + getLogger().error(MESSAGES.errorInstatiatingApplicationListener(listeners[i].getClass().getName()), t); ok = false; } } @@ -3435,7 +3368,7 @@ results[i + listeners.length] = listenerInstances[i]; } if (!ok) { - getLogger().error(sm.getString("standardContext.applicationSkipped")); + getLogger().error(MESSAGES.skippingApplicationListener()); return (false); } this.listenersInstances = results; @@ -3470,9 +3403,6 @@ */ public boolean listenerStop() { - if (log.isDebugEnabled()) - log.debug("Sending application stop events"); - boolean ok = true; Object listeners[] = getApplicationLifecycleListeners(); if (listeners != null && (listeners.length > 0)) { @@ -3491,8 +3421,7 @@ } catch (Throwable t) { fireContainerEvent("afterContextDestroyed", listener); getLogger().error - (sm.getString("standardContext.listenerStop", - listeners[i].getClass().getName()), t); + (MESSAGES.errorSendingContextDestroyedEvent(listeners[i].getClass().getName()), t); ok = false; } } @@ -3509,8 +3438,7 @@ getInstanceManager().destroyInstance(listeners[i]); } catch (Throwable t) { getLogger().error - (sm.getString("standardContext.listenerStop", - listeners[i].getClass().getName()), t); + (MESSAGES.errorDestroyingApplicationListener(listeners[i].getClass().getName()), t); ok = false; } } @@ -3572,7 +3500,7 @@ } this.resources = proxyDirContext; } catch (Throwable t) { - log.error(sm.getString("standardContext.resourcesStart"), t); + CatalinaLogger.CORE_LOGGER.errorStartingResources(t); ok = false; } @@ -3611,7 +3539,7 @@ } } } catch (Throwable t) { - log.error(sm.getString("standardContext.resourcesStop"), t); + CatalinaLogger.CORE_LOGGER.errorStoppingResources(t); ok = false; } @@ -3654,8 +3582,7 @@ try { wrapper.load(); } catch (ServletException e) { - getLogger().error(sm.getString("standardWrapper.loadException", - getName()), StandardWrapper.getRootCause(e)); + getLogger().error(MESSAGES.errorLoadingServlet(wrapper.getName()), StandardWrapper.getRootCause(e)); // NOTE: load errors (including a servlet that throws // UnavailableException from tht init() method) are NOT // fatal to application startup @@ -3673,17 +3600,16 @@ */ public synchronized void start() throws LifecycleException { if (started) { + CatalinaLogger.CORE_LOGGER.containerAlreadyStarted(logName()); return; } if( !initialized ) { try { init(); } catch( Exception ex ) { - throw new LifecycleException("Error initializaing ", ex); + throw new LifecycleException(MESSAGES.errorInitializingContext(), ex); } } - if(log.isDebugEnabled()) - log.debug("Starting " + ("".equals(getName()) ? "ROOT" : getName())); if (org.apache.tomcat.util.Constants.ENABLE_MODELER) { // Set JMX object name for proper pipeline registration @@ -3707,21 +3633,18 @@ // Add missing components as necessary if (webappResources == null) { // (1) Required by Loader - if (log.isDebugEnabled()) - log.debug("Configuring default Resources"); try { if ((docBase != null) && (docBase.endsWith(".war")) && (!(new File(getBasePath())).isDirectory())) setResources(new WARDirContext()); else setResources(new FileDirContext()); } catch (IllegalArgumentException e) { - log.error("Error initializing resources: " + e.getMessage()); + CatalinaLogger.CORE_LOGGER.errorInitializingResources(e); ok = false; } } if (ok) { if (!resourcesStart()) { - log.error( "Error in resourceStart()"); ok = false; } } @@ -3732,10 +3655,6 @@ // Post work directory postWorkDirectory(); - // Standard container startup - if (log.isDebugEnabled()) - log.debug("Processing standard container startup"); - // Binding thread ClassLoader oldCCL = bindThread(); @@ -3820,7 +3739,7 @@ } catch (Throwable t) { // This can happen in rare cases with custom components ok = false; - log.error(sm.getString("standardContext.startFailed", getName()), t); + CatalinaLogger.CORE_LOGGER.errorStartingContext(getName(), t); } finally { // Unbinding thread unbindThread(oldCCL); @@ -3848,7 +3767,6 @@ // Configure and call application event listeners if (ok) { if (!contextListenerStart()) { - log.error( "Error listenerStart"); ok = false; } } @@ -3863,7 +3781,6 @@ // Configure and call application filters if (ok) { if (!filterStart()) { - log.error( "Error filterStart"); ok = false; } } @@ -3875,7 +3792,6 @@ if (ok) { if (!listenerStart()) { - log.error( "Error listenerStart"); ok = false; } } @@ -3897,7 +3813,7 @@ } catch (Throwable t) { // This can happen in rare cases with custom components ok = false; - log.error(sm.getString("standardContext.startFailed", getName()), t); + CatalinaLogger.CORE_LOGGER.errorStartingContext(getName(), t); } finally { // Unbinding thread unbindThread(oldCCL); @@ -3908,15 +3824,13 @@ // Set available status depending upon startup success if (ok) { - if (log.isDebugEnabled()) - log.debug("Starting completed"); setAvailable(true); } else { - log.error(sm.getString("standardContext.startFailed", getName())); + CatalinaLogger.CORE_LOGGER.errorStartingContextWillStop(getName()); try { stop(); } catch (Throwable t) { - log.error(sm.getString("standardContext.startCleanup"), t); + CatalinaLogger.CORE_LOGGER.errorStartingContextCleanup(getName(), t); } setAvailable(false); } @@ -3954,8 +3868,7 @@ // Validate and update our current component state if (!started) { - if(log.isInfoEnabled()) - log.info(sm.getString("containerBase.notStarted", logName())); + CatalinaLogger.CORE_LOGGER.containerNotStarted(logName()); return; } @@ -4001,9 +3914,6 @@ // Finalize our character set mapper setCharsetMapper(null); - // Normal container shutdown processing - if (log.isDebugEnabled()) - log.debug("Processing standard container shutdown"); // Notify our interested LifecycleListeners lifecycle.fireLifecycleEvent(STOP_EVENT, null); started = false; @@ -4058,15 +3968,12 @@ try { resetContext(); } catch( Exception ex ) { - log.error( "Error reseting context " + this + " " + ex, ex ); + CatalinaLogger.CORE_LOGGER.errorResettingContext(getName(), ex); } // Notify our interested LifecycleListeners lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null); - if (log.isDebugEnabled()) - log.debug("Stopping complete"); - } /** Destroy needs to clean up the context completely. @@ -4114,9 +4021,6 @@ instanceManager = null; authenticator = null; - - if(log.isDebugEnabled()) - log.debug("resetContext " + oname); } /** @@ -4156,9 +4060,7 @@ return (urlPattern); if (!isServlet22()) return (urlPattern); - if(log.isDebugEnabled()) - log.debug(sm.getString("standardContext.urlPattern.patternWarning", - urlPattern)); + CatalinaLogger.CORE_LOGGER.urlPatternStartsWithSlash(urlPattern); return ("/" + urlPattern); } @@ -4532,12 +4434,10 @@ * See Bugzilla 34805, 43079 & 43080 */ protected void checkUnusualURLPattern(String urlPattern) { - if (log.isInfoEnabled()) { + if (CatalinaLogger.CORE_LOGGER.isInfoEnabled()) { if(urlPattern.endsWith("*") && (urlPattern.length() < 2 || urlPattern.charAt(urlPattern.length()-2) != '/')) { - log.info("Suspicious url pattern: \"" + urlPattern + "\"" + - " in context [" + getName() + "] - see" + - " section SRV.11.2 of the Servlet specification" ); + CatalinaLogger.CORE_LOGGER.suspiciousUrlPattern(getName(), urlPattern); } } } @@ -4625,8 +4525,6 @@ getJ2EEServer(); onameStr="j2eeType=WebModule,name=" + name + suffix; - if( log.isDebugEnabled()) - log.debug("Registering " + onameStr + " for " + oname); // default case - no domain explictely set. if( getDomain() == null ) domain=hst.getDomain(); @@ -4644,17 +4542,12 @@ controller = oname; } } catch(Exception ex) { - if(log.isInfoEnabled()) - log.info("Error registering ctx with jmx " + this + " " + - oname + " " + ex.toString(), ex ); + CatalinaLogger.CORE_LOGGER.contextObjectNameCreationFailed(getName(), ex); } } protected void registerJMX() { try { - if (log.isDebugEnabled()) { - log.debug("Checking for " + oname ); - } if(! Registry.getRegistry(null, null) .getMBeanServer().isRegistered(oname)) { controller = oname; @@ -4675,9 +4568,7 @@ ((StandardWrapper)children[i]).registerJMX( this ); } } catch (Exception ex) { - if(log.isInfoEnabled()) - log.info("Error registering wrapper with jmx " + this + " " + - oname + " " + ex.toString(), ex ); + CatalinaLogger.CORE_LOGGER.contextJmxRegistrationFailed(getName(), ex); } } @@ -4708,7 +4599,7 @@ try { stop(); } catch( Exception ex ) { - log.error( "error stopping ", ex); + CatalinaLogger.CORE_LOGGER.errorStoppingContext(getName(), ex); } } } @@ -4740,11 +4631,12 @@ // "Life" update String path=oname.getKeyProperty("name"); if( path == null ) { - log.error( "No name attribute " +name ); + CatalinaLogger.CORE_LOGGER.cannotFindContextJmxParentName(getName()); return null; } if( ! path.startsWith( "//")) { - log.error("Invalid name " + name); + CatalinaLogger.CORE_LOGGER.cannotFindContextJmxParentName(getName()); + return null; } path=path.substring(2); int delim=path.indexOf( "/" ); @@ -4758,8 +4650,6 @@ this.setName(path); } } else { - if(log.isDebugEnabled()) - log.debug("Setting path " + path ); this.setName( path ); } // XXX The service and domain should be the same. Modified: trunk/src/main/java/org/apache/catalina/core/StandardEngine.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/StandardEngine.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/StandardEngine.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -19,8 +19,8 @@ package org.apache.catalina.core; -import java.io.File; -import java.util.List; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.util.Locale; import javax.management.MBeanServer; @@ -33,8 +33,7 @@ import org.apache.catalina.LifecycleException; import org.apache.catalina.Service; import org.apache.tomcat.util.modeler.Registry; -import org.apache.tomcat.util.modeler.modules.MbeansSource; -import org.jboss.logging.Logger; +import org.jboss.web.CatalinaLogger; /** * Standard implementation of the Engine interface. Each @@ -50,8 +49,6 @@ extends ContainerBase implements Engine { - private static Logger log = Logger.getLogger(StandardEngine.class); - // ----------------------------------------------------------- Constructors @@ -101,20 +98,6 @@ */ private String baseDir = null; - /** Optional mbeans config file. This will replace the "hacks" in - * jk and ServerListener. The mbeans file will support (transparent) - * persistence - soon. It'll probably replace jk2.properties and could - * replace server.xml. Of course - the same beans could be loaded and - * managed by an external entity - like the embedding app - which - * can use a different persistence mechanism. - */ - private String mbeansFile = null; - - /** Mbeans loaded by the engine. - */ - private List mbeans; - - /** * The JVM Route ID for this Tomcat instance. All Route ID's must be unique * across the cluster. @@ -204,14 +187,6 @@ this.service = service; } - public String getMbeansFile() { - return mbeansFile; - } - - public void setMbeansFile(String mbeansFile) { - this.mbeansFile = mbeansFile; - } - public String getBaseDir() { if( baseDir==null ) { baseDir=System.getProperty("catalina.base"); @@ -238,8 +213,7 @@ public void addChild(Container child) { if (!(child instanceof Host)) - throw new IllegalArgumentException - (sm.getString("standardEngine.notHost")); + throw MESSAGES.engineChildMustBeHost(); super.addChild(child); } @@ -264,8 +238,7 @@ */ public void setParent(Container container) { - throw new IllegalArgumentException - (sm.getString("standardEngine.notParent")); + throw MESSAGES.engineHasNoParent(); } @@ -283,54 +256,16 @@ if (domain==null) { domain=getName(); } - if(log.isDebugEnabled()) - log.debug( "Register " + domain ); oname=new ObjectName(domain + ":type=Engine"); controller=oname; Registry.getRegistry(null, null) .registerComponent(this, oname, null); } catch( Throwable t ) { - log.info("Error registering ", t ); + CatalinaLogger.CORE_LOGGER.failedEngineJmxRegistration(oname, t); } } - - if( mbeansFile == null ) { - String defaultMBeansFile=getBaseDir() + "/conf/tomcat5-mbeans.xml"; - File f=new File( defaultMBeansFile ); - if( f.exists() ) mbeansFile=f.getAbsolutePath(); - } - if( mbeansFile != null ) { - readEngineMbeans(); - } - if( mbeans != null ) { - try { - Registry.getRegistry(null, null).invoke(mbeans, "init", false); - } catch (Exception e) { - log.error("Error in init() for " + mbeansFile, e); - } - } } - // not needed since the following if statement does the same thing the right way - // remove later after checking - //if( service==null ) { - // try { - // ObjectName serviceName=getParentName(); - // if( mserver.isRegistered( serviceName )) { - // log.info("Registering with the service "); - // try { - // mserver.invoke( serviceName, "setContainer", - // new Object[] { this }, - // new String[] { "org.apache.catalina.Container" } ); - // } catch( Exception ex ) { - // ex.printStackTrace(); - // } - // } - // } catch( Exception ex ) { - // log.error("Error registering with service "); - // } - //} - if( service==null ) { // for consistency...: we are probably in embeded mode try { @@ -338,7 +273,7 @@ service.setContainer( this ); service.initialize(); } catch( Throwable t ) { - log.error(t); + CatalinaLogger.CORE_LOGGER.failedServiceCreation(t); } } @@ -353,26 +288,15 @@ ((StandardService)service).destroy(); if (org.apache.tomcat.util.Constants.ENABLE_MODELER) { - if( mbeans != null ) { + if ( oname != null ) { try { - Registry.getRegistry(null, null) - .invoke(mbeans, "destroy", false); - } catch (Exception e) { - log.error(sm.getString("standardEngine.unregister.mbeans.failed" ,mbeansFile), e); - } - } - // - if( mbeans != null ) { - try { - for( int i=0; i<mbeans.size() ; i++ ) { - Registry.getRegistry(null, null) - .unregisterComponent((ObjectName)mbeans.get(i)); + if( controller == oname ) { + Registry.getRegistry(null, null).unregisterComponent(oname); } - } catch (Exception e) { - log.error(sm.getString("standardEngine.unregister.mbeans.failed", mbeansFile), e); + } catch( Throwable t ) { + CatalinaLogger.CORE_LOGGER.failedContainerJmxUnregistration(oname, t); } } - // force all metadata to be reloaded. // That doesn't affect existing beans. We should make it per // registry - and stop using the static. @@ -393,53 +317,11 @@ init(); } - if (org.apache.tomcat.util.Constants.ENABLE_MODELER) { - // Look for a realm - that may have been configured earlier. - // If the realm is added after context - it'll set itself. - if( realm == null ) { - ObjectName realmName=null; - try { - realmName=new ObjectName( domain + ":type=Realm"); - if( mserver.isRegistered(realmName ) ) { - mserver.invoke(realmName, "init", - new Object[] {}, - new String[] {} - ); - } - } catch( Throwable t ) { - log.debug("No realm for this engine " + realmName); - } - } - - if( mbeans != null ) { - try { - Registry.getRegistry(null, null) - .invoke(mbeans, "start", false); - } catch (Exception e) { - log.error("Error in start() for " + mbeansFile, e); - } - } - } - // Standard container startup super.start(); } - public void stop() throws LifecycleException { - super.stop(); - if (org.apache.tomcat.util.Constants.ENABLE_MODELER) { - if( mbeans != null ) { - try { - Registry.getRegistry(null, null).invoke(mbeans, "stop", false); - } catch (Exception e) { - log.error("Error in stop() for " + mbeansFile, e); - } - } - } - } - - /** * Return a String representation of this component. */ @@ -482,31 +364,9 @@ public ObjectName createObjectName(String domain, ObjectName parent) throws Exception { - if( log.isDebugEnabled()) - log.debug("Create ObjectName " + domain + " " + parent ); return new ObjectName( domain + ":type=Engine"); } - - private void readEngineMbeans() { - try { - MbeansSource mbeansMB=new MbeansSource(); - File mbeansF=new File( mbeansFile ); - mbeansMB.setSource(mbeansF); - - Registry.getRegistry(null, null).registerComponent - (mbeansMB, domain + ":type=MbeansFile", null); - mbeansMB.load(); - mbeansMB.init(); - mbeansMB.setRegistry(Registry.getRegistry(null, null)); - mbeans=mbeansMB.getMBeans(); - - } catch( Throwable t ) { - log.error( "Error loading " + mbeansFile, t ); - } - - } - public String getDomain() { if (domain!=null) { return domain; Modified: trunk/src/main/java/org/apache/catalina/core/StandardHost.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/StandardHost.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/StandardHost.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -19,6 +19,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.util.Locale; import javax.management.MBeanServer; @@ -32,6 +34,7 @@ import org.apache.catalina.startup.HostConfig; import org.apache.catalina.valves.ValveBase; import org.apache.tomcat.util.modeler.Registry; +import org.jboss.web.CatalinaLogger; /** @@ -48,10 +51,6 @@ extends ContainerBase implements Host { - /* Why do we implement deployer and delegate to deployer ??? */ - - private static org.jboss.logging.Logger log= - org.jboss.logging.Logger.getLogger( StandardHost.class ); // ----------------------------------------------------------- Constructors @@ -280,8 +279,7 @@ public void setName(String name) { if (name == null) - throw new IllegalArgumentException - (sm.getString("standardHost.nullName")); + throw MESSAGES.hostNameIsNull(); name = name.toLowerCase(Locale.ENGLISH); // Internally all names are lower case @@ -351,8 +349,7 @@ public void addChild(Container child) { if (!(child instanceof Context)) - throw new IllegalArgumentException - (sm.getString("standardHost.notContext")); + throw MESSAGES.hostChildMustBeContext(); super.addChild(child); } @@ -447,23 +444,6 @@ if( ! initialized ) init(); - // Look for a realm - that may have been configured earlier. - // If the realm is added after context - it'll set itself. - if( realm == null ) { - ObjectName realmName=null; - try { - realmName=new ObjectName( domain + ":type=Realm,host=" + getName()); - if( mserver.isRegistered(realmName ) ) { - mserver.invoke(realmName, "init", - new Object[] {}, - new String[] {} - ); - } - } catch( Throwable t ) { - log.debug("No realm for this host " + realmName); - } - } - // Set error report valve if ((errorReportValveClass != null) && (!errorReportValveClass.equals(""))) { @@ -483,9 +463,7 @@ errorReportValveObjectName = ((ValveBase)valve).getObjectName() ; } } catch (Throwable t) { - log.error(sm.getString - ("standardHost.invalidErrorReportValveClass", - errorReportValveClass), t); + CatalinaLogger.CORE_LOGGER.invalidErrorReportValveClass(errorReportValveClass, t); } } @@ -525,42 +503,31 @@ if( initialized ) return; initialized=true; - // already registered. - if( getParent() == null ) { - try { - // Register with the Engine - ObjectName serviceName=new ObjectName(domain + - ":type=Engine"); - - HostConfig deployer = new HostConfig(); - addLifecycleListener(deployer); - if( mserver.isRegistered( serviceName )) { - if(log.isDebugEnabled()) - log.debug("Registering "+ serviceName +" with the Engine"); - mserver.invoke( serviceName, "addChild", - new Object[] { this }, - new String[] { "org.apache.catalina.Container" } ); - } - } catch( Exception ex ) { - log.error("Host registering failed!",ex); - } - } - if (org.apache.tomcat.util.Constants.ENABLE_MODELER) { if( oname==null ) { // not registered in JMX yet - standalone mode try { StandardEngine engine=(StandardEngine)parent; domain=engine.getName(); - if(log.isDebugEnabled()) - log.debug( "Register host " + getName() + " with domain "+ domain ); oname=new ObjectName(domain + ":type=Host,host=" + this.getName()); controller = oname; - Registry.getRegistry(null, null) - .registerComponent(this, oname, null); + if( getParent() == null ) { + // Register with the Engine + ObjectName serviceName=new ObjectName(domain + + ":type=Engine"); + + HostConfig deployer = new HostConfig(); + addLifecycleListener(deployer); + if( mserver.isRegistered( serviceName )) { + mserver.invoke( serviceName, "addChild", + new Object[] { this }, + new String[] { "org.apache.catalina.Container" } ); + } + } + Registry.getRegistry(null, null).registerComponent(this, oname, null); } catch( Throwable t ) { - log.error("Host registering failed!", t ); + CatalinaLogger.CORE_LOGGER.failedHostJmxRegistration(oname, t); } } } @@ -590,8 +557,6 @@ public ObjectName createObjectName(String domain, ObjectName parent) throws Exception { - if( log.isDebugEnabled()) - log.debug("Create ObjectName " + domain + " " + parent ); return new ObjectName( domain + ":type=Host,host=" + getName()); } Modified: trunk/src/main/java/org/apache/catalina/core/StandardWrapper.java =================================================================== --- trunk/src/main/java/org/apache/catalina/core/StandardWrapper.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/apache/catalina/core/StandardWrapper.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -18,6 +18,8 @@ package org.apache.catalina.core; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.PrintStream; import java.lang.reflect.Method; import java.util.ArrayList; @@ -63,6 +65,7 @@ import org.apache.tomcat.InstanceManager; import org.apache.tomcat.PeriodicEventListener; import org.apache.tomcat.util.modeler.Registry; +import org.jboss.web.CatalinaLogger; /** * Standard implementation of the Wrapper interface that represents @@ -77,9 +80,6 @@ extends ContainerBase implements ServletConfig, Wrapper, NotificationEmitter { - protected static org.jboss.logging.Logger log= - org.jboss.logging.Logger.getLogger( StandardWrapper.class ); - protected static final String[] DEFAULT_SERVLET_METHODS = new String[] { "GET", "HEAD", "POST" }; @@ -598,8 +598,7 @@ if ((container != null) && !(container instanceof Context)) - throw new IllegalArgumentException - (sm.getString("standardWrapper.notContext")); + throw MESSAGES.wrapperParentMustBeContext(); if (container instanceof StandardContext) { unloadDelay = ((StandardContext)container).getUnloadDelay(); } @@ -847,8 +846,7 @@ */ public void addChild(Container child) { - throw new IllegalStateException - (sm.getString("standardWrapper.notChild")); + throw MESSAGES.wrapperHasNoChild(); } @@ -942,7 +940,7 @@ // If we are currently unloading this servlet, throw an exception if (unloading) throw new ServletException - (sm.getString("standardWrapper.unloading", getName())); + (MESSAGES.cannotAllocateServletWhileUnloading(getName())); // Load and initialize our instance if necessary if (instance == null) { @@ -953,7 +951,7 @@ } catch (ServletException e) { throw e; } catch (Throwable e) { - throw new ServletException(sm.getString("standardWrapper.allocate"), e); + throw new ServletException(MESSAGES.cannotAllocateServletInstance(), e); } } } @@ -975,7 +973,7 @@ throw e; } catch (Throwable e) { throw new ServletException - (sm.getString("standardWrapper.allocate"), e); + (MESSAGES.cannotAllocateServletInstance(), e); } } else { try { @@ -1147,7 +1145,7 @@ if (actualClass == null) { unavailable(null); throw new ServletException - (sm.getString("standardWrapper.notClass", getName())); + (MESSAGES.noClassSpecifiedForServlet(getName())); } if (servletInstance == null) { @@ -1158,19 +1156,13 @@ unavailable(null); // Restore the context ClassLoader throw new ServletException - (sm.getString("standardWrapper.notServlet", actualClass), e); + (MESSAGES.specifiedClassIsNotServlet(actualClass), e); } catch (Throwable e) { unavailable(null); - - // Added extra log statement for Bugzilla 36630: - // http://issues.apache.org/bugzilla/show_bug.cgi?id=36630 - if(log.isDebugEnabled()) { - log.debug(sm.getString("standardWrapper.instantiate", actualClass), e); - } - + CatalinaLogger.CORE_LOGGER.errorInstantiatingServletClass(actualClass, e); // Restore the context ClassLoader throw new ServletException - (sm.getString("standardWrapper.instantiate", actualClass), e); + (MESSAGES.errorInstantiatingServletClass(actualClass), e); } } else { servlet = servletInstance; @@ -1232,11 +1224,10 @@ throw f; } catch (Throwable f) { throwable = f; - getServletContext().log("StandardWrapper.Throwable", f ); // If the servlet wanted to be unavailable it would have // said so, so do not call unavailable(null). throw new ServletException - (sm.getString("standardWrapper.initException", getName()), f); + (MESSAGES.errorInitializingServlet(getName()), f); } finally { instanceSupport.fireInstanceEvent(InstanceEvent.AFTER_INIT_EVENT, servlet, throwable); @@ -1334,7 +1325,7 @@ * to mark this servlet as permanently unavailable */ public void unavailable(UnavailableException unavailable) { - getServletContext().log(sm.getString("standardWrapper.unavailable", getName())); + getServletContext().log(MESSAGES.markingServletUnavailable(getName())); if (unavailable == null) setAvailable(Long.MAX_VALUE); else if (unavailable.isPermanent()) @@ -1396,9 +1387,7 @@ nInstances = 0; fireContainerEvent("unload", this); unloading = false; - throw new ServletException - (sm.getString("standardWrapper.destroyException", getName()), - t); + throw new ServletException(MESSAGES.errorDestroyingServlet(getName()), t); } // Deregister the destroyed instance @@ -1422,9 +1411,7 @@ nInstances = 0; unloading = false; fireContainerEvent("unload", this); - throw new ServletException - (sm.getString("standardWrapper.destroyException", - getName()), t); + throw new ServletException(MESSAGES.errorDestroyingServlet(getName()), t); } instancePool = null; nInstances = 0; @@ -1681,8 +1668,7 @@ try { unload(); } catch (ServletException e) { - getServletContext().log(sm.getString - ("standardWrapper.unloadException", getName()), e); + getServletContext().log(MESSAGES.errorUnloadingServlet(getName()), e); } // Shut down this component @@ -1744,7 +1730,7 @@ broadcaster.sendNotification(notification); } } catch( Exception ex ) { - log.info("Error registering servlet with jmx " + this, ex); + CatalinaLogger.CORE_LOGGER.failedServletJmxRegistration(this, ex); } if (isJspServlet) { @@ -1758,8 +1744,7 @@ Registry.getRegistry(null, null) .registerComponent(instance, jspMonitorON, null); } catch( Exception ex ) { - log.info("Error registering JSP monitoring with jmx " + - instance, ex); + CatalinaLogger.CORE_LOGGER.failedServletJspMonitorJmxRegistration(instance, ex); } } } Modified: trunk/src/main/java/org/jboss/web/CatalinaLogger.java =================================================================== --- trunk/src/main/java/org/jboss/web/CatalinaLogger.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/jboss/web/CatalinaLogger.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -83,6 +83,11 @@ */ CatalinaLogger SESSION_LOGGER = Logger.getMessageLogger(CatalinaLogger.class, "org.apache.catalina.session"); + /** + * A logger with the category of the package name. + */ + CatalinaLogger CORE_LOGGER = Logger.getMessageLogger(CatalinaLogger.class, "org.apache.catalina.core"); + @LogMessage(level = WARN) @Message(id = 1000, value = "A valid entry has been removed from client nonce cache to make room for new entries. A replay attack is now possible. To prevent the possibility of replay attacks, reduce nonceValidity or increase cnonceCacheSize. Further warnings of this type will be suppressed for 5 minutes.") void digestCacheRemove(); @@ -327,4 +332,208 @@ @Message(id = 1059, value = "Backing up session %s to Store, idle for %s seconds") void persistentManagerBackupSession(String sessionId, int idle); + @LogMessage(level = ERROR) + @Message(id = 1060, value = "JMX registration failed for filter of type [%s] and name [%s]") + void filterJmxRegistrationFailed(String filterClass, String filterName, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1061, value = "JMX unregistration failed for filter of type [%s] and name [%s]") + void filterJmxUnregistrationFailed(String filterClass, String filterName, @Cause Throwable t); + + @LogMessage(level = DEBUG) + @Message(id = 1062, value = "Failed to initialize the SSLEngine") + void aprSslEngineInitFailed(@Cause Throwable t); + + @LogMessage(level = INFO) + @Message(id = 1063, value = "Failed to initialize the SSLEngine") + void aprSslEngineInitFailed(); + + @LogMessage(level = DEBUG) + @Message(id = 1064, value = "The native library which allows optimal performance in production environments was not found on the java.library.path: %s") + void aprInitFailed(@Cause Throwable t); + + @LogMessage(level = INFO) + @Message(id = 1065, value = "The native library which allows optimal performance in production environments was not found on the java.library.path: %s") + void aprInitFailed(); + + @LogMessage(level = ERROR) + @Message(id = 1066, value = "An incompatible version %s.%s.%s of the native library is installed, while JBoss Web requires version %s.%s.%s") + void aprInvalidVersion(int major, int minor, int patch, int requiredMajor, int requiredMinor, int requiredPatch); + + @LogMessage(level = INFO) + @Message(id = 1067, value = "An older version %s.%s.%s of the native library is installed, while JBoss Web recommends version greater than %s.%s.%s") + void aprRecommendedVersion(int major, int minor, int patch, int requiredMajor, int requiredMinor, int requiredPatch); + + @LogMessage(level = DEBUG) + @Message(id = 1068, value = "Loaded native library %s.%s.%s with APR capabilities: IPv6 [%s], sendfile [%s], random [%s]") + void aprInit(int major, int minor, int patch, boolean hasIp6, boolean hasSendfile, boolean hasRandom); + + @LogMessage(level = ERROR) + @Message(id = 1069, value = "Error stopping loader") + void errorStoppingLoader(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1070, value = "Error starting loader") + void errorStartingLoader(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1071, value = "Error stopping manager") + void errorStoppingManager(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1072, value = "Error starting manager") + void errorStartingManager(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1073, value = "Error stopping cluster") + void errorStoppingCluster(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1074, value = "Error starting cluster") + void errorStartingCluster(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1075, value = "Error stopping realm") + void errorStoppingRealm(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1076, value = "Error starting realm") + void errorStartingRealm(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1077, value = "Error starting realm") + void errorStoppingChild(@Cause Throwable t); + + @LogMessage(level = INFO) + @Message(id = 1078, value = "Container %s has already been started") + void containerAlreadyStarted(String name); + + @LogMessage(level = INFO) + @Message(id = 1079, value = "Container %s has not been started") + void containerNotStarted(String name); + + @LogMessage(level = ERROR) + @Message(id = 1080, value = "Failed container [%s] JMX unregistration") + void failedContainerJmxUnregistration(Object objectName, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1081, value = "Error invoking periodic operation") + void errorInPeriodicOperation(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1082, value = "Background processing error in [%s]") + void backgroundProcessingError(Object component, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1083, value = "Failed engine [%s] JMX registration") + void failedEngineJmxRegistration(Object objectName, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1084, value = "Error setting up service") + void failedServiceCreation(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1085, value = "Failed loding specified error report valve class: %s") + void invalidErrorReportValveClass(String className, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1086, value = "Failed host [%s] JMX registration") + void failedHostJmxRegistration(Object objectName, @Cause Throwable t); + + @LogMessage(level = DEBUG) + @Message(id = 1087, value = "Error instantiating servlet class %s") + void errorInstantiatingServletClass(String className, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1088, value = "Failed Servlet [%s] JMX registration") + void failedServletJmxRegistration(Object object, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1089, value = "Failed Servlet [%s] JSP monitoring JMX registration") + void failedServletJspMonitorJmxRegistration(Object object, @Cause Throwable t); + + @LogMessage(level = DEBUG) + @Message(id = 1090, value = "Form login page %s must start with a ''/'' in Servlet 2.4") + void loginPageStartsWithSlash(String loginPage); + + @LogMessage(level = DEBUG) + @Message(id = 1091, value = "Error page location %s must start with a ''/'' in Servlet 2.4") + void errorPageStartsWithSlash(String errorPage); + + @LogMessage(level = ERROR) + @Message(id = 1092, value = "Failed access to work directory for Context %s") + void failedObtainingWorkDirectory(String name, @Cause Throwable t); + + @LogMessage(level = INFO) + @Message(id = 1093, value = "The listener %s is already configured for this context, the duplicate definition has been ignored") + void duplicateListener(String listenerClass); + + @LogMessage(level = DEBUG) + @Message(id = 1094, value = "JSP file %s must start with a ''/'' in Servlet 2.4") + void jspFileStartsWithSlash(String jspFile); + + @LogMessage(level = INFO) + @Message(id = 1095, value = "Cannot find JSP Servlet, so ignoring jsp-property-group mappings") + void missingJspServlet(); + + @LogMessage(level = ERROR) + @Message(id = 1096, value = "Error stopping context") + void errorStoppingContext(String name, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1097, value = "Error starting context") + void errorStartingContext(String name, @Cause Throwable t); + + @LogMessage(level = DEBUG) + @Message(id = 1098, value = "Starting filter %s") + void startingFilter(String filterName); + + @LogMessage(level = DEBUG) + @Message(id = 1099, value = "Stopping filter %s") + void stoppingFilter(String filterName); + + @LogMessage(level = ERROR) + @Message(id = 1100, value = "Error starting context") + void errorStartingResources(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1101, value = "Error stopping context") + void errorStoppingResources(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1102, value = "Error initializing resources") + void errorInitializingResources(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1103, value = "Error detected during context start, will stop it") + void errorStartingContextWillStop(String name); + + @LogMessage(level = ERROR) + @Message(id = 1104, value = "Error performing failed context start cleanup") + void errorStartingContextCleanup(String name, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1105, value = "Error resetting context") + void errorResettingContext(String name, @Cause Throwable t); + + @LogMessage(level = DEBUG) + @Message(id = 1106, value = "URL pattern %s must start with a ''/'' in Servlet 2.4") + void urlPatternStartsWithSlash(String urlPattern); + + @LogMessage(level = INFO) + @Message(id = 1107, value = "Suspicious url pattern: %s in context %s - see section SRV.11.2 of the Servlet specification") + void suspiciousUrlPattern(String contextName, String urlPattern); + + @LogMessage(level = INFO) + @Message(id = 1108, value = "Context %s object name creation failed") + void contextObjectNameCreationFailed(String contextName, @Cause Throwable t); + + @LogMessage(level = INFO) + @Message(id = 1108, value = "Context %s JMX registration failed") + void contextJmxRegistrationFailed(String contextName, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1109, value = "Cannot find context %s parent Host JMX name") + void cannotFindContextJmxParentName(String name); + } Modified: trunk/src/main/java/org/jboss/web/CatalinaMessages.java =================================================================== --- trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-06 14:06:07 UTC (rev 2079) +++ trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-12 16:44:27 UTC (rev 2080) @@ -571,10 +571,229 @@ @Message(id = 216, value = "Non-serializable attribute %s") IllegalArgumentException sessionAttributeIsNotSerializable(String name); - @Message(id = 214, value = "Session binding event listener threw exception") + @Message(id = 217, value = "Session binding event listener threw exception") String sessionBindingEventListenerException(); - @Message(id = 214, value = "Cannot serialize session attribute %s for session %s") + @Message(id = 218, value = "Cannot serialize session attribute %s for session %s") String sessionAttributeSerializationException(Object attribute, String sessionId); + @Message(id = 219, value = "Path %s does not start with a '/' character") + IllegalArgumentException invalidDispatcherPath(String path); + + @Message(id = 220, value = "Dispatcher mapping error") + String dispatcherMappingError(); + + @Message(id = 221, value = "Path %s does not start with a '/' character") + String invalidDispatcherPathString(String path); + + @Message(id = 222, value = "Exception thrown by attributes event listener") + String servletContextAttributeListenerException(); + + @Message(id = 223, value = "Attribute name cannot be null") + String servletContextAttributeNameIsNull(); + + @Message(id = 224, value = "The listener that attempted to call this method is restricted") + UnsupportedOperationException restrictedListenerCannotCallMethod(); + + @Message(id = 225, value = "Context %s is already initialized") + IllegalStateException contextAlreadyInitialized(String context); + + @Message(id = 226, value = "Error creating instance") + String contextObjectCreationError(); + + @Message(id = 227, value = "Bad listener class %s for context %s") + IllegalArgumentException invalidContextListener(String className, String path); + + @Message(id = 228, value = "Bad listener class %s for context %s") + IllegalArgumentException invalidContextListener(String className, String path, @Cause Throwable t); + + @Message(id = 229, value = "The session tracking mode %s requested for context %s is not supported by that context") + IllegalArgumentException unsupportedSessionTrackingMode(String sessionTracking, String path); + + @Message(id = 230, value = "The session tracking mode SSL requested for context %s cannot be combined with other tracking modes") + IllegalArgumentException sslSessionTrackingModeIsExclusive(String path); + + @Message(id = 231, value = "Invalid empty role specified for context %s") + IllegalArgumentException invalidEmptyRole(String path); + + @Message(id = 232, value = "Cannot forward after response has been committed") + IllegalStateException cannotForwardAfterCommit(); + + @Message(id = 233, value = "Exception sending request initialized lifecycle event to listener instance of class %s") + String requestListenerInitException(String className); + + @Message(id = 234, value = "Servlet %s is currently unavailable") + String servletIsUnavailable(String wrapperName); + + @Message(id = 235, value = "Allocate exception for servlet %s") + String servletAllocateException(String wrapperName); + + @Message(id = 236, value = "Servlet.service() for servlet %s threw exception") + String servletServiceException(String wrapperName); + + @Message(id = 237, value = "Deallocate exception for servlet %s") + String servletDeallocateException(String wrapperName); + + @Message(id = 238, value = "Exception sending request destroyed lifecycle event to listener instance of class %s") + String requestListenerDestroyException(String className); + + @Message(id = 239, value = "Original SevletRequest or wrapped original ServletRequest not passed to RequestDispatcher in violation of SRV.8.2 and SRV.14.2.5.1") + String notOriginalRequestInDispatcher(); + + @Message(id = 240, value = "Original SevletResponse or wrapped original ServletResponse not passed to RequestDispatcher in violation of SRV.8.2 and SRV.14.2.5.1") + String notOriginalResponseInDispatcher(); + + @Message(id = 241, value = "Context %s has already been initialized") + IllegalStateException cannotAddFilterRegistrationAfterInit(String contextName); + + @Message(id = 242, value = "Illegal null or empty argument specified") + IllegalArgumentException invalidFilterRegistrationArguments(); + + @Message(id = 243, value = "Context %s has already been initialized") + IllegalStateException cannotAddServletRegistrationAfterInit(String contextName); + + @Message(id = 244, value = "Illegal null or empty argument specified") + IllegalArgumentException invalidServletRegistrationArguments(); + + @Message(id = 245, value = "Priveleged action exception") + String doAsPrivilegeException(); + + @Message(id = 246, value = "Exception processing component pre destroy") + String preDestroyException(); + + @Message(id = 247, value = "Filter execution threw an exception") + String filterException(); + + @Message(id = 248, value = "Servlet execution threw an exception") + String servletException(); + + @Message(id = 249, value = "Child container name cannot be null") + IllegalArgumentException containerChildWithNullName(); + + @Message(id = 250, value = "Child container with name %s already exists") + IllegalArgumentException containerChildNameNotUnique(String name); + + @Message(id = 251, value = "Failed to start child container %s") + IllegalStateException containerChildStartFailed(String name, @Cause Throwable t); + + @Message(id = 252, value = "Child of an Engine must be a Host") + IllegalArgumentException engineChildMustBeHost(); + + @Message(id = 253, value = "Engine cannot have a parent Container") + IllegalArgumentException engineHasNoParent(); + + @Message(id = 254, value = "Host name is required") + IllegalArgumentException hostNameIsNull(); + + @Message(id = 255, value = "Child of a Host must be a Context") + IllegalArgumentException hostChildMustBeContext(); + + @Message(id = 256, value = "Parent of a Wrapper must be a Context") + IllegalArgumentException wrapperParentMustBeContext(); + + @Message(id = 257, value = "A Wrapper cannot have a child container") + IllegalArgumentException wrapperHasNoChild(); + + @Message(id = 258, value = "Cannot allocate servlet %s because it is being unloaded") + String cannotAllocateServletWhileUnloading(String name); + + @Message(id = 259, value = "Error allocating a servlet instance") + String cannotAllocateServletInstance(); + + @Message(id = 260, value = "No servlet class has been specified for servlet %s") + String noClassSpecifiedForServlet(String name); + + @Message(id = 261, value = "Class %s is not a Servlet") + String specifiedClassIsNotServlet(String className); + + @Message(id = 262, value = "Error instantiating servlet class %s") + String errorInstantiatingServletClass(String className); + + @Message(id = 263, value = "Servlet.init() for servlet %s threw exception") + String errorInitializingServlet(String name); + + @Message(id = 264, value = "Marking servlet %s as unavailable") + String markingServletUnavailable(String name); + + @Message(id = 265, value = "Servlet.destroy() for servlet %s threw exception") + String errorDestroyingServlet(String name); + + @Message(id = 266, value = "Servlet %s threw unload exception") + String errorUnloadingServlet(String name); + + @Message(id = 267, value = "LoginConfig cannot be null") + IllegalArgumentException nullLoginConfig(); + + @Message(id = 268, value = "Form login page %s must start with a ''/'") + IllegalArgumentException loginPageMustStartWithSlash(String loginPage); + + @Message(id = 269, value = "Error page location %s must start with a ''/''") + IllegalArgumentException errorPageMustStartWithSlash(String errorPage); + + @Message(id = 270, value = "%s is not a subclass of StandardWrapper") + IllegalArgumentException invalidWrapperClass(String wrapperClass); + + @Message(id = 271, value = "Cannot set resources after Context startup") + IllegalStateException cannotSetResourcesAfterStart(); + + @Message(id = 272, value = "Child of a Context must be a Wrapper") + IllegalArgumentException contextChildMustBeWrapper(); + + @Message(id = 273, value = "JSP file %s must start with a ''/''") + IllegalArgumentException jspFileMustStartWithSlash(String jspFile); + + @Message(id = 274, value = "Invalid <url-pattern> %s in security constraint") + IllegalArgumentException invalidSecurityConstraintUrlPattern(String urlPattern); + + @Message(id = 275, value = "ErrorPage cannot be null") + IllegalArgumentException nullErrorPage(); + + @Message(id = 276, value = "Filter mapping specifies an unknown filter name %s") + IllegalArgumentException unknownFilterNameInMapping(String filterName); + + @Message(id = 277, value = "Filter mapping must specify either a <url-pattern> or a <servlet-name>") + IllegalArgumentException missingFilterMapping(); + + @Message(id = 278, value = "Invalid <url-pattern> %s in filter mapping") + IllegalArgumentException invalidFilterMappingUrlPattern(String urlPattern); + + @Message(id = 279, value = "Both parameter name and parameter value are required") + IllegalArgumentException missingParameterNameOrValue(); + + @Message(id = 280, value = "Duplicate context initialization parameter %s") + IllegalArgumentException duplicateContextParameters(String name); + + @Message(id = 281, value = "Servlet mapping specifies an unknown Servlet name %s") + IllegalArgumentException unknownServletNameInMapping(String servletName); + + @Message(id = 282, value = "Invalid <url-pattern> %s in Servlet mapping") + IllegalArgumentException invalidServletMappingUrlPattern(String urlPattern); + + @Message(id = 283, value = "Create wrapper failed") + IllegalStateException errorCreatingWrapper(@Cause Throwable t); + + @Message(id = 284, value = "Exception starting filter %s") + String errorStartingFilter(String filterName); + + @Message(id = 285, value = "Error configuring application listener of class %s") + String errorInstatiatingApplicationListener(String listenerClass); + + @Message(id = 286, value = "Skipped installing application listeners due to previous error(s)") + String skippingApplicationListener(); + + @Message(id = 287, value = "Exception sending context initialized event to listener instance of class %s") + String errorSendingContextInitializedEvent(String listenerClass); + + @Message(id = 287, value = "Exception sending context destroyed event to listener instance of class %s") + String errorSendingContextDestroyedEvent(String listenerClass); + + @Message(id = 288, value = "Error destroying application listener of class %s") + String errorDestroyingApplicationListener(String listenerClass); + + @Message(id = 289, value = "Servlet %s threw load() exception") + String errorLoadingServlet(String servletName); + + @Message(id = 290, value = "Error initializing context") + String errorInitializingContext(); + }

12 years, 3 months

1
0
0 / 0

JBossWeb SVN: r2079 - in trunk/src/main/java/org: jboss/web and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2012-09-06 10:06:07 -0400 (Thu, 06 Sep 2012) New Revision: 2079 Removed: trunk/src/main/java/org/apache/catalina/session/LocalStrings.properties trunk/src/main/java/org/apache/catalina/session/LocalStrings_es.properties trunk/src/main/java/org/apache/catalina/session/LocalStrings_fr.properties trunk/src/main/java/org/apache/catalina/session/LocalStrings_ja.properties Modified: trunk/src/main/java/org/apache/catalina/session/FileStore.java trunk/src/main/java/org/apache/catalina/session/JDBCStore.java trunk/src/main/java/org/apache/catalina/session/ManagerBase.java trunk/src/main/java/org/apache/catalina/session/PersistentManagerBase.java trunk/src/main/java/org/apache/catalina/session/StandardManager.java trunk/src/main/java/org/apache/catalina/session/StandardSession.java trunk/src/main/java/org/apache/catalina/session/StoreBase.java trunk/src/main/java/org/jboss/web/CatalinaLogger.java trunk/src/main/java/org/jboss/web/CatalinaMessages.java Log: New i18n for session package. Modified: trunk/src/main/java/org/apache/catalina/session/FileStore.java =================================================================== --- trunk/src/main/java/org/apache/catalina/session/FileStore.java 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/apache/catalina/session/FileStore.java 2012-09-06 14:06:07 UTC (rev 2079) @@ -19,6 +19,8 @@ package org.apache.catalina.session; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; @@ -34,7 +36,6 @@ import org.apache.catalina.Container; import org.apache.catalina.Context; -import org.apache.catalina.Globals; import org.apache.catalina.Loader; import org.apache.catalina.Session; import org.apache.catalina.Store; @@ -254,8 +255,7 @@ return (null); } if (manager.getContainer().getLogger().isDebugEnabled()) { - manager.getContainer().getLogger().debug(sm.getString(getStoreName()+".loading", - id, file.getAbsolutePath())); + manager.getContainer().getLogger().debug(MESSAGES.fileStoreSessionLoad(id, file.getAbsolutePath())); } FileInputStream fis = null; @@ -276,7 +276,7 @@ ois = new ObjectInputStream(bis); } catch (FileNotFoundException e) { if (manager.getContainer().getLogger().isDebugEnabled()) - manager.getContainer().getLogger().debug("No persisted data file found"); + manager.getContainer().getLogger().debug(MESSAGES.fileStoreFileNotFound()); return (null); } catch (IOException e) { if (ois != null) { @@ -325,8 +325,7 @@ return; } if (manager.getContainer().getLogger().isDebugEnabled()) { - manager.getContainer().getLogger().debug(sm.getString(getStoreName()+".removing", - id, file.getAbsolutePath())); + manager.getContainer().getLogger().debug(MESSAGES.fileStoreSessionRemove(id, file.getAbsolutePath())); } file.delete(); @@ -349,8 +348,8 @@ return; } if (manager.getContainer().getLogger().isDebugEnabled()) { - manager.getContainer().getLogger().debug(sm.getString(getStoreName()+".saving", - session.getIdInternal(), file.getAbsolutePath())); + manager.getContainer().getLogger().debug + (MESSAGES.fileStoreSessionSave(session.getIdInternal(), file.getAbsolutePath())); } FileOutputStream fos = null; ObjectOutputStream oos = null; @@ -404,8 +403,7 @@ servletContext.getAttribute(ServletContext.TEMPDIR); file = new File(work, this.directory); } else { - throw new IllegalArgumentException - ("Parent Container is not a Context"); + throw MESSAGES.parentNotContext(); } } if (!file.exists() || !file.isDirectory()) { Modified: trunk/src/main/java/org/apache/catalina/session/JDBCStore.java =================================================================== --- trunk/src/main/java/org/apache/catalina/session/JDBCStore.java 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/apache/catalina/session/JDBCStore.java 2012-09-06 14:06:07 UTC (rev 2079) @@ -17,6 +17,8 @@ package org.apache.catalina.session; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import org.apache.catalina.Container; import org.apache.catalina.LifecycleException; import org.apache.catalina.Loader; @@ -471,7 +473,7 @@ // Break out after the finally block numberOfTries = 0; } catch (SQLException e) { - manager.getContainer().getLogger().error(sm.getString(getStoreName() + ".SQLException", e)); + manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e); keys = new String[0]; // Close the connection so that it gets reopened next time if (dbConnection != null) @@ -530,7 +532,7 @@ // Break out after the finally block numberOfTries = 0; } catch (SQLException e) { - manager.getContainer().getLogger().error(sm.getString(getStoreName() + ".SQLException", e)); + manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e); if (dbConnection != null) close(dbConnection); } finally { @@ -605,20 +607,19 @@ } if (manager.getContainer().getLogger().isDebugEnabled()) { - manager.getContainer().getLogger().debug(sm.getString(getStoreName() + ".loading", - id, sessionTable)); + manager.getContainer().getLogger().debug(MESSAGES.jdbcStoreSessionLoad(id, sessionTable)); } _session = (StandardSession) manager.createEmptySession(); _session.readObjectData(ois); _session.setManager(manager); } else if (manager.getContainer().getLogger().isDebugEnabled()) { - manager.getContainer().getLogger().debug(getStoreName() + ": No persisted data object found"); + manager.getContainer().getLogger().debug(MESSAGES.jdbcStoreIdNotFound()); } // Break out after the finally block numberOfTries = 0; } catch (SQLException e) { - manager.getContainer().getLogger().error(sm.getString(getStoreName() + ".SQLException", e)); + manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e); if (dbConnection != null) close(dbConnection); } finally { @@ -679,7 +680,7 @@ // Break out after the finally block numberOfTries = 0; } catch (SQLException e) { - manager.getContainer().getLogger().error(sm.getString(getStoreName() + ".SQLException", e)); + manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e); if (dbConnection != null) close(dbConnection); } finally { @@ -690,7 +691,7 @@ } if (manager.getContainer().getLogger().isDebugEnabled()) { - manager.getContainer().getLogger().debug(sm.getString(getStoreName() + ".removing", id, sessionTable)); + manager.getContainer().getLogger().debug(MESSAGES.jdbcStoreSessionRemove(id, sessionTable)); } } @@ -721,7 +722,7 @@ // Break out after the finally block numberOfTries = 0; } catch (SQLException e) { - manager.getContainer().getLogger().error(sm.getString(getStoreName() + ".SQLException", e)); + manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e); if (dbConnection != null) close(dbConnection); } finally { @@ -789,7 +790,7 @@ // Break out after the finally block numberOfTries = 0; } catch (SQLException e) { - manager.getContainer().getLogger().error(sm.getString(getStoreName() + ".SQLException", e)); + manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e); if (dbConnection != null) close(dbConnection); } catch (IOException e) { @@ -812,8 +813,7 @@ } if (manager.getContainer().getLogger().isDebugEnabled()) { - manager.getContainer().getLogger().debug(sm.getString(getStoreName() + ".saving", - session.getIdInternal(), sessionTable)); + manager.getContainer().getLogger().debug(MESSAGES.jdbcStoreSessionSave(session.getIdInternal(), sessionTable)); } } @@ -829,15 +829,14 @@ protected Connection getConnection() { try { if (dbConnection == null || dbConnection.isClosed()) { - manager.getContainer().getLogger().info(sm.getString(getStoreName() + ".checkConnectionDBClosed")); + manager.getContainer().getLogger().info(MESSAGES.jdbcStoreConnectionWasClosed()); open(); if (dbConnection == null || dbConnection.isClosed()) { - manager.getContainer().getLogger().info(sm.getString(getStoreName() + ".checkConnectionDBReOpenFail")); + manager.getContainer().getLogger().info(MESSAGES.jdbcStoreConnectionReopenFailed()); } } } catch (SQLException ex) { - manager.getContainer().getLogger().error(sm.getString(getStoreName() + ".checkConnectionSQLException", - ex.toString())); + manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), ex); } return dbConnection; @@ -861,14 +860,11 @@ Class clazz = Class.forName(driverName); driver = (Driver) clazz.newInstance(); } catch (ClassNotFoundException ex) { - manager.getContainer().getLogger().error(sm.getString(getStoreName() + ".checkConnectionClassNotFoundException", - ex.toString())); + manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDriverFailure(driverName), ex); } catch (InstantiationException ex) { - manager.getContainer().getLogger().error(sm.getString(getStoreName() + ".checkConnectionClassNotFoundException", - ex.toString())); + manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDriverFailure(driverName), ex); } catch (IllegalAccessException ex) { - manager.getContainer().getLogger().error(sm.getString(getStoreName() + ".checkConnectionClassNotFoundException", - ex.toString())); + manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDriverFailure(driverName), ex); } } @@ -941,7 +937,7 @@ try { dbConnection.close(); } catch (SQLException e) { - manager.getContainer().getLogger().error(sm.getString(getStoreName() + ".close", e.toString())); // Just log it here + manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e); } finally { this.dbConnection = null; } Deleted: trunk/src/main/java/org/apache/catalina/session/LocalStrings.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/session/LocalStrings.properties 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/apache/catalina/session/LocalStrings.properties 2012-09-06 14:06:07 UTC (rev 2079) @@ -1,68 +0,0 @@ -applicationSession.session.ise=invalid session state -applicationSession.value.iae=null value -fileStore.alreadyStarted=File Store has already been started -fileStore.notStarted=File Store has not yet been started -fileStore.saving=Saving Session {0} to file {1} -fileStore.loading=Loading Session {0} from file {1} -fileStore.removing=Removing Session {0} at file {1} -JDBCStore.alreadyStarted=JDBC Store has already been started -JDBCStore.close=Exception closing database connection {0} -JDBCStore.notStarted=JDBC Store has not yet been started -JDBCStore.saving=Saving Session {0} to database {1} -JDBCStore.loading=Loading Session {0} from database {1} -JDBCStore.removing=Removing Session {0} at database {1} -JDBCStore.SQLException=SQL Error {0} -JDBCStore.checkConnectionDBClosed=The database connection is null or was found to be closed. Trying to re-open it. -JDBCStore.checkConnectionDBReOpenFail=The re-open on the database failed. The database could be down. -JDBCStore.checkConnectionSQLException=A SQL exception occurred {0} -JDBCStore.checkConnectionClassNotFoundException=JDBC driver class not found {0} -managerBase.complete=Seeding of random number generator has been completed -managerBase.getting=Getting message digest component for algorithm {0} -managerBase.gotten=Completed getting message digest component -managerBase.random=Exception initializing random number generator of class {0} -managerBase.seeding=Seeding random number generator class {0} -serverSession.value.iae=null value -standardManager.alreadyStarted=Manager has already been started -standardManager.createSession.ise=createSession: Too many active sessions -standardManager.expireException=processsExpire: Exception during session expiration -standardManager.loading=Loading persisted sessions from {0} -standardManager.loading.cnfe=ClassNotFoundException while loading persisted sessions: {0} -standardManager.loading.ioe=IOException while loading persisted sessions: {0} -standardManager.notStarted=Manager has not yet been started -standardManager.sessionTimeout=Invalid session timeout setting {0} -standardManager.unloading=Saving persisted sessions to {0} -standardManager.unloading.ioe=IOException while saving persisted sessions: {0} -standardManager.managerLoad=Exception loading sessions from persistent storage -standardManager.managerUnload=Exception unloading sessions to persistent storage -standardSession.attributeEvent=Session attribute event listener threw exception -standardSession.bindingEvent=Session binding event listener threw exception -standardSession.invalidate.ise=invalidate: Session already invalidated -standardSession.isNew.ise=isNew: Session already invalidated -standardSession.getAttribute.ise=getAttribute: Session already invalidated -standardSession.getAttributeNames.ise=getAttributeNames: Session already invalidated -standardSession.getCreationTime.ise=getCreationTime: Session already invalidated -standardSession.getLastAccessedTime.ise=getLastAccessedTime: Session already invalidated -standardSession.getId.ise=getId: Session already invalidated -standardSession.getMaxInactiveInterval.ise=getMaxInactiveInterval: Session already invalidated -standardSession.getValueNames.ise=getValueNames: Session already invalidated -standardSession.logoutfail=Exception logging out user when expiring session -standardSession.notSerializable=Cannot serialize session attribute {0} for session {1} -standardSession.removeAttribute.ise=removeAttribute: Session already invalidated -standardSession.sessionEvent=Session event listener threw exception -standardSession.setAttribute.iae=setAttribute: Non-serializable attribute {0} -standardSession.setAttribute.ise=setAttribute: Session already invalidated -standardSession.setAttribute.namenull=setAttribute: name parameter cannot be null -standardSession.sessionCreated=Created Session id = {0} -persistentManager.loading=Loading {0} persisted sessions -persistentManager.unloading=Saving {0} persisted sessions -persistentManager.expiring=Expiring {0} sessions before saving them -persistentManager.deserializeError=Error deserializing Session {0}: {1} -persistentManager.serializeError=Error serializing Session {0}: {1} -persistentManager.swapMaxIdle=Swapping session {0} to Store, idle for {1} seconds -persistentManager.backupMaxIdle=Backing up session {0} to Store, idle for {1} seconds -persistentManager.backupException=Exception occurred when backing up Session {0}: {1} -persistentManager.tooManyActive=Too many active sessions, {0}, looking for idle sessions to swap out -persistentManager.swapTooManyActive=Swapping out session {0}, idle for {1} seconds too many sessions active -persistentManager.processSwaps=Checking for sessions to swap out, {0} active sessions in memory -persistentManager.activeSession=Session {0} has been idle for {1} seconds -persistentManager.swapIn=Swapping session {0} in from Store Deleted: trunk/src/main/java/org/apache/catalina/session/LocalStrings_es.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/session/LocalStrings_es.properties 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/apache/catalina/session/LocalStrings_es.properties 2012-09-06 14:06:07 UTC (rev 2079) @@ -1,81 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -applicationSession.session.ise = estado inv\u00E1lido de sesi\u00F3n -applicationSession.value.iae = valor nulo -fileStore.alreadyStarted = Ya ha sido arrancado el Almac\u00E9n de Archivos -fileStore.notStarted = A\u00FAn no se ha arrancado el Almac\u00E9n de Archivos -fileStore.saving = Salvando Sesi\u00F3n {0} en archivo {1} -fileStore.loading = Cargando Sesi\u00F3n {0} desde archivo {1} -fileStore.removing = Quitando Sesi\u00F3n {0} en archivo {1} -JDBCStore.alreadyStarted = Ya ha sido arrancado el Almac\u00E9n JDBC -JDBCStore.close = Excepci\u00F3n cerrando conexi\u00F3n a base de datos {0} -JDBCStore.notStarted = A\u00FAn no se ha arrancado el Almac\u00E9n JDBC -JDBCStore.saving = Salvando Sesi\u00F3n {0} en base de datos {1} -JDBCStore.loading = Cargando Sesi\u00F3n {0} desde base de datos {1} -JDBCStore.removing = Quitando Sesi\u00F3n {0} en base de datos {1} -JDBCStore.SQLException = Error SQL {0} -JDBCStore.checkConnectionDBClosed = La conexi\u00F3na a base de datos es nula o est\u00E1 cerrada. Intentando reabrirla. -JDBCStore.checkConnectionDBReOpenFail = Fall\u00F3 la reapertura de la base de datos. Puede que la base de datos est\u00E9 ca\u00EDda. -JDBCStore.checkConnectionSQLException = Ha tenido lugar una excepci\u00F3n SQL {0} -JDBCStore.checkConnectionClassNotFoundException = No se ha hallado la clase del manejador (driver) JDBC {0} -managerBase.complete = Se ha completado la siembra del generador de n\u00FAmeros aleatorios -managerBase.getting = Obteniendo mensaje de componente de resumen (digest) para algoritmo {0} -managerBase.gotten = Completada la obtenci\u00F3n de mensaje de componente de resumen (digest) -managerBase.random = Excepci\u00F3n inicializando generador de n\u00FAmeros aleatorios de clase {0} -managerBase.seeding = Sembrando clase de generador de n\u00FAmeros aleatorios {0} -serverSession.value.iae = valor nulo -standardManager.alreadyStarted = Ya ha sido arrancado el Gestor -standardManager.createSession.ise = createSession\: Demasiadas sesiones activas -standardManager.expireException = processsExpire\: Excepci\u00F3n durante la expiraci\u00F3n de sesi\u00F3n -standardManager.loading = Cargando sesiones persistidas desde {0} -standardManager.loading.cnfe = ClassNotFoundException al cargar sesiones persistidas\: {0} -standardManager.loading.ioe = IOException al cargar sesiones persistidas\: {0} -standardManager.notStarted = A\u00FAn no se ha arrancado el Gestor -standardManager.sessionTimeout = Valor inv\u00E1lido de Tiempo Agotado de sesi\u00F3n {0} -standardManager.unloading = Salvando sesiones persistidas a {0} -standardManager.unloading.ioe = IOException al salvar sesiones persistidas\: {0} -standardManager.managerLoad = Excepci\u00F3n cargando sesiones desde almacenamiento persistente -standardManager.managerUnload = Excepci\u00F3n descargando sesiones a almacenamiento persistente -standardSession.attributeEvent = El oyente de eventos de atributo de Sesi\u00F3n lanz\u00F3 una excepci\u00F3n -standardSession.bindingEvent = El oyente de eventos de ligado de Sesi\u00F3n lanz\u00F3 una excepci\u00F3n -standardSession.invalidate.ise = invalidate\: La Sesi\u00F3n ya ha sido invalidada -standardSession.isNew.ise = isNew\: La Sesi\u00F3n ya ha sido invalidada -standardSession.getAttribute.ise = getAttribute\: La Sesi\u00F3n ya ha sido invalidada -standardSession.getAttributeNames.ise = getAttributeNames\: La Sesi\u00F3n ya ha sido invalidada -standardSession.getCreationTime.ise = getCreationTime\: La Sesi\u00F3n ya ha sido invalidada -standardSession.getLastAccessedTime.ise = getLastAccessedTime\: La Sesi\u00F3n ya ha sido invalidada -standardSession.getId.ise = getId\: La Sesi\u00F3n ya ha sido invalidada -standardSession.getMaxInactiveInterval.ise = getMaxInactiveInterval\: La Sesi\u00F3n ya ha sido invalidada -standardSession.getValueNames.ise = getValueNames\: La Sesi\u00F3n ya ha sido invalidada -standardSession.notSerializable = No puedo serializar atributo de sesi\u00F3n {0} para sesi\u00F3n {1} -standardSession.removeAttribute.ise = removeAttribute\: La Sesi\u00F3n ya ha sido invalidada -standardSession.sessionEvent = El oyente de evento de Sesi\u00F3n lanz\u00F3 una execpci\u00F3n -standardSession.setAttribute.iae = setAttribute\: Atributo no serializable -standardSession.setAttribute.ise = setAttribute\: La Sesi\u00F3n ya ha sido invalidada -standardSession.setAttribute.namenull = setAttribute\: el nuevo par\u00E1metro no puede ser nulo -standardSession.sessionCreated = Creada Sesi\u00F3n id \= {0} -persistentManager.loading = Cargando {0} sesiones persistidas -persistentManager.unloading = Salvando {0} sesiones persistidas -persistentManager.expiring = Expirando {0} sesiones antes de salvarlas -persistentManager.deserializeError = Error des-serializando Sesi\u00F3n {0}\: {1} -persistentManager.serializeError = Error serializando Sesi\u00F3n {0}\: {1} -persistentManager.swapMaxIdle = Intercambiando sesi\u00F3n {0} a fuera a Almac\u00E9n, ociosa durante {1} segundos -persistentManager.backupMaxIdle = Respaldando sesi\u00F3n {0} a Almac\u00E9n, ociosa durante {1} segundos -persistentManager.backupException = Ha tenido lugar una excepci\u00F3n al respaldar la Sesi\u00F3n {0}\: {1} -persistentManager.tooManyActive = Demasiadas sesiones activas, {0}, buscando sesiones ociosas para intercambiar -persistentManager.swapTooManyActive = Intercambiando sesi\u00F3n {0} a fuera, ociosa durante {1} segundos\: Demasiadas sesiones activas -persistentManager.processSwaps = Mirando qu\u00E9 sesiones intercambiar a fuera, {0} sesiones activas en memoria -persistentManager.activeSession = La sesi\u00F3n {0} ha estado ociosa durante {1} segundos -persistentManager.swapIn = Intercambiando sesi\u00F3n {0} a dentro desde Almac\u00E9n Deleted: trunk/src/main/java/org/apache/catalina/session/LocalStrings_fr.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/session/LocalStrings_fr.properties 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/apache/catalina/session/LocalStrings_fr.properties 2012-09-06 14:06:07 UTC (rev 2079) @@ -1,65 +0,0 @@ -applicationSession.session.ise=�tat de session invalide -applicationSession.value.iae=valeur nulle -fileStore.alreadyStarted=Le "File Store" a d�j� �t� d�marr� -fileStore.notStarted=Le "File Store" n''a pas encore �t� d�marr� -fileStore.saving=Sauvegarde de la Session {0} vers le fichier {1} -fileStore.loading=Chargement de la Session {0} depuis le fichier {1} -fileStore.removing=Retrait de la Session {0} du fichier {1} -JDBCStore.alreadyStarted=Le "JDBC Store" a d�j� �t� d�marr� -JDBCStore.notStarted=Le "JDBC Store" n''a pas encore �t� d�marr� -JDBCStore.saving=Sauvegarde de la Session {0} vers la base de donn�es {1} -JDBCStore.loading=Chargement de la Session {0} depuis la base de donn�es {1} -JDBCStore.removing=Retrait de la Session {0} de la base de donn�es {1} -JDBCStore.SQLException=Erreur SQL {0} -JDBCStore.checkConnectionDBClosed=La connexion � la base de donn�es est nulle ou a �t� trouv� ferm�. Tentative de r�ouverture. -JDBCStore.checkConnectionDBReOpenFail=La tentative de r�ouverture re-open de la base de donn�es a �chou�. La base de donn�es est peut �tre arr�t�e. -JDBCStore.checkConnectionSQLException=Une exception SQL s''est produite {0} -JDBCStore.checkConnectionClassNotFoundException=La classe du driver JDBC n''a pas �t� trouv�e {0} -managerBase.complete=L''alimentation du g�n�rateur de nombre al�atoire est termin� -managerBase.getting=Prise du composant d''algorithme empreinte de message (message digest) pour l''algorithme {0} -managerBase.gotten=Prise du composant d''algorithme empreinte de message (message digest) termin�e -managerBase.random=Exception durant l''initialisation de la classe du g�n�rateur de nombre al�atoire {0} -managerBase.seeding=Alimentation de la classe du g�n�rateur de nombre al�atoire {0} -serverSession.value.iae=valeur nulle -standardManager.alreadyStarted=Le "Manager" a �t� d�marr� -standardManager.createSession.ise="createSession": Trop de sessions actives -standardManager.expireException="processsExpire": Exception lors de l''expiration de la session -standardManager.loading=Chargement des sessions qui ont persist�s depuis {0} -standardManager.loading.cnfe="ClassNotFoundException" lors du chargement de sessions persistantes: {0} -standardManager.loading.ioe="IOException" lors du chargement des sessions persistantes: {0} -standardManager.notStarted=Le "Manager" n''a pas encore �t� d�marr� -standardManager.sessionTimeout=R�glage du d�lai d''inactivit� (timeout) de session invalide {0} -standardManager.unloading=Sauvegarde des sessions ayant persist�es vers {0} -standardManager.unloading.ioe="IOException" lors de la sauvegarde de sessions persistantes: {0} -standardManager.managerLoad=Exception au chargement des sessions depuis le stockage persistant (persistent storage) -standardManager.managerUnload=Exception au d�chargement des sessions vers le stockage persistant (persistent storage) -standardSession.attributeEvent=L''�couteur d''�v�nement Attribut de Session (attribute event listener) a g�n�r� une exception -standardSession.invalidate.ise="invalidate": Session d�j� invalid�e -standardSession.isNew.ise="isNew": Session d�j� invalid�e -standardSession.getAttribute.ise="getAttribute": Session d�j� invalid�e -standardSession.getAttributeNames.ise="getAttributeNames": Session d�j� invalid�e -standardSession.getCreationTime.ise="getCreationTime": Session d�j� invalid�e -standardSession.getLastAccessedTime.ise="getLastAccessedTime": Session d\u00E9j\u00E0 invalid\u00E9e -standardSession.getId.ise=getId: Session d�j� invalid�e -standardSession.getMaxInactiveInterval.ise="getMaxInactiveInterval": Session d�j� invalid�e -standardSession.getValueNames.ise="getValueNames": Session d�j� invalid�e -standardSession.notSerializable=Impossible de s�rialiser l''attribut de session {0} pour la session {1} -standardSession.removeAttribute.ise="removeAttribute": Session d�j� invalid�e -standardSession.sessionEvent=L''�couteur d''�v�nement de session (session event listener) a g�n�r� une exception -standardSession.setAttribute.iae="setAttribute": attribut non s�rialisable -standardSession.setAttribute.ise="setAttribute": Session d�j� invalid�e -standardSession.setAttribute.namenull="setAttribute": le nom de param�tre ne peut �tre nul -standardSession.sessionCreated=Cr�ation de l''Id de Session = {0} -persistentManager.loading=Chargement de {0} sessions persistantes -persistentManager.unloading=Sauvegarde de {0} sessions persistantes -persistentManager.expiring=Expiration de {0} sessions avant leur sauvegarde -persistentManager.deserializeError=Erreur lors de la d�s�rialisation de la session {0}: {1} -persistentManager.serializeError=Erreur lors de la s�rialisation de la session {0}: {1} -persistentManager.swapMaxIdle=Basculement de la session {0} vers le stockage (Store), en attente pour {1} secondes -persistentManager.backupMaxIdle=Sauvegarde de la session {0} vers le stockage (Store), en attente pour {1} secondes -persistentManager.backupException=Exception lors de la sauvegarde de la session {0}: {1} -persistentManager.tooManyActive=Trop de sessions actives, {0}, � la recherche de sessions en attente pour basculement vers stockage (swap out) -persistentManager.swapTooManyActive=Basculement vers stockage (swap out) de la session {0}, en attente pour {1} secondes trop de sessions actives -persistentManager.processSwaps=Recherche de sessions � basculer vers stockage (swap out), {0} sessions actives en m�moire -persistentManager.activeSession=La session {0} a �t� en attente durant {1} secondes -persistentManager.swapIn=Basculement depuis le stockage (swap in) de la session {0} Deleted: trunk/src/main/java/org/apache/catalina/session/LocalStrings_ja.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/session/LocalStrings_ja.properties 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/apache/catalina/session/LocalStrings_ja.properties 2012-09-06 14:06:07 UTC (rev 2079) @@ -1,67 +0,0 @@ -applicationSession.session.ise=\u7121\u52b9\u306a\u30bb\u30c3\u30b7\u30e7\u30f3\u72b6\u614b\u3067\u3059 -applicationSession.value.iae=null\u5024\u3067\u3059 -fileStore.alreadyStarted=\u30d5\u30a1\u30a4\u30eb\u30b9\u30c8\u30a2\u304c\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -fileStore.notStarted=\u30d5\u30a1\u30a4\u30eb\u30b9\u30c8\u30a2\u304c\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -fileStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30d5\u30a1\u30a4\u30eb {1} \u306b\u4fdd\u5b58\u3057\u307e\u3059 -fileStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30d5\u30a1\u30a4\u30eb {1} \u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059 -fileStore.removing=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30d5\u30a1\u30a4\u30eb {1} \u304b\u3089\u524a\u9664\u3057\u307e\u3059 -JDBCStore.alreadyStarted=JDBC\u30b9\u30c8\u30a2\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -JDBCStore.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a {0} \u3092\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -JDBCStore.notStarted=JDBC\u30b9\u30c8\u30a2\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u307e\u305b\u3093 -JDBCStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1} \u306b\u4fdd\u5b58\u3057\u307e\u3059 -JDBCStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1} \u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059 -JDBCStore.removing= \u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1} \u304b\u3089\u524a\u9664\u3057\u307e\u3059 -JDBCStore.SQLException=SQL\u30a8\u30e9\u30fc {0} -JDBCStore.checkConnectionDBClosed=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u304cnull\u3067\u3042\u308b\u304b\u3001\u30af\u30ed\u30fc\u30ba\u3055\u308c\u3066\u3044\u308b\u306e\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u518d\u30aa\u30fc\u30d7\u30f3\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -JDBCStore.checkConnectionDBReOpenFail=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u518d\u30aa\u30fc\u30d7\u30f3\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u30c0\u30a6\u30f3\u3057\u3066\u3044\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002 -JDBCStore.checkConnectionSQLException=SQL\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f {0} -JDBCStore.checkConnectionClassNotFoundException=JDBC\u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093 {0} -managerBase.complete=\u4e71\u6570\u767a\u751f\u5668\u306e\u30b7\u30fc\u30c9\u306e\u751f\u6210\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f -managerBase.getting=\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0 {0} \u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3092\u53d6\u5f97\u3057\u307e\u3059 -managerBase.gotten=\u30e1\u30c3\u30bb\u30fc\u30b8\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306e\u53d6\u5f97\u3092\u5b8c\u4e86\u3057\u307e\u3057\u305f -managerBase.random=\u30af\u30e9\u30b9 {0} \u306e\u4e71\u6570\u767a\u751f\u5668\u306e\u521d\u671f\u5316\u306e\u4f8b\u5916\u3067\u3059 -managerBase.seeding=\u4e71\u6570\u767a\u751f\u5668\u30af\u30e9\u30b9 {0} \u306e\u30b7\u30fc\u30c9\u3092\u751f\u6210\u3057\u3066\u3044\u307e\u3059 -serverSession.value.iae=null\u5024\u3067\u3059 -standardManager.alreadyStarted=\u30de\u30cd\u30fc\u30b8\u30e3\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -standardManager.createSession.ise=createSession: \u30a2\u30af\u30c6\u30a3\u30d6\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u307e\u3059 -standardManager.expireException=processsExpire: \u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u7d42\u4e86\u51e6\u7406\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardManager.loading={0} \u304b\u3089\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059 -standardManager.loading.cnfe=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306bClassNotFoundException\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0} -standardManager.loading.ioe=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306eIOException\u3067\u3059: {0} -standardManager.notStarted=\u30de\u30cd\u30fc\u30b8\u30e3\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -standardManager.sessionTimeout=\u7121\u52b9\u306a\u30bb\u30c3\u30b7\u30e7\u30f3\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u8a2d\u5b9a\u3067\u3059 {0} -standardManager.unloading=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092 {0} \u306b\u4fdd\u5b58\u3057\u307e\u3059 -standardManager.unloading.ioe=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u4fdd\u5b58\u4e2d\u306eIOException\u3067\u3059: {0} -standardManager.managerLoad=\u6c38\u7d9a\u8a18\u61b6\u88c5\u7f6e\u304b\u3089\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardManager.managerUnload=\u6c38\u7d9a\u8a18\u61b6\u88c5\u7f6e\u306b\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30a2\u30f3\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -standardSession.attributeEvent=\u30bb\u30c3\u30b7\u30e7\u30f3\u5c5e\u6027\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -standardSession.bindingEvent=\u30bb\u30c3\u30b7\u30e7\u30f3\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -standardSession.invalidate.ise=invalidate: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardSession.isNew.ise=isNew: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardSession.getAttribute.ise=getAttribute: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardSession.getAttributeNames.ise=getAttributeNames: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardSession.getCreationTime.ise=getCreationTime: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardSession.getLastAccessedTime.ise=getLastAccessedTime: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardSession.getId.ise=getId: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardSession.getMaxInactiveInterval.ise=getMaxInactiveInterval: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardSession.getValueNames.ise=getValueNames: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardSession.notSerializable=\u30bb\u30c3\u30b7\u30e7\u30f3 {1} \u306e\u305f\u3081\u306b\u30bb\u30c3\u30b7\u30e7\u30f3\u5c5e\u6027 {0} \u3092\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u3067\u304d\u307e\u305b\u3093 -standardSession.removeAttribute.ise=removeAttribute: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardSession.sessionEvent=\u30bb\u30c3\u30b7\u30e7\u30f3\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f -standardSession.setAttribute.iae=setAttribute: \u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u3067\u304d\u306a\u3044\u5c5e\u6027\u3067\u3059 -standardSession.setAttribute.ise=setAttribute: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059 -standardSession.setAttribute.namenull=setAttribute: name\u30d1\u30e9\u30e1\u30bf\u306fnull\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093 -standardSession.sessionCreated=\u30bb\u30c3\u30b7\u30e7\u30f3ID = {0} \u3092\u751f\u6210\u3057\u307e\u3057\u305f -persistentManager.loading={0} \u306e\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u3057\u307e\u3059 -persistentManager.unloading={0} \u306e\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u4fdd\u5b58\u3057\u307e\u3059 -persistentManager.expiring= {0} \u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u4fdd\u5b58\u3059\u308b\u524d\u306b\u671f\u9650\u5207\u308c\u306b\u306a\u308a\u307e\u3057\u305f -persistentManager.deserializeError=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30c7\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059: {1} -persistentManager.serializeError=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059: {1} -persistentManager.swapMaxIdle={1}\u79d2\u9593\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u308b\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u4fdd\u5b58\u3059\u308b\u305f\u3081\u306b\u30b9\u30ef\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059 -persistentManager.backupMaxIdle={1}\u79d2\u9593\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u308b\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u4fdd\u5b58\u3059\u308b\u305f\u3081\u306b\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059 -persistentManager.backupException=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3059\u308b\u6642\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {1} -persistentManager.tooManyActive=\u30a2\u30af\u30c6\u30a3\u30d6\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u307e\u3059\u3001{0}\u3001\u30b9\u30ef\u30c3\u30d7\u30a2\u30a6\u30c8\u3059\u308b\u305f\u3081\u306b\u30a2\u30a4\u30c9\u30eb\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u63a2\u3057\u3066\u3044\u307e\u3059 -persistentManager.swapTooManyActive=\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u308b\u306e\u3067\u3001{1}\u79d2\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u308b\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30b9\u30ef\u30c3\u30d7\u30a2\u30a6\u30c8\u3057\u307e\u3059 -persistentManager.processSwaps=\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30b9\u30ef\u30c3\u30d7\u3059\u308b\u305f\u3081\u306b\u30c1\u30a7\u30c3\u30af\u3057\u3066\u3044\u307e\u3059, \u30e1\u30e2\u30ea\u4e2d\u306b {0} \u30a2\u30af\u30c6\u30a3\u30d6\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u5b58\u5728\u3057\u307e\u3059 -persistentManager.activeSession=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u306f{1}\u79d2\u9593\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u307e\u3059 -persistentManager.swapIn=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30b9\u30ef\u30c3\u30d7\u30a4\u30f3\u3057\u3066\u3044\u307e\u3059 Modified: trunk/src/main/java/org/apache/catalina/session/ManagerBase.java =================================================================== --- trunk/src/main/java/org/apache/catalina/session/ManagerBase.java 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/apache/catalina/session/ManagerBase.java 2012-09-06 14:06:07 UTC (rev 2079) @@ -40,9 +40,8 @@ import org.apache.catalina.Session; import org.apache.catalina.core.StandardContext; import org.apache.catalina.core.StandardHost; -import org.apache.catalina.util.StringManager; import org.apache.tomcat.util.modeler.Registry; -import org.jboss.logging.Logger; +import org.jboss.web.CatalinaLogger; /** @@ -55,7 +54,6 @@ */ public abstract class ManagerBase implements Manager, MBeanRegistration { - protected Logger log = Logger.getLogger(ManagerBase.class); private static final char[] SESSION_ID_ALPHABET = System.getProperty("org.apache.catalina.session.ManagerBase.SESSION_ID_ALPHABET", @@ -156,12 +154,6 @@ protected int processExpiresFrequency = 6; /** - * The string manager for this package. - */ - protected static StringManager sm = - StringManager.getManager(Constants.Package); - - /** * The property change support for this component. */ protected PropertyChangeSupport support = new PropertyChangeSupport(this); @@ -384,16 +376,16 @@ Session sessions[] = findSessions(); int expireHere = 0 ; - if(log.isDebugEnabled()) - log.debug("Start expire sessions " + getName() + " at " + timeNow + " sessioncount " + sessions.length); + if(CatalinaLogger.SESSION_LOGGER.isDebugEnabled()) + CatalinaLogger.SESSION_LOGGER.debug("Start expire sessions " + getName() + " at " + timeNow + " sessioncount " + sessions.length); for (int i = 0; i < sessions.length; i++) { if (sessions[i] != null && !sessions[i].isValid()) { expireHere++; } } long timeEnd = System.currentTimeMillis(); - if(log.isDebugEnabled()) - log.debug("End expire sessions " + getName() + " processingTime " + (timeEnd - timeNow) + " expired sessions: " + expireHere); + if(CatalinaLogger.SESSION_LOGGER.isDebugEnabled()) + CatalinaLogger.SESSION_LOGGER.debug("End expire sessions " + getName() + " processingTime " + (timeEnd - timeNow) + " expired sessions: " + expireHere); processingTime += ( timeEnd - timeNow ); } @@ -411,8 +403,6 @@ if( initialized ) return; initialized=true; - log = Logger.getLogger(ManagerBase.class); - StandardContext ctx=(StandardContext)this.getContainer(); distributable = ctx.getDistributable(); if (org.apache.tomcat.util.Constants.ENABLE_MODELER) { @@ -429,13 +419,13 @@ + path + ",host=" + hst.getName()); Registry.getRegistry(null, null).registerComponent(this, oname, null ); } catch (Exception e) { - log.error("Error registering ",e); + CatalinaLogger.SESSION_LOGGER.failedSessionManagerJmxRegistration(oname, e); } } } - if(log.isDebugEnabled()) - log.debug("Registering " + oname ); + if(CatalinaLogger.SESSION_LOGGER.isDebugEnabled()) + CatalinaLogger.SESSION_LOGGER.debug("Registering " + oname ); } @@ -811,8 +801,6 @@ public String getSessionAttribute( String sessionId, String key ) { Session s = (Session) sessions.get(sessionId); if( s==null ) { - if(log.isInfoEnabled()) - log.info("Session not found " + sessionId); return null; } Object o=s.getSession().getAttribute(key); @@ -836,9 +824,6 @@ public HashMap getSession(String sessionId) { Session s = (Session) sessions.get(sessionId); if (s == null) { - if (log.isInfoEnabled()) { - log.info("Session not found " + sessionId); - } return null; } @@ -860,8 +845,6 @@ public void expireSession( String sessionId ) { Session s=(Session)sessions.get(sessionId); if( s==null ) { - if(log.isInfoEnabled()) - log.info("Session not found " + sessionId); return; } s.expire(); @@ -871,8 +854,6 @@ public String getLastAccessedTime( String sessionId ) { Session s=(Session)sessions.get(sessionId); if( s==null ) { - if(log.isInfoEnabled()) - log.info("Session not found " + sessionId); return ""; } return new Date(s.getLastAccessedTime()).toString(); @@ -881,8 +862,6 @@ public String getCreationTime( String sessionId ) { Session s=(Session)sessions.get(sessionId); if( s==null ) { - if(log.isInfoEnabled()) - log.info("Session not found " + sessionId); return ""; } return new Date(s.getCreationTime()).toString(); Modified: trunk/src/main/java/org/apache/catalina/session/PersistentManagerBase.java =================================================================== --- trunk/src/main/java/org/apache/catalina/session/PersistentManagerBase.java 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/apache/catalina/session/PersistentManagerBase.java 2012-09-06 14:06:07 UTC (rev 2079) @@ -18,6 +18,8 @@ package org.apache.catalina.session; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.IOException; @@ -36,7 +38,8 @@ import org.apache.catalina.Store; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.LifecycleSupport; -import org.jboss.logging.Logger; +import org.jboss.web.CatalinaLogger; + /** * Extends the ManagerBase class to implement most of the * functionality required by a Manager which supports any kind of @@ -55,8 +58,6 @@ extends ManagerBase implements Lifecycle, PropertyChangeListener { - private static Logger log = Logger.getLogger(PersistentManagerBase.class); - // ---------------------------------------------------- Security Classes private class PrivilegedStoreClear @@ -370,7 +371,7 @@ if ( super.findSession(id) != null ) return true; } catch (IOException e) { - log.error("checking isLoaded for id, " + id + ", "+e.getMessage(), e); + CatalinaLogger.SESSION_LOGGER.persistentManagerIsLoadedException(id, e); } return false; } @@ -524,15 +525,13 @@ AccessController.doPrivileged(new PrivilegedStoreClear()); }catch(PrivilegedActionException ex){ Exception exception = ex.getException(); - log.error("Exception clearing the Store: " + exception); - exception.printStackTrace(); + CatalinaLogger.SESSION_LOGGER.persistentManagerStoreClearException(exception); } } else { store.clear(); } } catch (IOException e) { - log.error("Exception clearing the Store: " + e); - e.printStackTrace(); + CatalinaLogger.SESSION_LOGGER.persistentManagerStoreClearException(e); } } @@ -546,8 +545,8 @@ long timeNow = System.currentTimeMillis(); Session sessions[] = findSessions(); int expireHere = 0 ; - if(log.isDebugEnabled()) - log.debug("Start expire sessions " + getName() + " at " + timeNow + " sessioncount " + sessions.length); + if(CatalinaLogger.SESSION_LOGGER.isDebugEnabled()) + CatalinaLogger.SESSION_LOGGER.debug("Start expire sessions " + getName() + " at " + timeNow + " sessioncount " + sessions.length); for (int i = 0; i < sessions.length; i++) { if (!sessions[i].isValid()) { expiredSessions++; @@ -560,8 +559,8 @@ } long timeEnd = System.currentTimeMillis(); - if(log.isDebugEnabled()) - log.debug("End expire sessions " + getName() + " processingTime " + (timeEnd - timeNow) + " expired sessions: " + expireHere); + if(CatalinaLogger.SESSION_LOGGER.isDebugEnabled()) + CatalinaLogger.SESSION_LOGGER.debug("End expire sessions " + getName() + " processingTime " + (timeEnd - timeNow) + " expired sessions: " + expireHere); processingTime += (timeEnd - timeNow); } @@ -658,15 +657,13 @@ AccessController.doPrivileged(new PrivilegedStoreKeys()); }catch(PrivilegedActionException ex){ Exception exception = ex.getException(); - log.error("Exception in the Store during load: " - + exception); - exception.printStackTrace(); + CatalinaLogger.SESSION_LOGGER.persistentManagerLoadFailed(exception); } } else { ids = store.keys(); } } catch (IOException e) { - log.error("Can't load sessions from store, " + e.getMessage(), e); + CatalinaLogger.SESSION_LOGGER.persistentManagerLoadFailed(e); return; } @@ -674,14 +671,11 @@ if (n == 0) return; - if (log.isDebugEnabled()) - log.debug(sm.getString("persistentManager.loading", String.valueOf(n))); - for (int i = 0; i < n; i++) try { swapIn(ids[i]); } catch (IOException e) { - log.error("Failed load session from store, " + e.getMessage(), e); + CatalinaLogger.SESSION_LOGGER.persistentManagerLoadFailed(e); } } @@ -716,16 +710,13 @@ AccessController.doPrivileged(new PrivilegedStoreRemove(id)); }catch(PrivilegedActionException ex){ Exception exception = ex.getException(); - log.error("Exception in the Store during removeSession: " - + exception); - exception.printStackTrace(); + CatalinaLogger.SESSION_LOGGER.persistentManagerSessionRemoveFailed(id, exception); } } else { store.remove(id); } } catch (IOException e) { - log.error("Exception removing session " + e.getMessage()); - e.printStackTrace(); + CatalinaLogger.SESSION_LOGGER.persistentManagerSessionRemoveFailed(id, e); } } @@ -748,9 +739,7 @@ if (n == 0) return; - if (log.isDebugEnabled()) - log.debug(sm.getString("persistentManager.unloading", - String.valueOf(n))); + CatalinaLogger.SESSION_LOGGER.persistentManagerSessionUnloadCount(n); for (int i = 0; i < n; i++) try { @@ -810,9 +799,7 @@ new PrivilegedStoreLoad(id)); } catch (PrivilegedActionException ex) { Exception e = ex.getException(); - log.error(sm.getString( - "persistentManager.swapInException", id), - e); + CatalinaLogger.SESSION_LOGGER.persistentManagerSwapInFailed(id, e); if (e instanceof IOException){ throw (IOException)e; } else if (e instanceof ClassNotFoundException) { @@ -823,24 +810,18 @@ session = store.load(id); } } catch (ClassNotFoundException e) { - String msg = sm.getString( - "persistentManager.deserializeError", id); - log.error(msg, e); - throw new IllegalStateException(msg, e); + throw MESSAGES.persistentManagerDeserializeError(id, e); } if (session != null && !session.isValid()) { - log.error(sm.getString( - "persistentManager.swapInInvalid", id)); + CatalinaLogger.SESSION_LOGGER.persistentManagerSwapInInvalid(id); session.expire(); removeSession(id); session = null; } if (session != null) { - if(log.isDebugEnabled()) - log.debug(sm.getString("persistentManager.swapIn", id)); - + CatalinaLogger.SESSION_LOGGER.sessionSwapIn(id); session.setManager(this); // make sure the listeners know about it. ((StandardSession)session).tellNew(); @@ -904,16 +885,13 @@ AccessController.doPrivileged(new PrivilegedStoreSave(session)); }catch(PrivilegedActionException ex){ Exception exception = ex.getException(); - log.error("Exception in the Store during writeSession: " - + exception); - exception.printStackTrace(); + CatalinaLogger.SESSION_LOGGER.persistentManagerStoreSaveError(session.getIdInternal(), exception); } } else { store.save(session); } } catch (IOException e) { - log.error(sm.getString - ("persistentManager.serializeError", session.getIdInternal(), e)); + CatalinaLogger.SESSION_LOGGER.persistentManagerStoreSaveError(session.getIdInternal(), e); throw e; } @@ -970,7 +948,6 @@ // Validate and update our current component state if (started) { - log.info(sm.getString("standardManager.alreadyStarted")); return; } if( ! initialized ) @@ -980,7 +957,7 @@ started = true; if (store == null) - log.error("No Store configured, persistence disabled"); + CatalinaLogger.SESSION_LOGGER.noStoreConfigured(); else if (store instanceof Lifecycle) ((Lifecycle)store).start(); @@ -997,12 +974,8 @@ */ public void stop() throws LifecycleException { - if (log.isDebugEnabled()) - log.debug("Stopping"); - // Validate and update our current component state if (!isStarted()) { - log.info(sm.getString("standardManager.notStarted")); return; } @@ -1052,8 +1025,7 @@ setMaxInactiveInterval ( ((Integer) event.getNewValue()).intValue()*60 ); } catch (NumberFormatException e) { - log.error(sm.getString("standardManager.sessionTimeout", - event.getNewValue().toString())); + CatalinaLogger.SESSION_LOGGER.managerInvalidSessionTimeout(event.getNewValue().toString()); } } @@ -1089,10 +1061,7 @@ // Session is currently being accessed - skip it continue; } - if (log.isDebugEnabled()) - log.debug(sm.getString - ("persistentManager.swapMaxIdle", - session.getIdInternal(), new Integer(timeIdle))); + CatalinaLogger.SESSION_LOGGER.sessionSwapOut(session.getIdInternal(), timeIdle); try { swapOut(session); } catch (IOException e) { @@ -1120,10 +1089,7 @@ if (getMaxActiveSessions() >= sessions.length) return; - if(log.isDebugEnabled()) - log.debug(sm.getString - ("persistentManager.tooManyActive", - new Integer(sessions.length))); + CatalinaLogger.SESSION_LOGGER.persistentManagerCheckIdle(sessions.length); int toswap = sessions.length - getMaxActiveSessions(); long timeNow = System.currentTimeMillis(); @@ -1139,10 +1105,7 @@ // Session is currently being accessed - skip it continue; } - if(log.isDebugEnabled()) - log.debug(sm.getString - ("persistentManager.swapTooManyActive", - session.getIdInternal(), new Integer(timeIdle))); + CatalinaLogger.SESSION_LOGGER.persistentManagerSwapIdleSession(session.getIdInternal(), timeIdle); try { swapOut(session); } catch (IOException e) { @@ -1177,11 +1140,7 @@ int timeIdle = // Truncate, do not round up (int) ((timeNow - session.getLastAccessedTime()) / 1000L); if (timeIdle > maxIdleBackup) { - if (log.isDebugEnabled()) - log.debug(sm.getString - ("persistentManager.backupMaxIdle", - session.getIdInternal(), new Integer(timeIdle))); - + CatalinaLogger.SESSION_LOGGER.persistentManagerBackupSession(session.getIdInternal(), timeIdle); try { writeSession(session); } catch (IOException e) { Modified: trunk/src/main/java/org/apache/catalina/session/StandardManager.java =================================================================== --- trunk/src/main/java/org/apache/catalina/session/StandardManager.java 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/apache/catalina/session/StandardManager.java 2012-09-06 14:06:07 UTC (rev 2079) @@ -18,6 +18,8 @@ package org.apache.catalina.session; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.BufferedInputStream; @@ -48,6 +50,8 @@ import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.CustomObjectInputStream; import org.apache.catalina.util.LifecycleSupport; +import org.jboss.web.CatalinaLogger; + /** * Standard implementation of the Manager interface that provides * simple session persistence across restarts of this component (such as @@ -290,8 +294,7 @@ if ((maxActiveSessions >= 0) && (sessions.size() >= maxActiveSessions)) { rejectedSessions++; - throw new IllegalStateException - (sm.getString("standardManager.createSession.ise")); + throw MESSAGES.managerMaxActiveSessions(); } return (super.createSession(sessionId, random)); @@ -319,9 +322,6 @@ } else if (exception instanceof IOException){ throw (IOException)exception; } - if (log.isDebugEnabled()) - log.debug("Unreported exception in load() " - + exception); } } else { doLoad(); @@ -339,9 +339,6 @@ * @exception IOException if an input/output error occurs */ protected void doLoad() throws ClassNotFoundException, IOException { - if (log.isDebugEnabled()) - log.debug("Start: Loading persisted sessions"); - // Initialize our internal data structures sessions.clear(); @@ -349,8 +346,6 @@ File file = file(); if (file == null) return; - if (log.isDebugEnabled()) - log.debug(sm.getString("standardManager.loading", pathname)); FileInputStream fis = null; ObjectInputStream ois = null; Loader loader = null; @@ -363,20 +358,14 @@ if (loader != null) classLoader = loader.getClassLoader(); if (classLoader != null) { - if (log.isDebugEnabled()) - log.debug("Creating custom object input stream for class loader "); ois = new CustomObjectInputStream(bis, classLoader); } else { - if (log.isDebugEnabled()) - log.debug("Creating standard object input stream"); ois = new ObjectInputStream(bis); } } catch (FileNotFoundException e) { - if (log.isDebugEnabled()) - log.debug("No persisted data file found"); return; } catch (IOException e) { - log.error(sm.getString("standardManager.loading.ioe", e), e); + CatalinaLogger.SESSION_LOGGER.managerLoadFailed(e); if (ois != null) { try { ois.close(); @@ -393,8 +382,6 @@ try { Integer count = (Integer) ois.readObject(); int n = count.intValue(); - if (log.isDebugEnabled()) - log.debug("Loading " + n + " persisted sessions"); for (int i = 0; i < n; i++) { StandardSession session = getNewSession(); session.readObjectData(ois); @@ -406,7 +393,7 @@ } } } catch (ClassNotFoundException e) { - log.error(sm.getString("standardManager.loading.cnfe", e), e); + CatalinaLogger.SESSION_LOGGER.managerLoadFailed(e); if (ois != null) { try { ois.close(); @@ -417,7 +404,7 @@ } throw e; } catch (IOException e) { - log.error(sm.getString("standardManager.loading.ioe", e), e); + CatalinaLogger.SESSION_LOGGER.managerLoadFailed(e); if (ois != null) { try { ois.close(); @@ -441,9 +428,6 @@ file.delete(); } } - - if (log.isDebugEnabled()) - log.debug("Finish: Loading persisted sessions"); } @@ -463,9 +447,6 @@ if (exception instanceof IOException){ throw (IOException)exception; } - if (log.isDebugEnabled()) - log.debug("Unreported exception in unLoad() " - + exception); } } else { doUnload(); @@ -482,22 +463,17 @@ */ protected void doUnload() throws IOException { - if (log.isDebugEnabled()) - log.debug("Unloading persisted sessions"); - // Open an output stream to the specified pathname, if any File file = file(); if (file == null) return; - if (log.isDebugEnabled()) - log.debug(sm.getString("standardManager.unloading", pathname)); FileOutputStream fos = null; ObjectOutputStream oos = null; try { fos = new FileOutputStream(file.getAbsolutePath()); oos = new ObjectOutputStream(new BufferedOutputStream(fos)); } catch (IOException e) { - log.error(sm.getString("standardManager.unloading.ioe", e), e); + CatalinaLogger.SESSION_LOGGER.managerUnloadFailed(e); if (oos != null) { try { oos.close(); @@ -512,8 +488,6 @@ // Write the number of active sessions, followed by the details ArrayList list = new ArrayList(); synchronized (sessions) { - if (log.isDebugEnabled()) - log.debug("Unloading " + sessions.size() + " sessions"); try { oos.writeObject(new Integer(sessions.size())); Iterator elements = sessions.values().iterator(); @@ -525,7 +499,7 @@ session.writeObjectData(oos); } } catch (IOException e) { - log.error(sm.getString("standardManager.unloading.ioe", e), e); + CatalinaLogger.SESSION_LOGGER.managerUnloadFailed(e); if (oos != null) { try { oos.close(); @@ -556,8 +530,6 @@ } // Expire all the sessions we just wrote - if (log.isDebugEnabled()) - log.debug("Expiring " + list.size() + " persisted sessions"); Iterator expires = list.iterator(); while (expires.hasNext()) { StandardSession session = (StandardSession) expires.next(); @@ -569,10 +541,6 @@ session.recycle(); } } - - if (log.isDebugEnabled()) - log.debug("Unloading complete"); - } @@ -637,7 +605,7 @@ try { load(); } catch (Throwable t) { - log.error(sm.getString("standardManager.managerLoad"), t); + CatalinaLogger.SESSION_LOGGER.managerLoadFailed(t); } } @@ -664,7 +632,7 @@ try { unload(); } catch (Throwable t) { - log.error(sm.getString("standardManager.managerUnload"), t); + CatalinaLogger.SESSION_LOGGER.managerUnloadFailed(t); } // Expire all active sessions @@ -711,8 +679,7 @@ setMaxInactiveInterval ( ((Integer) event.getNewValue()).intValue()*60 ); } catch (NumberFormatException e) { - log.error(sm.getString("standardManager.sessionTimeout", - event.getNewValue().toString())); + CatalinaLogger.SESSION_LOGGER.managerInvalidSessionTimeout(event.getNewValue().toString()); } } Modified: trunk/src/main/java/org/apache/catalina/session/StandardSession.java =================================================================== --- trunk/src/main/java/org/apache/catalina/session/StandardSession.java 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/apache/catalina/session/StandardSession.java 2012-09-06 14:06:07 UTC (rev 2079) @@ -19,6 +19,8 @@ package org.apache.catalina.session; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.IOException; import java.io.NotSerializableException; import java.io.ObjectInputStream; @@ -54,7 +56,6 @@ import org.apache.catalina.realm.GenericPrincipal; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.Enumerator; -import org.apache.catalina.util.StringManager; /** * Standard implementation of the Session interface. This object is @@ -238,13 +239,6 @@ /** - * The string manager for this package. - */ - protected static StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * The HTTP session context associated with this session. */ protected static HttpSessionContext sessionContext = null; @@ -379,8 +373,7 @@ } catch (Exception e) { ; } - manager.getContainer().getLogger().error - (sm.getString("standardSession.sessionEvent"), t); + manager.getContainer().getLogger().error(MESSAGES.sessionEventListenerException(), t); } } } @@ -410,8 +403,7 @@ public long getThisAccessedTime() { if (!isValidInternal()) { - throw new IllegalStateException - (sm.getString("standardSession.getThisAccessedTime.ise")); + throw MESSAGES.invalidSession(); } return (this.thisAccessedTime); @@ -434,8 +426,7 @@ public long getLastAccessedTime() { if (!isValidInternal()) { - throw new IllegalStateException - (sm.getString("standardSession.getLastAccessedTime.ise")); + throw MESSAGES.invalidSession(); } return (lastAccessedTime + creationTime); @@ -695,8 +686,7 @@ } catch (Exception e) { ; } - manager.getContainer().getLogger().error - (sm.getString("standardSession.sessionEvent"), t); + manager.getContainer().getLogger().error(MESSAGES.sessionEventListenerException(), t); } } } @@ -737,9 +727,7 @@ try { gp.logout(); } catch (Exception e) { - manager.getContainer().getLogger().error( - sm.getString("standardSession.logoutfail"), - e); + manager.getContainer().getLogger().error(MESSAGES.sessionLogoutException(), e); } } @@ -777,8 +765,7 @@ ((HttpSessionActivationListener)attribute) .sessionWillPassivate(event); } catch (Throwable t) { - manager.getContainer().getLogger().error - (sm.getString("standardSession.attributeEvent"), t); + manager.getContainer().getLogger().error(MESSAGES.sessionAttributeEventListenerException(), t); } } } @@ -812,8 +799,7 @@ ((HttpSessionActivationListener)attribute) .sessionDidActivate(event); } catch (Throwable t) { - manager.getContainer().getLogger().error - (sm.getString("standardSession.attributeEvent"), t); + manager.getContainer().getLogger().error(MESSAGES.sessionAttributeEventListenerException(), t); } } } @@ -970,8 +956,7 @@ public long getCreationTime() { if (!isValidInternal()) - throw new IllegalStateException - (sm.getString("standardSession.getCreationTime.ise")); + throw MESSAGES.invalidSession(); return (this.creationTime); @@ -1025,8 +1010,7 @@ public Object getAttribute(String name) { if (!isValidInternal()) - throw new IllegalStateException - (sm.getString("standardSession.getAttribute.ise")); + throw MESSAGES.invalidSession(); if (name == null) { return null; @@ -1047,8 +1031,7 @@ public Enumeration getAttributeNames() { if (!isValidInternal()) - throw new IllegalStateException - (sm.getString("standardSession.getAttributeNames.ise")); + throw MESSAGES.invalidSession(); return (new Enumerator(attributes.keySet(), true)); @@ -1087,8 +1070,7 @@ public String[] getValueNames() { if (!isValidInternal()) - throw new IllegalStateException - (sm.getString("standardSession.getValueNames.ise")); + throw MESSAGES.invalidSession(); return (keys()); @@ -1104,8 +1086,7 @@ public void invalidate() { if (!isValidInternal()) - throw new IllegalStateException - (sm.getString("standardSession.invalidate.ise")); + throw MESSAGES.invalidSession(); // Cause this session to expire expire(); @@ -1126,8 +1107,7 @@ public boolean isNew() { if (!isValidInternal()) - throw new IllegalStateException - (sm.getString("standardSession.isNew.ise")); + throw MESSAGES.invalidSession(); return (this.isNew); @@ -1201,8 +1181,7 @@ // Validate our current state if (!isValidInternal()) - throw new IllegalStateException - (sm.getString("standardSession.removeAttribute.ise")); + throw MESSAGES.invalidSession(); removeAttributeInternal(name, notify); @@ -1275,8 +1254,7 @@ // Name cannot be null if (name == null) - throw new IllegalArgumentException - (sm.getString("standardSession.setAttribute.namenull")); + throw MESSAGES.sessionAttributeNameIsNull(); // Null value is the same as removeAttribute() if (value == null) { @@ -1286,12 +1264,10 @@ // Validate our current state if (!isValidInternal()) - throw new IllegalStateException - (sm.getString("standardSession.setAttribute.ise")); + throw MESSAGES.invalidSession(); if ((manager != null) && manager.getDistributable() && !(value instanceof Serializable)) - throw new IllegalArgumentException - (sm.getString("standardSession.setAttribute.iae", name)); + throw MESSAGES.sessionAttributeIsNotSerializable(name); // Construct an event with the new value HttpSessionBindingEvent event = null; @@ -1305,8 +1281,7 @@ try { ((HttpSessionBindingListener) value).valueBound(event); } catch (Throwable t){ - manager.getContainer().getLogger().error - (sm.getString("standardSession.bindingEvent"), t); + manager.getContainer().getLogger().error(MESSAGES.sessionBindingEventListenerException(), t); } } } @@ -1321,8 +1296,7 @@ ((HttpSessionBindingListener) unbound).valueUnbound (new HttpSessionBindingEvent(getSession(), name)); } catch (Throwable t) { - manager.getContainer().getLogger().error - (sm.getString("standardSession.bindingEvent"), t); + manager.getContainer().getLogger().error(MESSAGES.sessionBindingEventListenerException(), t); } } @@ -1372,8 +1346,7 @@ } catch (Exception e) { ; } - manager.getContainer().getLogger().error - (sm.getString("standardSession.attributeEvent"), t); + manager.getContainer().getLogger().error(MESSAGES.sessionAttributeEventListenerException(), t); } } @@ -1506,8 +1479,7 @@ stream.writeObject(saveValues.get(i)); } catch (NotSerializableException e) { manager.getContainer().getLogger().warn - (sm.getString("standardSession.notSerializable", - saveNames.get(i), id), e); + (MESSAGES.sessionAttributeSerializationException(saveNames.get(i), id), e); stream.writeObject(NOT_SERIALIZED); if (manager.getContainer().getLogger().isDebugEnabled()) manager.getContainer().getLogger().debug @@ -1633,8 +1605,7 @@ } catch (Exception e) { ; } - manager.getContainer().getLogger().error - (sm.getString("standardSession.attributeEvent"), t); + manager.getContainer().getLogger().error(MESSAGES.sessionAttributeEventListenerException(), t); } } Modified: trunk/src/main/java/org/apache/catalina/session/StoreBase.java =================================================================== --- trunk/src/main/java/org/apache/catalina/session/StoreBase.java 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/apache/catalina/session/StoreBase.java 2012-09-06 14:06:07 UTC (rev 2079) @@ -17,6 +17,8 @@ package org.apache.catalina.session; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.IOException; @@ -27,7 +29,6 @@ import org.apache.catalina.Manager; import org.apache.catalina.Store; import org.apache.catalina.util.LifecycleSupport; -import org.apache.catalina.util.StringManager; /** * Abstract implementation of the Store interface to @@ -68,11 +69,6 @@ protected PropertyChangeSupport support = new PropertyChangeSupport(this); /** - * The string manager for this package. - */ - protected StringManager sm = StringManager.getManager(Constants.Package); - - /** * The Manager with which this JDBCStore is associated. */ protected Manager manager; @@ -238,8 +234,7 @@ public void start() throws LifecycleException { // Validate and update our current component state if (started) - throw new LifecycleException - (sm.getString(getStoreName()+".alreadyStarted")); + throw new LifecycleException(MESSAGES.storeAlreadyStarted()); lifecycle.fireLifecycleEvent(START_EVENT, null); started = true; @@ -257,8 +252,7 @@ public void stop() throws LifecycleException { // Validate and update our current component state if (!started) - throw new LifecycleException - (sm.getString(getStoreName()+".notStarted")); + throw new LifecycleException(MESSAGES.storeNotStarted()); lifecycle.fireLifecycleEvent(STOP_EVENT, null); started = false; Modified: trunk/src/main/java/org/jboss/web/CatalinaLogger.java =================================================================== --- trunk/src/main/java/org/jboss/web/CatalinaLogger.java 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/jboss/web/CatalinaLogger.java 2012-09-06 14:06:07 UTC (rev 2079) @@ -78,6 +78,11 @@ */ CatalinaLogger STARTUP_LOGGER = Logger.getMessageLogger(CatalinaLogger.class, "org.apache.catalina.startup"); + /** + * A logger with the category of the package name. + */ + CatalinaLogger SESSION_LOGGER = Logger.getMessageLogger(CatalinaLogger.class, "org.apache.catalina.session"); + @LogMessage(level = WARN) @Message(id = 1000, value = "A valid entry has been removed from client nonce cache to make room for new entries. A replay attack is now possible. To prevent the possibility of replay attacks, reduce nonceValidity or increase cnonceCacheSize. Further warnings of this type will be suppressed for 5 minutes.") void digestCacheRemove(); @@ -246,4 +251,80 @@ @Message(id = 1040, value = "Security role name %s used in a <run-as> without being defined in a <security-role>") void roleValidationLink(String roleName); + @LogMessage(level = ERROR) + @Message(id = 1041, value = "Failed session manager [%s] JMX registration.") + void failedSessionManagerJmxRegistration(Object objectName, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1042, value = "Exception loading persisted sessions.") + void managerLoadFailed(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1043, value = "Exception unloading persisted sessions.") + void managerUnloadFailed(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1044, value = "Invalid session timeout setting %s") + void managerInvalidSessionTimeout(String timeoutValue); + + @LogMessage(level = ERROR) + @Message(id = 1045, value = "Exception checking load state for session %s") + void persistentManagerIsLoadedException(String sessionId, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1046, value = "Exception clearing session store") + void persistentManagerStoreClearException(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1047, value = "Error loading persisted sessions") + void persistentManagerLoadFailed(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1048, value = "Error removing session %s") + void persistentManagerSessionRemoveFailed(String sessionId, @Cause Throwable t); + + @LogMessage(level = DEBUG) + @Message(id = 1049, value = "Unloading %s sessions") + void persistentManagerSessionUnloadCount(int count); + + @LogMessage(level = ERROR) + @Message(id = 1050, value = "Error swapping in session %s") + void persistentManagerSwapInFailed(String sessionId, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1051, value = "Error swapping out session %s") + void persistentManagerSwapOutFailed(String sessionId, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1052, value = "Swapped in invalid session %s") + void persistentManagerSwapInInvalid(String sessionId); + + @LogMessage(level = DEBUG) + @Message(id = 1053, value = "Swapped in session %s") + void sessionSwapIn(String sessionId); + + @LogMessage(level = ERROR) + @Message(id = 1054, value = "Error saving session %s to store") + void persistentManagerStoreSaveError(String sessionId, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1055, value = "No store is configured, persistence disabled") + void noStoreConfigured(); + + @LogMessage(level = DEBUG) + @Message(id = 1056, value = "Swapping session %s to Store, idle for %s seconds") + void sessionSwapOut(String sessionId, int idle); + + @LogMessage(level = DEBUG) + @Message(id = 1057, value = "Too many active sessions [%s] looking for idle sessions to swap out") + void persistentManagerCheckIdle(int activeCount); + + @LogMessage(level = DEBUG) + @Message(id = 1058, value = "Swapping out session %s, idle for %s seconds too many sessions active") + void persistentManagerSwapIdleSession(String sessionId, int idle); + + @LogMessage(level = DEBUG) + @Message(id = 1059, value = "Backing up session %s to Store, idle for %s seconds") + void persistentManagerBackupSession(String sessionId, int idle); + } Modified: trunk/src/main/java/org/jboss/web/CatalinaMessages.java =================================================================== --- trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-05 08:00:43 UTC (rev 2078) +++ trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-06 14:06:07 UTC (rev 2079) @@ -502,4 +502,79 @@ @Message(id = 155, value = "The client needs to authenticate to gain network access.") String http511(); + @Message(id = 200, value = "Store has already been started") + String storeAlreadyStarted(); + + @Message(id = 201, value = "Store has not yet been started") + String storeNotStarted(); + + @Message(id = 202, value = "Loading Session %s from file %s") + String fileStoreSessionLoad(String sessionId, String file); + + @Message(id = 203, value = "Saving Session %s to file %s") + String fileStoreSessionSave(String sessionId, String file); + + @Message(id = 204, value = "Removing Session %s at file %s") + String fileStoreSessionRemove(String sessionId, String file); + + @Message(id = 205, value = "No persisted data file found") + String fileStoreFileNotFound(); + + @Message(id = 206, value = "Parent Container is not a Context") + IllegalArgumentException parentNotContext(); + + @Message(id = 207, value = "JDBC Store SQL exception") + String jdbcStoreDatabaseError(); + + @Message(id = 202, value = "Loading Session %s from file %s") + String jdbcStoreSessionLoad(String sessionId, String table); + + @Message(id = 203, value = "Saving Session %s to file %s") + String jdbcStoreSessionSave(String sessionId, String table); + + @Message(id = 204, value = "Removing Session %s at file %s") + String jdbcStoreSessionRemove(String sessionId, String table); + + @Message(id = 205, value = "No persisted data object found") + String jdbcStoreIdNotFound(); + + @Message(id = 206, value = "The database connection is null or was found to be closed. Trying to re-open it.") + String jdbcStoreConnectionWasClosed(); + + @Message(id = 207, value = "The re-open on the database failed. The database could be down.") + String jdbcStoreConnectionReopenFailed(); + + @Message(id = 208, value = "JDBC driver class not found %s") + String jdbcStoreDriverFailure(String className); + + @Message(id = 209, value = "Session creation failed due to too many active sessions") + IllegalStateException managerMaxActiveSessions(); + + @Message(id = 210, value = "Error deserializing Session %s") + IllegalStateException persistentManagerDeserializeError(String sessionId, @Cause Throwable t); + + @Message(id = 211, value = "Session event listener threw exception") + String sessionEventListenerException(); + + @Message(id = 212, value = "Session already invalidated") + IllegalStateException invalidSession(); + + @Message(id = 213, value = "Exception logging out user when expiring session") + String sessionLogoutException(); + + @Message(id = 214, value = "Session attribute event listener threw exception") + String sessionAttributeEventListenerException(); + + @Message(id = 215, value = "Session attribute name cannot be null") + IllegalArgumentException sessionAttributeNameIsNull(); + + @Message(id = 216, value = "Non-serializable attribute %s") + IllegalArgumentException sessionAttributeIsNotSerializable(String name); + + @Message(id = 214, value = "Session binding event listener threw exception") + String sessionBindingEventListenerException(); + + @Message(id = 214, value = "Cannot serialize session attribute %s for session %s") + String sessionAttributeSerializationException(Object attribute, String sessionId); + }

12 years, 3 months

1
0
0 / 0

← Newer
1
2
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits September 2012