Author: violetagg
Date: Tue Jul 9 04:33:04 2013
New Revision: 1501082
URL: http://svn.apache.org/r1501082
Log:
Followup to r1500964: The new package in *RuleSet classes and in mbeans
descriptors.
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java?rev=1501082&r1=1501081&r2=1501082&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
Tue Jul 9 04:33:04 2013
@@ -31,7 +31,7 @@ import org.apache.tomcat.util.modeler.Ba
/**
* <p>A <strong>ModelMBean</strong> implementation for the
- * <code>org.apache.catalina.deploy.ContextEnvironment</code> component.</p>
+ * <code>org.apache.tomcat.util.descriptor.web.ContextEnvironment</code>
component.</p>
*
* @author Amy Roh
* @version $Id$
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java?rev=1501082&r1=1501081&r2=1501082&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
Tue Jul 9 04:33:04 2013
@@ -31,7 +31,7 @@ import org.apache.tomcat.util.modeler.Ba
/**
* <p>A <strong>ModelMBean</strong> implementation for the
- * <code>org.apache.catalina.deploy.ContextResourceLink</code> component.</p>
+ * <code>org.apache.tomcat.util.descriptor.web.ContextResourceLink</code>
component.</p>
*
* @author Amy Roh
* @version $Id$
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java?rev=1501082&r1=1501081&r2=1501082&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java Tue
Jul 9 04:33:04 2013
@@ -31,7 +31,7 @@ import org.apache.tomcat.util.modeler.Ba
/**
* <p>A <strong>ModelMBean</strong> implementation for the
- * <code>org.apache.catalina.deploy.ContextResource</code> component.</p>
+ * <code>org.apache.tomcat.util.descriptor.web.ContextResource</code>
component.</p>
*
* @author Amy Roh
* @version $Id$
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1501082&r1=1501081&r2=1501082&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Tue Jul 9
04:33:04 2013
@@ -564,6 +564,7 @@ public class MBeanUtils {
registry.loadDescriptors("org.apache.catalina.connector", cl);
registry.loadDescriptors("org.apache.catalina.valves", cl);
registry.loadDescriptors("org.apache.catalina.storeconfig", cl);
+ registry.loadDescriptors("org.apache.tomcat.util.descriptor.web",
cl);
}
return (registry);
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=1501082&r1=1501081&r2=1501082&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Tue Jul
9 04:33:04 2013
@@ -155,11 +155,11 @@ public class ContextRuleSet extends Rule
"org.apache.catalina.Store");
digester.addObjectCreate(prefix + "Context/Parameter",
-
"org.apache.catalina.deploy.ApplicationParameter");
+
"org.apache.tomcat.util.descriptor.web.ApplicationParameter");
digester.addSetProperties(prefix + "Context/Parameter");
digester.addSetNext(prefix + "Context/Parameter",
"addApplicationParameter",
- "org.apache.catalina.deploy.ApplicationParameter");
+
"org.apache.tomcat.util.descriptor.web.ApplicationParameter");
digester.addRuleSet(new RealmRuleSet(prefix + "Context/"));
@@ -197,11 +197,11 @@ public class ContextRuleSet extends Rule
digester.addObjectCreate(prefix + "Context/ResourceLink",
- "org.apache.catalina.deploy.ContextResourceLink");
+ "org.apache.tomcat.util.descriptor.web.ContextResourceLink");
digester.addSetProperties(prefix + "Context/ResourceLink");
digester.addRule(prefix + "Context/ResourceLink",
new SetNextNamingRule("addResourceLink",
- "org.apache.catalina.deploy.ContextResourceLink"));
+
"org.apache.tomcat.util.descriptor.web.ContextResourceLink"));
digester.addObjectCreate(prefix + "Context/Valve",
null, // MUST be specified in the element
Modified: tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java?rev=1501082&r1=1501081&r2=1501082&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java Tue Jul 9
04:33:04 2013
@@ -85,53 +85,53 @@ public class NamingRuleSet extends RuleS
public void addRuleInstances(Digester digester) {
digester.addObjectCreate(prefix + "Ejb",
- "org.apache.catalina.deploy.ContextEjb");
+
"org.apache.tomcat.util.descriptor.web.ContextEjb");
digester.addRule(prefix + "Ejb", new SetAllPropertiesRule());
digester.addRule(prefix + "Ejb",
new SetNextNamingRule("addEjb",
- "org.apache.catalina.deploy.ContextEjb"));
+
"org.apache.tomcat.util.descriptor.web.ContextEjb"));
digester.addObjectCreate(prefix + "Environment",
-
"org.apache.catalina.deploy.ContextEnvironment");
+
"org.apache.tomcat.util.descriptor.web.ContextEnvironment");
digester.addSetProperties(prefix + "Environment");
digester.addRule(prefix + "Environment",
new SetNextNamingRule("addEnvironment",
- "org.apache.catalina.deploy.ContextEnvironment"));
+
"org.apache.tomcat.util.descriptor.web.ContextEnvironment"));
digester.addObjectCreate(prefix + "LocalEjb",
- "org.apache.catalina.deploy.ContextLocalEjb");
+
"org.apache.tomcat.util.descriptor.web.ContextLocalEjb");
digester.addRule(prefix + "LocalEjb", new SetAllPropertiesRule());
digester.addRule(prefix + "LocalEjb",
new SetNextNamingRule("addLocalEjb",
- "org.apache.catalina.deploy.ContextLocalEjb"));
+
"org.apache.tomcat.util.descriptor.web.ContextLocalEjb"));
digester.addObjectCreate(prefix + "Resource",
- "org.apache.catalina.deploy.ContextResource");
+
"org.apache.tomcat.util.descriptor.web.ContextResource");
digester.addRule(prefix + "Resource", new SetAllPropertiesRule());
digester.addRule(prefix + "Resource",
new SetNextNamingRule("addResource",
- "org.apache.catalina.deploy.ContextResource"));
+
"org.apache.tomcat.util.descriptor.web.ContextResource"));
digester.addObjectCreate(prefix + "ResourceEnvRef",
- "org.apache.catalina.deploy.ContextResourceEnvRef");
+ "org.apache.tomcat.util.descriptor.web.ContextResourceEnvRef");
digester.addRule(prefix + "ResourceEnvRef", new
SetAllPropertiesRule());
digester.addRule(prefix + "ResourceEnvRef",
new SetNextNamingRule("addResourceEnvRef",
-
"org.apache.catalina.deploy.ContextResourceEnvRef"));
+
"org.apache.tomcat.util.descriptor.web.ContextResourceEnvRef"));
digester.addObjectCreate(prefix + "ServiceRef",
- "org.apache.catalina.deploy.ContextService");
+ "org.apache.tomcat.util.descriptor.web.ContextService");
digester.addRule(prefix + "ServiceRef", new SetAllPropertiesRule());
digester.addRule(prefix + "ServiceRef",
new SetNextNamingRule("addService",
- "org.apache.catalina.deploy.ContextService"));
+
"org.apache.tomcat.util.descriptor.web.ContextService"));
digester.addObjectCreate(prefix + "Transaction",
- "org.apache.catalina.deploy.ContextTransaction");
+ "org.apache.tomcat.util.descriptor.web.ContextTransaction");
digester.addRule(prefix + "Transaction", new SetAllPropertiesRule());
digester.addRule(prefix + "Transaction",
new SetNextNamingRule("setTransaction",
- "org.apache.catalina.deploy.ContextTransaction"));
+
"org.apache.tomcat.util.descriptor.web.ContextTransaction"));
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=1501082&r1=1501081&r2=1501082&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Tue Jul 9
04:33:04 2013
@@ -221,10 +221,10 @@ public class WebRuleSet extends RuleSetB
configureNamingRules(digester);
digester.addObjectCreate(fullPrefix + "/error-page",
- "org.apache.catalina.deploy.ErrorPage");
+
"org.apache.tomcat.util.descriptor.web.ErrorPage");
digester.addSetNext(fullPrefix + "/error-page",
"addErrorPage",
- "org.apache.catalina.deploy.ErrorPage");
+ "org.apache.tomcat.util.descriptor.web.ErrorPage");
digester.addCallMethod(fullPrefix + "/error-page/error-code",
"setErrorCode", 0);
@@ -234,10 +234,10 @@ public class WebRuleSet extends RuleSetB
"setLocation", 0);
digester.addObjectCreate(fullPrefix + "/filter",
- "org.apache.catalina.deploy.FilterDef");
+
"org.apache.tomcat.util.descriptor.web.FilterDef");
digester.addSetNext(fullPrefix + "/filter",
"addFilter",
- "org.apache.catalina.deploy.FilterDef");
+ "org.apache.tomcat.util.descriptor.web.FilterDef");
digester.addCallMethod(fullPrefix + "/filter/description",
"setDescription", 0);
@@ -262,10 +262,10 @@ public class WebRuleSet extends RuleSetB
1);
digester.addObjectCreate(fullPrefix + "/filter-mapping",
- "org.apache.catalina.deploy.FilterMap");
+
"org.apache.tomcat.util.descriptor.web.FilterMap");
digester.addSetNext(fullPrefix + "/filter-mapping",
"addFilterMapping",
- "org.apache.catalina.deploy.FilterMap");
+
"org.apache.tomcat.util.descriptor.web.FilterMap");
digester.addCallMethod(fullPrefix + "/filter-mapping/filter-name",
"setFilterName", 0);
@@ -284,10 +284,10 @@ public class WebRuleSet extends RuleSetB
jspConfig);
digester.addObjectCreate(fullPrefix + "/jsp-config/jsp-property-group",
-
"org.apache.catalina.deploy.JspPropertyGroup");
+
"org.apache.tomcat.util.descriptor.web.JspPropertyGroup");
digester.addSetNext(fullPrefix + "/jsp-config/jsp-property-group",
"addJspPropertyGroup",
- "org.apache.catalina.deploy.JspPropertyGroup");
+
"org.apache.tomcat.util.descriptor.web.JspPropertyGroup");
digester.addCallMethod(fullPrefix +
"/jsp-config/jsp-property-group/deferred-syntax-allowed-as-literal",
"setDeferredSyntax", 0);
digester.addCallMethod(fullPrefix +
"/jsp-config/jsp-property-group/el-ignored",
@@ -317,10 +317,10 @@ public class WebRuleSet extends RuleSetB
loginConfig);
digester.addObjectCreate(fullPrefix + "/login-config",
- "org.apache.catalina.deploy.LoginConfig");
+
"org.apache.tomcat.util.descriptor.web.LoginConfig");
digester.addSetNext(fullPrefix + "/login-config",
"setLoginConfig",
- "org.apache.catalina.deploy.LoginConfig");
+
"org.apache.tomcat.util.descriptor.web.LoginConfig");
digester.addCallMethod(fullPrefix + "/login-config/auth-method",
"setAuthMethod", 0);
@@ -338,10 +338,10 @@ public class WebRuleSet extends RuleSetB
digester.addObjectCreate(fullPrefix + "/security-constraint",
-
"org.apache.catalina.deploy.SecurityConstraint");
+
"org.apache.tomcat.util.descriptor.web.SecurityConstraint");
digester.addSetNext(fullPrefix + "/security-constraint",
"addSecurityConstraint",
- "org.apache.catalina.deploy.SecurityConstraint");
+
"org.apache.tomcat.util.descriptor.web.SecurityConstraint");
digester.addRule(fullPrefix + "/security-constraint/auth-constraint",
new SetAuthConstraintRule());
@@ -353,10 +353,10 @@ public class WebRuleSet extends RuleSetB
"setUserConstraint", 0);
digester.addObjectCreate(fullPrefix +
"/security-constraint/web-resource-collection",
-
"org.apache.catalina.deploy.SecurityCollection");
+
"org.apache.tomcat.util.descriptor.web.SecurityCollection");
digester.addSetNext(fullPrefix +
"/security-constraint/web-resource-collection",
"addCollection",
- "org.apache.catalina.deploy.SecurityCollection");
+
"org.apache.tomcat.util.descriptor.web.SecurityCollection");
digester.addCallMethod(fullPrefix +
"/security-constraint/web-resource-collection/http-method",
"addMethod", 0);
digester.addCallMethod(fullPrefix +
"/security-constraint/web-resource-collection/http-method-omission",
@@ -373,7 +373,7 @@ public class WebRuleSet extends RuleSetB
new ServletDefCreateRule());
digester.addSetNext(fullPrefix + "/servlet",
"addServlet",
- "org.apache.catalina.deploy.ServletDef");
+
"org.apache.tomcat.util.descriptor.web.ServletDef");
digester.addCallMethod(fullPrefix + "/servlet/init-param",
"addInitParameter", 2);
@@ -390,10 +390,10 @@ public class WebRuleSet extends RuleSetB
"setRunAs", 0);
digester.addObjectCreate(fullPrefix + "/servlet/security-role-ref",
- "org.apache.catalina.deploy.SecurityRoleRef");
+
"org.apache.tomcat.util.descriptor.web.SecurityRoleRef");
digester.addSetNext(fullPrefix + "/servlet/security-role-ref",
"addSecurityRoleRef",
- "org.apache.catalina.deploy.SecurityRoleRef");
+
"org.apache.tomcat.util.descriptor.web.SecurityRoleRef");
digester.addCallMethod(fullPrefix +
"/servlet/security-role-ref/role-link",
"setLink", 0);
digester.addCallMethod(fullPrefix +
"/servlet/security-role-ref/role-name",
@@ -405,10 +405,10 @@ public class WebRuleSet extends RuleSetB
"setServletName", 0);
digester.addObjectCreate(fullPrefix + "/servlet/multipart-config",
- "org.apache.catalina.deploy.MultipartDef");
+
"org.apache.tomcat.util.descriptor.web.MultipartDef");
digester.addSetNext(fullPrefix + "/servlet/multipart-config",
"setMultipartDef",
- "org.apache.catalina.deploy.MultipartDef");
+
"org.apache.tomcat.util.descriptor.web.MultipartDef");
digester.addCallMethod(fullPrefix +
"/servlet/multipart-config/location",
"setLocation", 0);
digester.addCallMethod(fullPrefix +
"/servlet/multipart-config/max-file-size",
@@ -431,9 +431,9 @@ public class WebRuleSet extends RuleSetB
digester.addRule(fullPrefix + "/session-config", sessionConfig);
digester.addObjectCreate(fullPrefix + "/session-config",
- "org.apache.catalina.deploy.SessionConfig");
+
"org.apache.tomcat.util.descriptor.web.SessionConfig");
digester.addSetNext(fullPrefix + "/session-config", "setSessionConfig",
- "org.apache.catalina.deploy.SessionConfig");
+
"org.apache.tomcat.util.descriptor.web.SessionConfig");
digester.addCallMethod(fullPrefix + "/session-config/session-timeout",
"setSessionTimeout", 0);
digester.addCallMethod(fullPrefix +
"/session-config/cookie-config/name",
@@ -489,10 +489,10 @@ public class WebRuleSet extends RuleSetB
protected void configureNamingRules(Digester digester) {
//ejb-local-ref
digester.addObjectCreate(fullPrefix + "/ejb-local-ref",
- "org.apache.catalina.deploy.ContextLocalEjb");
+
"org.apache.tomcat.util.descriptor.web.ContextLocalEjb");
digester.addSetNext(fullPrefix + "/ejb-local-ref",
"addEjbLocalRef",
- "org.apache.catalina.deploy.ContextLocalEjb");
+
"org.apache.tomcat.util.descriptor.web.ContextLocalEjb");
digester.addCallMethod(fullPrefix + "/ejb-local-ref/description",
"setDescription", 0);
digester.addCallMethod(fullPrefix + "/ejb-local-ref/ejb-link",
@@ -511,10 +511,10 @@ public class WebRuleSet extends RuleSetB
//ejb-ref
digester.addObjectCreate(fullPrefix + "/ejb-ref",
- "org.apache.catalina.deploy.ContextEjb");
+
"org.apache.tomcat.util.descriptor.web.ContextEjb");
digester.addSetNext(fullPrefix + "/ejb-ref",
"addEjbRef",
- "org.apache.catalina.deploy.ContextEjb");
+
"org.apache.tomcat.util.descriptor.web.ContextEjb");
digester.addCallMethod(fullPrefix + "/ejb-ref/description",
"setDescription", 0);
digester.addCallMethod(fullPrefix + "/ejb-ref/ejb-link",
@@ -533,10 +533,10 @@ public class WebRuleSet extends RuleSetB
//env-entry
digester.addObjectCreate(fullPrefix + "/env-entry",
-
"org.apache.catalina.deploy.ContextEnvironment");
+
"org.apache.tomcat.util.descriptor.web.ContextEnvironment");
digester.addSetNext(fullPrefix + "/env-entry",
"addEnvEntry",
- "org.apache.catalina.deploy.ContextEnvironment");
+
"org.apache.tomcat.util.descriptor.web.ContextEnvironment");
digester.addCallMethod(fullPrefix + "/env-entry/description",
"setDescription", 0);
digester.addCallMethod(fullPrefix + "/env-entry/env-entry-name",
@@ -551,10 +551,10 @@ public class WebRuleSet extends RuleSetB
//resource-env-ref
digester.addObjectCreate(fullPrefix + "/resource-env-ref",
- "org.apache.catalina.deploy.ContextResourceEnvRef");
+ "org.apache.tomcat.util.descriptor.web.ContextResourceEnvRef");
digester.addSetNext(fullPrefix + "/resource-env-ref",
"addResourceEnvRef",
-
"org.apache.catalina.deploy.ContextResourceEnvRef");
+
"org.apache.tomcat.util.descriptor.web.ContextResourceEnvRef");
digester.addCallMethod(fullPrefix +
"/resource-env-ref/resource-env-ref-name",
"setName", 0);
digester.addCallMethod(fullPrefix +
"/resource-env-ref/resource-env-ref-type",
@@ -565,10 +565,10 @@ public class WebRuleSet extends RuleSetB
//message-destination
digester.addObjectCreate(fullPrefix + "/message-destination",
-
"org.apache.catalina.deploy.MessageDestination");
+
"org.apache.tomcat.util.descriptor.web.MessageDestination");
digester.addSetNext(fullPrefix + "/message-destination",
"addMessageDestination",
- "org.apache.catalina.deploy.MessageDestination");
+
"org.apache.tomcat.util.descriptor.web.MessageDestination");
digester.addCallMethod(fullPrefix + "/message-destination/description",
"setDescription", 0);
digester.addCallMethod(fullPrefix +
"/message-destination/display-name",
@@ -584,10 +584,10 @@ public class WebRuleSet extends RuleSetB
//message-destination-ref
digester.addObjectCreate(fullPrefix + "/message-destination-ref",
-
"org.apache.catalina.deploy.MessageDestinationRef");
+
"org.apache.tomcat.util.descriptor.web.MessageDestinationRef");
digester.addSetNext(fullPrefix + "/message-destination-ref",
"addMessageDestinationRef",
-
"org.apache.catalina.deploy.MessageDestinationRef");
+
"org.apache.tomcat.util.descriptor.web.MessageDestinationRef");
digester.addCallMethod(fullPrefix +
"/message-destination-ref/description",
"setDescription", 0);
digester.addCallMethod(fullPrefix +
"/message-destination-ref/message-destination-link",
@@ -604,10 +604,10 @@ public class WebRuleSet extends RuleSetB
//resource-ref
digester.addObjectCreate(fullPrefix + "/resource-ref",
- "org.apache.catalina.deploy.ContextResource");
+
"org.apache.tomcat.util.descriptor.web.ContextResource");
digester.addSetNext(fullPrefix + "/resource-ref",
"addResourceRef",
- "org.apache.catalina.deploy.ContextResource");
+
"org.apache.tomcat.util.descriptor.web.ContextResource");
digester.addCallMethod(fullPrefix + "/resource-ref/description",
"setDescription", 0);
digester.addCallMethod(fullPrefix + "/resource-ref/res-auth",
@@ -624,10 +624,10 @@ public class WebRuleSet extends RuleSetB
//service-ref
digester.addObjectCreate(fullPrefix + "/service-ref",
- "org.apache.catalina.deploy.ContextService");
+
"org.apache.tomcat.util.descriptor.web.ContextService");
digester.addSetNext(fullPrefix + "/service-ref",
"addServiceRef",
- "org.apache.catalina.deploy.ContextService");
+
"org.apache.tomcat.util.descriptor.web.ContextService");
digester.addCallMethod(fullPrefix + "/service-ref/description",
"setDescription", 0);
digester.addCallMethod(fullPrefix + "/service-ref/display-name",
@@ -654,10 +654,10 @@ public class WebRuleSet extends RuleSetB
digester.addRule(fullPrefix +
"/service-ref/port-component-ref/port-component-link", new
CallParamMultiRule(1));
digester.addObjectCreate(fullPrefix + "/service-ref/handler",
- "org.apache.catalina.deploy.ContextHandler");
+
"org.apache.tomcat.util.descriptor.web.ContextHandler");
digester.addRule(fullPrefix + "/service-ref/handler",
new SetNextRule("addHandler",
- "org.apache.catalina.deploy.ContextHandler"));
+
"org.apache.tomcat.util.descriptor.web.ContextHandler"));
digester.addCallMethod(fullPrefix +
"/service-ref/handler/handler-name",
"setName", 0);
@@ -779,7 +779,7 @@ final class SetSessionConfig extends Rul
/**
* A Rule that calls the <code>setAuthConstraint(true)</code> method of
* the top item on the stack, which must be of type
- * <code>org.apache.catalina.deploy.SecurityConstraint</code>.
+ * <code>org.apache.tomcat.util.descriptor.web.SecurityConstraint</code>.
*/
final class SetAuthConstraintRule extends Rule {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml?rev=1501082&r1=1501081&r2=1501082&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml
Tue Jul 9 04:33:04 2013
@@ -22,7 +22,7 @@
description="Representation of an application environment entry"
domain="Catalina"
group="Resources"
- type="org.apache.catalina.deploy.ContextEnvironment">
+ type="org.apache.tomcat.util.descriptor.web.ContextEnvironment">
<attribute name="className"
description="Fully qualified class name of the managed object"
@@ -57,7 +57,7 @@
description="Representation of a resource reference for a web
application"
domain="Catalina"
group="Resources"
- type="org.apache.catalina.deploy.ContextResource">
+ type="org.apache.tomcat.util.descriptor.web.ContextResource">
<attribute name="auth"
description="The authorization requirement for this resource"
@@ -86,7 +86,7 @@
description="Representation of a resource link for a web application"
domain="Catalina"
group="Resources"
- type="org.apache.catalina.deploy.ContextResourceLink">
+ type="org.apache.tomcat.util.descriptor.web.ContextResourceLink">
<attribute name="global"
description="The global name of this resource"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
