Fix Bugzilla Bug 663546 - Disable the functionalities that are not exposed in the console

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1706 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

6 files changed, 37 insertions, 9 deletions

diff --git a/pki/base/common/src/com/netscape/cms/logging/RollingLogFile.java b/pki/base/common/src/com/netscape/cms/logging/RollingLogFile.java
index f38f24bba..32702d00d 100644
--- a/pki/base/common/src/com/netscape/cms/logging/RollingLogFile.java
+++ b/pki/base/common/src/com/netscape/cms/logging/RollingLogFile.java
@@ -511,8 +511,8 @@ public class RollingLogFile extends LogFile {
     /**
      * Retrieve log file list.
      */
-    public synchronized NameValuePairs retrieveLogList(Hashtable req,
-        Hashtable resp) throws ServletException,
+    public synchronized NameValuePairs retrieveLogList(Hashtable req
+        ) throws ServletException,
             IOException, EBaseException {
         NameValuePairs params = new NameValuePairs();
         String[] files = null;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
index d1ddf6f4d..423095d51 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
@@ -115,6 +115,7 @@ public class KRAAdminServlet extends AdminServlet {
                         null, resp);
                     return;
                 }
+                /* Functions not implemented in console
                 if (scope.equals(ScopeDef.SC_AUTO_RECOVERY)) {
                     readAutoRecoveryConfig(req, resp);
                     return;
@@ -124,7 +125,9 @@ public class KRAAdminServlet extends AdminServlet {
                 } else if (scope.equals(ScopeDef.SC_NOTIFICATION_RIQ)) {
                     getNotificationRIQConfig(req, resp);
                     return;
-                } else if (scope.equals(ScopeDef.SC_GENERAL)) {
+                } else
+                */ 
+                if (scope.equals(ScopeDef.SC_GENERAL)) {
                     getGeneralConfig(req, resp);
                     return;
                 }
@@ -136,6 +139,7 @@ public class KRAAdminServlet extends AdminServlet {
                         null, resp);
                     return;
                 }
+                /* Functions not implemented in console
                 if (scope.equals(ScopeDef.SC_AUTO_RECOVERY)) {
                     modifyAutoRecoveryConfig(req, resp);
                     return;
@@ -148,7 +152,9 @@ public class KRAAdminServlet extends AdminServlet {
                 } else if (scope.equals(ScopeDef.SC_NOTIFICATION_RIQ)) {
                     setNotificationRIQConfig(req, resp);
                     return;
-                } else if (scope.equals(ScopeDef.SC_GENERAL)) {
+                } else 
+                */
+                if (scope.equals(ScopeDef.SC_GENERAL)) {
                     setGeneralConfig(req,resp);
                 }
             } 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
index c1b28df0c..bd19a467f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
@@ -139,8 +139,9 @@ public abstract class CMSLogPanel extends CMSBasePanel
             }
         }else if (e.getSource().equals(mHelp)) {
             CMSAdminUtil.help(mHelpToken);
-        } else if (e.getSource().equals(mLevel) || e.getSource().equals(mSource)) {
-            Debug.println("AccessLogPanel: Changed Log Level or Source");
+        } else if (e.getSource().equals(mLevel) || e.getSource().equals(mSource)
+                  || e.getSource().equals(mFile)) {
+            Debug.println("AccessLogPanel: Changed Log Level or Source or File");
             refresh(); 
         }
     }
@@ -283,6 +284,7 @@ public abstract class CMSLogPanel extends CMSBasePanel
 		CMSAdminUtil.addEntryField(panel, label1, mSource, label2, mLevel, gbc);
                 mLevel.addActionListener(this);
                 mSource.addActionListener(this);
+                
 
 		//file
 		CMSAdminUtil.resetGBC(gbc);
@@ -290,6 +292,7 @@ public abstract class CMSLogPanel extends CMSBasePanel
 		JLabel label3 = makeJLabel("FILE");
 		mFile = new JComboBox();
         CMSAdminUtil.addEntryField(panel, label3, mFile, gbc);
+                mFile.addActionListener(this);
 
         return panel;
     }
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 e50308dde..569dd6718 100644
--- a/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml
+++ b/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml
@@ -657,6 +657,7 @@
                          <param-value> kra         </param-value> </init-param>
    </servlet>
 
+<!--
    <servlet>
       <servlet-name>  krajobsScheduler  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.admin.JobsAdminServlet  </servlet-class>
@@ -665,6 +666,7 @@
              <init-param><param-name>  AuthzMgr    </param-name>
                          <param-value> BasicAclAuthz </param-value> </init-param>
    </servlet>
+-->
 
    <servlet>
       <servlet-name>  kraauths  </servlet-name>
@@ -811,7 +813,9 @@
       <url-pattern>  /log                </url-pattern>
       <url-pattern>  /ug                 </url-pattern>
       <url-pattern>  /acl                </url-pattern>
+<!--
       <url-pattern>  /jobsScheduler      </url-pattern>
+-->
       <url-pattern>  /kra                </url-pattern>
    </filter-mapping>
 
@@ -857,10 +861,12 @@
       <url-pattern>   /auths  </url-pattern>
    </servlet-mapping>
 
+<!--
    <servlet-mapping>
       <servlet-name>  krajobsScheduler  </servlet-name>
       <url-pattern>   /jobsScheduler  </url-pattern>
    </servlet-mapping>
+-->
 
    <servlet-mapping>
       <servlet-name>  krapolicy  </servlet-name>
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 6a507dfd8..4526e029a 100644
--- a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
+++ b/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
@@ -130,6 +130,8 @@
              <init-param><param-name>  AuthzMgr    </param-name>
                          <param-value> BasicAclAuthz </param-value> </init-param>
    </servlet>
+
+<!--
    <servlet>
       <servlet-name>  ocspjobsScheduler  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.admin.JobsAdminServlet  </servlet-class>
@@ -138,6 +140,7 @@
              <init-param><param-name>  AuthzMgr    </param-name>
                          <param-value> BasicAclAuthz </param-value> </init-param>
    </servlet>
+-->
                                                                                 
    <servlet>
       <servlet-name>  ocspug  </servlet-name>
@@ -501,7 +504,9 @@
       <url-pattern>  /auths              </url-pattern>
       <url-pattern>  /ug                 </url-pattern>
       <url-pattern>  /log                </url-pattern>
+<!--
       <url-pattern>  /jobsScheduler      </url-pattern>
+-->
       <url-pattern>  /acl                </url-pattern>
       <url-pattern>  /server             </url-pattern>
       <url-pattern>  /ocsp               </url-pattern>
@@ -517,11 +522,13 @@
       <servlet-name>  ocspacl  </servlet-name>
       <url-pattern>   /acl  </url-pattern>
    </servlet-mapping>
-                                                                                
+
+<!--                                                                                
    <servlet-mapping>
       <servlet-name>  ocspjobsScheduler  </servlet-name>
       <url-pattern>   /jobsScheduler  </url-pattern>
    </servlet-mapping>
+-->
                                                                                 
    <servlet-mapping>
       <servlet-name>  ocspug  </servlet-name>
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 78d3cd721..3aeb71a3b 100644
--- a/pki/base/tks/shared/webapps/tks/WEB-INF/web.xml
+++ b/pki/base/tks/shared/webapps/tks/WEB-INF/web.xml
@@ -159,7 +159,8 @@
              <init-param><param-name>  AuthzMgr    </param-name>
                          <param-value> BasicAclAuthz </param-value> </init-param>
    </servlet>
-                                                                                
+                         
+<!--                                                       
    <servlet>
       <servlet-name>  tksjobsScheduler  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.admin.JobsAdminServlet  </servlet-class>
@@ -168,6 +169,7 @@
              <init-param><param-name>  AuthzMgr    </param-name>
                          <param-value> BasicAclAuthz </param-value> </init-param>
    </servlet>
+-->
 
    <servlet>
       <servlet-name>  tksacl  </servlet-name>
@@ -371,7 +373,9 @@
       <url-pattern>  /auths              </url-pattern>
       <url-pattern>  /ug                 </url-pattern>
       <url-pattern>  /log                </url-pattern>
+<!--
       <url-pattern>  /jobsScheduler      </url-pattern>
+-->
       <url-pattern>  /acl                </url-pattern>
       <url-pattern>  /server             </url-pattern>
    </filter-mapping>
@@ -401,11 +405,13 @@
       <servlet-name>  tksauths  </servlet-name>
       <url-pattern>   /auths  </url-pattern>
    </servlet-mapping>
-                                                                                
+                         
+<!--                                                       
    <servlet-mapping>
       <servlet-name>  tksjobsScheduler  </servlet-name>
       <url-pattern>   /jobsScheduler  </url-pattern>
    </servlet-mapping>
+-->
                                                                                 
    <servlet-mapping>
       <servlet-name>  tksacl  </servlet-name>