[jbossweb-commits] JBossWeb SVN: r2075 - in trunk/src/main/java/org: apache/catalina/manager and 5 other directories.

Author: remy.maucherat(a)jboss.com Date: 2012-08-30 13:19:13 -0400 (Thu, 30 Aug 2012) New Revision: 2075 Removed: trunk/src/main/java/org/apache/catalina/filters/LocalStrings.properties trunk/src/main/java/org/apache/catalina/filters/LocalStrings_es.properties trunk/src/main/java/org/apache/catalina/filters/LocalStrings_fr.properties trunk/src/main/java/org/apache/catalina/manager/Constants.java trunk/src/main/java/org/apache/catalina/manager/LocalStrings.properties trunk/src/main/java/org/apache/catalina/manager/LocalStrings_de.properties trunk/src/main/java/org/apache/catalina/manager/LocalStrings_es.properties trunk/src/main/java/org/apache/catalina/manager/LocalStrings_fr.properties trunk/src/main/java/org/apache/catalina/manager/LocalStrings_ja.properties trunk/src/main/java/org/apache/catalina/manager/StatusManagerServlet.java trunk/src/main/java/org/apache/catalina/manager/StatusTransformer.java trunk/src/main/java/org/apache/catalina/security/LocalStrings.properties trunk/src/main/java/org/apache/catalina/security/LocalStrings_es.properties trunk/src/main/java/org/apache/catalina/security/LocalStrings_fr.properties trunk/src/main/java/org/apache/catalina/security/LocalStrings_ja.properties trunk/src/main/java/org/apache/catalina/servlets/LocalStrings.properties trunk/src/main/java/org/apache/catalina/servlets/LocalStrings_es.properties trunk/src/main/java/org/apache/catalina/servlets/LocalStrings_fr.properties trunk/src/main/java/org/apache/catalina/servlets/LocalStrings_ja.properties trunk/src/main/java/org/apache/catalina/startup/HomesUserDatabase.java trunk/src/main/java/org/apache/catalina/startup/LocalStrings.properties trunk/src/main/java/org/apache/catalina/startup/LocalStrings_es.properties trunk/src/main/java/org/apache/catalina/startup/LocalStrings_fr.properties trunk/src/main/java/org/apache/catalina/startup/LocalStrings_ja.properties trunk/src/main/java/org/apache/catalina/startup/PasswdUserDatabase.java trunk/src/main/java/org/apache/catalina/startup/UserConfig.java trunk/src/main/java/org/apache/catalina/startup/UserDatabase.java trunk/src/main/java/org/apache/catalina/util/LocalStrings.properties trunk/src/main/java/org/apache/catalina/util/LocalStrings_es.properties trunk/src/main/java/org/apache/catalina/util/LocalStrings_fr.properties trunk/src/main/java/org/apache/catalina/util/LocalStrings_ja.properties Modified: trunk/src/main/java/org/apache/catalina/filters/CsrfPreventionFilter.java trunk/src/main/java/org/apache/catalina/filters/ExpiresFilter.java trunk/src/main/java/org/apache/catalina/filters/FilterBase.java trunk/src/main/java/org/apache/catalina/filters/RequestFilter.java trunk/src/main/java/org/apache/catalina/security/SecurityUtil.java trunk/src/main/java/org/apache/catalina/servlets/DefaultServlet.java trunk/src/main/java/org/apache/catalina/servlets/WebdavServlet.java trunk/src/main/java/org/apache/catalina/startup/Constants.java trunk/src/main/java/org/apache/catalina/startup/ContextConfig.java trunk/src/main/java/org/apache/catalina/startup/EngineConfig.java trunk/src/main/java/org/apache/catalina/startup/ExpandWar.java trunk/src/main/java/org/apache/catalina/startup/HostConfig.java trunk/src/main/java/org/apache/catalina/util/HexUtils.java trunk/src/main/java/org/apache/catalina/util/ParameterMap.java trunk/src/main/java/org/apache/catalina/util/ResourceSet.java trunk/src/main/java/org/jboss/web/CatalinaLogger.java trunk/src/main/java/org/jboss/web/CatalinaMessages.java Log: New i18n for more packages (and some removals of old stuff). Modified: trunk/src/main/java/org/apache/catalina/filters/CsrfPreventionFilter.java =================================================================== --- trunk/src/main/java/org/apache/catalina/filters/CsrfPreventionFilter.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/filters/CsrfPreventionFilter.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -17,6 +17,8 @@ package org.apache.catalina.filters; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.IOException; import java.security.SecureRandom; import java.util.HashSet; @@ -103,16 +105,13 @@ Class<?> clazz = Class.forName(randomClass); randomSource = (Random) clazz.newInstance(); } catch (ClassNotFoundException e) { - ServletException se = new ServletException(sm.getString( - "csrfPrevention.invalidRandomClass", randomClass), e); + ServletException se = new ServletException(MESSAGES.cannotCreateRandom(randomClass), e); throw se; } catch (InstantiationException e) { - ServletException se = new ServletException(sm.getString( - "csrfPrevention.invalidRandomClass", randomClass), e); + ServletException se = new ServletException(MESSAGES.cannotCreateRandom(randomClass), e); throw se; } catch (IllegalAccessException e) { - ServletException se = new ServletException(sm.getString( - "csrfPrevention.invalidRandomClass", randomClass), e); + ServletException se = new ServletException(MESSAGES.cannotCreateRandom(randomClass), e); throw se; } } Modified: trunk/src/main/java/org/apache/catalina/filters/ExpiresFilter.java =================================================================== --- trunk/src/main/java/org/apache/catalina/filters/ExpiresFilter.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/filters/ExpiresFilter.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -16,6 +16,8 @@ package org.apache.catalina.filters; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; @@ -42,6 +44,7 @@ import javax.servlet.http.HttpServletResponseWrapper; import org.jboss.logging.Logger; +import org.jboss.web.CatalinaLogger; /** * <p> @@ -1019,8 +1022,6 @@ private static final String HEADER_LAST_MODIFIED = "Last-Modified"; - private static Logger log = Logger.getLogger(ExpiresFilter.class); - private static final String PARAMETER_EXPIRES_BY_TYPE = "ExpiresByType"; private static final String PARAMETER_EXPIRES_DEFAULT = "ExpiresDefault"; @@ -1180,11 +1181,7 @@ HttpServletResponse httpResponse = (HttpServletResponse) response; if (response.isCommitted()) { - if (log.isDebugEnabled()) { - log.debug(sm.getString( - "expiresFilter.responseAlreadyCommited", - httpRequest.getRequestURL())); - } + CatalinaLogger.FILTERS_LOGGER.expiresResponseAlreadyCommitted(httpRequest.getRequestURI()); chain.doFilter(request, response); } else { XHttpServletResponse xResponse = new XHttpServletResponse( @@ -1298,9 +1295,7 @@ } break; default: - throw new IllegalStateException(sm.getString( - "expiresFilter.unsupportedStartingPoint", - configuration.getStartingPoint())); + throw MESSAGES.expiresUnsupportedStartingPoint("" + configuration.getStartingPoint()); } for (Duration duration : configuration.getDurations()) { calendar.add(duration.getUnit().getCalendardField(), @@ -1333,19 +1328,12 @@ } else if (name.equalsIgnoreCase(PARAMETER_EXPIRES_EXCLUDED_RESPONSE_STATUS_CODES)) { this.excludedResponseStatusCodes = commaDelimitedListToIntArray(value); } else { - log.warn(sm.getString( - "expiresFilter.unknownParameterIgnored", name, - value)); + CatalinaLogger.FILTERS_LOGGER.expiresUnknownParameter(name, value); } } catch (RuntimeException e) { - throw new ServletException(sm.getString( - "expiresFilter.exceptionProcessingParameter", name, - value), e); + throw new ServletException(MESSAGES.expiresExceptionProcessingParameter(name, value), e); } } - - log.debug(sm.getString("expiresFilter.filterInitialized", - this.toString())); } /** @@ -1359,24 +1347,13 @@ boolean expirationHeaderHasBeenSet = response.containsHeader(HEADER_EXPIRES) || contains(response.getCacheControlHeader(), "max-age"); if (expirationHeaderHasBeenSet) { - if (log.isDebugEnabled()) { - log.debug(sm.getString( - "expiresFilter.expirationHeaderAlreadyDefined", - request.getRequestURI(), - Integer.valueOf(response.getStatus()), - response.getContentType())); - } + CatalinaLogger.FILTERS_LOGGER.expiresHeaderAlreadyDefined(request.getRequestURI(), response.getStatus(), response.getContentType()); return false; } for (int skippedStatusCode : this.excludedResponseStatusCodes) { if (response.getStatus() == skippedStatusCode) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("expiresFilter.skippedStatusCode", - request.getRequestURI(), - Integer.valueOf(response.getStatus()), - response.getContentType())); - } + CatalinaLogger.FILTERS_LOGGER.expiresSkipStatusCode(request.getRequestURI(), response.getStatus(), response.getContentType()); return false; } } @@ -1440,8 +1417,7 @@ try { currentToken = tokenizer.nextToken(); } catch (NoSuchElementException e) { - throw new IllegalStateException(sm.getString( - "expiresFilter.startingPointNotFound", line)); + throw MESSAGES.expiresStartingPointNotFound(line); } StartingPoint startingPoint; @@ -1463,15 +1439,13 @@ tokenizer = new StringTokenizer(currentToken.substring(1) + " seconds", " "); } else { - throw new IllegalStateException(sm.getString( - "expiresFilter.startingPointInvalid", currentToken, line)); + throw MESSAGES.expiresInvalidStartingPoint(currentToken, line); } try { currentToken = tokenizer.nextToken(); } catch (NoSuchElementException e) { - throw new IllegalStateException(sm.getString( - "Duration not found in directive '{}'", line)); + throw MESSAGES.expiresDurationNotFound(line); } if ("plus".equalsIgnoreCase(currentToken)) { @@ -1479,8 +1453,7 @@ try { currentToken = tokenizer.nextToken(); } catch (NoSuchElementException e) { - throw new IllegalStateException(sm.getString( - "Duration not found in directive '{}'", line)); + throw MESSAGES.expiresDurationNotFound(line); } } @@ -1491,18 +1464,13 @@ try { amount = Integer.parseInt(currentToken); } catch (NumberFormatException e) { - throw new IllegalStateException(sm.getString( - "Invalid duration (number) '{}' in directive '{}'", - currentToken, line)); + throw MESSAGES.expiresInvalidDuration(currentToken, line); } try { currentToken = tokenizer.nextToken(); } catch (NoSuchElementException e) { - throw new IllegalStateException( - sm.getString( - "Duration unit not found after amount {} in directive '{}'", - Integer.valueOf(amount), line)); + throw MESSAGES.expiresDurationUnitNotFound(amount, line); } DurationUnit durationUnit; if ("years".equalsIgnoreCase(currentToken)) { @@ -1526,10 +1494,7 @@ "seconds".equalsIgnoreCase(currentToken)) { durationUnit = DurationUnit.SECOND; } else { - throw new IllegalStateException( - sm.getString( - "Invalid duration unit (years|months|weeks|days|hours|minutes|seconds) '{}' in directive '{}'", - currentToken, line)); + throw MESSAGES.expiresInvalidDurationUnit(currentToken, line); } Duration duration = new Duration(amount, durationUnit); Modified: trunk/src/main/java/org/apache/catalina/filters/FilterBase.java =================================================================== --- trunk/src/main/java/org/apache/catalina/filters/FilterBase.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/filters/FilterBase.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -17,6 +17,8 @@ package org.apache.catalina.filters; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.util.Enumeration; import javax.servlet.Filter; @@ -24,10 +26,9 @@ import javax.servlet.ServletException; import org.apache.tomcat.util.IntrospectionUtils; -import org.apache.catalina.util.StringManager; /** - * Base class for filters that provides generic initialisation and a simple + * Base class for filters that provides generic initialization and a simple * no-op destruction. * * @author xxd @@ -35,17 +36,13 @@ */ public abstract class FilterBase implements Filter { - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - public void init(FilterConfig filterConfig) throws ServletException { Enumeration<String> paramNames = filterConfig.getInitParameterNames(); while (paramNames.hasMoreElements()) { String paramName = paramNames.nextElement(); if (!IntrospectionUtils.setProperty(this, paramName, filterConfig.getInitParameter(paramName))) { - filterConfig.getServletContext().log(sm.getString("filterbase.noSuchProperty", - paramName, this.getClass().getName())); + filterConfig.getServletContext().log(MESSAGES.propertyNotFound(paramName, this.getClass().getName())); } } } Deleted: trunk/src/main/java/org/apache/catalina/filters/LocalStrings.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/filters/LocalStrings.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/filters/LocalStrings.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,35 +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. - -filterbase.noSuchProperty=The property "{0}" is not defined for filters of type "{1}" - -http.403=Access to the specified resource ({0}) has been forbidden. - -csrfPrevention.invalidRandomClass=Unable to create Random source using class [{0}] - -expiresFilter.noExpirationConfigured=Request "{0}" with response status "{1}" content-type "{2}", no expiration configured -expiresFilter.setExpirationDate=Request "{0}" with response status "{1}" content-type "{2}", set expiration date {3} -expiresFilter.startingPointNotFound=Starting point (access|now|modification|a<seconds>|m<seconds>) not found in directive "{0}" -expiresFilter.startingPointInvalid=Invalid starting point (access|now|modification|a<seconds>|m<seconds>) "{0}" in directive "{1}" -expiresFilter.responseAlreadyCommited=Request "{0}", can not apply ExpiresFilter on already committed response. -expiresFilter.noExpirationConfiguredForContentType=No Expires configuration found for content-type "{0}" -expiresFilter.useMatchingConfiguration=Use {0} matching "{1}" for content-type "{2}" returns {3} -expiresFilter.useDefaultConfiguration=Use default {0} for content-type "{1}" returns {2} -expiresFilter.unsupportedStartingPoint=Unsupported startingPoint "{0}" -expiresFilter.unknownParameterIgnored=Unknown parameter "{0}" with value "{1}" is ignored ! -expiresFilter.exceptionProcessingParameter=Exception processing configuration parameter "{0}":"{1}" -expiresFilter.filterInitialized=Filter initialized with configuration {0} -expiresFilter.expirationHeaderAlreadyDefined=Request "{0}" with response status "{1}" content-type "{2}", expiration header already defined -expiresFilter.skippedStatusCode=Request "{0}" with response status "{1}" content-type "{1}", skip expiration header generation for given status Deleted: trunk/src/main/java/org/apache/catalina/filters/LocalStrings_es.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/filters/LocalStrings_es.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/filters/LocalStrings_es.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,16 +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. - -http.403=El acceso al recurso especificado ({0}) ha sido prohibido. Deleted: trunk/src/main/java/org/apache/catalina/filters/LocalStrings_fr.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/filters/LocalStrings_fr.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/filters/LocalStrings_fr.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,16 +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. - -http.403=L''acc\u00e8s \u00e0 la ressource demand\u00e9e ({0}) a \u00e9t\u00e9 interdit. Modified: trunk/src/main/java/org/apache/catalina/filters/RequestFilter.java =================================================================== --- trunk/src/main/java/org/apache/catalina/filters/RequestFilter.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/filters/RequestFilter.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -19,6 +19,8 @@ package org.apache.catalina.filters; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.IOException; import java.util.ArrayList; import java.util.regex.Pattern; @@ -209,10 +211,7 @@ try { reList.add(Pattern.compile(pattern)); } catch (PatternSyntaxException e) { - IllegalArgumentException iae = new IllegalArgumentException - (sm.getString("requestFilterFilter.syntax", pattern)); - iae.initCause(e); - throw iae; + throw MESSAGES.requestFilterInvalidPattern(pattern, e); } list = list.substring(comma + 1); } @@ -305,7 +304,7 @@ private void sendErrorWhenNotHttp(ServletResponse response) throws IOException { response.setContentType(PLAIN_TEXT_MIME_TYPE); - response.getWriter().write(sm.getString("http.403")); + response.getWriter().write(MESSAGES.http403()); response.getWriter().flush(); } Deleted: trunk/src/main/java/org/apache/catalina/manager/Constants.java =================================================================== --- trunk/src/main/java/org/apache/catalina/manager/Constants.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/manager/Constants.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,117 +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.manager; - - -public class Constants { - - public static final String Package = "org.apache.catalina.manager"; - - public static final String HTML_HEADER_SECTION = - "<html>\n" + - "<head>\n" + - "<link href=\"{0}/jbossweb.css\" rel=\"stylesheet\" type=\"text/css\" />\n"; - - public static final String BODY_HEADER_SECTION = - "<title>{1}</title>\n" + - "</head>\n" + - "\n" + - "<body>\n" + - "\n" + - "<div class=\"wrapper\">\n" + - " <div class=\"header\">\n" + - " <div class=\"floatleft\"><a href=\"list\"><img src=\"{0}/images/hdr_hdrtitle.gif\" border=\"0\"></a></div>\n" + - " <div class=\"floatright\"><a href=\"http://www.jboss.com/\"><img src=\"{0}/images/hdr_jbosslogo.gif\" alt=\"JBoss, a division of Red Hat\" border=\"0\"></a><a href=\"http://www.jboss.org\"><img src=\"{0}/images/hdr_jbossorglogo.gif\" alt=\"JBoss.org - Community driven.\" border=\"0\" /></a></div>\n" + - " </div>\n" + - " <div class=\"container\">\n" + - "\n"; - - public static final String MESSAGE_SECTION = - "<table border=\"0\" class=\"message\"><tbody>\n" + - " <tr>\n" + - " <td width=\"10%\"><strong>{0}</strong></td>" + - " <td>{1}</td>\n" + - " </tr>\n" + - "</tbody></table>\n" + - "\n"; - - public static final String MANAGER_SECTION = - "<div class=\"leftcol\"><dl>\n" + - " <dt>Manager</dt>" + - " <dd><a href=\"{1}\">{2}</a></dd>" + - " <dd><a href=\"{3}\">{4}</a></dd>" + - " <dd><a href=\"{5}\">{6}</a></dd>" + - " <dd><a href=\"{7}\">{8}</a></dd>" + - "</dl></div>\n" + - "<div class=\"maincol\">\n"; - - public static final String MANAGER_STATUS_SECTION1 = - "<div class=\"leftcol\"><dl>\n" + - " <dt>Manager</dt>" + - " <dd><a href=\"{1}\">{2}</a></dd>" + - " <dd><a href=\"{3}\">{4}</a></dd>" + - " <dd><a href=\"{5}\">{6}</a></dd>" + - " <dd><a href=\"{7}\">{8}</a></dd>"; - - public static final String MANAGER_STATUS_SECTION2 = - "</dl></div>\n" + - "<div class=\"maincol\">\n"; - - public static final String SERVER_HEADER_SECTION = - "<table width=\"100%\" cellspacing=\"0\" class=\"tableStyle\" >\n" + - "<thead>\n" + - " <th colspan=\"6\">{0}</th>\n" + - "</thead>\n" + - "<tr class=\"UnsortableTableHeader\">\n" + - " <td>{1}</td>\n" + - " <td>{2}</td>\n" + - " <td>{3}</td>\n" + - " <td>{4}</td>\n" + - " <td>{5}</td>\n" + - " <td>{6}</td>\n" + - "</tr>\n"; - - public static final String SERVER_ROW_SECTION = - "<tbody><tr class=\"oddRow\">\n" + - " <td class=\"first\">{0}</small></td>\n" + - " <td>{1}</td>\n" + - " <td>{2}</td>\n" + - " <td>{3}</td>\n" + - " <td>{4}</td>\n" + - " <td>{5}</td>\n" + - "</tr>\n" + - "</tbody></table>\n" + - "\n"; - - public static final String HTML_TAIL_SECTION = - " </div>\n" + - " </div>\n" + - " <div class=\"footer\">&copy; 2008 Red Hat Middleware, LLC. All Rights Reserved. </div>\n" + - "</div></body></html>"; - - public static final String CHARSET="utf-8"; - - public static final String XML_DECLARATION = - "<?xml version=\"1.0\" encoding=\""+CHARSET+"\"?>"; - - public static final String XML_STYLE = - "<?xml-stylesheet type=\"text/xsl\" href=\"xform.xsl\" ?>"; - -} - Deleted: trunk/src/main/java/org/apache/catalina/manager/LocalStrings.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/manager/LocalStrings.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/manager/LocalStrings.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,89 +0,0 @@ -htmlManagerServlet.appsAvailable=Running -htmlManagerServlet.appsName=Display Name -htmlManagerServlet.appsPath=Path -htmlManagerServlet.appsReload=Reload -htmlManagerServlet.appsUndeploy=Undeploy -htmlManagerServlet.appsExpire=Expire sessions -htmlManagerServlet.appsSessions=Sessions -htmlManagerServlet.appsStart=Start -htmlManagerServlet.appsStop=Stop -htmlManagerServlet.appsTasks=Commands -htmlManagerServlet.appsTitle=Applications -htmlManagerServlet.expire.explain=with idle &ge; -htmlManagerServlet.expire.unit=minutes -htmlManagerServlet.helpHtmlManager=HTML Manager Help -htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html -htmlManagerServlet.helpManager=Manager Help -htmlManagerServlet.helpManagerFile=../docs/manager-howto.html -htmlManagerServlet.deployButton=Deploy -htmlManagerServlet.deployConfig=XML Configuration file URL: -htmlManagerServlet.deployPath=Context Path (required): -htmlManagerServlet.deployServer=Deploy directory or WAR file located on server -htmlManagerServlet.deployTitle=Deploy -htmlManagerServlet.deployUpload=WAR file to deploy -htmlManagerServlet.deployUploadFail=FAIL - Deploy Upload Failed, Exception: {0} -htmlManagerServlet.deployUploadFile=Select WAR file to upload -htmlManagerServlet.deployUploadInServerXml=FAIL - War file \"{0}\" cannot be uploaded if context is defined in server.xml -htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded \"{0}\" must be a .war -htmlManagerServlet.deployUploadNoFile=FAIL - File upload failed, no file -htmlManagerServlet.deployUploadWarExists=FAIL - War file \"{0}\" already exists on server -htmlManagerServlet.deployWar=WAR or Directory URL: -htmlManagerServlet.list=List Applications -htmlManagerServlet.manager=Manager -htmlManagerServlet.messageLabel=Message: -htmlManagerServlet.noManager=- -htmlManagerServlet.serverJVMVendor=JVM Vendor -htmlManagerServlet.serverJVMVersion=JVM Version -htmlManagerServlet.serverOSArch=OS Architecture -htmlManagerServlet.serverOSName=OS Name -htmlManagerServlet.serverOSVersion=OS Version -htmlManagerServlet.serverTitle=Server Information -htmlManagerServlet.serverVersion=Tomcat Version -htmlManagerServlet.title=Tomcat Web Application Manager -managerServlet.alreadyContext=FAIL - Application already exists at path {0} -managerServlet.alreadyDocBase=FAIL - Directory {0} is already in use -managerServlet.cannotInvoke=Cannot invoke manager servlet through invoker -managerServlet.configured=OK - Deployed application from context file {0} -managerServlet.deployed=OK - Deployed application at context path {0} -managerServlet.deployedButNotStarted=FAIL - Deployed application at context path {0} but context failed to start -managerServlet.deployFailed=FAIL - Failed to deploy application at context path {0} -managerServlet.exception=FAIL - Encountered exception {0} -managerServlet.deployed=OK - Deployed application at context path {0} -managerServlet.invalidPath=FAIL - Invalid context path {0} was specified -managerServlet.invalidWar=FAIL - Invalid application URL {0} was specified -managerServlet.listed=OK - Listed applications for virtual host {0} -managerServlet.listitem={0}:{1}:{2}:{3} -managerServlet.noAppBase=FAIL - Cannot identify application base for context path {0} -managerServlet.noCommand=FAIL - No command was specified -managerServlet.noContext=FAIL - No context exists for path {0} -managerServlet.noDirectory=FAIL - Non-directory document base for path {0} -managerServlet.noDocBase=FAIL - Cannot undeploy document base for path {0} -managerServlet.noGlobal=FAIL - No global JNDI resources are available -managerServlet.noManager=FAIL - No manager exists for path {0} -managerServlet.noReload=FAIL - Reload not supported on WAR deployed at path {0} -managerServlet.noRename=FAIL - Cannot deploy uploaded WAR for path {0} -managerServlet.noRole=FAIL - User does not possess role {0} -managerServlet.noSelf=FAIL - The manager can not reload, undeploy, stop, or undeploy itself -managerServlet.noWrapper=Container has not called setWrapper() for this servlet -managerServlet.notDeployed=FAIL - Context {0} is defined in server.xml and may not be undeployed -managerServlet.reloaded=OK - Reloaded application at context path {0} -managerServlet.undeployd=OK - Undeployed application at context path {0} -managerServlet.resourcesAll=OK - Listed global resources of all types -managerServlet.resourcesType=OK - Listed global resources of type {0} -managerServlet.rolesList=OK - Listed security roles -managerServlet.saveFail=FAIL - Configuration save failed: {0} -managerServlet.saved=OK - Server configuration saved -managerServlet.savedContext=OK - Context {0} configuration saved -managerServlet.sessiondefaultmax=Default maximum session inactive interval {0} minutes -managerServlet.sessiontimeout={0} minutes:{1} sessions -managerServlet.sessions=OK - Session information for application at context path {0} -managerServlet.started=OK - Started application at context path {0} -managerServlet.startFailed=FAIL - Application at context path {0} could not be started -managerServlet.stopped=OK - Stopped application at context path {0} -managerServlet.undeployed=OK - Undeployed application at context path {0} -managerServlet.unknownCommand=FAIL - Unknown command {0} -managerServlet.userDatabaseError=FAIL - Cannot resolve user database reference -managerServlet.userDatabaseMissing=FAIL - No user database is available - -statusServlet.title=Server Status -statusServlet.complete=Complete Server Status Deleted: trunk/src/main/java/org/apache/catalina/manager/LocalStrings_de.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/manager/LocalStrings_de.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/manager/LocalStrings_de.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,81 +0,0 @@ -htmlManagerServlet.appsAvailable=Verf�gbar -htmlManagerServlet.appsName=Anzeigename -htmlManagerServlet.appsPath=Kontext Pfad -htmlManagerServlet.appsReload=Neu laden -htmlManagerServlet.appsUndeploy=Entfernen -htmlManagerServlet.appsExpire=L�sche Sitzungen -htmlManagerServlet.appsSessions=Sitzungen -htmlManagerServlet.appsStart=Start -htmlManagerServlet.appsStop=Stop -htmlManagerServlet.appsTasks=Kommandos -htmlManagerServlet.appsTitle=Anwendungen -htmlManagerServlet.expire.explain=mit Inaktivit�t &ge; -htmlManagerServlet.expire.unit=Minuten -htmlManagerServlet.helpHtmlManager=Hilfeseite HTML Manager (englisch) -htmlManagerServlet.helpHtmlManagerFile=html-manager-howto.html -htmlManagerServlet.helpManager=Hilfeseite Manager (englisch) -htmlManagerServlet.helpManagerFile=manager-howto.html -htmlManagerServlet.deployButton=Installieren -htmlManagerServlet.deployConfig=XML Konfigurationsdatei URL: -htmlManagerServlet.deployPath=Kontext Pfad (optional): -htmlManagerServlet.deployServer=Verzeichnis oder WAR Datei auf Server installieren -htmlManagerServlet.deployTitle=Installieren -htmlManagerServlet.deployUpload=Lokale WAR Datei zur Installation hochladen -htmlManagerServlet.deployUploadFail=FEHLER - Hochladen zur Installation fehlgeschlagen, Ausnahme: {0} -htmlManagerServlet.deployUploadFile=WAR Datei ausw�hlen -htmlManagerServlet.deployUploadNotWar=FEHLER - Hochgeladene Datei \"{0}\" muss ein .war sein -htmlManagerServlet.deployUploadNoFile=FEHLER - Hochladen fehlgeschlagen, keine Datei vorhanden -htmlManagerServlet.deployUploadWarExists=FEHLER - WAR Datei \"{0}\" existiert bereits auf Server -htmlManagerServlet.deployWar=WAR oder Verzeichnis URL: -htmlManagerServlet.list=Anwendungen auflisten -htmlManagerServlet.manager=Manager -htmlManagerServlet.messageLabel=Nachricht: -htmlManagerServlet.serverJVMVendor=JVM Hersteller -htmlManagerServlet.serverJVMVersion=JVM Version -htmlManagerServlet.serverOSArch=OS Architektur -htmlManagerServlet.serverOSName=OS Name -htmlManagerServlet.serverOSVersion=OS Version -htmlManagerServlet.serverTitle=Server Informationen -htmlManagerServlet.serverVersion=Tomcat Version -htmlManagerServlet.title=Tomcat Webanwendungs-Manager -managerServlet.alreadyContext=FEHLER - Anwendung existiert bereits f�r Kontext Pfad {0} -managerServlet.alreadyDocBase=FEHLER - Verzeichnis {0} bereits in Benutzung -managerServlet.cannotInvoke=Kann Manager-Servlet nicht durch Invoker aufrufen -managerServlet.configured=OK - Anwendung von Kontext-Datei {0} installiert -managerServlet.deployed=OK - Anwendung mit Kontext Pfad {0} installiert -managerServlet.exception=FEHLER - Ausnahme aufgetreten {0} -managerServlet.deployed=OK - Anwendung mit Kontext Pfad {0} installiert -managerServlet.invalidPath=FEHLER - Ung�ltiger Kontext Pfad {0} angegeben -managerServlet.invalidWar=FEHLER - Ung�ltige URL {0} f�r Anwendung angegeben -managerServlet.listed=OK - Auflistung der Webanwendungen f�r virtuellen Server {0} -managerServlet.listitem={0}:{1}:{2}:{3} -managerServlet.noAppBase=FEHLER - Kann Verzeichnis f�r Kontext Pfad {0} nicht finden -managerServlet.noCommand=FEHLER - Es wurde kein Kommando angegeben -managerServlet.noContext=FEHLER - Es existiert kein Kontext f�r Pfad {0} -managerServlet.noDirectory=FEHLER - Pfad {0} ist kein Verzeichnis -managerServlet.noDocBase=FEHLER - Kann Webanwendungs-Verzeichnis nicht entfernen f�r Kontext Pfad {0} -managerServlet.noGlobal=FEHLER - Keine globalen JNDI Ressourcen verf�gbar -managerServlet.noReload=FEHLER - Neu laden nicht unterst�tzt f�r WAR mit Pfad {0} -managerServlet.noRename=FEHLER - Kann hochgeladenes WAR mit Pfad {0} nicht installieren -managerServlet.noRole=FEHLER - Benutzer nicht in Rolle {0} -managerServlet.noSelf=FEHLER - Manager-Kommandos k�nnen nicht auf die Manager-Anwendung selbst angewendet werden -managerServlet.noWrapper=Container hat setWrapper() f�r dieses Servlet nicht aufgerufen -managerServlet.reloaded=OK - Anwendung mit Kontext Pfad {0} neu geladen -managerServlet.undeployd=OK - Anwendung mit Kontext Pfad {0} entfernt -managerServlet.resourcesAll=OK - Auflistung globaler Ressourcen (alle Typen) -managerServlet.resourcesType=OK - Auflistung globaler Ressourcen von Typ {0} -managerServlet.rolesList=OK - Auflistung der Sicherheits-Rollen -managerServlet.saveFail=FEHLER - Speichern der Konfiguration fehlgeschlagen: {0} -managerServlet.sessiondefaultmax=Voreingestellter Sitzungsablauf nach maximal {0} Minuten Inaktivit�t -managerServlet.sessiontimeout={0} Minuten: {1} Sitzungen -managerServlet.sessions=OK - Sitzungs-Informationen f�r Anwendung mit Kontext Pfad {0} -managerServlet.started=OK - Anwendung mit Kontext Pfad {0} gestartet -managerServlet.startFailed=FEHLER - Anwendung mit Kontext Pfad {0} konnte nicht gestartet werden -managerServlet.stopped=OK - Anwendung mit Kontext Pfad {0} gestoppt -managerServlet.undeployed=OK - Anwendung mit Kontext Pfad {0} entfernt -managerServlet.unknownCommand=FEHLER - Unbekanntes Kommando {0} -managerServlet.userDatabaseError=FEHLER - Kann Referenz auf Benutzerdatendank nicht aufl�sen -managerServlet.userDatabaseMissing=FEHLER - Keine Benutzerdatenbank vorhanden - -statusServlet.title=Server Status -statusServlet.complete=Ausf�hrlicher Server Status Deleted: trunk/src/main/java/org/apache/catalina/manager/LocalStrings_es.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/manager/LocalStrings_es.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/manager/LocalStrings_es.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,101 +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. -htmlManagerServlet.appsAvailable = Ejecut\u00E1ndose -htmlManagerServlet.appsName = Nombre a Mostrar -htmlManagerServlet.appsPath = Trayectoria -htmlManagerServlet.appsReload = Recargar -htmlManagerServlet.appsUndeploy = Replegar -htmlManagerServlet.appsExpire = Expirar sesiones -htmlManagerServlet.appsSessions = Sesiones -htmlManagerServlet.appsStart = Arrancar -htmlManagerServlet.appsStop = Parar -htmlManagerServlet.appsTasks = Comandos -htmlManagerServlet.appsTitle = Aplicaciones -htmlManagerServlet.expire.explain = sin trabajar &ge; -htmlManagerServlet.expire.unit = minutos -htmlManagerServlet.helpHtmlManager = Ayuda HTML de Gestor -htmlManagerServlet.helpHtmlManagerFile = html-manager-howto.html -htmlManagerServlet.helpManager = Ayuda de Gestor -htmlManagerServlet.helpManagerFile = manager-howto.html -htmlManagerServlet.deployButton = Desplegar -htmlManagerServlet.deployConfig = URL de archivo de Configuraci\u00F3n XML\: -htmlManagerServlet.deployPath = Trayectoria de Contexto (opcional)\: -htmlManagerServlet.deployServer = Desplegar directorio o archivo WAR localizado en servidor -htmlManagerServlet.deployTitle = Desplegar -htmlManagerServlet.deployUpload = Archivo WAR a desplegar -htmlManagerServlet.deployUploadFail = FALLO - Fall\u00F3 Carga de Despliegue, Excepci\u00F3n\: {0} -htmlManagerServlet.deployUploadFile = Seleccione archivo WAR a cargar -htmlManagerServlet.deployUploadInServerXml = FALLO - El fichero war "{0}" no se puede cargar si se define el contexto en server.xml -htmlManagerServlet.deployUploadNotWar = FALLO - El fichero cargado "{0}" debe de ser un .war -htmlManagerServlet.deployUploadNoFile = FALLO - Fall\u00F3 la carga del fichero, no hay fichero -htmlManagerServlet.deployUploadWarExists = FALLO - El fichero war "{0}" ya existe en el servidor -htmlManagerServlet.deployWar = URL de WAR o Directorio\: -htmlManagerServlet.list = Listar Aplicaciones -htmlManagerServlet.manager = Gestor -htmlManagerServlet.messageLabel = Mensaje\: -htmlManagerServlet.noManager = - -htmlManagerServlet.serverJVMVendor = Vendedor JVM -htmlManagerServlet.serverJVMVersion = Versi\u00F3n JVM -htmlManagerServlet.serverOSArch = Arquitectura de SO -htmlManagerServlet.serverOSName = Nombre de SO -htmlManagerServlet.serverOSVersion = Versi\u00F3n de SO -htmlManagerServlet.serverTitle = Informaci\u00F3n de Servidor -htmlManagerServlet.serverVersion = Versi\u00F3n de Tomcat -htmlManagerServlet.title = Gestor de Aplicaciones Web de Tomcat -managerServlet.alreadyContext = FALLO - Ya existe la aplicaci\u00F3n en la trayectoria {0} -managerServlet.alreadyDocBase = FALLO - Directorio {0} ya est\u00E1 siendo usado -managerServlet.cannotInvoke = No puedo invocar servlet de gestor a trav\u00E9s de invocador -managerServlet.configured = OK - Desplegada aplicaci\u00F3n desde archivo de contexto {0} -managerServlet.deployed = OK - Desplegada aplicaci\u00F3n en trayectoria de contexto {0} -managerServlet.deployFailed = FALLO - No pude desplegar la aplicaci\u00F3n en ruta de contexto {0} -managerServlet.exception = FALLO - Encontrada excepci\u00F3n {0} -managerServlet.deployed = OK - Aplicaci\u00F3n desplegada en ruta de contexto {0} -managerServlet.invalidPath = FALLO - Se ha especificado una trayectoria inv\u00E1lida de contexto {0} -managerServlet.invalidWar = FALLO - Se ha especificado una URL de aplicaci\u00F3n inv\u00E1lida {0} -managerServlet.listed = OK - Aplicaciones listadas para m\u00E1quinda virutal {0} -managerServlet.listitem = {0}\:{1}\:{2}\:{3} -managerServlet.noAppBase = FALLO - No puedo identificar aplicaci\u00F3n base para trayectoria de contexto {0} -managerServlet.noCommand = FALLO - No se ha especificado comando -managerServlet.noContext = FALLO - No existe contexto para trayectoria {0} -managerServlet.noDirectory = FALLO - Documento base No-directorio para trayectoria {0} -managerServlet.noDocBase = FALLO - No puedo replegar documento base para trayectoria {0} -managerServlet.noGlobal = FALLO - No hay disponibles recursos globales JNDI -managerServlet.noManager = FALLO - No existe gestor para ruta {0} -managerServlet.noReload = FALLO - Recarga no soportada en WAR desplegado en trayectoria {0} -managerServlet.noRename = FALLO - No pudeo desplegar WAR cargado para trayectoria {0} -managerServlet.noRole = FALLO - El usuario no desempe\u00F1a el papel de {0} -managerServlet.noSelf = FALLO - El gestor no puede recargarse, replegarse, pararse o replegarse a s\u00ED mismo -managerServlet.noWrapper = El Contenedor no ha llamado a setWrapper() para este servlet -managerServlet.notDeployed = FALLO - El contexto {0} est\u00E1 definido en server.xml y puede que no est\u00E9 desplegado -managerServlet.reloaded = OK - Recargada aplicaci\u00F3n en trayectoria de contexto {0} -managerServlet.undeployd = OK - Replegada aplicaci\u00F3n en trayectoria de contexto {0} -managerServlet.resourcesAll = OK - Listados recursos globales de todos los tipos -managerServlet.resourcesType = OK - Listados recursos globales de tipo {0} -managerServlet.rolesList = OK - Listados papeles de seguridad -managerServlet.saveFail = FAIL - Fallo al guardar la configuraci\u00F3n\: {0} -managerServlet.saved = OK - Configuraci\u00F3n de Servidor guardada -managerServlet.savedContext = OK - Configuraci\u00F3n de Contexto {0} guardada -managerServlet.sessiondefaultmax = Intervalo m\u00E1ximo por defecto de sesi\u00F3n inactiva {0} minutos -managerServlet.sessiontimeout = {0} minutos\: {1} sesiones -managerServlet.sessions = OK - Informaci\u00F3n de sesi\u00F3n para aplicaci\u00F3n en trayectoria de contexto {0} -managerServlet.started = OK - Arrancada aplicaci\u00F3n en trayectoria de contexto {0} -managerServlet.startFailed = FALLO - No se pudo arrancar la aplicaci\u00F3n en trayectoria de contexto {0} -managerServlet.stopped = OK - Parada aplicaci\u00F3n en trayectoria de contexto {0} -managerServlet.undeployed = OK - Replegada aplicacaci\u00F3n en trayectoria de contexto {0} -managerServlet.unknownCommand = FALLO - Comando desconocido {0} -managerServlet.userDatabaseError = FALLO - No puedo resolver referencia de base de datos de usuario -managerServlet.userDatabaseMissing = FALLO - No se encuentra disponible base de datos de usuario -statusServlet.title = Estado de Servidor -statusServlet.complete = Estado Completo de Servidor Deleted: trunk/src/main/java/org/apache/catalina/manager/LocalStrings_fr.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/manager/LocalStrings_fr.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/manager/LocalStrings_fr.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,64 +0,0 @@ -htmlManagerServlet.appsAvailable=Fonctionnant -htmlManagerServlet.appsName=Nom d''affichage -htmlManagerServlet.appsPath=Chemin -htmlManagerServlet.appsReload=Recharger -htmlManagerServlet.appsRemove=Retirer -htmlManagerServlet.appsSessions=Sessions -htmlManagerServlet.appsStart=D�marrer -htmlManagerServlet.appsStop=Arr�ter -htmlManagerServlet.appsTitle=Applications -htmlManagerServlet.installButton=Installation -htmlManagerServlet.installConfig=URL de configuration: -htmlManagerServlet.installPath=Chemin: -htmlManagerServlet.installTitle=Installation -htmlManagerServlet.installWar=URL du WAR: -htmlManagerServlet.messageLabel=Message: -htmlManagerServlet.serverJVMVendor=Fournisseur de la JVM -htmlManagerServlet.serverJVMVersion=Version de la JVM -htmlManagerServlet.serverOSArch=Architecture d''OS -htmlManagerServlet.serverOSName=Nom d''OS -htmlManagerServlet.serverOSVersion=Version d''OS -htmlManagerServlet.serverTitle=Serveur -htmlManagerServlet.serverVersion=Version de serveur -htmlManagerServlet.title=Gestionnaire d''applications WEB Tomcat -managerServlet.alreadyContext=ECHEC - l''application existe d�j� dans le chemin {0} -managerServlet.alreadyDocBase=ECHEC - Le r�pertoire {0} est d�j� utilis� -managerServlet.cannotInvoke=Impossible d''utiliser le gestionnaire de servlet au travers du d�l�gu� (invoker) -managerServlet.configured=OK - Application configur�e depuis le fichier contexte {0} -managerServlet.deployed=OK - Application d�ploy�e pour le chemin de contexte {0} -managerServlet.exception=ECHEC - L''exception {0} a �t� rencontr�e -managerServlet.installed=OK - Application install�e pour le chemin de contexte {0} -managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide {0} a �t� sp�cifi� -managerServlet.invalidWar=ECHEC - Une URL d''application invalide {0} a �t� sp�cifi�e -managerServlet.listed=OK - Applications list�es pour l''h�te virtuel (virtual host) {0} -managerServlet.listitem={0}:{1}:{2}:{3} -managerServlet.noAppBase=ECHEC - Impossible d''identifier la base de l''application base pour le chemin de context {0} -managerServlet.noCommand=ECHEC - Aucune commande n''a �t� sp�cifi�e -managerServlet.noContext=ECHEC - Aucune contexte n''existe pour le chemin {0} -managerServlet.noDirectory=ECHEC - La base de document n''est pas un r�pertoire pour le chemin {0} -managerServlet.noDocBase=ECHEC - Impossible de retirer la base de document pour le chemin {0} -managerServlet.noGlobal=ECHEC - Aucune ressource JNDI globale n''est disponible -managerServlet.noReload=ECHEC - Rechargement non support� par le WAR d�ploy� au chemin {0} -managerServlet.noRename=ECHEC - Impossible de d�ployer un WAR t�l�charg� pour le chemin {0} -managerServlet.noRole=ECHEC - L''utilisateur ne poss�de pas le r�le {0} -managerServlet.noSelf=ECHEC - Le gestionnaire ne peut recharger, retirer, arr�ter, ou se d�ployer lui-m�me -managerServlet.noWrapper=Le conteneur n''a pas appel� "setWrapper()" pour cette servlet -managerServlet.reloaded=OK - Application recharg�e au chemin de contexte {0} -managerServlet.removed=OK - Application retir�e au chemin de contexte {0} -managerServlet.resourcesAll=OK - Liste des ressources globales de tout type -managerServlet.resourcesType=OK - Liste des ressources globales de type {0} -managerServlet.rolesList=OK - Liste de r�les de securit� -managerServlet.saveFail=ECHEC - La sauvegarde de la configuration a �chou�: {0} -managerServlet.sessiondefaultmax=Interval par d�faut de maximum de session inactive {0} minutes -managerServlet.sessiontimeout={0} minutes:{1} sessions -managerServlet.sessions=OK - Information de session pour l''application au chemin de contexte {0} -managerServlet.started=OK - Application d�marr�e pour le chemin de contexte {0} -managerServlet.startFailed=ECHEC - L''application pour le chemin de contexte {0} n''a pas pu�tred�marr�e -managerServlet.stopped=OK - Application arr�t�e pour le chemin de contexte {0} -managerServlet.undeployed=OK - Application non-d�ploy�e pour le chemin de contexte {0} -managerServlet.unknownCommand=ECHEC - Commande inconnue {0} -managerServlet.userDatabaseError=ECHEC - Impossible de r�soudre la base de donn�es utilisateurs der�f�rence -managerServlet.userDatabaseMissing=ECHEC - Aucune base de donn�es utilisateurs n''est disponible - -statusServlet.title=Etat du serveur -statusServlet.complete=Etat complet du serveur Deleted: trunk/src/main/java/org/apache/catalina/manager/LocalStrings_ja.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/manager/LocalStrings_ja.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/manager/LocalStrings_ja.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,79 +0,0 @@ -htmlManagerServlet.appsAvailable=\u5b9f\u884c\u4e2d -htmlManagerServlet.appsName=\u8868\u793a\u540d -htmlManagerServlet.appsPath=\u30d1\u30b9 -htmlManagerServlet.appsReload=\u518d\u30ed\u30fc\u30c9 -htmlManagerServlet.appsUndeploy=\u914d\u5099\u89e3\u9664 -htmlManagerServlet.appsSessions=\u30bb\u30c3\u30b7\u30e7\u30f3 -htmlManagerServlet.appsStart=\u8d77\u52d5 -htmlManagerServlet.appsStop=\u505c\u6b62 -htmlManagerServlet.appsTasks=\u30b3\u30de\u30f3\u30c9 -htmlManagerServlet.appsTitle=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 -htmlManagerServlet.helpHtmlManager=HTML\u30de\u30cd\u30fc\u30b8\u30e3\u30d8\u30eb\u30d7 -htmlManagerServlet.helpHtmlManagerFile=html-manager-howto.html -htmlManagerServlet.helpManager=\u30de\u30cd\u30fc\u30b8\u30e3\u30d8\u30eb\u30d7 -htmlManagerServlet.helpManagerFile=manager-howto.html -htmlManagerServlet.deployButton=\u914d\u5099 -htmlManagerServlet.deployConfig=XML\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u306eURL: -htmlManagerServlet.deployPath=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 (\u7701\u7565\u53ef): -htmlManagerServlet.deployServer=\u30b5\u30fc\u30d0\u4e0a\u306eWAR\u30d5\u30a1\u30a4\u30eb\u53c8\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u914d\u5099 -htmlManagerServlet.deployTitle=\u914d\u5099 -htmlManagerServlet.deployUpload=WAR\u30d5\u30a1\u30a4\u30eb\u306e\u914d\u5099 -htmlManagerServlet.deployUploadFail=FAIL - \u914d\u5099\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3001\u4f8b\u5916: {0} -htmlManagerServlet.deployUploadFile=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3059\u308bWAR\u30d5\u30a1\u30a4\u30eb\u306e\u9078\u629e -htmlManagerServlet.deployUploadNotWar=FAIL - \u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3059\u308b\u30d5\u30a1\u30a4\u30eb \"{0}\" \u306fWAR\u30d5\u30a1\u30a4\u30eb\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 -htmlManagerServlet.deployUploadNoFile=FAIL - \u30d5\u30a1\u30a4\u30eb\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3001\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3057\u307e\u305b\u3093 -htmlManagerServlet.deployUploadWarExists=FAIL - WAR\u30d5\u30a1\u30a4\u30eb \"{0}\" \u306f\u65e2\u306b\u30b5\u30fc\u30d0\u4e0a\u306b\u5b58\u5728\u3057\u307e\u3059 -htmlManagerServlet.deployWar=WAR\u30d5\u30a1\u30a4\u30eb\u53c8\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306eURL: -htmlManagerServlet.list=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u4e00\u89a7 -htmlManagerServlet.manager=\u30de\u30cd\u30fc\u30b8\u30e3 -htmlManagerServlet.messageLabel=\u30e1\u30c3\u30bb\u30fc\u30b8 -htmlManagerServlet.serverJVMVendor=JVM\u30d9\u30f3\u30c0 -htmlManagerServlet.serverJVMVersion=JVM\u30d0\u30fc\u30b8\u30e7\u30f3 -htmlManagerServlet.serverOSArch=OS\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3 -htmlManagerServlet.serverOSName=OS\u540d -htmlManagerServlet.serverOSVersion=OS\u30d0\u30fc\u30b8\u30e7\u30f3 -htmlManagerServlet.serverTitle=\u30b5\u30fc\u30d0\u60c5\u5831 -htmlManagerServlet.serverVersion=Tomcat\u30d0\u30fc\u30b8\u30e7\u30f3 -htmlManagerServlet.title=Tomcat Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30de\u30cd\u30fc\u30b8\u30e3 -managerServlet.alreadyContext=FAIL - \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u3001\u65e2\u306b\u30d1\u30b9 {0} \u306b\u5b58\u5728\u3057\u307e\u3059 -managerServlet.alreadyDocBase=FAIL - \u30c7\u30a3\u30ec\u30af\u30c8\u30ea {0} \u306f\u65e2\u306b\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u3059 -managerServlet.cannotInvoke=\u30a4\u30f3\u30dc\u30fc\u30ab\u3067\u30de\u30cd\u30fc\u30b8\u30e3\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3092\u8d77\u52d5\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f -managerServlet.configured=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb {0} \u304b\u3089\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3057\u305f -managerServlet.deployed=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u3057\u307e\u3057\u305f -managerServlet.exception=FAIL - \u4f8b\u5916 {0} \u304c\u767a\u751f\u3057\u307e\u3057\u305f -managerServlet.deployed=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306b\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3057\u305f -managerServlet.invalidPath=FAIL - \u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f -managerServlet.invalidWar=FAIL - \u7121\u52b9\u306a\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306eURL {0} \u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f -managerServlet.listed=OK - \u30d0\u30fc\u30c1\u30e3\u30eb\u30db\u30b9\u30c8 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4e00\u89a7\u3067\u3059 -managerServlet.listitem={0}:{1}:{2}:{3} -managerServlet.noAppBase=FAIL - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306b\u5bfe\u3057\u3066\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d9\u30fc\u30b9\u3092\u78ba\u8a8d\u3067\u304d\u307e\u305b\u3093 -managerServlet.noCommand=FAIL - \u30b3\u30de\u30f3\u30c9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -managerServlet.noContext=FAIL - \u30d1\u30b9 {0} \u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u304c\u5b58\u5728\u3057\u307e\u305b\u3093 -managerServlet.noDirectory=FAIL - \u30d1\u30b9 {0} \u306b\u5bfe\u3059\u308b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30d9\u30fc\u30b9\u304c\u3042\u308a\u307e\u305b\u3093 -managerServlet.noDocBase=FAIL - \u30d1\u30b9 {0} \u306b\u5bfe\u3059\u308b\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30d9\u30fc\u30b9\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093 -managerServlet.noGlobal=FAIL - \u30b0\u30ed\u30fc\u30d0\u30eb\u306aJNDI\u30ea\u30bd\u30fc\u30b9\u304c\u5229\u7528\u3067\u304d\u307e\u305b\u3093 -managerServlet.noReload=FAIL - \u30d1\u30b9 {0} \u306b\u914d\u5099\u3055\u308c\u305fWAR\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u518d\u30ed\u30fc\u30c9\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -managerServlet.noRename=FAIL - \u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3055\u308c\u305fWAR\u30d5\u30a1\u30a4\u30eb\u3092\u30d1\u30b9 {0} \u306b\u914d\u5099\u3067\u304d\u307e\u305b\u3093 -managerServlet.noRole=FAIL - \u30e6\u30fc\u30b6\u306f\u30ed\u30fc\u30eb {0} \u3092\u6301\u3063\u3066\u3044\u307e\u305b\u3093 -managerServlet.noSelf=FAIL - \u30de\u30cd\u30fc\u30b8\u30e3\u81ea\u8eab\u3092\u518d\u30ed\u30fc\u30c9\u3001\u524a\u9664\u3001\u505c\u6b62\u3001\u53c8\u306f\u914d\u5099\u89e3\u9664\u3067\u304d\u307e\u305b\u3093 -managerServlet.noWrapper=\u30b3\u30f3\u30c6\u30ca\u306f\u3053\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306b\u5bfe\u3057\u3066\u547c\u3073\u51fa\u3055\u308c\u305fsetWrapper()\u3092\u6301\u3063\u3066\u3044\u307e\u305b\u3093 -managerServlet.reloaded=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u518d\u30ed\u30fc\u30c9\u3057\u307e\u3057\u305f -managerServlet.undeployd=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u304b\u3089\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u89e3\u9664\u3057\u307e\u3057\u305f -managerServlet.resourcesAll=OK - \u3059\u3079\u3066\u306e\u30bf\u30a4\u30d7\u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30ea\u30bd\u30fc\u30b9\u3092\u5217\u6319\u3057\u307e\u3057\u305f -managerServlet.resourcesType=OK - \u30bf\u30a4\u30d7 {0} \u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30ea\u30bd\u30fc\u30b9\u3092\u5217\u6319\u3057\u307e\u3057\u305f -managerServlet.rolesList=OK - \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u3092\u5217\u6319\u3057\u307e\u3057\u305f -managerServlet.saveFail=FAIL - \u8a2d\u5b9a\u306e\u4fdd\u5b58\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0} -managerServlet.saved=OK - \u30b5\u30fc\u30d0\u306e\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3057\u307e\u3057\u305f -managerServlet.savedContext=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8 {0} \u306e\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3057\u307e\u3057\u305f -managerServlet.sessiondefaultmax=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u6700\u5927\u30bb\u30c3\u30b7\u30e7\u30f3\u505c\u6b62\u9593\u9694\u306f{0}\u5206\u3067\u3059 -managerServlet.sessiontimeout={0}\u5206: {1}\u30bb\u30c3\u30b7\u30e7\u30f3 -managerServlet.sessions=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u60c5\u5831\u3067\u3059 -managerServlet.started=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u8d77\u52d5\u3057\u307e\u3057\u305f -managerServlet.startFailed=FAIL - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u8d77\u52d5\u3067\u304d\u307e\u305b\u3093 -managerServlet.stopped=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u505c\u6b62\u3057\u307e\u3057\u305f -managerServlet.undeployed=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u89e3\u9664\u3057\u307e\u3057\u305f -managerServlet.unknownCommand=FAIL - \u672a\u77e5\u306e\u30b3\u30de\u30f3\u30c9 {0} \u3067\u3059 -managerServlet.userDatabaseError=FAIL - \u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u53c2\u7167\u3092\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093 -managerServlet.userDatabaseMissing=FAIL - \u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u5229\u7528\u3067\u304d\u307e\u305b\u3093 -statusServlet.title=\u30b5\u30fc\u30d0\u306e\u72b6\u614b -statusServlet.complete=\u30b5\u30fc\u30d0\u306e\u5168\u72b6\u614b Deleted: trunk/src/main/java/org/apache/catalina/manager/StatusManagerServlet.java =================================================================== --- trunk/src/main/java/org/apache/catalina/manager/StatusManagerServlet.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/manager/StatusManagerServlet.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,375 +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.manager; - - -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.Set; -import java.util.Vector; - -import javax.management.MBeanServer; -import javax.management.MBeanServerNotification; -import javax.management.Notification; -import javax.management.NotificationListener; -import javax.management.ObjectInstance; -import javax.management.ObjectName; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.catalina.util.ServerInfo; -import org.apache.catalina.util.StringManager; -import org.apache.tomcat.util.modeler.Registry; - -/** - * This servlet will display a complete status of the HTTP/1.1 connector. - * - * @author Remy Maucherat - * @version $Revision: 515 $ $Date: 2008-03-17 22:02:23 +0100 (Mon, 17 Mar 2008) $ - */ - -public class StatusManagerServlet - extends HttpServlet implements NotificationListener { - - - // ----------------------------------------------------- Instance Variables - - - /** - * The debugging detail level for this servlet. - */ - private int debug = 0; - - - /** - * MBean server. - */ - protected MBeanServer mBeanServer = null; - - - /** - * Vector of protocol handlers object names. - */ - protected Vector protocolHandlers = new Vector(); - - - /** - * Vector of thread pools object names. - */ - protected Vector threadPools = new Vector(); - - - /** - * Vector of request processors object names. - */ - protected Vector requestProcessors = new Vector(); - - - /** - * Vector of global request processors object names. - */ - protected Vector globalRequestProcessors = new Vector(); - - - /** - * The string manager for this package. - */ - protected static StringManager sm = - StringManager.getManager(Constants.Package); - - - // --------------------------------------------------------- Public Methods - - - /** - * Initialize this servlet. - */ - public void init() throws ServletException { - - // Retrieve the MBean server - mBeanServer = Registry.getRegistry(null, null).getMBeanServer(); - - // Set our properties from the initialization parameters - String value = null; - try { - value = getServletConfig().getInitParameter("debug"); - debug = Integer.parseInt(value); - } catch (Throwable t) { - ; - } - - try { - - // Query protocol handlers - String onStr = "*:type=ProtocolHandler,*"; - ObjectName objectName = new ObjectName(onStr); - Set set = mBeanServer.queryMBeans(objectName, null); - Iterator iterator = set.iterator(); - while (iterator.hasNext()) { - ObjectInstance oi = (ObjectInstance) iterator.next(); - protocolHandlers.addElement(oi.getObjectName()); - } - - // Query Thread Pools - onStr = "*:type=ThreadPool,*"; - objectName = new ObjectName(onStr); - set = mBeanServer.queryMBeans(objectName, null); - iterator = set.iterator(); - while (iterator.hasNext()) { - ObjectInstance oi = (ObjectInstance) iterator.next(); - threadPools.addElement(oi.getObjectName()); - } - - // Query Global Request Processors - onStr = "*:type=GlobalRequestProcessor,*"; - objectName = new ObjectName(onStr); - set = mBeanServer.queryMBeans(objectName, null); - iterator = set.iterator(); - while (iterator.hasNext()) { - ObjectInstance oi = (ObjectInstance) iterator.next(); - globalRequestProcessors.addElement(oi.getObjectName()); - } - - // Query Request Processors - onStr = "*:type=RequestProcessor,*"; - objectName = new ObjectName(onStr); - set = mBeanServer.queryMBeans(objectName, null); - iterator = set.iterator(); - while (iterator.hasNext()) { - ObjectInstance oi = (ObjectInstance) iterator.next(); - requestProcessors.addElement(oi.getObjectName()); - } - - // Register with MBean server - onStr = "JMImplementation:type=MBeanServerDelegate"; - objectName = new ObjectName(onStr); - mBeanServer.addNotificationListener(objectName, this, null, null); - - } catch (Exception e) { - e.printStackTrace(); - } - - } - - - /** - * Finalize this servlet. - */ - public void destroy() { - - ; // No actions necessary - - } - - - /** - * Process a GET request for the specified resource. - * - * @param request The servlet request we are processing - * @param response The servlet response we are creating - * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet-specified error occurs - */ - public void doGet(HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException { - - // mode is flag for HTML or XML output - int mode = 0; - // if ?XML=true, set the mode to XML - if (request.getParameter("XML") != null - && request.getParameter("XML").equals("true")) { - mode = 1; - } - StatusTransformer.setContentType(response, mode); - - PrintWriter writer = response.getWriter(); - - boolean completeStatus = false; - if ((request.getPathInfo() != null) - && (request.getPathInfo().equals("/all"))) { - completeStatus = true; - } - // use StatusTransformer to output status - Object[] args = new Object[1]; - args[0] = request.getContextPath(); - StatusTransformer.writeHeader(writer, args, mode); - - // Body Header Section - args = new Object[2]; - args[0] = request.getContextPath(); - if (completeStatus) { - args[1] = sm.getString("statusServlet.complete"); - } else { - args[1] = sm.getString("statusServlet.title"); - } - // use StatusTransformer to output status - StatusTransformer.writeBody(writer,args,mode); - - // Manager Section - args = new Object[9]; - args[0] = sm.getString("htmlManagerServlet.manager"); - args[1] = response.encodeURL(request.getContextPath() + "/html/list"); - args[2] = sm.getString("htmlManagerServlet.list"); - args[3] = response.encodeURL - (request.getContextPath() + "/" + - sm.getString("htmlManagerServlet.helpHtmlManagerFile")); - args[4] = sm.getString("htmlManagerServlet.helpHtmlManager"); - args[5] = response.encodeURL - (request.getContextPath() + "/" + - sm.getString("htmlManagerServlet.helpManagerFile")); - args[6] = sm.getString("htmlManagerServlet.helpManager"); - if (completeStatus) { - args[7] = response.encodeURL - (request.getContextPath() + "/status"); - args[8] = sm.getString("statusServlet.title"); - } else { - args[7] = response.encodeURL - (request.getContextPath() + "/status/all"); - args[8] = sm.getString("statusServlet.complete"); - } - // use StatusTransformer to output status - StatusTransformer.writeManager1(writer,args,mode); - try { - - if ((request.getPathInfo() != null) - && (request.getPathInfo().equals("/all"))) { - // Note: Retrieving the full status is much slower - // use StatusTransformer to output status - StatusTransformer.writeAppList - (writer, mBeanServer, mode); - } - - } catch (Exception e) { - throw new ServletException(e); - } - StatusTransformer.writeManager2(writer,args,mode); - - // Server Header Section - args = new Object[7]; - args[0] = sm.getString("htmlManagerServlet.serverTitle"); - args[1] = sm.getString("htmlManagerServlet.serverVersion"); - args[2] = sm.getString("htmlManagerServlet.serverJVMVersion"); - args[3] = sm.getString("htmlManagerServlet.serverJVMVendor"); - args[4] = sm.getString("htmlManagerServlet.serverOSName"); - args[5] = sm.getString("htmlManagerServlet.serverOSVersion"); - args[6] = sm.getString("htmlManagerServlet.serverOSArch"); - // use StatusTransformer to output status - StatusTransformer.writePageHeading(writer,args,mode); - - // Server Row Section - args = new Object[6]; - args[0] = ServerInfo.getServerInfo(); - args[1] = System.getProperty("java.runtime.version"); - args[2] = System.getProperty("java.vm.vendor"); - args[3] = System.getProperty("os.name"); - args[4] = System.getProperty("os.version"); - args[5] = System.getProperty("os.arch"); - // use StatusTransformer to output status - StatusTransformer.writeServerInfo(writer, args, mode); - - try { - - // Display operating system statistics using APR if available - StatusTransformer.writeOSState(writer,mode); - - // Display virtual machine statistics - StatusTransformer.writeVMState(writer,mode); - - Enumeration enumeration = threadPools.elements(); - while (enumeration.hasMoreElements()) { - ObjectName objectName = (ObjectName) enumeration.nextElement(); - String name = objectName.getKeyProperty("name"); - // use StatusTransformer to output status - StatusTransformer.writeConnectorState - (writer, objectName, - name, mBeanServer, globalRequestProcessors, - requestProcessors, mode); - } - - if ((request.getPathInfo() != null) - && (request.getPathInfo().equals("/all"))) { - // Note: Retrieving the full status is much slower - // use StatusTransformer to output status - StatusTransformer.writeDetailedState - (writer, mBeanServer, mode); - } - - } catch (Exception e) { - throw new ServletException(e); - } - - // use StatusTransformer to output status - StatusTransformer.writeFooter(writer, mode); - - } - - // ------------------------------------------- NotificationListener Methods - - - public void handleNotification(Notification notification, - java.lang.Object handback) { - - if (notification instanceof MBeanServerNotification) { - ObjectName objectName = - ((MBeanServerNotification) notification).getMBeanName(); - if (notification.getType().equals - (MBeanServerNotification.REGISTRATION_NOTIFICATION)) { - String type = objectName.getKeyProperty("type"); - if (type != null) { - if (type.equals("ProtocolHandler")) { - protocolHandlers.addElement(objectName); - } else if (type.equals("ThreadPool")) { - threadPools.addElement(objectName); - } else if (type.equals("GlobalRequestProcessor")) { - globalRequestProcessors.addElement(objectName); - } else if (type.equals("RequestProcessor")) { - requestProcessors.addElement(objectName); - } - } - } else if (notification.getType().equals - (MBeanServerNotification.UNREGISTRATION_NOTIFICATION)) { - String type = objectName.getKeyProperty("type"); - if (type != null) { - if (type.equals("ProtocolHandler")) { - protocolHandlers.removeElement(objectName); - } else if (type.equals("ThreadPool")) { - threadPools.removeElement(objectName); - } else if (type.equals("GlobalRequestProcessor")) { - globalRequestProcessors.removeElement(objectName); - } else if (type.equals("RequestProcessor")) { - requestProcessors.removeElement(objectName); - } - } - String j2eeType = objectName.getKeyProperty("j2eeType"); - if (j2eeType != null) { - - } - } - } - - } - - -} Deleted: trunk/src/main/java/org/apache/catalina/manager/StatusTransformer.java =================================================================== --- trunk/src/main/java/org/apache/catalina/manager/StatusTransformer.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/manager/StatusTransformer.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,960 +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.manager; - -import java.io.IOException; -import java.io.PrintWriter; -import java.lang.reflect.Method; -import java.text.MessageFormat; -import java.util.Date; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.Set; -import java.util.Vector; - -import javax.management.MBeanServer; -import javax.management.ObjectInstance; -import javax.management.ObjectName; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; - -import org.apache.catalina.util.RequestUtil; - -/** - * This is a refactoring of the servlet to externalize - * the output into a simple class. Although we could - * use XSLT, that is unnecessarily complex. - * - * @author Peter Lin - * @version $Revision: 1237 $ $Date: 2009-11-03 02:55:48 +0100 (Tue, 03 Nov 2009) $ - */ - -public class StatusTransformer { - - - // --------------------------------------------------------- Public Methods - - - public static void setContentType(HttpServletResponse response, - int mode) { - if (mode == 0){ - response.setContentType("text/html;charset="+Constants.CHARSET); - } else if (mode == 1){ - response.setContentType("text/xml;charset="+Constants.CHARSET); - } - } - - - /** - * Process a GET request for the specified resource. - * - * @param request The servlet request we are processing - * @param response The servlet response we are creating - * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet-specified error occurs - */ - public static void writeHeader(PrintWriter writer, Object[] args, int mode) { - if (mode == 0){ - // HTML Header Section - writer.print(MessageFormat.format - (Constants.HTML_HEADER_SECTION, args)); - } else if (mode == 1){ - writer.write(Constants.XML_DECLARATION); - writer.write - (Constants.XML_STYLE); - writer.write("<status>"); - } - } - - - /** - * Write the header body. XML output doesn't bother - * to output this stuff, since it's just title. - * - * @param writer The output writer - * @param args What to write - * @param mode 0 means write - */ - public static void writeBody(PrintWriter writer, Object[] args, int mode) { - if (mode == 0){ - writer.print(MessageFormat.format - (Constants.BODY_HEADER_SECTION, args)); - } - } - - - /** - * Write the manager webapp information. - * - * @param writer The output writer - * @param args What to write - * @param mode 0 means write - */ - public static void writeManager1(PrintWriter writer, Object[] args, - int mode) { - if (mode == 0){ - writer.print(MessageFormat.format(Constants.MANAGER_STATUS_SECTION1, args)); - } - } - - - /** - * Write the manager webapp information. - * - * @param writer The output writer - * @param args What to write - * @param mode 0 means write - */ - public static void writeManager2(PrintWriter writer, Object[] args, - int mode) { - if (mode == 0){ - writer.print(MessageFormat.format(Constants.MANAGER_STATUS_SECTION2, args)); - } - } - - - public static void writePageHeading(PrintWriter writer, Object[] args, - int mode) { - if (mode == 0){ - writer.print(MessageFormat.format - (Constants.SERVER_HEADER_SECTION, args)); - } - } - - - public static void writeServerInfo(PrintWriter writer, Object[] args, - int mode){ - if (mode == 0){ - writer.print(MessageFormat.format(Constants.SERVER_ROW_SECTION, args)); - } - } - - - /** - * - */ - public static void writeFooter(PrintWriter writer, int mode) { - if (mode == 0){ - // HTML Tail Section - writer.print(Constants.HTML_TAIL_SECTION); - } else if (mode == 1){ - writer.write("</status>"); - } - } - - - /** - * Write the OS state. Mode 0 will generate HTML. - * Mode 1 will generate XML. - */ - public static void writeOSState(PrintWriter writer, int mode) { - long[] result = new long[16]; - boolean ok = false; - try { - String methodName = "info"; - Class paramTypes[] = new Class[1]; - paramTypes[0] = result.getClass(); - Object paramValues[] = new Object[1]; - paramValues[0] = result; - Method method = Class.forName("org.apache.tomcat.jni.OS") - .getMethod(methodName, paramTypes); - method.invoke(null, paramValues); - ok = true; - } catch (Throwable t) { - // Ignore - } - - if (ok) { - if (mode == 0){ - writer.print("<h3>OS</h3>"); - - writer.print("<p>"); - writer.print(" <strong>Physical memory:</strong> "); - writer.print(formatSize(new Long(result[0]), true)); - writer.print("<br><strong>Available memory:</strong> "); - writer.print(formatSize(new Long(result[1]), true)); - writer.print("<br><strong>Total page file:</strong> "); - writer.print(formatSize(new Long(result[2]), true)); - writer.print("<br><strong>Free page file:</strong> "); - writer.print(formatSize(new Long(result[3]), true)); - writer.print("<br><strong>Memory load:</strong> "); - writer.print(new Long(result[6])); - writer.print("<br><strong>Process kernel time:</strong> "); - writer.print(formatTime(new Long(result[11] / 1000), true)); - writer.print("<br><strong>Process user time:</strong> "); - writer.print(formatTime(new Long(result[12] / 1000), true)); - writer.print("</p>"); - } else if (mode == 1){ - } - } - - } - - - /** - * Write the VM state. Mode 0 will generate HTML. - * Mode 1 will generate XML. - */ - public static void writeVMState(PrintWriter writer, int mode) - throws Exception { - - if (mode == 0){ - writer.print("<h3>JVM</h3>"); - - writer.print("<p>"); - writer.print(" <strong>Free memory:</strong> "); - writer.print(formatSize - (new Long(Runtime.getRuntime().freeMemory()), true)); - writer.print(" <br><strong>Total memory:</strong> "); - writer.print(formatSize - (new Long(Runtime.getRuntime().totalMemory()), true)); - writer.print(" <br><strong>Max memory:</strong> "); - writer.print(formatSize - (new Long(Runtime.getRuntime().maxMemory()), true)); - writer.print("</p>"); - } else if (mode == 1){ - writer.write("<jvm>"); - - writer.write("<memory"); - writer.write(" free='" + Runtime.getRuntime().freeMemory() + "'"); - writer.write(" total='" + Runtime.getRuntime().totalMemory() + "'"); - writer.write(" max='" + Runtime.getRuntime().maxMemory() + "'/>"); - - writer.write("</jvm>"); - } - - } - - - /** - * Write connector state. - */ - public static void writeConnectorState(PrintWriter writer, - ObjectName tpName, String name, - MBeanServer mBeanServer, - Vector globalRequestProcessors, - Vector requestProcessors, int mode) - throws Exception { - - if (mode == 0) { - writer.print("<h3>"); - writer.print(name); - writer.print("</h3>"); - - writer.print("<p>"); - writer.print(" <strong>Max threads:</strong> "); - writer.print(mBeanServer.getAttribute(tpName, "maxThreads")); - writer.print(" <br><strong>Current thread count:</strong> "); - writer.print(mBeanServer.getAttribute(tpName, "currentThreadCount")); - writer.print(" <br><strong>Current thread busy:</strong> "); - writer.print(mBeanServer.getAttribute(tpName, "currentThreadsBusy")); - try { - Object value = mBeanServer.getAttribute(tpName, "keepAliveCount"); - writer.print(" <br><strong>Keeped alive sockets count:</strong> "); - writer.print(value); - } catch (Exception e) { - // Ignore - } - - ObjectName grpName = null; - - Enumeration enumeration = globalRequestProcessors.elements(); - while (enumeration.hasMoreElements()) { - ObjectName objectName = (ObjectName) enumeration.nextElement(); - if (name.equals(objectName.getKeyProperty("name"))) { - grpName = objectName; - } - } - - if (grpName == null) { - return; - } - - writer.print(" <br><strong>Max processing time:</strong> "); - writer.print(formatTime(mBeanServer.getAttribute - (grpName, "maxTime"), false)); - writer.print(" <br><strong>Processing time:</strong> "); - writer.print(formatTime(mBeanServer.getAttribute - (grpName, "processingTime"), true)); - writer.print(" <br><strong>Request count:</strong> "); - writer.print(mBeanServer.getAttribute(grpName, "requestCount")); - writer.print(" <br><strong>Error count:</strong> "); - writer.print(mBeanServer.getAttribute(grpName, "errorCount")); - writer.print(" <br><strong>Bytes received:</strong> "); - writer.print(formatSize(mBeanServer.getAttribute - (grpName, "bytesReceived"), true)); - writer.print(" <br><strong>Bytes sent:</strong> "); - writer.print(formatSize(mBeanServer.getAttribute - (grpName, "bytesSent"), true)); - writer.print("</p>"); - - writer.print("<table width=\"100%\" cellspacing=\"0\" class=\"tableStyle\">"); - writer.print("<thead><th colspan=\"7\">"); - writer.print(name); - writer.print("</th></thead>"); - writer.print("<tr class=\"UnsortableTableHeader\"><td>Stage</td><td>Time</td><td>B Sent</td><td>B Received</td><td>Client</td><td>V. Host</td><td>Request</td></tr><tbody>"); - - enumeration = requestProcessors.elements(); - boolean isHighlighted = false; - String highlightStyle = null; - while (enumeration.hasMoreElements()) { - isHighlighted = !isHighlighted; - if(isHighlighted) { - highlightStyle = "oddRow"; - } else { - highlightStyle = "evenRow"; - } - ObjectName objectName = (ObjectName) enumeration.nextElement(); - if (name.equals(objectName.getKeyProperty("worker"))) { - writer.print("<tr class=\""); - writer.print(highlightStyle); - writer.print("\">"); - writeProcessorState(writer, objectName, mBeanServer, mode); - writer.print("</tr>"); - } - } - - writer.print("<caption align=\"bottom\">P: Parse and prepare request S: Service F: Finishing R: Ready K: Keepalive</caption></tbody></table>"); - - } else if (mode == 1){ - writer.write("<connector name='" + name + "'>"); - - writer.write("<threadInfo "); - writer.write(" maxThreads=\"" + mBeanServer.getAttribute(tpName, "maxThreads") + "\""); - writer.write(" currentThreadCount=\"" + mBeanServer.getAttribute(tpName, "currentThreadCount") + "\""); - writer.write(" currentThreadsBusy=\"" + mBeanServer.getAttribute(tpName, "currentThreadsBusy") + "\""); - writer.write(" />"); - - ObjectName grpName = null; - - Enumeration enumeration = globalRequestProcessors.elements(); - while (enumeration.hasMoreElements()) { - ObjectName objectName = (ObjectName) enumeration.nextElement(); - if (name.equals(objectName.getKeyProperty("name"))) { - grpName = objectName; - } - } - - if (grpName != null) { - - writer.write("<requestInfo "); - writer.write(" maxTime=\"" + mBeanServer.getAttribute(grpName, "maxTime") + "\""); - writer.write(" processingTime=\"" + mBeanServer.getAttribute(grpName, "processingTime") + "\""); - writer.write(" requestCount=\"" + mBeanServer.getAttribute(grpName, "requestCount") + "\""); - writer.write(" errorCount=\"" + mBeanServer.getAttribute(grpName, "errorCount") + "\""); - writer.write(" bytesReceived=\"" + mBeanServer.getAttribute(grpName, "bytesReceived") + "\""); - writer.write(" bytesSent=\"" + mBeanServer.getAttribute(grpName, "bytesSent") + "\""); - writer.write(" />"); - - writer.write("<workers>"); - enumeration = requestProcessors.elements(); - while (enumeration.hasMoreElements()) { - ObjectName objectName = (ObjectName) enumeration.nextElement(); - if (name.equals(objectName.getKeyProperty("worker"))) { - writeProcessorState(writer, objectName, mBeanServer, mode); - } - } - writer.write("</workers>"); - } - - writer.write("</connector>"); - } - - } - - - /** - * Write processor state. - */ - protected static void writeProcessorState(PrintWriter writer, - ObjectName pName, - MBeanServer mBeanServer, - int mode) - throws Exception { - - Integer stageValue = - (Integer) mBeanServer.getAttribute(pName, "stage"); - int stage = stageValue.intValue(); - boolean fullStatus = true; - boolean showRequest = true; - String stageStr = null; - - switch (stage) { - - case (1/*org.apache.coyote.Constants.STAGE_PARSE*/): - stageStr = "P"; - fullStatus = false; - break; - case (2/*org.apache.coyote.Constants.STAGE_PREPARE*/): - stageStr = "P"; - fullStatus = false; - break; - case (3/*org.apache.coyote.Constants.STAGE_SERVICE*/): - stageStr = "S"; - break; - case (4/*org.apache.coyote.Constants.STAGE_ENDINPUT*/): - stageStr = "F"; - break; - case (5/*org.apache.coyote.Constants.STAGE_ENDOUTPUT*/): - stageStr = "F"; - break; - case (7/*org.apache.coyote.Constants.STAGE_ENDED*/): - stageStr = "R"; - fullStatus = false; - break; - case (6/*org.apache.coyote.Constants.STAGE_KEEPALIVE*/): - stageStr = "K"; - fullStatus = true; - showRequest = false; - break; - case (0/*org.apache.coyote.Constants.STAGE_NEW*/): - stageStr = "R"; - fullStatus = false; - break; - default: - // Unknown stage - stageStr = "?"; - fullStatus = false; - - } - - if (mode == 0) { - writer.write("<td class=\"first\"><strong>"); - writer.write(stageStr); - writer.write("</strong></td>"); - - if (fullStatus) { - writer.write("<td>"); - writer.print(formatTime(mBeanServer.getAttribute - (pName, "requestProcessingTime"), false)); - writer.write("</td>"); - writer.write("<td>"); - if (showRequest) { - writer.print(formatSize(mBeanServer.getAttribute - (pName, "requestBytesSent"), false)); - } else { - writer.write("?"); - } - writer.write("</td>"); - writer.write("<td>"); - if (showRequest) { - writer.print(formatSize(mBeanServer.getAttribute - (pName, "requestBytesReceived"), - false)); - } else { - writer.write("?"); - } - writer.write("</td>"); - writer.write("<td>"); - writer.print(filter(mBeanServer.getAttribute - (pName, "remoteAddr"))); - writer.write("</td>"); - writer.write("<td nowrap>"); - writer.write(filter(mBeanServer.getAttribute - (pName, "virtualHost"))); - writer.write("</td>"); - writer.write("<td nowrap>"); - if (showRequest) { - writer.write(filter(mBeanServer.getAttribute - (pName, "method"))); - writer.write(" "); - writer.write(filter(mBeanServer.getAttribute - (pName, "currentUri"))); - String queryString = (String) mBeanServer.getAttribute - (pName, "currentQueryString"); - if ((queryString != null) && (!queryString.equals(""))) { - writer.write("?"); - writer.print(RequestUtil.filter(queryString)); - } - writer.write(" "); - writer.write(filter(mBeanServer.getAttribute - (pName, "protocol"))); - } else { - writer.write("?"); - } - writer.write("</td>"); - } else { - writer.write("<td>?</td><td>?</td><td>?</td><td>?</td><td>?</td><td>?</td>"); - } - } else if (mode == 1){ - writer.write("<worker "); - writer.write(" stage=\"" + stageStr + "\""); - - if (fullStatus) { - writer.write(" requestProcessingTime=\"" - + mBeanServer.getAttribute - (pName, "requestProcessingTime") + "\""); - writer.write(" requestBytesSent=\""); - if (showRequest) { - writer.write("" + mBeanServer.getAttribute - (pName, "requestBytesSent")); - } else { - writer.write("0"); - } - writer.write("\""); - writer.write(" requestBytesReceived=\""); - if (showRequest) { - writer.write("" + mBeanServer.getAttribute - (pName, "requestBytesReceived")); - } else { - writer.write("0"); - } - writer.write("\""); - writer.write(" remoteAddr=\"" - + filter(mBeanServer.getAttribute - (pName, "remoteAddr")) + "\""); - writer.write(" virtualHost=\"" - + filter(mBeanServer.getAttribute - (pName, "virtualHost")) + "\""); - - if (showRequest) { - writer.write(" method=\"" - + filter(mBeanServer.getAttribute - (pName, "method")) + "\""); - writer.write(" currentUri=\"" - + filter(mBeanServer.getAttribute - (pName, "currentUri")) + "\""); - - String queryString = (String) mBeanServer.getAttribute - (pName, "currentQueryString"); - if ((queryString != null) && (!queryString.equals(""))) { - writer.write(" currentQueryString=\"" - + RequestUtil.filter(queryString) + "\""); - } else { - writer.write(" currentQueryString=\"&#63;\""); - } - writer.write(" protocol=\"" - + filter(mBeanServer.getAttribute - (pName, "protocol")) + "\""); - } else { - writer.write(" method=\"&#63;\""); - writer.write(" currentUri=\"&#63;\""); - writer.write(" currentQueryString=\"&#63;\""); - writer.write(" protocol=\"&#63;\""); - } - } else { - writer.write(" requestProcessingTime=\"0\""); - writer.write(" requestBytesSent=\"0\""); - writer.write(" requestBytesRecieved=\"0\""); - writer.write(" remoteAddr=\"&#63;\""); - writer.write(" virtualHost=\"&#63;\""); - writer.write(" method=\"&#63;\""); - writer.write(" currentUri=\"&#63;\""); - writer.write(" currentQueryString=\"&#63;\""); - writer.write(" protocol=\"&#63;\""); - } - writer.write(" />"); - } - - } - - - /** - * Write applications state. - */ - public static void writeDetailedState(PrintWriter writer, - MBeanServer mBeanServer, int mode) - throws Exception { - - if (mode == 0){ - ObjectName queryHosts = new ObjectName("*:j2eeType=WebModule,*"); - Set hostsON = mBeanServer.queryNames(queryHosts, null); - - // Webapp list - int count = 0; - Iterator iterator = hostsON.iterator(); - while (iterator.hasNext()) { - ObjectName contextON = (ObjectName) iterator.next(); - writer.print("<a name=\"" + (count++) + ".0\">"); - writeContext(writer, contextON, mBeanServer, mode); - } - - } else if (mode == 1){ - // for now we don't write out the Detailed state in XML - } - - } - - - /** - * Write applications state. - */ - public static void writeAppList(PrintWriter writer, - MBeanServer mBeanServer, int mode) - throws Exception { - - if (mode == 0){ - ObjectName queryHosts = new ObjectName("*:j2eeType=WebModule,*"); - Set hostsON = mBeanServer.queryNames(queryHosts, null); - - // Navigation menu - writer.print("<dt>Application list</dt>"); - - int count = 0; - Iterator iterator = hostsON.iterator(); - while (iterator.hasNext()) { - writer.print("<dd>"); - ObjectName contextON = (ObjectName) iterator.next(); - String webModuleName = contextON.getKeyProperty("name"); - if (webModuleName.startsWith("//")) { - webModuleName = webModuleName.substring(2); - } - int slash = webModuleName.indexOf("/"); - if (slash == -1) { - count++; - continue; - } - - writer.print("<a href=\"#" + (count++) + ".0\">"); - writer.print(webModuleName); - writer.print("</a>"); - writer.print("</dd>"); - } - - } else if (mode == 1){ - // for now we don't write out the Detailed state in XML - } - - } - - - /** - * Write context state. - */ - protected static void writeContext(PrintWriter writer, - ObjectName objectName, - MBeanServer mBeanServer, int mode) - throws Exception { - - if (mode == 0){ - String webModuleName = objectName.getKeyProperty("name"); - String name = webModuleName; - if (name == null) { - return; - } - - String hostName = null; - String contextName = null; - if (name.startsWith("//")) { - name = name.substring(2); - } - int slash = name.indexOf("/"); - if (slash != -1) { - hostName = name.substring(0, slash); - contextName = name.substring(slash); - } else { - return; - } - - ObjectName queryManager = new ObjectName - (objectName.getDomain() + ":type=Manager,path=" + contextName - + ",host=" + hostName + ",*"); - Set managersON = mBeanServer.queryNames(queryManager, null); - ObjectName managerON = null; - Iterator iterator2 = managersON.iterator(); - while (iterator2.hasNext()) { - managerON = (ObjectName) iterator2.next(); - } - - ObjectName queryJspMonitor = new ObjectName - (objectName.getDomain() + ":type=JspMonitor,WebModule=" + - webModuleName + ",*"); - Set jspMonitorONs = mBeanServer.queryNames(queryJspMonitor, null); - - // Special case for the root context - if (contextName.equals("/")) { - contextName = ""; - } - - writer.print("<h3>"); - writer.print(name); - writer.print("</h3>"); - writer.print("</a>"); - - writer.print("<p>"); - Object startTime = mBeanServer.getAttribute(objectName, - "startTime"); - writer.print(" <strong>Start time:</strong> " + - new Date(((Long) startTime).longValue())); - writer.print(" <br><strong>Startup time:</strong> "); - writer.print(formatTime(mBeanServer.getAttribute - (objectName, "startupTime"), false)); - writer.print(" <br><strong>TLD scan time:</strong> "); - writer.print(formatTime(mBeanServer.getAttribute - (objectName, "tldScanTime"), false)); - if (managerON != null) { - writeManager(writer, managerON, mBeanServer, mode); - } - if (jspMonitorONs != null) { - writeJspMonitor(writer, jspMonitorONs, mBeanServer, mode); - } - writer.print("</p>"); - - String onStr = objectName.getDomain() - + ":j2eeType=Servlet,WebModule=" + webModuleName + ",*"; - ObjectName servletObjectName = new ObjectName(onStr); - Set set = mBeanServer.queryMBeans(servletObjectName, null); - Iterator iterator = set.iterator(); - while (iterator.hasNext()) { - ObjectInstance oi = (ObjectInstance) iterator.next(); - writeWrapper(writer, oi.getObjectName(), mBeanServer, mode); - } - - } else if (mode == 1){ - // for now we don't write out the context in XML - } - - } - - - /** - * Write detailed information about a manager. - */ - public static void writeManager(PrintWriter writer, ObjectName objectName, - MBeanServer mBeanServer, int mode) - throws Exception { - - if (mode == 0) { - writer.print(" <br><strong>Active sessions:</strong> "); - writer.print(mBeanServer.getAttribute - (objectName, "activeSessions")); - writer.print(" <br><strong>Session count:</strong> "); - writer.print(mBeanServer.getAttribute - (objectName, "sessionCounter")); - writer.print(" <br><strong>Max active sessions:</strong> "); - writer.print(mBeanServer.getAttribute(objectName, "maxActive")); - writer.print(" <br><strong>Rejected session creations:</strong> "); - writer.print(mBeanServer.getAttribute - (objectName, "rejectedSessions")); - writer.print(" <br><strong>Expired sessions:</strong> "); - writer.print(mBeanServer.getAttribute - (objectName, "expiredSessions")); - writer.print(" <br><strong>Longest session alive time:</strong> "); - writer.print(formatSeconds(mBeanServer.getAttribute( - objectName, - "sessionMaxAliveTime"))); - writer.print(" <br><strong>Average session alive time:</strong> "); - writer.print(formatSeconds(mBeanServer.getAttribute( - objectName, - "sessionAverageAliveTime"))); - writer.print(" <br><strong>Processing time:</strong> "); - writer.print(formatTime(mBeanServer.getAttribute - (objectName, "processingTime"), false)); - } else if (mode == 1) { - // for now we don't write out the wrapper details - } - - } - - - /** - * Write JSP monitoring information. - */ - public static void writeJspMonitor(PrintWriter writer, - Set jspMonitorONs, - MBeanServer mBeanServer, - int mode) - throws Exception { - - int jspCount = 0; - int jspReloadCount = 0; - - Iterator iter = jspMonitorONs.iterator(); - while (iter.hasNext()) { - ObjectName jspMonitorON = (ObjectName) iter.next(); - Object obj = mBeanServer.getAttribute(jspMonitorON, "jspCount"); - jspCount += ((Integer) obj).intValue(); - obj = mBeanServer.getAttribute(jspMonitorON, "jspReloadCount"); - jspReloadCount += ((Integer) obj).intValue(); - } - - if (mode == 0) { - writer.print(" <br><strong>JSPs loaded:</strong> "); - writer.print(jspCount); - writer.print(" <br><strong>JSPs reloaded:</strong> "); - writer.print(jspReloadCount); - } else if (mode == 1) { - // for now we don't write out anything - } - } - - - /** - * Write detailed information about a wrapper. - */ - public static void writeWrapper(PrintWriter writer, ObjectName objectName, - MBeanServer mBeanServer, int mode) - throws Exception { - - if (mode == 0) { - String servletName = objectName.getKeyProperty("name"); - - String[] mappings = (String[]) - mBeanServer.invoke(objectName, "findMappings", null, null); - - writer.print("<h2>"); - writer.print(servletName); - if ((mappings != null) && (mappings.length > 0)) { - writer.print(" [ "); - for (int i = 0; i < mappings.length; i++) { - writer.print(mappings[i]); - if (i < mappings.length - 1) { - writer.print(" , "); - } - } - writer.print(" ] "); - } - writer.print("</h2>"); - - writer.print("<p>"); - writer.print(" <strong>Processing time:</strong> "); - writer.print(formatTime(mBeanServer.getAttribute - (objectName, "processingTime"), true)); - writer.print(" <br><strong>Max time:</strong> "); - writer.print(formatTime(mBeanServer.getAttribute - (objectName, "maxTime"), false)); - writer.print(" <br><strong>Request count:</strong> "); - writer.print(mBeanServer.getAttribute(objectName, "requestCount")); - writer.print(" <br><strong>Error count:</strong> "); - writer.print(mBeanServer.getAttribute(objectName, "errorCount")); - writer.print(" <br><strong>Load time:</strong> "); - writer.print(formatTime(mBeanServer.getAttribute - (objectName, "loadTime"), false)); - writer.print(" <br><strong>Classloading time:</strong> "); - writer.print(formatTime(mBeanServer.getAttribute - (objectName, "classLoadTime"), false)); - writer.print("</p>"); - } else if (mode == 1){ - // for now we don't write out the wrapper details - } - - } - - - /** - * Filter the specified message string for characters that are sensitive - * in HTML. This avoids potential attacks caused by including JavaScript - * codes in the request URL that is often reported in error messages. - * - * @param obj The message string to be filtered - */ - public static String filter(Object obj) { - - if (obj == null) - return ("?"); - String message = obj.toString(); - - char content[] = new char[message.length()]; - message.getChars(0, message.length(), content, 0); - StringBuilder result = new StringBuilder(content.length + 50); - for (int i = 0; i < content.length; i++) { - switch (content[i]) { - case '<': - result.append("&lt;"); - break; - case '>': - result.append("&gt;"); - break; - case '&': - result.append("&amp;"); - break; - case '"': - result.append("&quot;"); - break; - default: - result.append(content[i]); - } - } - return (result.toString()); - - } - - - /** - * Display the given size in bytes, either as KB or MB. - * - * @param mb true to display megabytes, false for kilobytes - */ - public static String formatSize(Object obj, boolean mb) { - - long bytes = -1L; - - if (obj instanceof Long) { - bytes = ((Long) obj).longValue(); - } else if (obj instanceof Integer) { - bytes = ((Integer) obj).intValue(); - } - - if (mb) { - long mbytes = bytes / (1024 * 1024); - long rest = - ((bytes - (mbytes * (1024 * 1024))) * 100) / (1024 * 1024); - return (mbytes + "." + ((rest < 10) ? "0" : "") + rest + " MB"); - } else { - return ((bytes / 1024) + " KB"); - } - - } - - - /** - * Display the given time in ms, either as ms or s. - * - * @param seconds true to display seconds, false for milliseconds - */ - public static String formatTime(Object obj, boolean seconds) { - - long time = -1L; - - if (obj instanceof Long) { - time = ((Long) obj).longValue(); - } else if (obj instanceof Integer) { - time = ((Integer) obj).intValue(); - } - - if (seconds) { - return ((((float) time ) / 1000) + " s"); - } else { - return (time + " ms"); - } - } - - - /** - * Formats the given time (given in seconds) as a string. - * - * @param obj Time object to be formatted as string - * - * @return String formatted time - */ - public static String formatSeconds(Object obj) { - - long time = -1L; - - if (obj instanceof Long) { - time = ((Long) obj).longValue(); - } else if (obj instanceof Integer) { - time = ((Integer) obj).intValue(); - } - - return (time + " s"); - } - -} Deleted: trunk/src/main/java/org/apache/catalina/security/LocalStrings.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/security/LocalStrings.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/security/LocalStrings.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,2 +0,0 @@ -SecurityUtil.doAsPrivilege=An exception occurs when running the PrivilegedExceptionAction block. - Deleted: trunk/src/main/java/org/apache/catalina/security/LocalStrings_es.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/security/LocalStrings_es.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/security/LocalStrings_es.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,17 +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. - -SecurityUtil.doAsPrivilege=Ha tenido lugar una excepci�n al ejecutar el bloque PrivilegedExceptionAction. - Deleted: trunk/src/main/java/org/apache/catalina/security/LocalStrings_fr.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/security/LocalStrings_fr.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/security/LocalStrings_fr.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,2 +0,0 @@ -SecurityUtil.doAsPrivilege=Une exception s''est produite lors de l''ex�cution du bloc "PrivilegedExceptionAction". - Deleted: trunk/src/main/java/org/apache/catalina/security/LocalStrings_ja.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/security/LocalStrings_ja.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/security/LocalStrings_ja.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,2 +0,0 @@ -SecurityUtil.doAsPrivilege=PrivilegedExceptionAction\u30d6\u30ed\u30c3\u30af\u3092\u5b9f\u884c\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 - Modified: trunk/src/main/java/org/apache/catalina/security/SecurityUtil.java =================================================================== --- trunk/src/main/java/org/apache/catalina/security/SecurityUtil.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/security/SecurityUtil.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -69,23 +69,11 @@ private static HashMap<Object,Method[]> objectCache = new HashMap<Object,Method[]>(); - private static org.jboss.logging.Logger log= - org.jboss.logging.Logger.getLogger( SecurityUtil.class ); - - private static String PACKAGE = "org.apache.catalina.security"; - private static boolean packageDefinitionEnabled = (System.getProperty("package.definition") == null && System.getProperty("package.access") == null) ? false : true; /** - * The string resources for this package. - */ - private static final StringManager sm = - StringManager.getManager(PACKAGE); - - - /** * Perform work as a particular </code>Subject</code>. Here the work * will be granted to a <code>null</code> subject. * @@ -314,10 +302,6 @@ e = pe; } - if (log.isDebugEnabled()){ - log.debug(sm.getString("SecurityUtil.doAsPrivilege"), e); - } - if (e instanceof UnavailableException) throw (UnavailableException) e; else if (e instanceof ServletException) Modified: trunk/src/main/java/org/apache/catalina/servlets/DefaultServlet.java =================================================================== --- trunk/src/main/java/org/apache/catalina/servlets/DefaultServlet.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/servlets/DefaultServlet.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -19,6 +19,8 @@ package org.apache.catalina.servlets; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -63,7 +65,6 @@ import org.apache.catalina.connector.ResponseFacade; import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.ServerInfo; -import org.apache.catalina.util.StringManager; import org.apache.catalina.util.URLEncoder; import org.apache.naming.resources.CacheEntry; import org.apache.naming.resources.ProxyDirContext; @@ -205,13 +206,6 @@ /** - * The string manager for this package. - */ - protected static StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * Size of file transfer buffer in bytes. */ protected static final int BUFFER_SIZE = 4096; @@ -654,8 +648,7 @@ // We're included, and the response.sendError() below is going // to be ignored by the resource that is including us. // Therefore, throw an exception to notify the error. - throw new FileNotFoundException(sm.getString("defaultServlet.missingResource", - RequestUtil.filter(requestUri))); + throw new FileNotFoundException(MESSAGES.resourceNotAvailable(RequestUtil.filter(requestUri))); } response.sendError(HttpServletResponse.SC_NOT_FOUND, @@ -1254,7 +1247,7 @@ sb.append("<html>\r\n"); sb.append("<head>\r\n"); sb.append("<title>"); - sb.append(sm.getString("directory.title", name)); + sb.append(MESSAGES.listingDirectoryTitle(name)); sb.append("</title>\r\n"); sb.append("<STYLE><!--"); sb.append(org.apache.catalina.util.TomcatCSS.TOMCAT_CSS); @@ -1262,7 +1255,7 @@ sb.append("</head>\r\n"); sb.append("<body>"); sb.append("<h1>"); - sb.append(sm.getString("directory.title", name)); + sb.append(MESSAGES.listingDirectoryTitle(name)); // Render the link to our parent (if required) String parentDirectory = name; @@ -1282,7 +1275,7 @@ sb.append("/"); sb.append("\">"); sb.append("<b>"); - sb.append(sm.getString("directory.parent", parent)); + sb.append(MESSAGES.listingDirectoryParent(parent)); sb.append("</b>"); sb.append("</a>"); } @@ -1296,13 +1289,13 @@ // Render the column headings sb.append("<tr>\r\n"); sb.append("<td align=\"left\"><font size=\"+1\"><strong>"); - sb.append(sm.getString("directory.filename")); + sb.append(MESSAGES.listingFilename()); sb.append("</strong></font></td>\r\n"); sb.append("<td align=\"center\"><font size=\"+1\"><strong>"); - sb.append(sm.getString("directory.size")); + sb.append(MESSAGES.listingSize()); sb.append("</strong></font></td>\r\n"); sb.append("<td align=\"right\"><font size=\"+1\"><strong>"); - sb.append(sm.getString("directory.lastModified")); + sb.append(MESSAGES.listingLastModified()); sb.append("</strong></font></td>\r\n"); sb.append("</tr>"); Deleted: trunk/src/main/java/org/apache/catalina/servlets/LocalStrings.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/servlets/LocalStrings.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/servlets/LocalStrings.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,13 +0,0 @@ -defaultServlet.missingResource=The requested resource ({0}) is not available -defaultservlet.directorylistingfor=Directory Listing for: -defaultservlet.upto=Up to: -defaultservlet.subdirectories=Subdirectories: -defaultservlet.files=Files: -webdavservlet.jaxpfailed=JAXP initialization failed -directory.filename=Filename -directory.lastModified=Last Modified -directory.parent=Up To {0} -directory.size=Size -directory.title=Directory Listing For {0} -directory.version=Tomcat Catalina version 4.0 - Deleted: trunk/src/main/java/org/apache/catalina/servlets/LocalStrings_es.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/servlets/LocalStrings_es.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/servlets/LocalStrings_es.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,33 +0,0 @@ -defaultServlet.missingResource = El recurso requerido {0} no se encuentra disponible -# 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. -defaultservlet.directorylistingfor = Listado de Directorio para\: -defaultservlet.upto = Atr\u00E1s a\: -defaultservlet.subdirectories = Subdirectorios\: -defaultservlet.files = Archivos\: -invokerServlet.allocate = No puedo reservar espacio para instancia de servlet para trayectoria {0} -invokerServlet.cannotCreate = No puedo crear arropador (wrapper) de servlet para trayectoria {0} -invokerServlet.deallocate = No puedo recuperar instancia de servlet para trayectoria {0} -invokerServlet.invalidPath = No se ha especificado nombre de servlet o clase en trayectoria {0} -invokerServlet.notNamed = No puedo llamar a servlet invocador mediante un despachador nombrado (named) -invokerServlet.noWrapper = El Contenedor no ha llamado a setWrapper() para este servlet -webdavservlet.jaxpfailed = Fall\u00F3 la inicializaci\u00F3n de JAXP -webdavservlet.enternalEntityIgnored = El requerimiento inclu\u00EDa una referencia a una entidad externa con PublicID {0} y SystemID {1} que fue ignorada -directory.filename = Nombre de Archivo -directory.lastModified = \u00DAltima Modificaci\u00F3n -directory.parent = Atr\u00E1s A {0} -directory.size = Medida -directory.title = Listado de Directorio Para {0} -directory.version = Tomcat Catalina versi\u00F3n 4.0 Deleted: trunk/src/main/java/org/apache/catalina/servlets/LocalStrings_fr.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/servlets/LocalStrings_fr.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/servlets/LocalStrings_fr.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,18 +0,0 @@ -defaultservlet.directorylistingfor=Liste du r�pertoire pour : -defaultservlet.upto=Jusqu''�: -defaultservlet.subdirectories=Sous-r�pertoires: -defaultservlet.files=Fichiers: -invokerServlet.allocate=Impossible d''allouer une instance de servlet pour le chemin {0} -invokerServlet.cannotCreate=Impossible de cr�er un enrobeur (wrapper) de servlet pour le chemin {0} -invokerServlet.deallocate=Impossible de d�sallouer une instance de servlet pour le chemin {0} -invokerServlet.invalidPath=Aucun nom de servlet ou de classe n''a �t� sp�cifi� pour le chemin {0} -invokerServlet.notNamed=Impossible d''appeler le d�l�gu� (invoker) de servlet avec un aiguilleur (dispatcher) nomm� -invokerServlet.noWrapper=Le conteneur n''a pas appel� "setWrapper()" pour cette servlet -webdavservlet.jaxpfailed=Erreur d''initialisation de JAXP -directory.filename=Nom de fichier -directory.lastModified=Derni�re modification -directory.parent=Jusqu''� {0} -directory.size=Taille -directory.title=Liste du r�pertoire pour {0} -directory.version=Tomcat Catalina version 4.0 - Deleted: trunk/src/main/java/org/apache/catalina/servlets/LocalStrings_ja.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/servlets/LocalStrings_ja.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/servlets/LocalStrings_ja.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,18 +0,0 @@ -defaultservlet.directorylistingfor=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u4e00\u89a7: -defaultservlet.upto=\u89aa\u30c7\u30a3\u30ec\u30af\u30c8\u30ea: -defaultservlet.subdirectories=\u30b5\u30d6\u30c7\u30a3\u30ec\u30af\u30c8\u30ea: -defaultservlet.files=\u30d5\u30a1\u30a4\u30eb: -invokerServlet.allocate=\u30d1\u30b9 {0} \u306b\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u5272\u308a\u5f53\u3066\u3089\u308c\u307e\u305b\u3093 -invokerServlet.cannotCreate=\u30d1\u30b9 {0} \u306b\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30e9\u30c3\u30d1\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093 -invokerServlet.deallocate=\u30d1\u30b9 {0} \u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u5272\u308a\u5f53\u3066\u3092\u89e3\u9664\u3067\u304d\u307e\u305b\u3093 -invokerServlet.invalidPath=\u30d1\u30b9 {0} \u306b\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u540d\u53c8\u306f\u30af\u30e9\u30b9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -invokerServlet.notNamed=\u305d\u306e\u540d\u524d\u306e\u30c7\u30a3\u30b9\u30d1\u30c3\u30c1\u30e3\u3067\u30a4\u30f3\u30dc\u30fc\u30ab\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3092\u547c\u3073\u51fa\u305b\u307e\u305b\u3093 -invokerServlet.noWrapper=\u30b3\u30f3\u30c6\u30ca\u306f\u3053\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306b\u5bfe\u3057\u3066\u547c\u3073\u51fa\u3055\u308c\u305fsetWrapper()\u3092\u6301\u3063\u3066\u3044\u307e\u305b\u3093 -webdavservlet.jaxpfailed=JAXP\u306e\u521d\u671f\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f -directory.filename=\u30d5\u30a1\u30a4\u30eb\u540d -directory.lastModified=\u6700\u7d42\u66f4\u65b0 -directory.parent={0} \u306b\u79fb\u52d5 -directory.size=\u30b5\u30a4\u30ba -directory.title={0} \u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u4e00\u89a7 -directory.version=Tomcat Catalina \u30d0\u30fc\u30b8\u30e7\u30f3 4.0 - Modified: trunk/src/main/java/org/apache/catalina/servlets/WebdavServlet.java =================================================================== --- trunk/src/main/java/org/apache/catalina/servlets/WebdavServlet.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/servlets/WebdavServlet.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -19,6 +19,8 @@ package org.apache.catalina.servlets; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.FileNotFoundException; import java.io.IOException; import java.io.StringReader; @@ -299,8 +301,7 @@ documentBuilder.setEntityResolver( new WebdavResolver(this.getServletContext())); } catch(ParserConfigurationException e) { - throw new ServletException - (sm.getString("webdavservlet.jaxpfailed")); + throw new ServletException(MESSAGES.jaxpInitializationFailed()); } return documentBuilder; } @@ -2799,8 +2800,7 @@ } public InputSource resolveEntity (String publicId, String systemId) { - context.log(sm.getString("webdavservlet.enternalEntityIgnored", - publicId, systemId)); + context.log(MESSAGES.ignoredExternalEntity(publicId, systemId)); return new InputSource( new StringReader("Ignored external entity")); } Modified: trunk/src/main/java/org/apache/catalina/startup/Constants.java =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/Constants.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/Constants.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -29,8 +29,6 @@ public final class Constants { - public static final String Package = "org.apache.catalina.startup"; - public static final String ApplicationContextXml = "META-INF/context.xml"; public static final String ApplicationWebXml = "/WEB-INF/web.xml"; public static final String DefaultContextXml = "conf/context.xml"; Modified: trunk/src/main/java/org/apache/catalina/startup/ContextConfig.java =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/ContextConfig.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/ContextConfig.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -82,7 +82,7 @@ import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.deploy.SecurityCollection; import org.apache.catalina.deploy.SecurityConstraint; -import org.apache.catalina.util.StringManager; +import org.jboss.web.CatalinaLogger; /** * Startup event listener for a <b>Context</b> that configures the properties @@ -96,9 +96,6 @@ public class ContextConfig implements LifecycleListener { - protected static org.jboss.logging.Logger log= - org.jboss.logging.Logger.getLogger( ContextConfig.class ); - // ----------------------------------------------------- Instance Variables @@ -129,13 +126,6 @@ /** - * The string resources for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * Deployment count. */ protected static long deploymentCount = 0L; @@ -170,12 +160,7 @@ public void lifecycleEvent(LifecycleEvent event) { // Identify the context we are associated with - try { - context = (Context) event.getLifecycle(); - } catch (ClassCastException e) { - log.error(sm.getString("contextConfig.cce", event.getLifecycle()), e); - return; - } + context = (Context) event.getLifecycle(); // Process the event that has occurred if (event.getType().equals(Lifecycle.START_EVENT)) { @@ -260,7 +245,7 @@ // Has a Realm been configured for us to authenticate against? if (context.getRealm() == null) { - log.error(sm.getString("contextConfig.missingRealm")); + CatalinaLogger.STARTUP_LOGGER.noRealmFound(); ok = false; return; } @@ -284,14 +269,12 @@ authenticators = new Properties(); authenticators.load(is); } else { - log.error(sm.getString( - "contextConfig.authenticatorResources")); + CatalinaLogger.STARTUP_LOGGER.cannotFindAuthenticatoMappings(); ok=false; return; } } catch (IOException e) { - log.error(sm.getString( - "contextConfig.authenticatorResources"), e); + CatalinaLogger.STARTUP_LOGGER.failedLoadingAuthenticatoMappings(e); ok = false; return; } @@ -302,8 +285,7 @@ authenticatorName = authenticators.getProperty(loginConfig.getAuthMethod()); if (authenticatorName == null) { - log.error(sm.getString("contextConfig.authenticatorMissing", - loginConfig.getAuthMethod())); + CatalinaLogger.STARTUP_LOGGER.noAuthenticatorForAuthMethod(loginConfig.getAuthMethod()); ok = false; return; } @@ -313,10 +295,7 @@ Class authenticatorClass = Class.forName(authenticatorName); authenticator = (Valve) authenticatorClass.newInstance(); } catch (Throwable t) { - log.error(sm.getString( - "contextConfig.authenticatorInstantiate", - authenticatorName), - t); + CatalinaLogger.STARTUP_LOGGER.failedLoadingAuthenticator(authenticatorName, t); ok = false; } } @@ -328,11 +307,7 @@ Pipeline pipeline = ((ContainerBase) context).getPipeline(); if (pipeline != null) { ((ContainerBase) context).addValve(authenticator); - if (log.isDebugEnabled()) { - log.debug(sm.getString( - "contextConfig.authenticatorConfigured", - loginConfig.getAuthMethod())); - } + CatalinaLogger.STARTUP_LOGGER.authenticatorConfigured(loginConfig.getAuthMethod()); } } @@ -385,8 +360,6 @@ * Process a "init" event for this Context. */ protected void init() { - if (log.isDebugEnabled()) - log.debug(sm.getString("contextConfig.init")); context.setConfigured(false); ok = true; } @@ -405,9 +378,6 @@ protected void start() { // Called from StandardContext.start() - if (log.isDebugEnabled()) - log.debug(sm.getString("contextConfig.start")); - // Process the default and application web.xml files if (ok) { defaultWebConfig(); @@ -434,25 +404,25 @@ } // Dump the contents of this pipeline if requested - if ((log.isDebugEnabled()) && (context instanceof ContainerBase)) { - log.debug("Pipeline Configuration:"); + if ((CatalinaLogger.STARTUP_LOGGER.isDebugEnabled()) && (context instanceof ContainerBase)) { + CatalinaLogger.STARTUP_LOGGER.debug("Pipeline Configuration:"); Pipeline pipeline = ((ContainerBase) context).getPipeline(); Valve valves[] = null; if (pipeline != null) valves = pipeline.getValves(); if (valves != null) { for (int i = 0; i < valves.length; i++) { - log.debug(" " + valves[i].getInfo()); + CatalinaLogger.STARTUP_LOGGER.debug(" " + valves[i].getInfo()); } } - log.debug("======================"); + CatalinaLogger.STARTUP_LOGGER.debug("======================"); } // Make our application available if no problems were encountered if (ok) { context.setConfigured(true); } else { - log.error(sm.getString("contextConfig.unavailable")); + CatalinaLogger.STARTUP_LOGGER.contextUnavailable(); context.setConfigured(false); } @@ -470,9 +440,6 @@ */ protected void stop() { - if (log.isDebugEnabled()) - log.debug(sm.getString("contextConfig.stop")); - int i; // Removing children @@ -579,8 +546,6 @@ */ protected void destroy() { // Called from StandardContext.destroy() - if (log.isDebugEnabled()) - log.debug(sm.getString("contextConfig.destroy")); // Changed to getWorkPath per Bugzilla 35819. String workDir = ((StandardContext) context).getWorkPath(); @@ -740,7 +705,7 @@ for (int j = 0; j < roles.length; j++) { if (!"*".equals(roles[j]) && !context.findSecurityRole(roles[j])) { - log.info(sm.getString("contextConfig.role.auth", roles[j])); + CatalinaLogger.STARTUP_LOGGER.roleValidationAuth(roles[j]); context.addSecurityRole(roles[j]); } } @@ -752,14 +717,14 @@ Wrapper wrapper = (Wrapper) wrappers[i]; String runAs = wrapper.getRunAs(); if ((runAs != null) && !context.findSecurityRole(runAs)) { - log.info(sm.getString("contextConfig.role.runas", runAs)); + CatalinaLogger.STARTUP_LOGGER.roleValidationRunAs(runAs); context.addSecurityRole(runAs); } String names[] = wrapper.findSecurityReferences(); for (int j = 0; j < names.length; j++) { String link = wrapper.findSecurityReference(names[j]); if ((link != null) && !context.findSecurityRole(link)) { - log.info(sm.getString("contextConfig.role.link", link)); + CatalinaLogger.STARTUP_LOGGER.roleValidationLink(link); context.addSecurityRole(link); } } Modified: trunk/src/main/java/org/apache/catalina/startup/EngineConfig.java =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/EngineConfig.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/EngineConfig.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -23,7 +23,6 @@ import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; -import org.apache.catalina.util.StringManager; /** @@ -37,10 +36,6 @@ public class EngineConfig implements LifecycleListener { - - protected static org.jboss.logging.Logger log= - org.jboss.logging.Logger.getLogger( EngineConfig.class ); - // ----------------------------------------------------- Instance Variables @@ -50,13 +45,6 @@ protected Engine engine = null; - /** - * The string resources for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - // --------------------------------------------------------- Public Methods @@ -68,12 +56,7 @@ public void lifecycleEvent(LifecycleEvent event) { // Identify the engine we are associated with - try { - engine = (Engine) event.getLifecycle(); - } catch (ClassCastException e) { - log.error(sm.getString("engineConfig.cce", event.getLifecycle()), e); - return; - } + engine = (Engine) event.getLifecycle(); // Process the event that has occurred if (event.getType().equals(Lifecycle.START_EVENT)) @@ -91,10 +74,6 @@ * Process a "start" event for this Engine. */ protected void start() { - - if (engine.getLogger().isDebugEnabled()) - engine.getLogger().debug(sm.getString("engineConfig.start")); - } @@ -102,10 +81,6 @@ * Process a "stop" event for this Engine. */ protected void stop() { - - if (engine.getLogger().isDebugEnabled()) - engine.getLogger().debug(sm.getString("engineConfig.stop")); - } Modified: trunk/src/main/java/org/apache/catalina/startup/ExpandWar.java =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/ExpandWar.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/ExpandWar.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -18,16 +18,13 @@ package org.apache.catalina.startup; -import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.nio.channels.FileChannel; -import org.apache.catalina.util.StringManager; -import org.jboss.logging.Logger; +import org.jboss.web.CatalinaLogger; /** * Expand out a WAR in a Host's appBase. @@ -40,16 +37,7 @@ public class ExpandWar { - private static Logger log = Logger.getLogger(ExpandWar.class); - /** - * The string resources for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * Copy the specified file or directory to the destination. * * @param src File object representing the source @@ -83,8 +71,7 @@ oc = (new FileOutputStream(fileDest)).getChannel(); ic.transferTo(0, ic.size(), oc); } catch (IOException e) { - log.error(sm.getString - ("expandWar.copy", fileSrc, fileDest), e); + CatalinaLogger.STARTUP_LOGGER.fileCopyError(fileSrc, fileDest, e); result = false; } finally { if (ic != null) { @@ -138,8 +125,7 @@ } } if (logFailure && !result) { - log.error(sm.getString( - "expandWar.deleteFailed", dir.getAbsolutePath())); + CatalinaLogger.STARTUP_LOGGER.fileDeleteError(dir.getAbsolutePath()); } return result; } @@ -186,8 +172,7 @@ } if (logFailure && !result) { - log.error(sm.getString( - "expandWar.deleteFailed", dir.getAbsolutePath())); + CatalinaLogger.STARTUP_LOGGER.fileDeleteError(dir.getAbsolutePath()); } return result; Deleted: trunk/src/main/java/org/apache/catalina/startup/HomesUserDatabase.java =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/HomesUserDatabase.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/HomesUserDatabase.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,144 +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.startup; - - -import java.io.File; -import java.util.Hashtable; -import java.util.Enumeration; - - -/** - * Concrete implementation of the <strong>UserDatabase</code> interface - * considers all directories in a directory whose pathname is specified - * to our constructor to be "home" directories for those users. - * - * @author Craig R. McClanahan - * @version $Revision: 515 $ $Date: 2008-03-17 22:02:23 +0100 (Mon, 17 Mar 2008) $ - */ - -public final class HomesUserDatabase - implements UserDatabase { - - - // --------------------------------------------------------- Constructors - - - /** - * Initialize a new instance of this user database component. - */ - public HomesUserDatabase() { - - super(); - - } - - - // --------------------------------------------------- Instance Variables - - - /** - * The set of home directories for all defined users, keyed by username. - */ - private Hashtable homes = new Hashtable(); - - - /** - * The UserConfig listener with which we are associated. - */ - private UserConfig userConfig = null; - - - // ----------------------------------------------------------- Properties - - - /** - * Return the UserConfig listener with which we are associated. - */ - public UserConfig getUserConfig() { - - return (this.userConfig); - - } - - - /** - * Set the UserConfig listener with which we are associated. - * - * @param userConfig The new UserConfig listener - */ - public void setUserConfig(UserConfig userConfig) { - - this.userConfig = userConfig; - init(); - - } - - - // ------------------------------------------------------- Public Methods - - - /** - * Return an absolute pathname to the home directory for the specified user. - * - * @param user User for which a home directory should be retrieved - */ - public String getHome(String user) { - - return ((String) homes.get(user)); - - } - - - /** - * Return an enumeration of the usernames defined on this server. - */ - public Enumeration getUsers() { - - return (homes.keys()); - - } - - - // ------------------------------------------------------ Private Methods - - - /** - * Initialize our set of users and home directories. - */ - private void init() { - - String homeBase = userConfig.getHomeBase(); - File homeBaseDir = new File(homeBase); - if (!homeBaseDir.exists() || !homeBaseDir.isDirectory()) - return; - String homeBaseFiles[] = homeBaseDir.list(); - - for (int i = 0; i < homeBaseFiles.length; i++) { - File homeDir = new File(homeBaseDir, homeBaseFiles[i]); - if (!homeDir.isDirectory() || !homeDir.canRead()) - continue; - homes.put(homeBaseFiles[i], homeDir.toString()); - } - - - } - - -} Modified: trunk/src/main/java/org/apache/catalina/startup/HostConfig.java =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/HostConfig.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/HostConfig.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -22,19 +22,13 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; -import javax.management.ObjectName; - import org.apache.catalina.Container; import org.apache.catalina.Engine; import org.apache.catalina.Host; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; -import org.apache.catalina.util.StringManager; -import org.apache.tomcat.util.modeler.Registry; /** @@ -48,9 +42,6 @@ public class HostConfig implements LifecycleListener { - protected static org.jboss.logging.Logger log= - org.jboss.logging.Logger.getLogger( HostConfig.class ); - // ----------------------------------------------------- Instance Variables @@ -85,13 +76,6 @@ /** - * The string resources for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * List of applications which are being serviced, and shouldn't be * deployed/undeployed/redeployed at the moment. */ @@ -156,12 +140,7 @@ public void lifecycleEvent(LifecycleEvent event) { // Identify the context we are associated with - try { - host = (Host) event.getLifecycle(); - } catch (ClassCastException e) { - log.error(sm.getString("hostConfig.cce", event.getLifecycle()), e); - return; - } + host = (Host) event.getLifecycle(); if (event.getType().equals(Lifecycle.PERIODIC_EVENT)) check(); @@ -267,10 +246,6 @@ * Process a "start" event for this Host. */ public void start() { - - if (log.isDebugEnabled()) - log.debug(sm.getString("hostConfig.start")); - } @@ -279,9 +254,6 @@ */ public void stop() { - if (log.isDebugEnabled()) - log.debug(sm.getString("hostConfig.stop")); - undeployApps(); appBase = null; @@ -294,10 +266,6 @@ * Undeploy all deployed applications. */ protected void undeployApps() { - - if (log.isDebugEnabled()) - log.debug(sm.getString("hostConfig.undeploying")); - } Deleted: trunk/src/main/java/org/apache/catalina/startup/LocalStrings.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/LocalStrings.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/LocalStrings.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,93 +0,0 @@ -contextConfig.applicationClose=Error closing application web.xml -contextConfig.applicationConfig=Configuration error in application web.xml -contextConfig.applicationListener=Exception creating listener of class {0} -contextConfig.applicationMissing=Missing application web.xml, using defaults only -contextConfig.applicationParse=Parse error in application web.xml file at {0} -contextConfig.applicationPosition=Occurred at line {0} column {1} -contextConfig.authenticatorConfigured=Configured an authenticator for method {0} -contextConfig.authenticatorInstantiate=Cannot instantiate an authenticator of class {0} -contextConfig.authenticatorMissing=Cannot configure an authenticator for method {0} -contextConfig.authenticatorResources=Cannot load authenticators mapping list -contextConfig.cce=Lifecycle event data object {0} is not a Context -contextConfig.certificatesConfig.added=Added certificates -> request attribute Valve -contextConfig.certificatesConfig.error=Exception adding CertificatesValve: -contextConfig.contextClose=Error closing context.xml -contextConfig.contextMissing=Missing context.xml: {0} -contextConfig.contextParse=Parse error in context.xml for {0} -contextConfig.defaultClose=Error closing default web.xml -contextConfig.defaultConfig=Configuration error in default web.xml -contextConfig.defaultMissing=Missing default web.xml, using application web.xml only -contextConfig.defaultParse=Parse error in default web.xml -contextConfig.defaultPosition=Occurred at line {0} column {1} -contextConfig.fixDocBase=Exception fixing docBase: {0} -contextConfig.fragmentOrderingParse=Failed to parse web fragment ordering for {0} -contextConfig.init=ContextConfig: Initializing -contextConfig.invalidAbsoluteOrder=Invalid absolute order -contextConfig.missingRealm=No Realm has been configured to authenticate against -contextConfig.noOverlay=Overlay used in {0} requires a ProxyDirContext in the context -contextConfig.role.auth=WARNING: Security role name {0} used in an <auth-constraint> without being defined in a <security-role> -contextConfig.role.link=WARNING: Security role name {0} used in a <role-link> without being defined in a <security-role> -contextConfig.role.runas=WARNING: Security role name {0} used in a <run-as> without being defined in a <security-role> -contextConfig.scan=Error scanning context resources -contextConfig.servletContainerInitializer=Error running Servlet container initializer {0} -contextConfig.start=ContextConfig: Processing START -contextConfig.stop=ContextConfig: Processing STOP -contextConfig.tldEntryException=Exception processing TLD {0} in JAR at resource path {1} in context {2} -contextConfig.tldFileException=Exception processing TLD at resource path {0} in context {1} -contextConfig.tldJarException=Exception processing JAR at resource path {0} in context {1} -contextConfig.tldResourcePath=Invalid TLD resource path {0} -contextConfig.unavailable=Marking this application unavailable due to previous error(s) -contextConfig.altDDNotFound=alt-dd file {0} not found -embedded.alreadyStarted=Embedded service has already been started -embedded.noEngines=No engines have been defined yet -embedded.notmp=Cannot find specified temporary folder at {0} -embedded.notStarted=Embedded service has not yet been started -embedded.authenticatorNotInstanceOfValve=Specified Authenticator is not a Valve -engineConfig.cce=Lifecycle event data object {0} is not an Engine -engineConfig.start=EngineConfig: Processing START -engineConfig.stop=EngineConfig: Processing STOP -expandWar.copy=Error copying {0} to {1} -expandWar.deleteFailed=[{0}] could not be completely deleted. The presence of the remaining files may cause problems -expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an entry contains an illegal path [{1}] -hostConfig.appBase=Application base directory {0} does not exist -hostConfig.canonicalizing=Error delete redeploy resources from context [{0}] -hostConfig.cce=Lifecycle event data object {0} is not a Host -hostConfig.context.destroy=Error during context [{0}] destroy -hostConfig.context.remove=Error while removing context [{0}] -hostConfig.context.restart=Error during context [{0}] restart -hostConfig.deploy=Deploying web application directory {0} -hostConfig.deployDescriptor=Deploying configuration descriptor {0} -hostConfig.deployDescriptor.error=Error deploying configuration descriptor {0} -hostConfig.deployDescriptor.localDocBaseSpecified=A docBase {0} inside the host appBase has been specified, and will be ignored -hostConfig.deployDir=Deploying web application directory {0} -hostConfig.deployDir.error=Error deploying web application directory {0} -hostConfig.deployJar=Deploying web application archive {0} -hostConfig.deployJar.error=Error deploying web application archive {0} -hostConfig.deploy.error=Exception while deploying web application directory {0} -hostConfig.deploying=Deploying discovered web applications -hostConfig.expand=Expanding web application archive {0} -hostConfig.expand.error=Exception while expanding web application archive {0} -hostConfig.expanding=Expanding discovered web application archives -hostConfig.illegalWarName=The war name [{0}] is invalid. The archive will be ignored. -hostConfig.jmx.register=Register context [{0}] failed -hostConfig.jmx.unregister=Unregister context [{0}] failed -hostConfig.reload=Reloading context [{0}] -hostConfig.removeXML=Context [{0}] is undeployed -hostConfig.removeDIR=Directory {0} is undeployed -hostConfig.removeWAR=War {0} is undeployed -hostConfig.start=HostConfig: Processing START -hostConfig.stop=HostConfig: Processing STOP -hostConfig.undeploy=Undeploying context [{0}] -hostConfig.undeploy.error=Error undeploying web application at context path {0} -hostConfig.undeploying=Undeploying deployed web applications -userConfig.database=Exception loading user database -userConfig.deploy=Deploying web application for user {0} -userConfig.deploying=Deploying user web applications -userConfig.error=Error deploying web application for user {0} -userConfig.start=UserConfig: Processing START -userConfig.stop=UserConfig: Processing STOP - -ordering.afterAndBeforeOthers=Jar fragment {0} contains an invalid ordering specifying both after and before other fragments -ordering.duplicateName=Jar fragment {0} declares a duplicate name -ordering.unkonwnName=Jar fragment {0} ordering refers to an unknown fragment name -ordering.orderConflict=Jar fragment {0} causes an order conflict Deleted: trunk/src/main/java/org/apache/catalina/startup/LocalStrings_es.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/LocalStrings_es.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/LocalStrings_es.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,94 +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. -contextConfig.applicationClose = Error durante el cierre del archivo web.xml de la aplicaci\u00F3n -contextConfig.applicationConfig = Error de configuraci\u00F3n en el archivo web.xml de la aplicaci\u00F3n -contextConfig.applicationListener = Excepci\u00F3n durante la creaci\u00F3n de la clase de escucha (listener) {0} -contextConfig.applicationMissing = Falta el archivo web.xml de la aplicaci\u00F3n. Utilizando los par\u00E1metros por defecto -contextConfig.applicationParse = Error de evaluaci\u00F3n (parse) en el archivo web.xml de la aplicaci\u00F3n a {0} -contextConfig.applicationPosition = Se ha producido en la l\u00EDnea {0} columna {1} -contextConfig.authenticatorConfigured = Configuraci\u00F3n de un autentificador (authenticator) para el m\u00E9todo {0} -contextConfig.authenticatorInstantiate = Imposible de instanciar un autenticador (authenticator) para la clase {0} -contextConfig.authenticatorMissing = Imposible de configurar un autentificador (authenticator) para el m\u00E9todo {0} -contextConfig.authenticatorResources = Imposible de cargar la lista de correspondencia de autenticadores (authenticators) -contextConfig.cce = El objeto de los datos de evento de ciclo de vida (Lifecycle event data object) {0} no es un Contexto -contextConfig.certificatesConfig.added = Adici\u00F3n de certificados -> requiere v\u00E1lvula de atributo (attribute Valve) -contextConfig.certificatesConfig.error = Excepci\u00F3n durante la adici\u00F3n de "CertificatesValve"\: -contextConfig.contextClose = Error cerrando context.xml\: {0} -contextConfig.contextMissing = Falta context.xml\: {0} -contextConfig.contextParse = Error de an\u00E1lisis en context.xml\: {0} -contextConfig.defaultClose = Error durante el cierre del archivo web.xml por defecto -contextConfig.defaultConfig = Error de configuraci\u00F3n en el archivo web.xml por defecto -contextConfig.defaultMissing = Falta el archivo web.xml por defecto, utilizando s\u00F3lo el archivo web.xml de la aplicaci\u00F3n -contextConfig.defaultParse = Error de evaluaci\u00F3n (parse) en el arcivo web.xml por defecto -contextConfig.defaultPosition = Se ha producido en la l\u00EDnea {0} columna {1} -contextConfig.fixDocBase = Excepci\u00F3n arreglando docBase\: {0} -contextConfig.init = ContextConfig\: Inicializando -contextConfig.missingRealm = Alg\u00FAn reino (realm) no ha sido configurado para realizar la autenticaci\u00F3n -contextConfig.role.auth = ATENCI\u00D3N\: El nombre de papel de seguridad {0} es usado en un <auth-constraint> sin haber sido definido en <security-role> -contextConfig.role.link = ATENCI\u00D3N\: El nombre de papel de seguridad {0} es usado en un <role-link> sin haber sido definido en <security-role> -contextConfig.role.runas = ATENCI\u00D3N\: El nombre de papel de seguridad {0} es usado en un <run-as> sin haber sido definido en <security-role> -contextConfig.start = "ContextConfig"\: Tratamiento del "START" -contextConfig.stop = "ContextConfig"\: Tratamiento del "STOP" -contextConfig.tldEntryException = Excepci\u00F3n durante el tratamiento de la TLD {0} en el JAR indicado por la trayectoria de recurso {1} en contexto {2} -contextConfig.tldFileException = Excepci\u00F3n durante el tratamiento de la TLD indicada por la trayectoria de recurso {0} en contexto {1} -contextConfig.tldJarException = Excepci\u00F3n durante el tratamiento del JAR indicado por la trayectoria de recurso {0} en contexto {1} -contextConfig.tldResourcePath = Trayectoria de recurso TLD {0} inv\u00E1lida -contextConfig.unavailable = Esta aplicaci\u00F3n est\u00E1 marcada como no disponible debido a los errores precedentes -contextConfig.altDDNotFound = fichero alt-dd {0} no hallado -embedded.alreadyStarted = El servicio embebido (embedded service) ya ha sido arrancado -embedded.noEngines = Alg\u00FAn motor (engine) no ha sido a\u00FAn definido -embedded.notmp = No puedo hallar carpeta temporal especificada en {0} -embedded.notStarted = El servicio embebido (embedded service) a\u00FAn no ha sido arrancado -embedded.authenticatorNotInstanceOfValve = El Autenticado especificado no es un V\u00E1lvula -engineConfig.cce = El objeto de los datos de evento de ciclo de vida (Lifecycle event data object) {0} no es un motor (engine) -engineConfig.start = "EngineConfig"\: Tratamiento del "START" -engineConfig.stop = "EngineConfig"\: Tratamiento del "STOP" -expandWar.copy = Error copiando {0} a {1} -hostConfig.appBase = No existe el directorio base de la aplicaci\u00F3n {0} -hostConfig.canonicalizing = Error al borrar redespliegue de recursos desde contexto [{0}] -hostConfig.cce = El objeto de los datos de evento de ciclo de vida (Lifecycle event data object) {0} no es una m\u00E1quina (host) -hostConfig.context.destroy = Error al destruir contexto [{0}] -hostConfig.context.remove = Error al quitar contexto [{0}] -hostConfig.context.restart = Error durante el arranque del contexto {0} -hostConfig.deploy = Desplieque del directorio {0} de la aplicaci\u00F3n web -hostConfig.deployDescriptor = Desplieque del descriptor de configuraci\u00F3n {0} -hostConfig.deployDescriptor.error = Error durante el despliegue del descriptor de configuraci\u00F3n {0} -hostConfig.deployDescriptor.localDocBaseSpecified = Se ha especificado un docBase {0} dentro del appBase de la m\u00E1quina y ser\u00E1 ignorado -hostConfig.deployDir = Despliegue del directorio {0} de la aplicaci\u00F3n web -hostConfig.deployDir.error = Error durante el despliegue del directorio {0} de la aplicaci\u00F3n web -hostConfig.deployJar = Despliegue del archivo {0} de la aplicaci\u00F3n web -hostConfig.deployJar.error = Error durante el despliegue del archivo {0} de la aplicaci\u00F3n web -hostConfig.deploy.error = Excepci\u00F3n en el directorio {0} de la aplicaci\u00F3n web -hostConfig.deploying = Desplegando aplicaciones web descubiertas -hostConfig.expand = Descompresi\u00F3n del archivo {0} de la aplicaci\u00F3n web -hostConfig.expand.error = Excepci\u00F3n durante la descompresi\u00F3n del archivo {0} de la aplicaci\u00F3n web -hostConfig.expanding = Descubierta descompresi\u00F3n de archivos de aplicaciones web -hostConfig.jmx.register = Fall\u00F3 el registro del contexto [{0}] -hostConfig.jmx.unregister = Fall\u00F3 el desregistro del contexto [{0}] -hostConfig.reload = Fall\u00F3 la recarga del contexto [{0}] -hostConfig.removeXML = El context [{0}] est\u00E1 replegado -hostConfig.removeDIR = El directorio [{0}] est\u00E1 replegado -hostConfig.removeWAR = El War [{0}] est\u00E1 replegado -hostConfig.start = "HostConfig"\: Tratamiento del "START" -hostConfig.stop = "HostConfig"\: Tratamiento del "STOP" -hostConfig.undeploy = Repliegue (undeploy) de la aplicaci\u00F3n web que tiene como trayectoria de contexto {0} -hostConfig.undeploy.error = Error durante el repliegue (undeploy) de la aplicaci\u00F3n web que tiene como trayectoria de contexto {0} -hostConfig.undeploying = Repliegue de las aplicaciones web desplegadas -userConfig.database = Excepci\u00F3n durante la carga de base de datos de usuario -userConfig.deploy = Despliegue de la aplicaci\u00F3n web para el usuario {0} -userConfig.deploying = Desplegando aplicaciones web para el usuario -userConfig.error = Error durante el despliegue de la aplicaci\u00F3n web para el usario {0} -userConfig.start = "UserConfig"\: Tratamiento del "START" -userConfig.stop = "UserConfig"\: Tratamiento del "STOP" Deleted: trunk/src/main/java/org/apache/catalina/startup/LocalStrings_fr.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/LocalStrings_fr.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/LocalStrings_fr.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,59 +0,0 @@ -contextConfig.applicationClose=Erreur lors de la fermeture du fichier web.xml de l''application -contextConfig.applicationConfig=Erreur de configuration dans le fichier web.xml de l''application -contextConfig.applicationListener=Exception lors de la cr�ation de la classe d''�coute (listener) {0} -contextConfig.applicationMissing=Le fichier web.xml de l''application est absent, utilisation des param�tres par d�faut -contextConfig.applicationParse=Erreur d''�valuation (parse) dans le fichier web.xml de l''application � {0} -contextConfig.applicationPosition=S''est produite � la ligne {0} colonne {1} -contextConfig.authenticatorConfigured=Configuration d''un authentificateur (authenticator) pour la m�thode {0} -contextConfig.authenticatorInstantiate=Impossible d''instancier un authentificateur (authenticator) pour la classe {0} -contextConfig.authenticatorMissing=Impossible de configurer un authentificateur (authenticator) pour la m�thode {0} -contextConfig.authenticatorResources=Impossible de charger la liste de correspondance des authentificateur (authenticators) -contextConfig.cce=L''objet donn�e �v�nement cycle de vie (Lifecycle event data object) {0} n''est pas un Contexte -contextConfig.certificatesConfig.added=Ajout de certificats -> requ�te Attribut de Valve (attribute Valve) -contextConfig.certificatesConfig.error=Exception lors de l''ajout des "CertificatesValve": -contextConfig.defaultClose=Erreur lors de la fermeture du fichier web.xml par d�faut -contextConfig.defaultConfig=Erreur de configuration dans le fichier web.xml par d�faut -contextConfig.defaultMissing=Le fichier web.xml par d�faut est absent, utilisation du fichier web.xml de l''application web.xml seulement -contextConfig.defaultParse=Erreur d''�valuation (parse) dans le fichier web.xml par d�faut -contextConfig.defaultPosition=S''est produite � la ligne {0} colonne {1} -contextConfig.missingRealm=Aucun royaume (realm) n''a �t� configur� pour r�aliser l''authentification -contextConfig.role.auth=ATTENTION: Le nom de r�le de s�curit� {0} est utilis� dans un <auth-constraint> sans avoir �t� d�fini dans <security-role> -contextConfig.role.link=ATTENTION: Le nom de r�le de s�curit� {0} est utilis� dans un <role-link> sans avoir �t� d�fini dans <security-role> -contextConfig.role.runas=ATTENTION: Le nom de r�le de s�curit� {0} est utilis� dans un <run-as> sans avoir �t� d�fini dans <security-role> -contextConfig.start="ContextConfig": Traitement du "START" -contextConfig.stop="ContextConfig": Traitement du "STOP" -contextConfig.tldEntryException=Exception lors du traitement de la TLD {0} dans le JAR indiqu� par le chemin de ressource {1} dans le contexte {2} -contextConfig.tldFileException=Exception lors du traitement de la TLD indiqu� par le chemin de ressource {0} dans le contexte {1} -contextConfig.tldJarException=Exception lors du traitement du JAR indiqu� par le chemin de ressource {0} dans le contexte {1} -contextConfig.tldResourcePath=Chemin de ressource TLD {0} invalide -contextConfig.unavailable=Cette application est marqu�e comme non disponible suite aux erreurs pr�c�dentes -embedded.alreadyStarted=Le service enfoui (embedded service) a d�j� �t� d�marr� -embedded.noEngines=Aucun moteur (engine) n''a encore �t� d�fini -embedded.notStarted=Le service enfoui (embedded service) n''a pas encore �t� d�marr� -engineConfig.cce=L''objet donn�e �v�nement cycle de vie (Lifecycle event data object) {0} n''est pas un moteur (engine) -engineConfig.start="EngineConfig": Traitement du "START" -engineConfig.stop="EngineConfig": Traitement du "STOP" -hostConfig.cce=L''objet donn�e �v�nement cycle de vie (Lifecycle event data object) {0} n''est pas un h�te -hostConfig.deploy=D�ploiement du r�pertoire {0} de l''application web -hostConfig.deployDescriptor=D�ploiement du descripteur de configuration {0} -hostConfig.deployDescriptor.error=Erreur lors du d�ploiement du descripteur de configuration {0} -hostConfig.deployDir=D�ploiement du r�pertoire {0} de l''application web -hostConfig.deployDir.error=Erreur lors du d�ploiement du r�pertoire {0} de l''application web -hostConfig.deployJar=D�ploiement de l''archive {0} de l''application web -hostConfig.deployJar.error=Erreur lors du d�ploiement de l''archive {0} de l''application web -hostConfig.deploy.error=Exception lors du r�pertoire {0} de l''application web -hostConfig.deploying=D�ploiement des applications web d�couvertes (discovered) -hostConfig.expand=D�compression de l''archive {0} de l''application web -hostConfig.expand.error=Exception lors de la d�compression de l''archive {0} de l''application web -hostConfig.expanding=D�compression des archives des applications web d�couvertes (discovered) -hostConfig.start="HostConfig": Traitement du "START" -hostConfig.stop="HostConfig": Traitement du "STOP" -hostConfig.undeploy=Repli (undeploy) de l''application web ayant pour chemin de contexte {0} -hostConfig.undeploy.error=Erreur lors du repli (undeploy) de l''application web ayant pour chemin de contexte {0} -hostConfig.undeploying=Repli des applications web d�ploy�es -userConfig.database=Exception lors du chargement de la base de donn�es utilisateur -userConfig.deploy=D�ploiement de l''application web pour l''utilisateur {0} -userConfig.deploying=D�ploiement des applications web utilisateur -userConfig.error=Erreur lors du d�ploiement de l''application web pour l''utilisateur {0} -userConfig.start="UserConfig": Traitement du "START" -userConfig.stop="UserConfig": Traitement du "STOP" Deleted: trunk/src/main/java/org/apache/catalina/startup/LocalStrings_ja.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/LocalStrings_ja.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/LocalStrings_ja.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,64 +0,0 @@ -contextConfig.applicationClose=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306eweb.xml\u3092\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059 -contextConfig.applicationConfig=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306eweb.xml\u306e\u8a2d\u5b9a\u30a8\u30e9\u30fc\u3067\u3059 -contextConfig.applicationListener=\u30af\u30e9\u30b9 {0} \u306e\u30ea\u30b9\u30ca\u3092\u4f5c\u6210\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -contextConfig.applicationMissing=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306eweb.xml\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u3060\u3051\u3092\u4f7f\u7528\u3057\u307e\u3059 -contextConfig.applicationParse=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306eweb.xml\u30d5\u30a1\u30a4\u30eb {0} \u306e\u89e3\u6790\u30a8\u30e9\u30fc\u3067\u3059 -contextConfig.applicationPosition={0}\u884c\u306e{1}\u5217\u76ee\u3067\u767a\u751f\u3057\u307e\u3057\u305f -contextConfig.authenticatorConfigured=\u30e1\u30bd\u30c3\u30c9 {0} \u306e\u30aa\u30fc\u30bb\u30f3\u30c6\u30a3\u30b1\u30fc\u30bf\u3092\u8a2d\u5b9a\u3057\u307e\u3059 -contextConfig.authenticatorInstantiate=\u30af\u30e9\u30b9 {0} \u306e\u30aa\u30fc\u30bb\u30f3\u30c6\u30a3\u30b1\u30fc\u30bf\u3092\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5316\u3067\u304d\u307e\u305b\u3093 -contextConfig.authenticatorMissing=\u30e1\u30bd\u30c3\u30c9 {0} \u306e\u30aa\u30fc\u30bb\u30f3\u30c6\u30a3\u30b1\u30fc\u30bf\u3092\u8a2d\u5b9a\u3067\u304d\u307e\u305b\u3093 -contextConfig.authenticatorResources=\u30aa\u30fc\u30bb\u30f3\u30c6\u30a3\u30b1\u30fc\u30bf\u306e\u30de\u30c3\u30d7\u30ea\u30b9\u30c8\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093 -contextConfig.cce=\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u30a4\u30d9\u30f3\u30c8\u30c7\u30fc\u30bf\u30aa\u30d6\u30b8\u30a7\u30af\u30c8 {0} \u306f\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3067\u306f\u3042\u308a\u307e\u305b\u3093 -contextConfig.certificatesConfig.added=\u8a3c\u660e\u66f8\u3092\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u5c5e\u6027\u5024\u306b\u8ffd\u52a0\u3057\u307e\u3059 -contextConfig.certificatesConfig.error=CertificatesValve\u3092\u8ffd\u52a0\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f: -contextConfig.defaultClose=\u30c7\u30d5\u30a9\u30eb\u30c8\u306eweb.xml\u306e\u30af\u30ed\u30fc\u30ba\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f -contextConfig.defaultConfig=\u30c7\u30d5\u30a9\u30eb\u30c8\u306eweb.xml\u306e\u4e2d\u306e\u8a2d\u5b9a\u30a8\u30e9\u30fc\u3067\u3059 -contextConfig.defaultMissing=\u30c7\u30d5\u30a9\u30eb\u30c8\u306eweb.xml\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3001\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306eweb.xml\u3060\u3051\u3092\u4f7f\u7528\u3057\u307e\u3059 -contextConfig.defaultParse=\u30c7\u30d5\u30a9\u30eb\u30c8\u306eweb.xml\u4e2d\u306e\u89e3\u6790\u30a8\u30e9\u30fc\u3067\u3059 -contextConfig.defaultPosition={0}\u884c\u306e{1}\u5217\u76ee\u3067\u767a\u751f\u3057\u307e\u3057\u305f -contextConfig.missingRealm=\u8a8d\u8a3c\u3059\u308b\u305f\u3081\u306b\u30ec\u30eb\u30e0\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -contextConfig.role.auth=\u8b66\u544a: <security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d {0} \u304c<auth-constraint>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f -contextConfig.role.link=\u8b66\u544a: <security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d {0} \u304c<role-link>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f -contextConfig.role.runas=\u8b66\u544a: <security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d {0} \u304c<run-as>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f -contextConfig.start=ContextConfig: \u51e6\u7406\u3092\u958b\u59cb\u3057\u307e\u3059 -contextConfig.stop=ContextConfig: \u51e6\u7406\u3092\u505c\u6b62\u3057\u307e\u3059 -contextConfig.tldEntryException=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8 {2} \u306e\u30ea\u30bd\u30fc\u30b9\u30d1\u30b9 {1} \u306eJAR\u30d5\u30a1\u30a4\u30eb\u306eTLD {0} \u3092\u51e6\u7406\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -contextConfig.tldFileException=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8 {1} \u306e\u30ea\u30bd\u30fc\u30b9\u30d1\u30b9 {0} \u306eTLD\u3092\u51e6\u7406\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -contextConfig.tldJarException=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8 {1} \u306e\u30ea\u30bd\u30fc\u30b9\u30d1\u30b9 {0} \u306eJAR\u30d5\u30a1\u30a4\u30eb\u3092\u51e6\u7406\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -contextConfig.tldResourcePath=\u7121\u52b9\u306aTLD\u306e\u30ea\u30bd\u30fc\u30b9\u30d1\u30b9 {0} -contextConfig.unavailable=\u524d\u306e\u30a8\u30e9\u30fc\u306e\u305f\u3081\u306b\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u5229\u7528\u3067\u304d\u306a\u3044\u3088\u3046\u306b\u30de\u30fc\u30af\u3057\u307e\u3059 -embedded.alreadyStarted=\u7d44\u307f\u8fbc\u307f\u30b5\u30fc\u30d3\u30b9\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 -embedded.noEngines=\u307e\u3060\u30a8\u30f3\u30b8\u30f3\u304c\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -embedded.notStarted=\u7d44\u307f\u8fbc\u307f\u30b5\u30fc\u30d3\u30b9\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -engineConfig.cce=\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u30a4\u30d9\u30f3\u30c8\u30c7\u30fc\u30bf\u30aa\u30d6\u30b8\u30a7\u30af\u30c8 {0} \u306f\u30a8\u30f3\u30b8\u30f3\u3067\u306f\u3042\u308a\u307e\u305b\u3093 -engineConfig.start=EngineConfig: \u51e6\u7406\u3092\u958b\u59cb\u3057\u307e\u3059 -engineConfig.stop=EngineConfig: \u51e6\u7406\u3092\u505c\u6b62\u3057\u307e\u3059 -hostConfig.appBase=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d9\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea {0} \u306f\u5b58\u5728\u3057\u307e\u305b\u3093 -hostConfig.cce=\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u30a4\u30d9\u30f3\u30c8\u30c7\u30fc\u30bf\u30aa\u30d6\u30b8\u30a7\u30af\u30c8 {0} \u306f\u30db\u30b9\u30c8\u3067\u306f\u3042\u308a\u307e\u305b\u3093 -hostConfig.deploy=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30c7\u30a3\u30ec\u30af\u30c8\u30ea {0} \u3092\u914d\u5099\u3057\u307e\u3059 -hostConfig.deployDescriptor=\u8a2d\u5b9a\u8a18\u8ff0\u5b50 {0} \u3092\u914d\u5099\u3057\u307e\u3059 -hostConfig.deployDescriptor.error=\u8a2d\u5b9a\u8a18\u8ff0\u5b50 {0} \u3092\u914d\u5099\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059 -hostConfig.deployDir=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30c7\u30a3\u30ec\u30af\u30c8\u30ea {0} \u3092\u914d\u5099\u3057\u307e\u3059 -hostConfig.deployDir.error=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30c7\u30a3\u30ec\u30af\u30c8\u30ea {0} \u3092\u914d\u5099\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059 -hostConfig.deployJar=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30fc\u30ab\u30a4\u30d6 {0} \u3092\u914d\u5099\u3057\u307e\u3059 -hostConfig.deployJar.error=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30fc\u30ab\u30a4\u30d6 {0} \u3092\u914d\u5099\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059 -hostConfig.deploy.error=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30c7\u30a3\u30ec\u30af\u30c8\u30ea {0} \u3092\u914d\u5099\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -hostConfig.deploying=\u898b\u3064\u304b\u3063\u305fWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u3057\u307e\u3059 -hostConfig.expand=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30fc\u30ab\u30a4\u30d6 {0} \u3092\u5c55\u958b\u3057\u307e\u3059 -hostConfig.expand.error=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30fc\u30ab\u30a4\u30d6 {0} \u3092\u5c55\u958b\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -hostConfig.expanding=\u898b\u3064\u304b\u3063\u305fWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30fc\u30ab\u30a4\u30d6\u3092\u5c55\u958b\u3057\u307e\u3059 -hostConfig.context.restart=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8 {0} \u3092\u518d\u8d77\u52d5\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059 -hostConfig.removeXML=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8 {0} \u306e\u914d\u5099\u3092\u89e3\u9664\u3057\u307e\u3057\u305f -hostConfig.removeDIR=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea {0} \u306e\u914d\u5099\u3092\u89e3\u9664\u3057\u307e\u3057\u305f -hostConfig.removeWAR=WAR\u30d5\u30a1\u30a4\u30eb {0} \u306e\u914d\u5099\u3092\u89e3\u9664\u3057\u307e\u3057\u305f -hostConfig.start=HostConfig: \u51e6\u7406\u3092\u505c\u6b62\u3057\u307e\u3059 -hostConfig.stop=HostConfig: \u51e6\u7406\u3092\u505c\u6b62\u3057\u307e\u3059 -hostConfig.undeploy=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306eWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u914d\u5099\u3092\u89e3\u9664\u3057\u307e\u3059 -hostConfig.undeploy.error=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306eWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u914d\u5099\u3092\u89e3\u9664\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059 -hostConfig.undeploying=\u914d\u5099\u3055\u308c\u305fWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u914d\u5099\u3092\u89e3\u9664\u3057\u3066\u3044\u307e\u3059 -userConfig.database=\u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059 -userConfig.deploy=\u30e6\u30fc\u30b6 {0} \u306eWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u3057\u307e\u3059 -userConfig.deploying=\u30e6\u30fc\u30b6\u306eWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u3057\u307e\u3059 -userConfig.error=\u30e6\u30fc\u30b6 {0} \u306eWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059 -userConfig.start=UserConfig: \u51e6\u7406\u3092\u958b\u59cb\u3057\u307e\u3059 -userConfig.stop=UserConfig: \u51e6\u7406\u3092\u505c\u6b62\u3057\u307e\u3059 Deleted: trunk/src/main/java/org/apache/catalina/startup/PasswdUserDatabase.java =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/PasswdUserDatabase.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/PasswdUserDatabase.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,194 +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.startup; - - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; -import java.util.Hashtable; -import java.util.Enumeration; - - -/** - * Concrete implementation of the <strong>UserDatabase</code> interface - * that processes the <code>/etc/passwd</code> file on a Unix system. - * - * @author Craig R. McClanahan - * @version $Revision: 1237 $ $Date: 2009-11-03 02:55:48 +0100 (Tue, 03 Nov 2009) $ - */ - -public final class PasswdUserDatabase - implements UserDatabase { - - - // --------------------------------------------------------- Constructors - - - /** - * Initialize a new instance of this user database component. - */ - public PasswdUserDatabase() { - - super(); - - } - - - // --------------------------------------------------- Instance Variables - - - /** - * The pathname of the Unix password file. - */ - private static final String PASSWORD_FILE = "/etc/passwd"; - - - /** - * The set of home directories for all defined users, keyed by username. - */ - private Hashtable homes = new Hashtable(); - - - /** - * The UserConfig listener with which we are associated. - */ - private UserConfig userConfig = null; - - - // ----------------------------------------------------------- Properties - - - /** - * Return the UserConfig listener with which we are associated. - */ - public UserConfig getUserConfig() { - - return (this.userConfig); - - } - - - /** - * Set the UserConfig listener with which we are associated. - * - * @param userConfig The new UserConfig listener - */ - public void setUserConfig(UserConfig userConfig) { - - this.userConfig = userConfig; - init(); - - } - - - // ------------------------------------------------------- Public Methods - - - /** - * Return an absolute pathname to the home directory for the specified user. - * - * @param user User for which a home directory should be retrieved - */ - public String getHome(String user) { - - return ((String) homes.get(user)); - - } - - - /** - * Return an enumeration of the usernames defined on this server. - */ - public Enumeration getUsers() { - - return (homes.keys()); - - } - - - // ------------------------------------------------------ Private Methods - - - /** - * Initialize our set of users and home directories. - */ - private void init() { - - BufferedReader reader = null; - try { - - reader = new BufferedReader(new FileReader(PASSWORD_FILE)); - - while (true) { - - // Accumulate the next line - StringBuilder buffer = new StringBuilder(); - while (true) { - int ch = reader.read(); - if ((ch < 0) || (ch == '\n')) - break; - buffer.append((char) ch); - } - String line = buffer.toString(); - if (line.length() < 1) - break; - - // Parse the line into constituent elements - int n = 0; - String tokens[] = new String[7]; - for (int i = 0; i < tokens.length; i++) - tokens[i] = null; - while (n < tokens.length) { - String token = null; - int colon = line.indexOf(':'); - if (colon >= 0) { - token = line.substring(0, colon); - line = line.substring(colon + 1); - } else { - token = line; - line = ""; - } - tokens[n++] = token; - } - - // Add this user and corresponding directory - if ((tokens[0] != null) && (tokens[5] != null)) - homes.put(tokens[0], tokens[5]); - - } - - reader.close(); - reader = null; - - } catch (Exception e) { - if (reader != null) { - try { - reader.close(); - } catch (IOException f) { - ; - } - reader = null; - } - } - - } - - -} Deleted: trunk/src/main/java/org/apache/catalina/startup/UserConfig.java =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/UserConfig.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/UserConfig.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,339 +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.startup; - - -import java.io.File; -import java.util.Enumeration; - -import org.apache.catalina.Context; -import org.apache.catalina.Host; -import org.apache.catalina.Lifecycle; -import org.apache.catalina.LifecycleEvent; -import org.apache.catalina.LifecycleListener; -import org.apache.catalina.util.StringManager; - - -/** - * Startup event listener for a <b>Host</b> that configures Contexts (web - * applications) for all defined "users" who have a web application in a - * directory with the specified name in their home directories. The context - * path of each deployed application will be set to <code>~xxxxx</code>, where - * xxxxx is the username of the owning user for that web application - * - * @author Craig R. McClanahan - * @version $Revision: 515 $ $Date: 2008-03-17 22:02:23 +0100 (Mon, 17 Mar 2008) $ - */ - -public final class UserConfig - implements LifecycleListener { - - - private static org.jboss.logging.Logger log= - org.jboss.logging.Logger.getLogger( UserConfig.class ); - - - // ----------------------------------------------------- Instance Variables - - - /** - * The Java class name of the Context configuration class we should use. - */ - private String configClass = "org.apache.catalina.startup.ContextConfig"; - - - /** - * The Java class name of the Context implementation we should use. - */ - private String contextClass = "org.apache.catalina.core.StandardContext"; - - - /** - * The directory name to be searched for within each user home directory. - */ - private String directoryName = "public_html"; - - - /** - * The base directory containing user home directories. - */ - private String homeBase = null; - - - /** - * The Host we are associated with. - */ - private Host host = null; - - - /** - * The string resources for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** - * The Java class name of the user database class we should use. - */ - private String userClass = - "org.apache.catalina.startup.PasswdUserDatabase"; - - - // ------------------------------------------------------------- Properties - - - /** - * Return the Context configuration class name. - */ - public String getConfigClass() { - - return (this.configClass); - - } - - - /** - * Set the Context configuration class name. - * - * @param configClass The new Context configuration class name. - */ - public void setConfigClass(String configClass) { - - this.configClass = configClass; - - } - - - /** - * Return the Context implementation class name. - */ - public String getContextClass() { - - return (this.contextClass); - - } - - - /** - * Set the Context implementation class name. - * - * @param contextClass The new Context implementation class name. - */ - public void setContextClass(String contextClass) { - - this.contextClass = contextClass; - - } - - - /** - * Return the directory name for user web applications. - */ - public String getDirectoryName() { - - return (this.directoryName); - - } - - - /** - * Set the directory name for user web applications. - * - * @param directoryName The new directory name - */ - public void setDirectoryName(String directoryName) { - - this.directoryName = directoryName; - - } - - - /** - * Return the base directory containing user home directories. - */ - public String getHomeBase() { - - return (this.homeBase); - - } - - - /** - * Set the base directory containing user home directories. - * - * @param homeBase The new base directory - */ - public void setHomeBase(String homeBase) { - - this.homeBase = homeBase; - - } - - - /** - * Return the user database class name for this component. - */ - public String getUserClass() { - - return (this.userClass); - - } - - - /** - * Set the user database class name for this component. - */ - public void setUserClass(String userClass) { - - this.userClass = userClass; - - } - - - // --------------------------------------------------------- Public Methods - - - /** - * Process the START event for an associated Host. - * - * @param event The lifecycle event that has occurred - */ - public void lifecycleEvent(LifecycleEvent event) { - - // Identify the host we are associated with - try { - host = (Host) event.getLifecycle(); - } catch (ClassCastException e) { - log.error(sm.getString("hostConfig.cce", event.getLifecycle()), e); - return; - } - - // Process the event that has occurred - if (event.getType().equals(Lifecycle.START_EVENT)) - start(); - else if (event.getType().equals(Lifecycle.STOP_EVENT)) - stop(); - - } - - - // -------------------------------------------------------- Private Methods - - - /** - * Deploy a web application for any user who has a web application present - * in a directory with a specified name within their home directory. - */ - private void deploy() { - - if (host.getLogger().isDebugEnabled()) - host.getLogger().debug(sm.getString("userConfig.deploying")); - - // Load the user database object for this host - UserDatabase database = null; - try { - Class clazz = Class.forName(userClass); - database = (UserDatabase) clazz.newInstance(); - database.setUserConfig(this); - } catch (Exception e) { - host.getLogger().error(sm.getString("userConfig.database"), e); - return; - } - - // Deploy the web application (if any) for each defined user - Enumeration users = database.getUsers(); - while (users.hasMoreElements()) { - String user = (String) users.nextElement(); - String home = database.getHome(user); - deploy(user, home); - } - - } - - - /** - * Deploy a web application for the specified user if they have such an - * application in the defined directory within their home directory. - * - * @param user Username owning the application to be deployed - * @param home Home directory of this user - */ - private void deploy(String user, String home) { - - // Does this user have a web application to be deployed? - String contextPath = "/~" + user; - if (host.findChild(contextPath) != null) - return; - File app = new File(home, directoryName); - if (!app.exists() || !app.isDirectory()) - return; - /* - File dd = new File(app, "/WEB-INF/web.xml"); - if (!dd.exists() || !dd.isFile() || !dd.canRead()) - return; - */ - host.getLogger().info(sm.getString("userConfig.deploy", user)); - - // Deploy the web application for this user - try { - Class clazz = Class.forName(contextClass); - Context context = - (Context) clazz.newInstance(); - context.setPath(contextPath); - context.setDocBase(app.toString()); - if (context instanceof Lifecycle) { - clazz = Class.forName(configClass); - LifecycleListener listener = - (LifecycleListener) clazz.newInstance(); - ((Lifecycle) context).addLifecycleListener(listener); - } - host.addChild(context); - } catch (Exception e) { - host.getLogger().error(sm.getString("userConfig.error", user), e); - } - - } - - - /** - * Process a "start" event for this Host. - */ - private void start() { - - if (host.getLogger().isDebugEnabled()) - host.getLogger().debug(sm.getString("userConfig.start")); - - deploy(); - - } - - - /** - * Process a "stop" event for this Host. - */ - private void stop() { - - if (host.getLogger().isDebugEnabled()) - host.getLogger().debug(sm.getString("userConfig.stop")); - - } - - -} Deleted: trunk/src/main/java/org/apache/catalina/startup/UserDatabase.java =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/UserDatabase.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/startup/UserDatabase.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,70 +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.startup; - - -import java.util.Enumeration; - - -/** - * Abstraction of the set of users defined by the operating system on the - * current server platform. - * - * @author Craig R. McClanahan - * @version $Revision: 515 $ $Date: 2008-03-17 22:02:23 +0100 (Mon, 17 Mar 2008) $ - */ - -public interface UserDatabase { - - - // ----------------------------------------------------------- Properties - - - /** - * Return the UserConfig listener with which we are associated. - */ - public UserConfig getUserConfig(); - - - /** - * Set the UserConfig listener with which we are associated. - * - * @param userConfig The new UserConfig listener - */ - public void setUserConfig(UserConfig userConfig); - - - // ------------------------------------------------------- Public Methods - - - /** - * Return an absolute pathname to the home directory for the specified user. - * - * @param user User for which a home directory should be retrieved - */ - public String getHome(String user); - - - /** - * Return an enumeration of the usernames defined on this server. - */ - public Enumeration getUsers(); - - -} Modified: trunk/src/main/java/org/apache/catalina/util/HexUtils.java =================================================================== --- trunk/src/main/java/org/apache/catalina/util/HexUtils.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/util/HexUtils.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -18,6 +18,8 @@ package org.apache.catalina.util; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.io.ByteArrayOutputStream; /** @@ -53,13 +55,6 @@ /** - * The string manager for this package. - */ - private static StringManager sm = - StringManager.getManager("org.apache.catalina.util"); - - - /** * Convert a String of hexadecimal digits into the corresponding * byte array by encoding each two hexadecimal digits as a byte. * @@ -75,8 +70,7 @@ for (int i = 0; i < digits.length(); i += 2) { char c1 = digits.charAt(i); if ((i+1) >= digits.length()) - throw new IllegalArgumentException - (sm.getString("hexUtil.odd")); + throw MESSAGES.oddNomberOfHexDigits(); char c2 = digits.charAt(i + 1); byte b = 0; if ((c1 >= '0') && (c1 <= '9')) @@ -86,8 +80,7 @@ else if ((c1 >= 'A') && (c1 <= 'F')) b += ((c1 - 'A' + 10) * 16); else - throw new IllegalArgumentException - (sm.getString("hexUtil.bad")); + throw MESSAGES.badHexDigit(); if ((c2 >= '0') && (c2 <= '9')) b += (c2 - '0'); else if ((c2 >= 'a') && (c2 <= 'f')) @@ -95,8 +88,7 @@ else if ((c2 >= 'A') && (c2 <= 'F')) b += (c2 - 'A' + 10); else - throw new IllegalArgumentException - (sm.getString("hexUtil.bad")); + throw MESSAGES.badHexDigit(); baos.write(b); } return (baos.toByteArray()); @@ -138,19 +130,19 @@ int len; if(hex.length < 4 ) return 0; if( DEC[hex[0]]<0 ) - throw new IllegalArgumentException(sm.getString("hexUtil.bad")); + throw MESSAGES.badHexDigit(); len = DEC[hex[0]]; len = len << 4; if( DEC[hex[1]]<0 ) - throw new IllegalArgumentException(sm.getString("hexUtil.bad")); + throw MESSAGES.badHexDigit(); len += DEC[hex[1]]; len = len << 4; if( DEC[hex[2]]<0 ) - throw new IllegalArgumentException(sm.getString("hexUtil.bad")); + throw MESSAGES.badHexDigit(); len += DEC[hex[2]]; len = len << 4; if( DEC[hex[3]]<0 ) - throw new IllegalArgumentException(sm.getString("hexUtil.bad")); + throw MESSAGES.badHexDigit(); len += DEC[hex[3]]; return len; } Deleted: trunk/src/main/java/org/apache/catalina/util/LocalStrings.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/util/LocalStrings.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/util/LocalStrings.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,11 +0,0 @@ -parameterMap.locked=No modifications are allowed to a locked ParameterMap -resourceSet.locked=No modifications are allowed to a locked ResourceSet -hexUtil.bad=Bad hexadecimal digit -hexUtil.odd=Odd number of hexadecimal digits -#Default Messages Utilized by the ExtensionValidator -extensionValidator.web-application-manifest=Web Application Manifest -extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]: Required extension "{2}" not found. -extensionValidator.extension-validation-error=ExtensionValidator[{0}]: Failure to find {1} required extension(s). -extensionValidator.failload=Failure loading extension {0} -SecurityUtil.doAsPrivilege=An exception occurs when running the PrivilegedExceptionAction block. - Deleted: trunk/src/main/java/org/apache/catalina/util/LocalStrings_es.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/util/LocalStrings_es.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/util/LocalStrings_es.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,24 +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. -parameterMap.locked = No se permiten modificaciones en un ParameterMap bloqueado -resourceSet.locked = No se permiten modificaciones en un ResourceSet bloqueado -hexUtil.bad = D\u00EDgito hexadecimal incorrecto -hexUtil.odd = N\u00FAmero de d\u00EDgitos hexadecimales impar -#Default Messages Utilized by the ExtensionValidator -extensionValidator.web-application-manifest = Manifiesto de Aplicaci\u00F3n Web -extensionValidator.extension-not-found-error = ExtensionValidator[{0}][{1}]\: La extensi\u00F3n no encuentra el "{2}" requerido. -extensionValidator.extension-validation-error = ExtensionValidator[{0}]\: Imposible de hallar la(s) extension(es) {1} requerida(s). -extensionValidator.failload = No pude cargar la extensi\u00F3n {0} -SecurityUtil.doAsPrivilege = Una excepci\u00F3n se ha producido durante la ejecuci\u00F3n del bloque PrivilegedExceptionAction. Deleted: trunk/src/main/java/org/apache/catalina/util/LocalStrings_fr.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/util/LocalStrings_fr.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/util/LocalStrings_fr.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,10 +0,0 @@ -parameterMap.locked=Aucune modification n''est authoris�e sur un ParameterMap v�rrouill� -resourceSet.locked=Aucune modification n''est authoris�e sur un ResourceSet v�rrouill� -hexUtil.bad=Mauvais digit hexadecimal -hexUtil.odd=Nombre impair de digits hexadecimaux -#Default Messages Utilized by the ExtensionValidator -extensionValidator.web-application-manifest=Web Application Manifest -extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]: L''extension requise "{2}" est introuvable. -extensionValidator.extension-validation-error=ExtensionValidator[{0}]: Impossible de trouver {1} extension(s) requise(s). -SecurityUtil.doAsPrivilege=Une exception s''est produite lors de l''execution du bloc PrivilegedExceptionAction. - Deleted: trunk/src/main/java/org/apache/catalina/util/LocalStrings_ja.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/util/LocalStrings_ja.properties 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/util/LocalStrings_ja.properties 2012-08-30 17:19:13 UTC (rev 2075) @@ -1,11 +0,0 @@ -parameterMap.locked=\u30ed\u30c3\u30af\u3055\u308c\u305fParameterMap\u306f\u5909\u66f4\u304c\u8a31\u3055\u308c\u307e\u305b\u3093 -resourceSet.locked=\u30ed\u30c3\u30af\u3055\u308c\u305fResourceSet\u306f\u5909\u66f4\u304c\u8a31\u3055\u308c\u307e\u305b\u3093 -hexUtil.bad=\u7121\u52b9\u306a16\u9032\u6570\u5024\u3067\u3059 -hexUtil.odd=\u5947\u6570\u6841\u306e16\u9032\u6570\u5024\u3067\u3059 -#Default Messages Utilized by the ExtensionValidator -extensionValidator.web-application-manifest=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30de\u30cb\u30d5\u30a7\u30b9\u30c8 -extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]: \u5fc5\u8981\u306a\u62e1\u5f35 "{2}" \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 -extensionValidator.extension-validation-error=ExtensionValidator[{0}]: \u5fc5\u8981\u306a\u62e1\u5f35 "{1}" \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 -extensionValidator.failload=\u62e1\u5f35 {0} \u306e\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f -SecurityUtil.doAsPrivilege=PrivilegedExceptionAction\u30d6\u30ed\u30c3\u30af\u3092\u5b9f\u884c\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 - Modified: trunk/src/main/java/org/apache/catalina/util/ParameterMap.java =================================================================== --- trunk/src/main/java/org/apache/catalina/util/ParameterMap.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/util/ParameterMap.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -19,6 +19,8 @@ package org.apache.catalina.util; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.util.HashMap; import java.util.Map; @@ -121,13 +123,6 @@ } - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager("org.apache.catalina.util"); - - // --------------------------------------------------------- Public Methods @@ -140,8 +135,7 @@ public void clear() { if (locked) - throw new IllegalStateException - (sm.getString("parameterMap.locked")); + throw MESSAGES.lockedParameterMap(); super.clear(); } @@ -163,8 +157,7 @@ public Object put(Object key, Object value) { if (locked) - throw new IllegalStateException - (sm.getString("parameterMap.locked")); + throw MESSAGES.lockedParameterMap(); return (super.put(key, value)); } @@ -182,8 +175,7 @@ public void putAll(Map map) { if (locked) - throw new IllegalStateException - (sm.getString("parameterMap.locked")); + throw MESSAGES.lockedParameterMap(); super.putAll(map); } @@ -202,8 +194,7 @@ public Object remove(Object key) { if (locked) - throw new IllegalStateException - (sm.getString("parameterMap.locked")); + throw MESSAGES.lockedParameterMap(); return (super.remove(key)); } Modified: trunk/src/main/java/org/apache/catalina/util/ResourceSet.java =================================================================== --- trunk/src/main/java/org/apache/catalina/util/ResourceSet.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/apache/catalina/util/ResourceSet.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -19,6 +19,8 @@ package org.apache.catalina.util; +import static org.jboss.web.CatalinaMessages.MESSAGES; + import java.util.Collection; import java.util.HashSet; @@ -121,13 +123,6 @@ } - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager("org.apache.catalina.util"); - - // --------------------------------------------------------- Public Methods @@ -142,8 +137,7 @@ public boolean add(Object o) { if (locked) - throw new IllegalStateException - (sm.getString("resourceSet.locked")); + throw MESSAGES.lockedResourceSet(); return (super.add(o)); } @@ -157,8 +151,7 @@ public void clear() { if (locked) - throw new IllegalStateException - (sm.getString("resourceSet.locked")); + throw MESSAGES.lockedResourceSet(); super.clear(); } @@ -175,8 +168,7 @@ public boolean remove(Object o) { if (locked) - throw new IllegalStateException - (sm.getString("resourceSet.locked")); + throw MESSAGES.lockedResourceSet(); return (super.remove(o)); } Modified: trunk/src/main/java/org/jboss/web/CatalinaLogger.java =================================================================== --- trunk/src/main/java/org/jboss/web/CatalinaLogger.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/jboss/web/CatalinaLogger.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -27,6 +27,8 @@ import static org.jboss.logging.Logger.Level.WARN; import static org.jboss.logging.Logger.Level.DEBUG; +import java.io.File; + import org.jboss.logging.BasicLogger; import org.jboss.logging.Cause; import org.jboss.logging.LogMessage; @@ -66,6 +68,16 @@ */ CatalinaLogger CONNECTOR_LOGGER = Logger.getMessageLogger(CatalinaLogger.class, "org.apache.catalina.connector"); + /** + * A logger with the category of the package name. + */ + CatalinaLogger FILTERS_LOGGER = Logger.getMessageLogger(CatalinaLogger.class, "org.apache.catalina.filters"); + + /** + * A logger with the category of the package name. + */ + CatalinaLogger STARTUP_LOGGER = Logger.getMessageLogger(CatalinaLogger.class, "org.apache.catalina.startup"); + @LogMessage(level = WARN) @Message(id = 1000, value = "A valid entry has been removed from client nonce cache to make room for new entries. A replay attack is now possible. To prevent the possibility of replay attacks, reduce nonceValidity or increase cnonceCacheSize. Further warnings of this type will be suppressed for 5 minutes.") void digestCacheRemove(); @@ -170,4 +182,68 @@ @Message(id = 1024, value = "Exception thrown whilst processing POSTed parameters") void exceptionProcessingParameters(@Cause Throwable t); + @LogMessage(level = DEBUG) + @Message(id = 1025, value = "Request [%s], can not apply ExpiresFilter on already committed response.") + void expiresResponseAlreadyCommitted(String uri); + + @LogMessage(level = WARN) + @Message(id = 1026, value = "Unknown parameter %s with value %s is ignored.") + void expiresUnknownParameter(String name, String value); + + @LogMessage(level = DEBUG) + @Message(id = 1027, value = "Request [%s] with response status %s content-type %s, expiration header already defined") + void expiresHeaderAlreadyDefined(String uri, int statusCode, String contentType); + + @LogMessage(level = DEBUG) + @Message(id = 1028, value = "Request [%s] with response status %s content-type %s, skip expiration header generation for given status") + void expiresSkipStatusCode(String uri, int statusCode, String contentType); + + @LogMessage(level = ERROR) + @Message(id = 1029, value = "Error copying %s to %s") + void fileCopyError(File src, File dest, @Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1030, value = "%s could not be completely deleted. The presence of the remaining files may cause problems") + void fileDeleteError(String delete); + + @LogMessage(level = ERROR) + @Message(id = 1031, value = "No Realm has been configured to authenticate against") + void noRealmFound(); + + @LogMessage(level = ERROR) + @Message(id = 1032, value = "Cannot load authenticators mapping list") + void cannotFindAuthenticatoMappings(); + + @LogMessage(level = ERROR) + @Message(id = 1033, value = "Cannot load authenticators mapping list") + void failedLoadingAuthenticatoMappings(@Cause Throwable t); + + @LogMessage(level = ERROR) + @Message(id = 1034, value = "Cannot configure an authenticator for method %s") + void noAuthenticatorForAuthMethod(String authMethod); + + @LogMessage(level = ERROR) + @Message(id = 1035, value = "Cannot instantiate an authenticator of class %s") + void failedLoadingAuthenticator(String className, @Cause Throwable t); + + @LogMessage(level = DEBUG) + @Message(id = 1036, value = "Configured an authenticator for method %s") + void authenticatorConfigured(String authMethod); + + @LogMessage(level = ERROR) + @Message(id = 1037, value = "Marking this application unavailable due to previous error(s)") + void contextUnavailable(); + + @LogMessage(level = INFO) + @Message(id = 1038, value = "Security role name %s used in an <auth-constraint> without being defined in a <security-role>") + void roleValidationAuth(String roleName); + + @LogMessage(level = INFO) + @Message(id = 1039, value = "Security role name %s used in a <role-link> without being defined in a <security-role>") + void roleValidationRunAs(String roleName); + + @LogMessage(level = INFO) + @Message(id = 1040, value = "Security role name %s used in a <run-as> without being defined in a <security-role>") + void roleValidationLink(String roleName); + } Modified: trunk/src/main/java/org/jboss/web/CatalinaMessages.java =================================================================== --- trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-08-29 16:44:25 UTC (rev 2074) +++ trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-08-30 17:19:13 UTC (rev 2075) @@ -217,7 +217,7 @@ @Message(id = 58, value = "The response object has been recycled and is no longer associated with this facade") IllegalStateException nullResponseFacade(); - @Message(id = 60, value = "Stream closed") + @Message(id = 59, value = "Stream closed") IOException streamClosed(); @Message(id = 64, value = "Error report") @@ -265,6 +265,75 @@ @Message(id = 78, value = "Syntax error in request filter pattern %s") String requestFilterValvePatternError(String pattern); + @Message(id = 79, value = "The property %s is not defined for filters of type %s") + String propertyNotFound(String property, String className); + + @Message(id = 80, value = "Unable to create Random source using class %s") + String cannotCreateRandom(String className); + + @Message(id = 81, value = "Unsupported startingPoint %s") + IllegalStateException expiresUnsupportedStartingPoint(String startingPoint); + + @Message(id = 82, value = "Exception processing configuration parameter %s: %s") + String expiresExceptionProcessingParameter(String name, String value); + + @Message(id = 83, value = "Starting point (access|now|modification|a<seconds>|m<seconds>) not found in directive %s") + IllegalStateException expiresStartingPointNotFound(String line); + + @Message(id = 84, value = "Invalid starting point (access|now|modification|a<seconds>|m<seconds>) %s in directive %s") + IllegalStateException expiresInvalidStartingPoint(String token, String line); + + @Message(id = 85, value = "Duration not found in directive %s") + IllegalStateException expiresDurationNotFound(String line); + + @Message(id = 86, value = "Invalid duration (number) %s in directive %s") + IllegalStateException expiresInvalidDuration(String token, String line); + + @Message(id = 87, value = "Duration unit not found after amount %s in directive %s") + IllegalStateException expiresDurationUnitNotFound(int amount, String line); + + @Message(id = 86, value = "Invalid duration unit (years|months|weeks|days|hours|minutes|seconds) %s in directive %s") + IllegalStateException expiresInvalidDurationUnit(String token, String line); + + @Message(id = 87, value = "Request filter invalid pattern %s") + IllegalArgumentException requestFilterInvalidPattern(String pattern, @Cause Throwable t); + + @Message(id = 88, value = "The requested resource (%s) is not available") + String resourceNotAvailable(String resource); + + @Message(id = 89, value = "Directory Listing For %s") + String listingDirectoryTitle(String directory); + + @Message(id = 90, value = "Up To %s") + String listingDirectoryParent(String directory); + + @Message(id = 91, value = "Filename") + String listingFilename(); + + @Message(id = 92, value = "Size") + String listingSize(); + + @Message(id = 93, value = "Last Modified") + String listingLastModified(); + + @Message(id = 94, value = "JAXP initialization failed") + String jaxpInitializationFailed(); + + @Message(id = 95, value = "Ignored external entity %s %s") + String ignoredExternalEntity(String publicId, String systemId); + + @Message(id = 96, value = "No modifications are allowed to a locked ParameterMap") + IllegalStateException lockedParameterMap(); + + @Message(id = 97, value = "No modifications are allowed to a locked ResourceSet") + IllegalStateException lockedResourceSet(); + + @Message(id = 98, value = "Bad hexadecimal digit") + IllegalArgumentException badHexDigit(); + + @Message(id = 99, value = "Odd number of hexadecimal digits") + IllegalArgumentException oddNomberOfHexDigits(); + @Message(id = 100, value = "The client may continue.") String http100();