From 7175f637c3d4fe8c2578b79d37019a8daf07da8c Mon Sep 17 00:00:00 2001
From: mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Fri, 27 Aug 2010 00:26:56 +0000
Subject: Bugzilla Bug #583825 - CC: Obsolete servlets to be removed from
 web.xml as part of CC interface review

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1247 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
---
 pki/base/ca/shared/webapps/ca/WEB-INF/web.xml      | 190 ---------------------
 .../servlet/csadmin/AgentAuthenticatePanel.java    |   4 +
 pki/base/kra/shared/webapps/kra/WEB-INF/web.xml    | 143 ----------------
 pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml  |  36 ----
 pki/base/tks/shared/webapps/tks/WEB-INF/web.xml    |  17 --
 5 files changed, 4 insertions(+), 386 deletions(-)

diff --git a/pki/base/ca/shared/webapps/ca/WEB-INF/web.xml b/pki/base/ca/shared/webapps/ca/WEB-INF/web.xml
index 8020182f8..953a75ebb 100644
--- a/pki/base/ca/shared/webapps/ca/WEB-INF/web.xml
+++ b/pki/base/ca/shared/webapps/ca/WEB-INF/web.xml
@@ -65,15 +65,6 @@
         </init-param>
     </servlet>
 
-    <servlet>
-        <servlet-name>csadmin-base</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.BaseServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
     <servlet>
         <servlet-name>csadmin-login</servlet-name>
         <servlet-class>com.netscape.cms.servlet.csadmin.LoginServlet</servlet-class>
@@ -146,78 +137,6 @@
         </init-param>
     </servlet>
 
-    <servlet>
-        <servlet-name>csadmin-welcome</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.WelcomeServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-database</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.DatabaseServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-admin</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.AdministratorServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-module</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.ModuleServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-size</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.KeySizeServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-name</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.NameServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-hierarchy</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.HierarchyServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-done</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.DoneServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
    <servlet>
       <servlet-name>  services </servlet-name>
       <servlet-class> com.netscape.cms.servlet.csadmin.MainPageServlet </servlet-class>
@@ -468,19 +387,6 @@
                          <param-value> caGetStatus </param-value> </init-param>
    </servlet>
 
-   <servlet>
-      <servlet-name>  caCheckIdentity  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.CheckIdentity  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> false       </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> ca          </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> caCheckIdentity </param-value> </init-param>
-             <init-param><param-name>  AuthMgr     </param-name>
-                         <param-value> passwdUserDBAuthMgr </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  caGetConfigEntries  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.csadmin.GetConfigEntries </servlet-class>
@@ -1285,27 +1191,6 @@
                          <param-value> certUserDBAuthMgr </param-value> </init-param>
    </servlet>
 
-   <servlet>
-      <servlet-name>  camasterCCA-CLAConnector  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.connector.CloneServlet  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> true        </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> ca          </param-value> </init-param>
-             <init-param><param-name>  interface  </param-name>
-                         <param-value> agent      </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> camasterCCA-CLAConnector </param-value> </init-param>
-             <init-param><param-name>  RequestEncoder  </param-name>
-                         <param-value> com.netscape.cmscore.connector.HttpRequestEncoder </param-value> </init-param>
-             <init-param><param-name>  resourceID  </param-name>
-                         <param-value> certServer.ca.clone </param-value> </init-param>
-             <init-param><param-name>  AuthMgr     </param-name>
-                         <param-value> certUserDBAuthMgr </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  camasterCADisplayCRL  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.cert.DisplayCRL  </servlet-class>
@@ -1426,19 +1311,6 @@
                          <param-value> certServer.ee.crl </param-value> </init-param>
    </servlet>
 
-   <servlet>
-      <servlet-name>  caRemoteAuthConfig  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.cert.RemoteAuthConfig  </servlet-class>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> caRemoteAuthConfig </param-value> </init-param>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> false       </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> ca          </param-value> </init-param>
-             <init-param><param-name>  interface   </param-name>
-                         <param-value> ee          </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  caGetBySerial  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.cert.GetBySerial  </servlet-class>
@@ -2059,7 +1931,6 @@
       <url-pattern>   /index                      </url-pattern>
       <url-pattern>   /ca/connector               </url-pattern>
       <url-pattern>   /ca/displayCertFromRequest  </url-pattern>
-      <url-pattern>   /ca/cloneConnector          </url-pattern>
       <url-pattern>   /doRevoke                   </url-pattern>
 
       <url-pattern>   /acl                        </url-pattern>
@@ -2075,7 +1946,6 @@
       <url-pattern>   /capublisher                </url-pattern>
 
       <url-pattern>   /renewal                    </url-pattern>
-      <url-pattern>   /remoteAuthConfig           </url-pattern>
       <url-pattern>   /certbasedenrollment        </url-pattern>
       <url-pattern>   /enrollment                 </url-pattern>
       <url-pattern>   /ocsp                       </url-pattern>
@@ -2139,11 +2009,6 @@
       <url-pattern>   /ca/getAdminCertBySerial  </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>
-      <servlet-name>  caCheckIdentity  </servlet-name>
-      <url-pattern>   /ee/ca/checkIdentity  </url-pattern>
-   </servlet-mapping>
-
    <servlet-mapping>
       <servlet-name>  caGetConfigEntries  </servlet-name>
       <url-pattern>   /admin/ca/getConfigEntries  </url-pattern>
@@ -2399,11 +2264,6 @@
       <url-pattern>   /agent/ca/updateCRL  </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>  
-      <servlet-name>  camasterCCA-CLAConnector  </servlet-name>
-      <url-pattern>   /ca/cloneConnector  </url-pattern>
-   </servlet-mapping>
-
    <servlet-mapping>  
       <servlet-name>  camasterCADisplayCRL  </servlet-name>
       <url-pattern>   /agent/ca/displayCRL  </url-pattern>
@@ -2434,11 +2294,6 @@
       <url-pattern>   /ee/ca/getCRL  </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>
-      <servlet-name>  caRemoteAuthConfig  </servlet-name>
-      <url-pattern>   /remoteAuthConfig  </url-pattern>
-   </servlet-mapping>
-
    <servlet-mapping>
       <servlet-name>  caGetBySerial  </servlet-name>
       <url-pattern>   /ee/ca/getBySerial  </url-pattern>
@@ -2564,56 +2419,11 @@
       <url-pattern>   /ee/ca/doRevoke  </url-pattern>
    </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>csadmin-base</servlet-name>
-        <url-pattern>/admin/console/config/base</url-pattern>
-    </servlet-mapping>
-
     <servlet-mapping>
         <servlet-name>csadmin-login</servlet-name>
         <url-pattern>/admin/console/config/login</url-pattern>
     </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>csadmin-welcome</servlet-name>
-        <url-pattern>/admin/console/config/welcome</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-database</servlet-name>
-        <url-pattern>/admin/console/config/database</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-admin</servlet-name>
-        <url-pattern>/admin/console/config/admin</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-module</servlet-name>
-        <url-pattern>/admin/console/config/module</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-size</servlet-name>
-        <url-pattern>/admin/console/config/size</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-name</servlet-name>
-        <url-pattern>/admin/console/config/name</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-hierarchy</servlet-name>
-        <url-pattern>/admin/console/config/hierarchy</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-done</servlet-name>
-        <url-pattern>/admin/console/config/done</url-pattern>
-    </servlet-mapping>
-
     <servlet-mapping>
         <servlet-name>config-db</servlet-name>
         <url-pattern>/admin/console/config/config_db</url-pattern>
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
index b24341459..18741bfb0 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
@@ -197,6 +197,9 @@ public class AgentAuthenticatePanel extends WizardPanelBase {
                 throw new IOException("Missing port");
             }
 
+/*
+             // Bugzilla Bug #583825 - CC: Obsolete servlets to be removed from
+             //                        web.xml as part of CC interface review
              boolean authenticated = authenticate(host, httpsport, true,
              "/ca/ee/ca/checkIdentity", "uid="+uid+"&pwd="+pwd);
 
@@ -204,6 +207,7 @@ public class AgentAuthenticatePanel extends WizardPanelBase {
                  context.put("errorString", "Wrong user id or password");
                  throw new IOException("Wrong user id or password");
              }
+*/
 
             try {
                 config.commit(false);
diff --git a/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml b/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml
index 8d7baae02..564a0c306 100644
--- a/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml
+++ b/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml
@@ -56,15 +56,6 @@
         </init-param>
     </servlet>
 
-    <servlet>
-        <servlet-name>csadmin-base</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.BaseServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
     <servlet>
         <servlet-name>csadmin-login</servlet-name>
         <servlet-class>com.netscape.cms.servlet.csadmin.LoginServlet</servlet-class>
@@ -74,78 +65,6 @@
         </init-param>
     </servlet>
 
-    <servlet>
-        <servlet-name>csadmin-welcome</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.WelcomeServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-database</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.DatabaseServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-admin</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.AdministratorServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-module</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.ModuleServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-size</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.KeySizeServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-name</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.NameServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-hierarchy</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.HierarchyServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>csadmin-done</servlet-name>
-        <servlet-class>com.netscape.cms.servlet.csadmin.DoneServlet</servlet-class>
-        <init-param>
-            <param-name>properties</param-name>
-            <param-value>/WEB-INF/velocity.properties</param-value>
-        </init-param>
-    </servlet>
-
     <servlet>
         <servlet-name>config-db</servlet-name>
         <servlet-class>com.netscape.cms.servlet.csadmin.ConfigDatabaseServlet</servlet-class>
@@ -820,17 +739,6 @@
                          <param-value> /services.template </param-value> </init-param>
    </servlet>
 
-   <servlet>
-      <servlet-name>  kraregistry  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.admin.RegistryAdminServlet  </servlet-class>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> kraregistry </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> kra         </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  kraUpdateNumberRange  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.csadmin.UpdateNumberRange  </servlet-class>
@@ -890,7 +798,6 @@
       <url-pattern>   /server  </url-pattern>
       <url-pattern>   /kra  </url-pattern>
       <url-pattern>   /log  </url-pattern>
-      <url-pattern>   /registry  </url-pattern>
       <url-pattern>   /ug  </url-pattern>
       <url-pattern>   /acl  </url-pattern>
       <url-pattern>   /jobsScheduler  </url-pattern>
@@ -934,11 +841,6 @@
       <url-pattern>   /log  </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>
-      <servlet-name>  kraregistry  </servlet-name>
-      <url-pattern>   /registry  </url-pattern>
-   </servlet-mapping>
-
 
    <servlet-mapping>
       <servlet-name>  kraug  </servlet-name>
@@ -1100,11 +1002,6 @@
       <url-pattern>   /agent/kra/displayBySerial  </url-pattern>
    </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>csadmin-base</servlet-name>
-        <url-pattern>/admin/console/config/base</url-pattern>
-    </servlet-mapping>
-
     <servlet-mapping>
         <servlet-name>csadmin-login</servlet-name>
         <url-pattern>/admin/console/config/login</url-pattern>
@@ -1136,46 +1033,6 @@
     </servlet-mapping>
 
 
-    <servlet-mapping>
-        <servlet-name>csadmin-welcome</servlet-name>
-        <url-pattern>/admin/console/config/welcome</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-database</servlet-name>
-        <url-pattern>/admin/console/config/database</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-admin</servlet-name>
-        <url-pattern>/admin/console/config/admin</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-module</servlet-name>
-        <url-pattern>/admin/console/config/module</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-size</servlet-name>
-        <url-pattern>/admin/console/config/size</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-name</servlet-name>
-        <url-pattern>/admin/console/config/name</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-hierarchy</servlet-name>
-        <url-pattern>/admin/console/config/hierarchy</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>csadmin-done</servlet-name>
-        <url-pattern>/admin/console/config/done</url-pattern>
-    </servlet-mapping>
-
    <servlet-mapping>
       <servlet-name>  kraRegisterUser </servlet-name>
       <url-pattern>   /admin/kra/registerUser  </url-pattern>
diff --git a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml b/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
index 698fe26c4..c6e3a8514 100644
--- a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
+++ b/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
@@ -115,16 +115,6 @@
     </servlet>
 
 
-   <servlet>
-      <servlet-name>  ocspregistry  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.admin.RegistryAdminServlet  </servlet-class>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> ocspregistry </param-value> </init-param>             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> ocsp        </param-value> </init-param>
-   </servlet>
-                                                                                
    <servlet>
       <servlet-name>  ocspacl  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.admin.ACLAdminServlet  </servlet-class>
@@ -412,21 +402,6 @@
                          <param-value> /agent/header.template </param-value> </init-param>
    </servlet>
 
-   <servlet>
-      <servlet-name>  eeocspAddCRL  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.ocsp.AddCRLServlet  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> false       </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> ocsp        </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> eeocspAddCRL  </param-value> </init-param>
-             <init-param><param-name>  resourceID  </param-name>
-                         <param-value> certServer.ee.crl </param-value> </init-param>
-   </servlet>
-                                                                                
    <servlet>
       <servlet-name>  services </servlet-name>
       <servlet-class> com.netscape.cms.servlet.csadmin.MainPageServlet </servlet-class>
@@ -488,7 +463,6 @@
 [PKI_OPEN_SEPARATE_PORTS_WEB_COMMENT]
    <filter-mapping>
       <filter-name>   PassThroughRequestFilter    </filter-name>
-      <url-pattern>   /registry  </url-pattern>
       <url-pattern>   /acl  </url-pattern>
       <url-pattern>   /jobsScheduler  </url-pattern>
       <url-pattern>   /ug  </url-pattern>
@@ -518,11 +492,6 @@
    </filter-mapping>
 [PKI_CLOSE_SEPARATE_PORTS_WEB_COMMENT]
 
-   <servlet-mapping>
-      <servlet-name>  ocspregistry  </servlet-name>
-      <url-pattern>   /registry  </url-pattern>
-   </servlet-mapping>
-                                                                                
    <servlet-mapping>
       <servlet-name>  ocspacl  </servlet-name>
       <url-pattern>   /acl  </url-pattern>
@@ -618,11 +587,6 @@
       <url-pattern>   /agent/header  </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>
-      <servlet-name>  eeocspAddCRL  </servlet-name>
-      <url-pattern>   /ee/ocsp/addCRL  </url-pattern>
-   </servlet-mapping>
-                                                                                
    <servlet-mapping>
       <servlet-name>  ocspOCSP  </servlet-name>
       <url-pattern>   /ee/ocsp  </url-pattern>
diff --git a/pki/base/tks/shared/webapps/tks/WEB-INF/web.xml b/pki/base/tks/shared/webapps/tks/WEB-INF/web.xml
index d0ad44899..4592f8164 100644
--- a/pki/base/tks/shared/webapps/tks/WEB-INF/web.xml
+++ b/pki/base/tks/shared/webapps/tks/WEB-INF/web.xml
@@ -144,17 +144,6 @@
                          <param-value> BasicAclAuthz </param-value> </init-param>
    </servlet>
                                                                                 
-   <servlet>
-      <servlet-name>  tksregistry  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.admin.RegistryAdminServlet  </servlet-class>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> tksregistry </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> tks         </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  tksauths  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.admin.AuthAdminServlet  </servlet-class>
@@ -350,7 +339,6 @@
       <filter-name>  PassThroughRequestFilter  </filter-name>
       <url-pattern>   /ug  </url-pattern>
       <url-pattern>   /log  </url-pattern>
-      <url-pattern>   /registry  </url-pattern>
       <url-pattern>   /jobsScheduler  </url-pattern>
       <url-pattern>   /acl  </url-pattern>
       <url-pattern>   /server  </url-pattern>
@@ -392,11 +380,6 @@
       <url-pattern>   /log  </url-pattern>
    </servlet-mapping>
                                                                                 
-   <servlet-mapping>
-      <servlet-name>  tksregistry  </servlet-name>
-      <url-pattern>   /registry  </url-pattern>
-   </servlet-mapping>
-                      
    <servlet-mapping>
       <servlet-name>  tksauths  </servlet-name>
       <url-pattern>   /auths  </url-pattern>
-- 
cgit