Author: markt
Date: Fri Jun 14 13:51:13 2013
New Revision: 1493073
URL: http://svn.apache.org/r1493073
Log:
Rename string and update text
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1493071
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1493073&r1=1493072&r2=1493073&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Fri Jun 14 13:51:13 2013
@@ -105,6 +105,7 @@ naming.unbindFailed=Failed to unbind obj
naming.invalidEnvEntryType=Environment entry {0} has an invalid type
naming.invalidEnvEntryValue=Environment entry {0} has an invalid value
naming.namingContextCreationFailed=Creation of the naming context failed: {0}
+noPluggabilityServletContext.notAllowed=Section 4.4 of the Servlet 3.0
specification does not permit this method to be called from a
ServletContextListener that was not defined in web.xml, a web-fragment.xml file
nor annotated with @WebLister
standardContext.invalidWrapperClass={0} is not a subclass of StandardWrapper
standardContext.alreadyStarted=Context has already been started
standardContext.applicationListener=Error configuring application listener of
class {0}
@@ -267,8 +268,6 @@ standardWrapper.waiting=Waiting for {0}
threadLocalLeakPreventionListener.lifecycleEvent.error=Exception processing
lifecycle event {0}
threadLocalLeakPreventionListener.containerEvent.error=Exception processing
container event {0}
-tldListenerServletContext.notAllowed=Section 4.4 of the Servlet 3.0
specification does not permit this method to be called from a
ServletContextListener that is defined in a TLD
-
defaultInstanceManager.restrictedServletsResource=Restricted servlets property
file not found
defaultInstanceManager.privilegedServlet=Servlet of class {0} is privileged
and cannot be loaded by this web application
defaultInstanceManager.restrictedFiltersResource=Restricted filters property
file not found
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1493073&r1=1493072&r2=1493073&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Fri
Jun 14 13:51:13 2013
@@ -6775,13 +6775,13 @@ public class StandardContext extends Con
@Override
public int getEffectiveMajorVersion() {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public int getEffectiveMinorVersion() {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
@@ -6871,7 +6871,7 @@ public class StandardContext extends Con
@Override
public boolean setInitParameter(String name, String value) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
@@ -6902,147 +6902,147 @@ public class StandardContext extends Con
@Override
public Dynamic addServlet(String servletName, String className) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public Dynamic addServlet(String servletName, Servlet servlet) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public Dynamic addServlet(String servletName,
Class<? extends Servlet> servletClass) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public <T extends Servlet> T createServlet(Class<T> c)
throws ServletException {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public ServletRegistration getServletRegistration(String servletName) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public Map<String,? extends ServletRegistration>
getServletRegistrations() {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public javax.servlet.FilterRegistration.Dynamic addFilter(
String filterName, String className) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public javax.servlet.FilterRegistration.Dynamic addFilter(
String filterName, Filter filter) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public javax.servlet.FilterRegistration.Dynamic addFilter(
String filterName, Class<? extends Filter> filterClass) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public <T extends Filter> T createFilter(Class<T> c)
throws ServletException {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public FilterRegistration getFilterRegistration(String filterName) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public Map<String,? extends FilterRegistration>
getFilterRegistrations() {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public SessionCookieConfig getSessionCookieConfig() {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public void setSessionTrackingModes(
Set<SessionTrackingMode> sessionTrackingModes) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public void addListener(String className) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public <T extends EventListener> void addListener(T t) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public void addListener(Class<? extends EventListener> listenerClass) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public <T extends EventListener> T createListener(Class<T> c)
throws ServletException {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public JspConfigDescriptor getJspConfigDescriptor() {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public ClassLoader getClassLoader() {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
@Override
public void declareRoles(String... roleNames) {
throw new UnsupportedOperationException(
- sm.getString("tldListenerServletContext.notAllowed"));
+ sm.getString("noPluggabilityServletContext.notAllowed"));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
