Fixed bugzilla bug #649343.

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

3 files changed, 21 insertions, 7 deletions

diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
index 84744af3..797dd832 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
@@ -792,10 +792,15 @@ public class DBSubsystem implements IDBSubsystem {
                 reg.registerObjectClass(
                     RepositoryRecord.class.getName(), repRecordOC);
             }
-            if (!reg.isAttributeRegistered(RepositoryRecord.ATTR_SERIALNO)) {
-                reg.registerAttribute(RepositoryRecord.ATTR_SERIALNO,
+            if (!reg.isAttributeRegistered(IRepositoryRecord.ATTR_SERIALNO)) {
+                reg.registerAttribute(IRepositoryRecord.ATTR_SERIALNO,
                     new BigIntegerMapper(RepositorySchema.LDAP_ATTR_SERIALNO));
             }
+            if (!reg.isAttributeRegistered(IRepositoryRecord.ATTR_PUB_STATUS)) {
+                reg.registerAttribute(IRepositoryRecord.ATTR_PUB_STATUS,
+                    new StringMapper(RepositorySchema.LDAP_ATTR_PUB_STATUS));
+            }
+
         } catch (EBaseException e) {
             if (CMS.isPreOpMode())
                 return;
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java b/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java
index e177f8d2..7aa63fa1 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java
@@ -39,13 +39,13 @@ import com.netscape.certsrv.dbs.repository.*;
  */
 public class RepositoryRecord implements IRepositoryRecord {
 
-    public final static String ATTR_SERIALNO = "serialNo";
-	
     private BigInteger mSerialNo = null;
+    private String mPublishingStatus = null;
 
     protected static Vector mNames = new Vector();
     static {
-        mNames.addElement(ATTR_SERIALNO);
+        mNames.addElement(IRepositoryRecord.ATTR_SERIALNO);
+        mNames.addElement(IRepositoryRecord.ATTR_PUB_STATUS);
     }
 
     /**
@@ -59,8 +59,10 @@ public class RepositoryRecord implements IRepositoryRecord {
      * Sets attribute.
      */
     public void set(String name, Object obj) throws EBaseException {
-        if (name.equalsIgnoreCase(ATTR_SERIALNO)) {
+        if (name.equalsIgnoreCase(IRepositoryRecord.ATTR_SERIALNO)) {
             mSerialNo = (BigInteger) obj;
+        } else if (name.equalsIgnoreCase(IRepositoryRecord.ATTR_PUB_STATUS)) {
+            mPublishingStatus = (String) obj;
         } else {
             throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_ATTRIBUTE", name));
         }
@@ -70,8 +72,10 @@ public class RepositoryRecord implements IRepositoryRecord {
      * Retrieves attribute from this record.
      */
     public Object get(String name) throws EBaseException {
-        if (name.equalsIgnoreCase(ATTR_SERIALNO)) {
+        if (name.equalsIgnoreCase(IRepositoryRecord.ATTR_SERIALNO)) {
             return mSerialNo;
+        } else if (name.equalsIgnoreCase(IRepositoryRecord.ATTR_PUB_STATUS)) {
+            return mPublishingStatus;
         } else {
             throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_ATTRIBUTE", name));
         }
@@ -101,4 +105,8 @@ public class RepositoryRecord implements IRepositoryRecord {
     public BigInteger getSerialNumber() {
         return mSerialNo;
     }
+
+    public String getPublishingStatus() {
+        return mPublishingStatus;
+    }
 }
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java b/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java
index 70bb7d4b..436c8633 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java
@@ -40,4 +40,5 @@ public class RepositorySchema {
     public static final String LDAP_OC_TOP = "top";
     public static final String LDAP_OC_REPOSITORY = "repository";
     public static final String LDAP_ATTR_SERIALNO = "serialno";
+    public static final String LDAP_ATTR_PUB_STATUS = "publishingStatus";
 }