Fix update for bugzilla bug #649343.

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

2 files changed, 15 insertions, 0 deletions

diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
index 3feceab2f..cb8826d2a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
@@ -56,6 +56,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
     private String mPublishingQueuePriorityLevel = "0";
     private String mMaxNumberOfPublishingThreads = "3";
     private String mPublishingQueuePageSize = "40";
+    private String mPublishingQueueStatus = "200";
     private JLabel mAuthLabel, mCertLabel;
     private JComboBox mAuthBox, mCertBox;
     private String mPanelName;
@@ -99,6 +100,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
                                 0,
                                 DIFFERENT_COMPONENT_SPACE);
         gb.setConstraints(mEnablePublishing, gbc);
+        mEnablePublishing.addItemListener(this);
         mCenterPanel.add(mEnablePublishing);
 
         //add the enable queue
@@ -114,6 +116,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
                                 0,
                                 DIFFERENT_COMPONENT_SPACE);
         gb.setConstraints(mEnableQueue, gbc);
+        mEnableQueue.addItemListener(this);
         mCenterPanel.add(mEnableQueue);
 
         //add the enable checkbox
@@ -129,6 +132,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
                                 0,
                                 DIFFERENT_COMPONENT_SPACE);
         gb.setConstraints(mEnable, gbc);
+        mEnable.addItemListener(this);
         if (mLDAPPublishing)
             mCenterPanel.add(mEnable);
         
@@ -247,6 +251,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
         nvps.add(Constants.PR_PUBLISHING_QUEUE_THREADS, "");
         nvps.add(Constants.PR_PUBLISHING_QUEUE_PAGE_SIZE, "");
         nvps.add(Constants.PR_PUBLISHING_QUEUE_PRIORITY, "");
+        nvps.add(Constants.PR_PUBLISHING_QUEUE_STATUS, "");
 
         try {
             NameValuePairs val = mAdmin.read(mServletName,
@@ -308,6 +313,8 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
                 mPublishingQueuePageSize = nvp.getValue();
             } else if (name.equals(Constants.PR_PUBLISHING_QUEUE_PRIORITY)) {
                 mPublishingQueuePriorityLevel = nvp.getValue();
+            } else if (name.equals(Constants.PR_PUBLISHING_QUEUE_STATUS)) {
+                mPublishingQueueStatus = nvp.getValue();
             } else if (name.equals(Constants.PR_ENABLE)) {
                 if (nvp.getValue().equals(Constants.TRUE))
                     mEnable.setSelected(true);
@@ -379,6 +386,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
 	if (!enable) {
 		mEnable.setSelected(false);
 		mEnableQueue.setSelected(false);
+		mPublishingQueue = false;
 	}
 	enableFields(enable, color);
     }
@@ -486,6 +494,11 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
                 mSecurePort.setSelected(true);
             }
             enableFields(true, mActiveColor);
+        } else if (e.getSource().equals(mEnable)) {
+            if (mEnable.isSelected()) {
+                mEnableQueue.setSelected(true);
+            }
+            enableFields(true, mActiveColor);
         }
     }
 
@@ -518,6 +531,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
         nvps.add(Constants.PR_PUBLISHING_QUEUE_THREADS, mMaxNumberOfPublishingThreads);
         nvps.add(Constants.PR_PUBLISHING_QUEUE_PAGE_SIZE, mPublishingQueuePageSize);
         nvps.add(Constants.PR_PUBLISHING_QUEUE_PRIORITY, mPublishingQueuePriorityLevel);
+        nvps.add(Constants.PR_PUBLISHING_QUEUE_STATUS, mPublishingQueueStatus);
 
         if (mEnable.isSelected()) {
             String host = mHostNameText.getText().trim();
diff --git a/pki/base/console/src/com/netscape/certsrv/common/Constants.java b/pki/base/console/src/com/netscape/certsrv/common/Constants.java
index e993efa31..6f3e3acdf 100644
--- a/pki/base/console/src/com/netscape/certsrv/common/Constants.java
+++ b/pki/base/console/src/com/netscape/certsrv/common/Constants.java
@@ -250,6 +250,7 @@ public interface Constants {
     public final static String PR_PUBLISHING_QUEUE_THREADS = "queue.maxNumberOfThreads";
     public final static String PR_PUBLISHING_QUEUE_PAGE_SIZE = "queue.pageSize";
     public final static String PR_PUBLISHING_QUEUE_PRIORITY = "queue.priorityLevel";
+    public final static String PR_PUBLISHING_QUEUE_STATUS = "queue.saveStatus";
 
     public final static String PR_BASE_DN = "baseDN";
     public final static String PR_DNCOMPS = "dnComps";