From 56a30f1a24860549508e7028da1519b5b0d2906a Mon Sep 17 00:00:00 2001
From: Ade Lee <alee@redhat.com>
Date: Thu, 24 Jan 2013 10:03:23 -0500
Subject: remove unneeded getTokenInfo servlet

---
 base/ca/shared/webapps/ca/WEB-INF/web.xml     | 18 ------------------
 base/kra/shared/webapps/kra/WEB-INF/web.xml   | 18 ------------------
 base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml | 18 ------------------
 base/tks/shared/webapps/tks/WEB-INF/web.xml   | 17 -----------------
 4 files changed, 71 deletions(-)

diff --git a/base/ca/shared/webapps/ca/WEB-INF/web.xml b/base/ca/shared/webapps/ca/WEB-INF/web.xml
index 286d1e33f..a875fee18 100644
--- a/base/ca/shared/webapps/ca/WEB-INF/web.xml
+++ b/base/ca/shared/webapps/ca/WEB-INF/web.xml
@@ -1766,19 +1766,6 @@
                          <param-value> ee          </param-value> </init-param>
    </servlet>
 
-   <servlet>
-      <servlet-name>  caGetTokenInfo  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.GetTokenInfo  </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> caGetTokenInfo </param-value> </init-param>
-             <init-param><param-name>  interface   </param-name>
-                         <param-value> ee          </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  caProxyProfileSubmit  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.base.ProxyServlet  </servlet-class>
@@ -2340,11 +2327,6 @@
       <url-pattern>   /ee/ca/tokenAuthenticate  </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>
-      <servlet-name>  caGetTokenInfo </servlet-name>
-      <url-pattern>   /ee/ca/getTokenInfo </url-pattern>
-   </servlet-mapping>
-
    <servlet-mapping>
       <servlet-name>  caUpdateOCSPConfig </servlet-name>
       <url-pattern>   /ee/ca/updateOCSPConfig </url-pattern>
diff --git a/base/kra/shared/webapps/kra/WEB-INF/web.xml b/base/kra/shared/webapps/kra/WEB-INF/web.xml
index ca7d6ea4d..c278bcbad 100644
--- a/base/kra/shared/webapps/kra/WEB-INF/web.xml
+++ b/base/kra/shared/webapps/kra/WEB-INF/web.xml
@@ -680,19 +680,6 @@
                          <param-value> certServer.clone.configuration </param-value> </init-param>
    </servlet>
 
-   <servlet>
-      <servlet-name>  kraGetTokenInfo  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.GetTokenInfo  </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> kra          </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> kraGetTokenInfo </param-value> </init-param>
-             <init-param><param-name>  interface   </param-name>
-                         <param-value> ee          </param-value> </init-param>
-   </servlet>
-
    <!-- ==================== RESTEasy Configuration =============== -->
 
    <listener>
@@ -939,11 +926,6 @@
       <url-pattern>   /admin/console/config/savepkcs12 </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>
-      <servlet-name>  kraGetTokenInfo </servlet-name>
-      <url-pattern>   /ee/kra/getTokenInfo </url-pattern>
-   </servlet-mapping>
-
    <!-- ==================== Default Session Configuration =============== -->
    <!-- You can set the default session timeout (in minutes) for all newly -->
    <!-- created sessions by modifying the value below.                     -->
diff --git a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
index 1deadc9dc..eb29dc154 100644
--- a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
+++ b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
@@ -393,19 +393,6 @@
                          <param-value> BasicAclAuthz </param-value> </init-param>
    </servlet>
 
-   <servlet>
-      <servlet-name>  ocspGetTokenInfo  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.GetTokenInfo  </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> ocsp          </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> ocspGetTokenInfo </param-value> </init-param>
-             <init-param><param-name>  interface   </param-name>
-                         <param-value> ee          </param-value> </init-param>
-   </servlet>
-
    <listener>
       <listener-class> org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap </listener-class>
    </listener>
@@ -573,11 +560,6 @@
       <url-pattern>   /admin/console/config/savepkcs12 </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>
-      <servlet-name>  ocspGetTokenInfo </servlet-name>
-      <url-pattern>   /ee/ocsp/getTokenInfo </url-pattern>
-   </servlet-mapping>
-
    <!-- ==================== Default Session Configuration =============== -->
    <!-- You can set the default session timeout (in minutes) for all newly -->
    <!-- created sessions by modifying the value below.                     -->
diff --git a/base/tks/shared/webapps/tks/WEB-INF/web.xml b/base/tks/shared/webapps/tks/WEB-INF/web.xml
index b1958c033..7cfb24b15 100644
--- a/base/tks/shared/webapps/tks/WEB-INF/web.xml
+++ b/base/tks/shared/webapps/tks/WEB-INF/web.xml
@@ -263,18 +263,6 @@
                          <param-value> certServer.clone.configuration.GetConfigEntries </param-value> </init-param>
    </servlet>
 
-   <servlet>
-      <servlet-name>  tksGetTokenInfo  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.GetTokenInfo  </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> tks          </param-value> </init-param>             <init-param><param-name>  ID          </param-name>
-                         <param-value> tksGetTokenInfo </param-value> </init-param>
-             <init-param><param-name>  interface   </param-name>
-                         <param-value> ee          </param-value> </init-param>
-   </servlet>
-
    <listener>
       <listener-class> org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap </listener-class>
    </listener>
@@ -403,11 +391,6 @@
       <url-pattern>   /admin/console/config/savepkcs12 </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>
-      <servlet-name>  tksGetTokenInfo </servlet-name>
-      <url-pattern>   /ee/tks/getTokenInfo </url-pattern>
-   </servlet-mapping>
-
    <!-- ==================== Default Session Configuration =============== -->
    <!-- You can set the default session timeout (in minutes) for all newly -->
    <!-- created sessions by modifying the value below.                     -->
-- 
cgit