Author: xiaming
Date: Thu Dec 15 19:38:29 2011
New Revision: 1214928
URL: http://svn.apache.org/viewvc?rev=1214928&view=rev
Log:
More changes on instanceManager replacing AnnotationProcessor
Modified:
geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/servlets/WebdavServlet.java
geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/startup/ConnectorCreateRule.java
geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/startup/WebRuleSet.java
geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/core/LocalStrings.properties
geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml
geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties
geronimo/external/trunk/tomcat-parent-6.0.35/jasper/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java
Modified: geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/servlets/WebdavServlet.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1214928&r1=1214927&r2=1214928&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/servlets/WebdavServlet.java
(original)
+++ geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/servlets/WebdavServlet.java
Thu Dec 15 19:38:29 2011
@@ -39,7 +39,6 @@ import javax.naming.NameClassPair;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServletRequest;
@@ -61,7 +60,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -321,8 +319,6 @@ public class WebdavServlet
documentBuilderFactory.setNamespaceAware(true);
documentBuilderFactory.setExpandEntityReferences(false);
documentBuilder = documentBuilderFactory.newDocumentBuilder();
- documentBuilder.setEntityResolver(
- new WebdavResolver(this.getServletContext()));
} catch(ParserConfigurationException e) {
throw new ServletException
(sm.getString("webdavservlet.jaxpfailed"));
Modified: geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/startup/ConnectorCreateRule.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/startup/ConnectorCreateRule.java?rev=1214928&r1=1214927&r2=1214928&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/startup/ConnectorCreateRule.java
(original)
+++ geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/startup/ConnectorCreateRule.java
Thu Dec 15 19:38:29 2011
@@ -53,18 +53,14 @@ public class ConnectorCreateRule extends
ex = svc.getExecutor(attributes.getValue("executor"));
}
Connector con = new Connector(attributes.getValue("protocol"));
- if ( ex != null ) _setExecutor(con,ex);
+ if ( ex != null ) setExecutor(con,ex);
digester.push(con);
}
- public void _setExecutor(Connector con, Executor ex) throws Exception {
- Method m = IntrospectionUtils.findMethod(con.getProtocolHandler().getClass(),"setExecutor",new
Class[] {java.util.concurrent.Executor.class});
- if (m!=null) {
- m.invoke(con.getProtocolHandler(), new Object[] {ex});
- }else {
- log.warn("Connector ["+con+"] does not support external executors. Method setExecutor(java.util.concurrent.Executor)
not found.");
- }
+ public void setExecutor(Connector con, Executor ex) throws Exception {
+ IntrospectionUtils.callMethod1(con.getProtocolHandler(), "setExecutor",
+ ex, java.util.concurrent.Executor.class.getName(), getClass().getClassLoader());
}
Modified: geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/startup/WebRuleSet.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/startup/WebRuleSet.java?rev=1214928&r1=1214927&r2=1214928&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/startup/WebRuleSet.java
(original)
+++ geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/startup/WebRuleSet.java
Thu Dec 15 19:38:29 2011
@@ -139,58 +139,7 @@ public class WebRuleSet extends RuleSetB
digester.addRule(prefix + "web-app/distributable",
new SetDistributableRule());
- digester.addObjectCreate(prefix + "web-app/ejb-local-ref",
- "org.apache.catalina.deploy.ContextLocalEjb");
- digester.addRule(prefix + "web-app/ejb-local-ref",
- new SetNextNamingRule("addLocalEjb",
- "org.apache.catalina.deploy.ContextLocalEjb"));
-
- digester.addCallMethod(prefix + "web-app/ejb-local-ref/description",
- "setDescription", 0);
- digester.addCallMethod(prefix + "web-app/ejb-local-ref/ejb-link",
- "setLink", 0);
- digester.addCallMethod(prefix + "web-app/ejb-local-ref/ejb-ref-name",
- "setName", 0);
- digester.addCallMethod(prefix + "web-app/ejb-local-ref/ejb-ref-type",
- "setType", 0);
- digester.addCallMethod(prefix + "web-app/ejb-local-ref/local",
- "setLocal", 0);
- digester.addCallMethod(prefix + "web-app/ejb-local-ref/local-home",
- "setHome", 0);
-
- digester.addObjectCreate(prefix + "web-app/ejb-ref",
- "org.apache.catalina.deploy.ContextEjb");
- digester.addRule(prefix + "web-app/ejb-ref",
- new SetNextNamingRule("addEjb",
- "org.apache.catalina.deploy.ContextEjb"));
-
- digester.addCallMethod(prefix + "web-app/ejb-ref/description",
- "setDescription", 0);
- digester.addCallMethod(prefix + "web-app/ejb-ref/ejb-link",
- "setLink", 0);
- digester.addCallMethod(prefix + "web-app/ejb-ref/ejb-ref-name",
- "setName", 0);
- digester.addCallMethod(prefix + "web-app/ejb-ref/ejb-ref-type",
- "setType", 0);
- digester.addCallMethod(prefix + "web-app/ejb-ref/home",
- "setHome", 0);
- digester.addCallMethod(prefix + "web-app/ejb-ref/remote",
- "setRemote", 0);
-
- digester.addObjectCreate(prefix + "web-app/env-entry",
- "org.apache.catalina.deploy.ContextEnvironment");
- digester.addRule(prefix + "web-app/env-entry",
- new SetNextNamingRule("addEnvironment",
- "org.apache.catalina.deploy.ContextEnvironment"));
-
- digester.addCallMethod(prefix + "web-app/env-entry/description",
- "setDescription", 0);
- digester.addCallMethod(prefix + "web-app/env-entry/env-entry-name",
- "setName", 0);
- digester.addCallMethod(prefix + "web-app/env-entry/env-entry-type",
- "setType", 0);
- digester.addCallMethod(prefix + "web-app/env-entry/env-entry-value",
- "setValue", 0);
+ configureNamingRules(digester);
digester.addObjectCreate(prefix + "web-app/error-page",
"org.apache.catalina.deploy.ErrorPage");
@@ -279,6 +228,160 @@ public class WebRuleSet extends RuleSetB
digester.addCallParam(prefix + "web-app/mime-mapping/extension", 0);
digester.addCallParam(prefix + "web-app/mime-mapping/mime-type", 1);
+
+ digester.addObjectCreate(prefix + "web-app/security-constraint",
+ "org.apache.catalina.deploy.SecurityConstraint");
+ digester.addSetNext(prefix + "web-app/security-constraint",
+ "addConstraint",
+ "org.apache.catalina.deploy.SecurityConstraint");
+
+ digester.addRule(prefix + "web-app/security-constraint/auth-constraint",
+ new SetAuthConstraintRule());
+ digester.addCallMethod(prefix + "web-app/security-constraint/auth-constraint/role-name",
+ "addAuthRole", 0);
+ digester.addCallMethod(prefix + "web-app/security-constraint/display-name",
+ "setDisplayName", 0);
+ digester.addCallMethod(prefix + "web-app/security-constraint/user-data-constraint/transport-guarantee",
+ "setUserConstraint", 0);
+
+ digester.addObjectCreate(prefix + "web-app/security-constraint/web-resource-collection",
+ "org.apache.catalina.deploy.SecurityCollection");
+ digester.addSetNext(prefix + "web-app/security-constraint/web-resource-collection",
+ "addCollection",
+ "org.apache.catalina.deploy.SecurityCollection");
+ digester.addCallMethod(prefix + "web-app/security-constraint/web-resource-collection/http-method",
+ "addMethod", 0);
+ digester.addCallMethod(prefix + "web-app/security-constraint/web-resource-collection/url-pattern",
+ "addPattern", 0);
+ digester.addCallMethod(prefix + "web-app/security-constraint/web-resource-collection/web-resource-name",
+ "setName", 0);
+
+ digester.addCallMethod(prefix + "web-app/security-role/role-name",
+ "addSecurityRole", 0);
+
+ digester.addRule(prefix + "web-app/servlet",
+ new WrapperCreateRule());
+ digester.addSetNext(prefix + "web-app/servlet",
+ "addChild",
+ "org.apache.catalina.Container");
+
+ digester.addCallMethod(prefix + "web-app/servlet/init-param",
+ "addInitParameter", 2);
+ digester.addCallParam(prefix + "web-app/servlet/init-param/param-name",
+ 0);
+ digester.addCallParam(prefix + "web-app/servlet/init-param/param-value",
+ 1);
+
+ digester.addCallMethod(prefix + "web-app/servlet/jsp-file",
+ "setJspFile", 0);
+ digester.addCallMethod(prefix + "web-app/servlet/load-on-startup",
+ "setLoadOnStartupString", 0);
+ digester.addCallMethod(prefix + "web-app/servlet/run-as/role-name",
+ "setRunAs", 0);
+
+ digester.addRule(prefix + "web-app/servlet/security-role-ref",
+ new SecurityRoleRefCreateRule());
+ digester.addCallMethod(
+ prefix + "web-app/servlet/security-role-ref/role-link",
+ "setLink", 0);
+ digester.addCallMethod(
+ prefix + "web-app/servlet/security-role-ref/role-name",
+ "setName", 0);
+
+ digester.addCallMethod(prefix + "web-app/servlet/servlet-class",
+ "setServletClass", 0);
+ digester.addCallMethod(prefix + "web-app/servlet/servlet-name",
+ "setName", 0);
+
+ digester.addRule(prefix + "web-app/servlet-mapping",
+ new CallMethodMultiRule("addServletMapping", 2, 0));
+ digester.addCallParam(prefix + "web-app/servlet-mapping/servlet-name", 1);
+ digester.addRule(prefix + "web-app/servlet-mapping/url-pattern", new CallParamMultiRule(0));
+
+ digester.addRule(prefix + "web-app/session-config",
+ sessionConfig);
+
+ digester.addCallMethod(prefix + "web-app/session-config/session-timeout",
+ "setSessionTimeout", 1,
+ new Class[] { Integer.TYPE });
+ digester.addCallParam(prefix + "web-app/session-config/session-timeout", 0);
+
+ digester.addCallMethod(prefix + "web-app/taglib",
+ "addTaglib", 2);
+ digester.addCallParam(prefix + "web-app/taglib/taglib-location", 1);
+ digester.addCallParam(prefix + "web-app/taglib/taglib-uri", 0);
+
+ digester.addCallMethod(prefix + "web-app/welcome-file-list/welcome-file",
+ "addWelcomeFile", 0);
+
+ digester.addCallMethod(prefix + "web-app/locale-encoding-mapping-list/locale-encoding-mapping",
+ "addLocaleEncodingMappingParameter", 2);
+ digester.addCallParam(prefix + "web-app/locale-encoding-mapping-list/locale-encoding-mapping/locale",
0);
+ digester.addCallParam(prefix + "web-app/locale-encoding-mapping-list/locale-encoding-mapping/encoding",
1);
+
+ }
+
+ protected void configureNamingRules(Digester digester) {
+ //ejb-local-ref
+ digester.addObjectCreate(prefix + "web-app/ejb-local-ref",
+ "org.apache.catalina.deploy.ContextLocalEjb");
+ digester.addRule(prefix + "web-app/ejb-local-ref",
+ new SetNextNamingRule("addLocalEjb",
+ "org.apache.catalina.deploy.ContextLocalEjb"));
+
+ digester.addCallMethod(prefix + "web-app/ejb-local-ref/description",
+ "setDescription", 0);
+ digester.addCallMethod(prefix + "web-app/ejb-local-ref/ejb-link",
+ "setLink", 0);
+ digester.addCallMethod(prefix + "web-app/ejb-local-ref/ejb-ref-name",
+ "setName", 0);
+ digester.addCallMethod(prefix + "web-app/ejb-local-ref/ejb-ref-type",
+ "setType", 0);
+ digester.addCallMethod(prefix + "web-app/ejb-local-ref/local",
+ "setLocal", 0);
+ digester.addCallMethod(prefix + "web-app/ejb-local-ref/local-home",
+ "setHome", 0);
+ configureInjectionRules(digester, "web-app/ejb-local-ref/");
+
+ //ejb-ref
+ digester.addObjectCreate(prefix + "web-app/ejb-ref",
+ "org.apache.catalina.deploy.ContextEjb");
+ digester.addRule(prefix + "web-app/ejb-ref",
+ new SetNextNamingRule("addEjb",
+ "org.apache.catalina.deploy.ContextEjb"));
+
+ digester.addCallMethod(prefix + "web-app/ejb-ref/description",
+ "setDescription", 0);
+ digester.addCallMethod(prefix + "web-app/ejb-ref/ejb-link",
+ "setLink", 0);
+ digester.addCallMethod(prefix + "web-app/ejb-ref/ejb-ref-name",
+ "setName", 0);
+ digester.addCallMethod(prefix + "web-app/ejb-ref/ejb-ref-type",
+ "setType", 0);
+ digester.addCallMethod(prefix + "web-app/ejb-ref/home",
+ "setHome", 0);
+ digester.addCallMethod(prefix + "web-app/ejb-ref/remote",
+ "setRemote", 0);
+ configureInjectionRules(digester, "web-app/ejb-ref/");
+
+ //env-entry
+ digester.addObjectCreate(prefix + "web-app/env-entry",
+ "org.apache.catalina.deploy.ContextEnvironment");
+ digester.addRule(prefix + "web-app/env-entry",
+ new SetNextNamingRule("addEnvironment",
+ "org.apache.catalina.deploy.ContextEnvironment"));
+
+ digester.addCallMethod(prefix + "web-app/env-entry/description",
+ "setDescription", 0);
+ digester.addCallMethod(prefix + "web-app/env-entry/env-entry-name",
+ "setName", 0);
+ digester.addCallMethod(prefix + "web-app/env-entry/env-entry-type",
+ "setType", 0);
+ digester.addCallMethod(prefix + "web-app/env-entry/env-entry-value",
+ "setValue", 0);
+ configureInjectionRules(digester, "web-app/env-entry/");
+
+ //resource-env-ref
digester.addObjectCreate(prefix + "web-app/resource-env-ref",
"org.apache.catalina.deploy.ContextResourceEnvRef");
digester.addRule(prefix + "web-app/resource-env-ref",
@@ -289,7 +392,9 @@ public class WebRuleSet extends RuleSetB
"setName", 0);
digester.addCallMethod(prefix + "web-app/resource-env-ref/resource-env-ref-type",
"setType", 0);
+ configureInjectionRules(digester, "web-app/ejb-local-ref/");
+ //message-destination
digester.addObjectCreate(prefix + "web-app/message-destination",
"org.apache.catalina.deploy.MessageDestination");
digester.addSetNext(prefix + "web-app/message-destination",
@@ -307,6 +412,7 @@ public class WebRuleSet extends RuleSetB
digester.addCallMethod(prefix + "web-app/message-destination/message-destination-name",
"setName", 0);
+ //message-destination-ref
digester.addObjectCreate(prefix + "web-app/message-destination-ref",
"org.apache.catalina.deploy.MessageDestinationRef");
digester.addSetNext(prefix + "web-app/message-destination-ref",
@@ -324,6 +430,9 @@ public class WebRuleSet extends RuleSetB
digester.addCallMethod(prefix + "web-app/message-destination-ref/message-destination-usage",
"setUsage", 0);
+ configureInjectionRules(digester, "web-app/message-destination-ref/");
+
+ //resource-ref
digester.addObjectCreate(prefix + "web-app/resource-ref",
"org.apache.catalina.deploy.ContextResource");
digester.addRule(prefix + "web-app/resource-ref",
@@ -340,37 +449,9 @@ public class WebRuleSet extends RuleSetB
"setScope", 0);
digester.addCallMethod(prefix + "web-app/resource-ref/res-type",
"setType", 0);
+ configureInjectionRules(digester, "web-app/resource-ref/");
- digester.addObjectCreate(prefix + "web-app/security-constraint",
- "org.apache.catalina.deploy.SecurityConstraint");
- digester.addSetNext(prefix + "web-app/security-constraint",
- "addConstraint",
- "org.apache.catalina.deploy.SecurityConstraint");
-
- digester.addRule(prefix + "web-app/security-constraint/auth-constraint",
- new SetAuthConstraintRule());
- digester.addCallMethod(prefix + "web-app/security-constraint/auth-constraint/role-name",
- "addAuthRole", 0);
- digester.addCallMethod(prefix + "web-app/security-constraint/display-name",
- "setDisplayName", 0);
- digester.addCallMethod(prefix + "web-app/security-constraint/user-data-constraint/transport-guarantee",
- "setUserConstraint", 0);
-
- digester.addObjectCreate(prefix + "web-app/security-constraint/web-resource-collection",
- "org.apache.catalina.deploy.SecurityCollection");
- digester.addSetNext(prefix + "web-app/security-constraint/web-resource-collection",
- "addCollection",
- "org.apache.catalina.deploy.SecurityCollection");
- digester.addCallMethod(prefix + "web-app/security-constraint/web-resource-collection/http-method",
- "addMethod", 0);
- digester.addCallMethod(prefix + "web-app/security-constraint/web-resource-collection/url-pattern",
- "addPattern", 0);
- digester.addCallMethod(prefix + "web-app/security-constraint/web-resource-collection/web-resource-name",
- "setName", 0);
-
- digester.addCallMethod(prefix + "web-app/security-role/role-name",
- "addSecurityRole", 0);
-
+ //service-ref
digester.addObjectCreate(prefix + "web-app/service-ref",
"org.apache.catalina.deploy.ContextService");
digester.addRule(prefix + "web-app/service-ref",
@@ -403,7 +484,7 @@ public class WebRuleSet extends RuleSetB
digester.addRule(prefix + "web-app/service-ref/handler",
new SetNextRule("addHandler",
"org.apache.catalina.deploy.ContextHandler"));
-
+
digester.addCallMethod(prefix + "web-app/service-ref/handler/handler-name",
"setName", 0);
digester.addCallMethod(prefix + "web-app/service-ref/handler/handler-class",
@@ -422,69 +503,20 @@ public class WebRuleSet extends RuleSetB
"addSoapRole", 0);
digester.addCallMethod(prefix + "web-app/service-ref/handler/port-name",
"addPortName", 0);
-
- digester.addRule(prefix + "web-app/servlet",
- new WrapperCreateRule());
- digester.addSetNext(prefix + "web-app/servlet",
- "addChild",
- "org.apache.catalina.Container");
-
- digester.addCallMethod(prefix + "web-app/servlet/init-param",
- "addInitParameter", 2);
- digester.addCallParam(prefix + "web-app/servlet/init-param/param-name",
- 0);
- digester.addCallParam(prefix + "web-app/servlet/init-param/param-value",
- 1);
-
- digester.addCallMethod(prefix + "web-app/servlet/jsp-file",
- "setJspFile", 0);
- digester.addCallMethod(prefix + "web-app/servlet/load-on-startup",
- "setLoadOnStartupString", 0);
- digester.addCallMethod(prefix + "web-app/servlet/run-as/role-name",
- "setRunAs", 0);
-
- digester.addRule(prefix + "web-app/servlet/security-role-ref",
- new SecurityRoleRefCreateRule());
- digester.addCallMethod(
- prefix + "web-app/servlet/security-role-ref/role-link",
- "setLink", 0);
- digester.addCallMethod(
- prefix + "web-app/servlet/security-role-ref/role-name",
- "setName", 0);
-
- digester.addCallMethod(prefix + "web-app/servlet/servlet-class",
- "setServletClass", 0);
- digester.addCallMethod(prefix + "web-app/servlet/servlet-name",
- "setName", 0);
+ configureInjectionRules(digester, "web-app/service-ref/");
- digester.addRule(prefix + "web-app/servlet-mapping",
- new CallMethodMultiRule("addServletMapping", 2, 0));
- digester.addCallParam(prefix + "web-app/servlet-mapping/servlet-name", 1);
- digester.addRule(prefix + "web-app/servlet-mapping/url-pattern", new CallParamMultiRule(0));
-
- digester.addRule(prefix + "web-app/session-config",
- sessionConfig);
-
- digester.addCallMethod(prefix + "web-app/session-config/session-timeout",
- "setSessionTimeout", 1,
- new Class[] { Integer.TYPE });
- digester.addCallParam(prefix + "web-app/session-config/session-timeout", 0);
- digester.addCallMethod(prefix + "web-app/taglib",
- "addTaglib", 2);
- digester.addCallParam(prefix + "web-app/taglib/taglib-location", 1);
- digester.addCallParam(prefix + "web-app/taglib/taglib-uri", 0);
+ }
- digester.addCallMethod(prefix + "web-app/welcome-file-list/welcome-file",
- "addWelcomeFile", 0);
+ protected void configureInjectionRules(Digester digester, String base) {
- digester.addCallMethod(prefix + "web-app/locale-encoding-mapping-list/locale-encoding-mapping",
- "addLocaleEncodingMappingParameter", 2);
- digester.addCallParam(prefix + "web-app/locale-encoding-mapping-list/locale-encoding-mapping/locale",
0);
- digester.addCallParam(prefix + "web-app/locale-encoding-mapping-list/locale-encoding-mapping/encoding",
1);
+ digester.addCallMethod(prefix + base + "injection-target", "addInjectionTarget",
2);
+ digester.addCallParam(prefix + base + "injection-target/injection-target-class",
0);
+ digester.addCallParam(prefix + base + "injection-target/injection-target-name", 1);
}
+
/**
* Reset counter used for validating the web.xml file.
*/
Modified: geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/core/LocalStrings.properties
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/core/LocalStrings.properties?rev=1214928&r1=1214927&r2=1214928&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/core/LocalStrings.properties
(original)
+++ geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/core/LocalStrings.properties
Thu Dec 15 19:38:29 2011
@@ -217,7 +217,6 @@ standardWrapper.notClass=No servlet clas
standardWrapper.notContext=Parent container of a Wrapper must be a Context
standardWrapper.notFound=Servlet {0} is not available
standardWrapper.notServlet=Class {0} is not a Servlet
-standardWrapper.privilegedServlet=Servlet of class {0} is privileged and cannot be loaded
by this web application
standardWrapper.releaseFilters=Release filters exception for servlet {0}
standardWrapper.serviceException=Servlet.service() for servlet {0} threw exception
standardWrapper.statusHeader=HTTP Status {0} - {1}
@@ -226,7 +225,9 @@ standardWrapper.unavailable=Marking serv
standardWrapper.unloadException=Servlet {0} threw unload() exception
standardWrapper.unloading=Cannot allocate servlet {0} because it is being unloaded
standardWrapper.waiting=Waiting for {0} instance(s) to be deallocated
-standardWrapper.restrictedServletsResource=Restricted servlets property file not found
-applicationFilterConfig.restrictedFiltersResource=Restricted filters property file not found
-applicationFilterConfig.privilegedFilter=Filter of class {0} is privileged and cannot be
loaded by this web application
+defaultInstanceManager.restrictedServletsResource=Restricted servlets property file not found
+defaultInstanceManager.privilegedServlet=Servlet of class {0} is privileged and cannot be
loaded by this web application
+defaultInstanceManager.restrictedFiltersResource=Restricted filters property file not found
+defaultInstanceManager.privilegedFilter=Filter of class {0} is privileged and cannot be loaded
by this web application
+defaultInstanceManager.restrictedListenersResources="Restricted listeners property file not
found
\ No newline at end of file
Modified: geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml?rev=1214928&r1=1214927&r2=1214928&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml
(original)
+++ geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml
Thu Dec 15 19:38:29 2011
@@ -64,9 +64,9 @@
is="true"
type="boolean"/>
- <attribute name="annotationProcessor"
- description="Object that processes things like injection annotations"
- type="org.apache.AnnotationProcessor" />
+ <attribute name="instanceManager"
+ description="Object that creates and destroys servlets, filters, and listeners.
Include dependency injection and postConstruct/preDestory handling"
+ type="org.apache.catalina.instanceManagement.InstanceManager" />
<attribute name="antiJARLocking"
description="Take care to not lock jar files"
Modified: geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties?rev=1214928&r1=1214927&r2=1214928&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties
(original)
+++ geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties
Thu Dec 15 19:38:29 2011
@@ -25,7 +25,6 @@ invokerServlet.invalidPath=No servlet na
invokerServlet.notNamed=Cannot call invoker servlet with a named dispatcher
invokerServlet.noWrapper=Container has not called setWrapper() for this servlet
webdavservlet.jaxpfailed=JAXP initialization failed
-webdavservlet.enternalEntityIgnored=The request included a reference to an external entity
with PublicID {0} and SystemID {1} which was ignored
directory.filename=Filename
directory.lastModified=Last Modified
directory.parent=Up To {0}
Modified: geronimo/external/trunk/tomcat-parent-6.0.35/jasper/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.35/jasper/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java?rev=1214928&r1=1214927&r2=1214928&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.35/jasper/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java
(original)
+++ geronimo/external/trunk/tomcat-parent-6.0.35/jasper/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java
Thu Dec 15 19:38:29 2011
@@ -111,7 +111,7 @@ public class TagHandlerPool {
* @throws JspException if a tag handler cannot be instantiated
*/
public Tag get(Class handlerClass) throws JspException {
- Tag handler = null;
+ Tag handler;
synchronized( this ) {
if (current >= 0) {
handler = handlers[current--];
|