Author: kkolinko
Date: Mon Jan 4 16:00:49 2016
New Revision: 1722905
URL: http://svn.apache.org/viewvc?rev=1722905&view=rev
Log:
Simplify. Fix naming of message keys (s/Resources/Resource/). Log name of a
missing resource.
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1722905&r1=1722904&r2=1722905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Mon
Jan 4 16:00:49 2016
@@ -88,19 +88,16 @@ public class DefaultInstanceManager impl
privileged = catalinaContext.getPrivileged();
this.containerClassLoader = containerClassLoader;
ignoreAnnotations = catalinaContext.getIgnoreAnnotations();
- StringManager sm = StringManager.getManager(Constants.Package);
+ Log log = catalinaContext.getLogger();
restrictedServlets = loadProperties(
"org/apache/catalina/core/RestrictedServlets.properties",
-
sm.getString("defaultInstanceManager.restrictedServletsResource"),
- catalinaContext.getLogger());
+ "defaultInstanceManager.restrictedServletsResource", log);
restrictedListeners = loadProperties(
"org/apache/catalina/core/RestrictedListeners.properties",
-
sm.getString("defaultInstanceManager.restrictedListenersResources"),
- catalinaContext.getLogger());
+ "defaultInstanceManager.restrictedListenersResource", log);
restrictedFilters = loadProperties(
"org/apache/catalina/core/RestrictedFilters.properties",
-
sm.getString("defaultInstanceManager.restrictedFiltersResource"),
- catalinaContext.getLogger());
+ "defaultInstanceManager.restrictedFiltersResource", log);
this.context = context;
this.injectionMap = injectionMap;
this.postConstructMethods = catalinaContext.findPostConstructMethods();
@@ -624,17 +621,17 @@ public class DefaultInstanceManager impl
}
}
- private static Properties loadProperties(String resourceName, String
errorString, Log log) {
+ private static Properties loadProperties(String resourceName, String
messageKey, Log log) {
Properties result = new Properties();
ClassLoader cl = DefaultInstanceManager.class.getClassLoader();
try (InputStream is = cl.getResourceAsStream(resourceName)) {
- if (is ==null) {
- log.error(errorString);
+ if (is == null) {
+ log.error(sm.getString(messageKey, resourceName));
} else {
result.load(is);
}
} catch (IOException ioe) {
- log.error(errorString, ioe);
+ log.error(sm.getString(messageKey, resourceName), ioe);
}
return result;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1722905&r1=1722904&r2=1722905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Mon Jan
4 16:00:49 2016
@@ -222,6 +222,6 @@ threadLocalLeakPreventionListener.lifecy
threadLocalLeakPreventionListener.containerEvent.error=Exception processing
container event {0}
defaultInstanceManager.invalidInjection=Invalid method resource injection
annotation
-defaultInstanceManager.restrictedServletsResource=Restricted servlets property
file not found
-defaultInstanceManager.restrictedFiltersResource=Restricted filters property
file not found
-defaultInstanceManager.restrictedListenersResources=Restricted listeners
property file not found
+defaultInstanceManager.restrictedFiltersResource=Restricted filters property
file not found [{0}]
+defaultInstanceManager.restrictedListenersResource=Restricted listeners
property file not found [{0}]
+defaultInstanceManager.restrictedServletsResource=Restricted servlets property
file not found [{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
