Author: remm
Date: Wed Jul 1 08:40:12 2015
New Revision: 1688590
URL: http://svn.apache.org/r1688590
Log:
Add credential handler and upgrade protocol to the interface list.
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java?rev=1688590&r1=1688589&r2=1688590&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java Wed
Jul 1 08:40:12 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;
@@ -39,6 +40,7 @@ import org.apache.catalina.tribes.Member
import org.apache.catalina.tribes.MembershipService;
import org.apache.catalina.tribes.MessageListener;
import org.apache.catalina.tribes.transport.DataSender;
+import org.apache.coyote.UpgradeProtocol;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -63,7 +65,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, UpgradeProtocol.class };
/**
* @return Returns the name.
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml?rev=1688590&r1=1688589&r2=1688590&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Wed
Jul 1 08:40:12 2015
@@ -106,7 +106,7 @@
<Description
tag="UpgradeProtocol"
standard="false"
- default="true"
+ default="false"
tagClass="org.apache.coyote.UpgradeProtocol"
children="false"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
