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

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. - * - * <p>The StringManager operates on a package basis. One StringManager - * per package can be created and accessed via the getManager method - * call. - * - * <p>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. - * - * <p>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; /** * <p> @@ -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); } }