Author: markt
Date: Fri Jun 1 09:43:15 2012
New Revision: 1345031
URL: http://svn.apache.org/viewvc?rev=1345031&view=rev
Log:
Modify how the digester processes security-role-ref since link is optional and
null parameters are not handled by IntrospectionUtils
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ServletDef.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1345029
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ServletDef.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ServletDef.java?rev=1345031&r1=1345030&r2=1345031&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ServletDef.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ServletDef.java Fri
Jun 1 09:43:15 2012
@@ -215,7 +215,9 @@ public class ServletDef implements Seria
/**
* Add a security-role-ref to the set of security-role-refs associated
* with this servlet.
+ * @deprecated
*/
+ @Deprecated
public void addSecurityRoleRef(String roleName, String roleLink) {
SecurityRoleRef srr = new SecurityRoleRef();
srr.setName(roleName);
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=1345031&r1=1345030&r2=1345031&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java Fri
Jun 1 09:43:15 2012
@@ -386,10 +386,15 @@ public class WebRuleSet extends RuleSetB
digester.addCallMethod(fullPrefix + "/servlet/run-as/role-name",
"setRunAs", 0);
- digester.addCallMethod(fullPrefix + "/servlet/security-role-ref",
- "addSecurityRoleRef", 2);
- digester.addCallParam(fullPrefix +
"/servlet/security-role-ref/role-link", 1);
- digester.addCallParam(fullPrefix +
"/servlet/security-role-ref/role-name", 0);
+ digester.addObjectCreate(fullPrefix + "/servlet/security-role-ref",
+ "org.apache.catalina.deploy.SecurityRoleRef");
+ digester.addSetNext(fullPrefix + "/servlet/security-role-ref",
+ "addSecurityRoleRef",
+ "org.apache.catalina.deploy.SecurityRoleRef");
+ digester.addCallMethod(fullPrefix +
"/servlet/security-role-ref/role-link",
+ "setLink", 0);
+ digester.addCallMethod(fullPrefix +
"/servlet/security-role-ref/role-name",
+ "setName", 0);
digester.addCallMethod(fullPrefix + "/servlet/servlet-class",
"setServletClass", 0);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1345031&r1=1345030&r2=1345031&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jun 1 09:43:15 2012
@@ -161,6 +161,10 @@
full GC every hour. (markt)
</fix>
<fix>
+ <bug>53285</bug>: Do not require <code>security-role-ref</code>
elements
+ to contain a <code>role-link</code> element. (markt)
+ </fix>
+ <fix>
<bug>53322</bug>: When processing resource injection, correctly infer
property name from its setter method if the name starts with several
uppercase characters. (kkolinko)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
