Author: remm
Date: Mon Nov 17 21:42:48 2014
New Revision: 1640233
URL: http://svn.apache.org/r1640233
Log:
Merge patch. Add CredentialHandler support to storeconfig.
Added:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/CredentialHandlerSF.java
- copied unchanged from r1640187,
tomcat/trunk/java/org/apache/catalina/storeconfig/CredentialHandlerSF.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/NestedCredentialHandler.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/RealmSF.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/NestedCredentialHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/NestedCredentialHandler.java?rev=1640233&r1=1640232&r2=1640233&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/NestedCredentialHandler.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/NestedCredentialHandler.java
Mon Nov 17 21:42:48 2014
@@ -57,4 +57,9 @@ public class NestedCredentialHandler imp
public void addCredentialHandler(CredentialHandler handler) {
credentialHandlers.add(handler);
}
+
+ public CredentialHandler[] getCredentialHandlers() {
+ return credentialHandlers.toArray(new CredentialHandler[0]);
+ }
+
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/RealmSF.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/RealmSF.java?rev=1640233&r1=1640232&r2=1640233&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/RealmSF.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/RealmSF.java Mon
Nov 17 21:42:48 2014
@@ -19,6 +19,7 @@ package org.apache.catalina.storeconfig;
import java.io.PrintWriter;
+import org.apache.catalina.CredentialHandler;
import org.apache.catalina.Realm;
import org.apache.catalina.realm.CombinedRealm;
import org.apache.juli.logging.Log;
@@ -81,6 +82,11 @@ public class RealmSF extends StoreFactor
Realm[] realms = combinedRealm.getNestedRealms();
storeElementArray(aWriter, indent, realms);
}
+ // Store nested <CredentialHandler> element
+ CredentialHandler credentialHandler = ((Realm)
aRealm).getCredentialHandler();
+ if (credentialHandler != null) {
+ storeElement(aWriter, indent, credentialHandler);
+ }
}
}
\ No newline at end of file
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/server-registry.xml?rev=1640233&r1=1640232&r2=1640233&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
Mon Nov 17 21:42:48 2014
@@ -158,13 +158,21 @@
tag="Realm"
standard="false"
default="false"
- children="false"
+ children="true"
tagClass="org.apache.catalina.Realm"
storeFactoryClass="org.apache.catalina.storeconfig.RealmSF">
<TransientAttribute>domain</TransientAttribute>
<TransientAttribute>realmPath</TransientAttribute>
</Description>
<Description
+ tag="CredentialHandler"
+ standard="false"
+ default="false"
+ children="false"
+ tagClass="org.apache.catalina.CredentialHandler"
+
storeFactoryClass="org.apache.catalina.storeconfig.CredentialHandlerSF">
+ </Description>
+ <Description
tag="Parameter"
standard="true"
default="false"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
