Author: markt
Date: Thu Sep 25 19:33:40 2014
New Revision: 1627613
URL: http://svn.apache.org/r1627613
Log:
Add CredentialHandler support to config rulsets
Added:
tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
- copied, changed from r1627612,
tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/realm/NestedCredentialHandler.java
tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/realm/NestedCredentialHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/NestedCredentialHandler.java?rev=1627613&r1=1627612&r2=1627613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/NestedCredentialHandler.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/NestedCredentialHandler.java
Thu Sep 25 19:33:40 2014
@@ -52,4 +52,9 @@ public class NestedCredentialHandler imp
return credentialHandlers.get(0).mutate(inputCredentials);
}
+
+
+ public void addCredentialHandler(CredentialHandler handler) {
+ credentialHandlers.add(handler);
+ }
}
Copied:
tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
(from r1627612, tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java?p2=tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java&p1=tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java&r1=1627612&r2=1627613&rev=1627613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
Thu Sep 25 19:33:40 2014
@@ -14,25 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.startup;
-
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSetBase;
-
/**
- * <p><strong>RuleSet</strong> for processing the contents of a Realm
definition
- * element. This <code>RuleSet</code> supports Realms such as the
- * <code>CombinedRealm</code> that used nested Realms.</p>
+ * <p><strong>RuleSet</strong> for processing the contents of a
+ * CredentialHandler definition element. This <code>RuleSet</code> supports
+ * CredentialHandler such as the <code>NestedCredentialHandler</code> that used
+ * nested CredentialHandlers.</p>
*/
-public class RealmRuleSet extends RuleSetBase {
+public class CredentialHandlerRuleSet extends RuleSetBase {
- private static final int MAX_NESTED_REALM_LEVELS = Integer.getInteger(
- "org.apache.catalina.startup.RealmRuleSet.MAX_NESTED_REALM_LEVELS",
+ private static final int MAX_NESTED_LEVELS = Integer.getInteger(
+
"org.apache.catalina.startup.CredentialHandlerRuleSet.MAX_NESTED_LEVELS",
3).intValue();
// ----------------------------------------------------- Instance Variables
@@ -51,7 +48,7 @@ public class RealmRuleSet extends RuleSe
* Construct an instance of this <code>RuleSet</code> with the default
* matching pattern prefix.
*/
- public RealmRuleSet() {
+ public CredentialHandlerRuleSet() {
this("");
}
@@ -63,7 +60,7 @@ public class RealmRuleSet extends RuleSe
* @param prefix Prefix for matching pattern rules (including the
* trailing slash character)
*/
- public RealmRuleSet(String prefix) {
+ public CredentialHandlerRuleSet(String prefix) {
this.namespaceURI = null;
this.prefix = prefix;
}
@@ -86,12 +83,12 @@ public class RealmRuleSet extends RuleSe
String pattern = prefix;
- for (int i = 0; i < MAX_NESTED_REALM_LEVELS; i++) {
+ for (int i = 0; i < MAX_NESTED_LEVELS; i++) {
if (i > 0) {
pattern += "/";
}
- pattern += "Realm";
+ pattern += "CredentialHandler";
digester.addObjectCreate(pattern,
null, // MUST be specified in the element,
@@ -99,12 +96,12 @@ public class RealmRuleSet extends RuleSe
digester.addSetProperties(pattern);
if (i == 0) {
digester.addSetNext(pattern,
- "setRealm",
- "org.apache.catalina.Realm");
+ "setCredentialHandler",
+ "org.apache.catalina.CredentialHandler");
} else {
digester.addSetNext(pattern,
- "addRealm",
- "org.apache.catalina.Realm");
+ "addCredentialHandler",
+ "org.apache.catalina.CredentialHandler");
}
}
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java?rev=1627613&r1=1627612&r2=1627613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java Thu Sep 25
19:33:40 2014
@@ -106,6 +106,7 @@ public class RealmRuleSet extends RuleSe
"addRealm",
"org.apache.catalina.Realm");
}
+ digester.addRuleSet(new CredentialHandlerRuleSet(pattern + "/"));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
