Author: remm Date: Wed Jul 1 11:09:24 2015 New Revision: 1688618 URL: http://svn.apache.org/r1688618 Log: Port r1688590 and r1688617 for CredentialHandler handling in storeconfig.
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/server-registry.xml tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java?rev=1688618&r1=1688617&r2=1688618&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java Wed Jul 1 11:09:24 2015 @@ -22,6 +22,7 @@ import java.util.Map; import javax.naming.directory.DirContext; +import org.apache.catalina.CredentialHandler; import org.apache.catalina.LifecycleListener; import org.apache.catalina.Manager; import org.apache.catalina.Realm; @@ -63,7 +64,8 @@ public class StoreRegistry { Manager.class, DirContext.class, LifecycleListener.class, Valve.class, ClusterListener.class, MessageListener.class, DataSender.class, ChannelInterceptor.class, Member.class, - WebResourceRoot.class, WebResourceSet.class }; + WebResourceRoot.class, WebResourceSet.class, + CredentialHandler.class }; /** * @return Returns the name. 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=1688618&r1=1688617&r2=1688618&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 Wed Jul 1 11:09:24 2015 @@ -168,7 +168,7 @@ tag="CredentialHandler" standard="false" default="false" - children="false" + children="true" tagClass="org.apache.catalina.CredentialHandler" storeFactoryClass="org.apache.catalina.storeconfig.CredentialHandlerSF"> </Description> Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1688618&r1=1688617&r2=1688618&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Jul 1 11:09:24 2015 @@ -106,6 +106,9 @@ ANT for web application deployment. Based on a patch provided by Lukasz Jader. (violetagg) </fix> + <fix> + Fix CredentialHandler element handling in storeconfig. (remm) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org