Added paging on all find commands.

The find commands in some REST services have been modified to support
paging to be consistent with others. The other find commands have been
cleaned up as well.

17 files changed, 84 insertions, 424 deletions

diff --git a/base/common/src/com/netscape/certsrv/base/DataCollection.java b/base/common/src/com/netscape/certsrv/base/DataCollection.java
index 8432604f0..f5f46bcb8 100644
--- a/base/common/src/com/netscape/certsrv/base/DataCollection.java
+++ b/base/common/src/com/netscape/certsrv/base/DataCollection.java
@@ -47,7 +47,9 @@ public class DataCollection<E> {
     }
 
     public void setEntries(Collection<E> entries) {
-        this.entries = entries;
+        this.entries.clear();
+        if (entries == null) return;
+        this.entries.addAll(entries);
     }
 
     public void addEntry(E entry) {
@@ -63,8 +65,10 @@ public class DataCollection<E> {
         return links;
     }
 
-    public void setLink(Collection<Link> links) {
-        this.links = links;
+    public void setLinks(Collection<Link> links) {
+        this.links.clear();
+        if (links == null) return;
+        this.links.addAll(links);
     }
 
     public void addLink(Link link) {
diff --git a/base/common/src/com/netscape/certsrv/ca/CAClient.java b/base/common/src/com/netscape/certsrv/ca/CAClient.java
index 24a84a2ea..fecef38f5 100644
--- a/base/common/src/com/netscape/certsrv/ca/CAClient.java
+++ b/base/common/src/com/netscape/certsrv/ca/CAClient.java
@@ -50,8 +50,8 @@ public class CAClient extends SubsystemClient {
         profileClient = createProxy(ProfileResource.class);
     }
 
-    public ProfileDataInfos listProfiles() {
-        return profileClient.listProfiles();
+    public ProfileDataInfos listProfiles(Integer start, Integer size) {
+        return profileClient.listProfiles(start, size);
     }
 
     public ProfileData getProfile(String id) {
diff --git a/base/common/src/com/netscape/certsrv/cert/CertClient.java b/base/common/src/com/netscape/certsrv/cert/CertClient.java
index 9de548cad..ab7ad9a55 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertClient.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertClient.java
@@ -51,8 +51,8 @@ public class CertClient extends Client {
         return certClient.reviewCert(id);
     }
 
-    public CertDataInfos listCerts(String status, Integer start, Integer size) {
-        return certClient.listCerts(status, start, size);
+    public CertDataInfos listCerts(String status, Integer maxResults, Integer maxTime, Integer start, Integer size) {
+        return certClient.listCerts(status, maxResults, maxTime, start, size);
     }
 
     public CertDataInfos findCerts(CertSearchRequest data, Integer start, Integer size) {
@@ -120,8 +120,8 @@ public class CertClient extends Client {
         return certRequestClient.getEnrollmentTemplate(id);
     }
 
-    public ProfileDataInfos listEnrollmentTemplates() {
-        return certRequestClient.listEnrollmentTemplates();
+    public ProfileDataInfos listEnrollmentTemplates(Integer start, Integer size) {
+        return certRequestClient.listEnrollmentTemplates(start, size);
     }
 
 }
diff --git a/base/common/src/com/netscape/certsrv/cert/CertDataInfos.java b/base/common/src/com/netscape/certsrv/cert/CertDataInfos.java
index 475e90815..1010f3d40 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertDataInfos.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertDataInfos.java
@@ -17,56 +17,18 @@
 //--- END COPYRIGHT BLOCK ---
 package com.netscape.certsrv.cert;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.jboss.resteasy.plugins.providers.atom.Link;
+import com.netscape.certsrv.base.DataCollection;
 
 @XmlRootElement(name = "CertDataInfos")
-public class CertDataInfos {
+public class CertDataInfos extends DataCollection<CertDataInfo> {
 
-    protected Collection<CertDataInfo> certInfos = new ArrayList<CertDataInfo>();
-    protected List<Link> links = new ArrayList<Link>();
-
-    /**
-     * @return the CertInfos
-     */
-    @XmlElementRef
-    public Collection<CertDataInfo> getCertInfos() {
-        return certInfos;
-    }
-
-    /**
-     * @param certInfos the CertInfos to set
-     */
-    public void setCertInfos(Collection<CertDataInfo> certInfos) {
-        this.certInfos = certInfos;
-    }
-
-    /**
-     * @return the links
-     */
     @XmlElementRef
-    public List<Link> getLinks() {
-        return links;
-    }
-
-    /**
-     * @param links the links to set
-     */
-    public void setLinks(List<Link> links) {
-        this.links = links;
-    }
-
-    public void addCertData(CertDataInfo certInfo){
-        this.certInfos.add(certInfo);
-    }
-
-    public void addLink(Link link) {
-        this.links.add(link);
+    public Collection<CertDataInfo> getEntries() {
+        return super.getEntries();
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/cert/CertRequestInfos.java b/base/common/src/com/netscape/certsrv/cert/CertRequestInfos.java
index a6a520c23..6948b285b 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertRequestInfos.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertRequestInfos.java
@@ -19,84 +19,33 @@ package com.netscape.certsrv.cert;
 
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import com.netscape.certsrv.base.Link;
+import org.jboss.resteasy.plugins.providers.atom.Link;
+
+import com.netscape.certsrv.base.DataCollection;
 import com.netscape.certsrv.request.RequestStatus;
 
 @XmlRootElement(name = "CertRequestInfos")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class CertRequestInfos {
+public class CertRequestInfos extends DataCollection<CertRequestInfo> {
 
     @XmlElementRef
-    protected Collection<CertRequestInfo> requests = new ArrayList<CertRequestInfo>();
-
-    @XmlElement(name = "Links")
-    protected List<Link> links = new ArrayList<Link>();
-
-    /**
-     * @return the requests
-     */
-    public Collection<CertRequestInfo> getRequests() {
-        return requests;
-    }
-
-    /**
-     * @param requests the requests to set
-     */
-    public void setRequests(Collection<CertRequestInfo> requests) {
-        this.requests.clear();
-        if (requests == null) return;
-        this.requests.addAll(requests);
-    }
-
-    /**
-     * @param requests the request to add
-     */
-    public void addRequest(CertRequestInfo request) {
-        requests.add(request);
-    }
-
-    /**
-     * @return the links
-     */
-    public List<Link> getLinks() {
-        return links;
-    }
-
-    /**
-     * @param links the links to set
-     */
-    public void setLinks(List<Link> links) {
-        this.links.clear();
-        if (links == null) return;
-        this.links.addAll(links);
-    }
-
-    /**
-     * @param links the link to add
-     */
-    public void addLink(Link link) {
-        links.add(link);
+    public Collection<CertRequestInfo> getEntries() {
+        return super.getEntries();
     }
 
     @XmlTransient
     public String getNext() {
-        for (Link link : links) {
-            if ("next".equals(link.getRelationship())) {
-                return link.getHref();
+        for (Link link : getLinks()) {
+            if ("next".equals(link.getRel())) {
+                return link.getHref().toString();
             }
         }
         return null;
@@ -104,45 +53,14 @@ public class CertRequestInfos {
 
     @XmlTransient
     public String getPrevious() {
-        for (Link link : links) {
-            if ("previous".equals(link.getRelationship())) {
-                return link.getHref();
+        for (Link link : getLinks()) {
+            if ("previous".equals(link.getRel())) {
+                return link.getHref().toString();
             }
         }
         return null;
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((links == null) ? 0 : links.hashCode());
-        result = prime * result + ((requests == null) ? 0 : requests.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        CertRequestInfos other = (CertRequestInfos) obj;
-        if (links == null) {
-            if (other.links != null)
-                return false;
-        } else if (!links.equals(other.links))
-            return false;
-        if (requests == null) {
-            if (other.requests != null)
-                return false;
-        } else if (!requests.equals(other.requests))
-            return false;
-        return true;
-    }
-
     public String toString() {
         try {
             StringWriter sw = new StringWriter();
@@ -173,7 +91,7 @@ public class CertRequestInfos {
         request.setRequestType("enrollment");
         request.setRequestStatus(RequestStatus.COMPLETE);
         request.setCertRequestType("pkcs10");
-        before.addRequest(request);
+        before.addEntry(request);
 
         String string = before.toString();
         System.out.println(string);
diff --git a/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java b/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java
index 0d58be282..7656080a1 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java
@@ -81,7 +81,9 @@ public interface CertRequestResource {
     @GET
     @Path("certrequests/profiles")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public ProfileDataInfos listEnrollmentTemplates();
+    public ProfileDataInfos listEnrollmentTemplates(
+            @QueryParam("start") Integer start,
+            @QueryParam("size") Integer size);
 
     @GET
     @Path("certrequests/profiles/{id}")
diff --git a/base/common/src/com/netscape/certsrv/cert/CertResource.java b/base/common/src/com/netscape/certsrv/cert/CertResource.java
index a667fdc2d..b5b282b18 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertResource.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertResource.java
@@ -1,7 +1,6 @@
 package com.netscape.certsrv.cert;
 
 import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -17,16 +16,15 @@ import com.netscape.certsrv.dbs.certdb.CertId;
 @Path("")
 public interface CertResource {
 
-    public static final int DEFAULT_MAXTIME = 0;
-    public static final int DEFAULT_MAXRESULTS = 20;
-
     @GET
     @Path("certs")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public CertDataInfos listCerts(
             @QueryParam("status") String status,
-            @DefaultValue("" + DEFAULT_MAXRESULTS) @QueryParam("maxResults") int maxResults,
-            @DefaultValue("" + DEFAULT_MAXTIME) @QueryParam("maxTime") int maxTime);
+            @QueryParam("maxResults") Integer maxResults,
+            @QueryParam("maxTime") Integer maxTime,
+            @QueryParam("start") Integer start,
+            @QueryParam("size") Integer size);
 
     @POST
     @Path("certs/search")
diff --git a/base/common/src/com/netscape/certsrv/key/KeyClient.java b/base/common/src/com/netscape/certsrv/key/KeyClient.java
index 385996eed..272f8ca04 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyClient.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyClient.java
@@ -41,8 +41,9 @@ public class KeyClient extends Client {
         keyRequestClient = createProxy(KeyRequestResource.class);
     }
 
-    public KeyDataInfos findKeys(String clientID, String status, Integer maxSize, Integer maxTime) {
-        return keyClient.listKeys(clientID, status, maxSize, maxTime);
+    public KeyDataInfos findKeys(String clientID, String status, Integer maxSize, Integer maxTime,
+            Integer start, Integer size) {
+        return keyClient.listKeys(clientID, status, maxSize, maxTime, start, size);
     }
 
     public KeyData retrieveKey(KeyRecoveryRequest data) {
diff --git a/base/common/src/com/netscape/certsrv/key/KeyDataInfos.java b/base/common/src/com/netscape/certsrv/key/KeyDataInfos.java
index d9fc885b4..eab8ae97c 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyDataInfos.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyDataInfos.java
@@ -17,82 +17,18 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.certsrv.key;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 
-import com.netscape.certsrv.base.Link;
+import com.netscape.certsrv.base.DataCollection;
 
 @XmlRootElement(name = "KeyDataInfos")
-public class KeyDataInfos {
+public class KeyDataInfos extends DataCollection<KeyDataInfo> {
 
-    protected Collection<KeyDataInfo> keyInfos = new ArrayList<KeyDataInfo>();
-    protected List<Link> links = new ArrayList<Link>();
-
-    /**
-     * @return the keyInfos
-     */
     @XmlElementRef
     public Collection<KeyDataInfo> getKeyInfos() {
-        return keyInfos;
-    }
-
-    /**
-     * @param keyInfos the keyInfos to set
-     */
-    public void setKeyInfos(Collection<KeyDataInfo> keyInfos) {
-        this.keyInfos = keyInfos;
-    }
-
-    /**
-     * @param keyInfo the keyInfo to add
-     */
-    public void addKeyInfo(KeyDataInfo keyInfo) {
-        keyInfos.add(keyInfo);
-    }
-
-    /**
-     * @return the links
-     */
-    @XmlElementRef
-    public List<Link> getLinks() {
-        return links;
-    }
-
-    /**
-     * @param links the links to set
-     */
-    public void setLinks(List<Link> links) {
-        this.links = links;
-    }
-
-    @XmlTransient
-    public String getNext() {
-        if (links == null) {
-            return null;
-        }
-        for (Link link : links) {
-            if ("next".equals(link.getRelationship())) {
-                return link.getHref();
-            }
-        }
-        return null;
-    }
-
-    @XmlTransient
-    public String getPrevious() {
-        if (links == null) {
-            return null;
-        }
-        for (Link link : links) {
-            if ("previous".equals(link.getRelationship())) {
-                return link.getHref();
-            }
-        }
-        return null;
+        return super.getEntries();
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestInfos.java b/base/common/src/com/netscape/certsrv/key/KeyRequestInfos.java
index 90756f8d3..403dc7d41 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyRequestInfos.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyRequestInfos.java
@@ -19,84 +19,32 @@ package com.netscape.certsrv.key;
 
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import com.netscape.certsrv.base.Link;
+import org.jboss.resteasy.plugins.providers.atom.Link;
+
+import com.netscape.certsrv.base.DataCollection;
 import com.netscape.certsrv.request.RequestStatus;
 
 @XmlRootElement(name = "KeyRequestInfos")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class KeyRequestInfos {
+public class KeyRequestInfos extends DataCollection<KeyRequestInfo> {
 
     @XmlElementRef
-    protected Collection<KeyRequestInfo> requests = new ArrayList<KeyRequestInfo>();
-
-    @XmlElement(name = "Link")
-    protected List<Link> links = new ArrayList<Link>();
-
-    /**
-     * @return the requests
-     */
-    public Collection<KeyRequestInfo> getRequests() {
-        return requests;
-    }
-
-    /**
-     * @param requests the requests to set
-     */
-    public void setRequests(Collection<KeyRequestInfo> requests) {
-        this.requests.clear();
-        if (requests == null) return;
-        this.requests.addAll(requests);
-    }
-
-    /**
-     * @param request the request to add
-     */
-    public void addRequest(KeyRequestInfo request) {
-        requests.add(request);
-    }
-
-    /**
-     * @return the links
-     */
-    public List<Link> getLinks() {
-        return links;
+    public Collection<KeyRequestInfo> getEntries() {
+        return super.getEntries();
     }
-
-    /**
-     * @param links the links to set
-     */
-    public void setLinks(List<Link> links) {
-        this.links.clear();
-        if (links == null) return;
-        this.links.addAll(links);
-    }
-
-    /**
-     * @param links the link to add
-     */
-    public void addLink(Link link) {
-        this.links.add(link);
-    }
-
     @XmlTransient
     public String getNext() {
-        for (Link link : links) {
-            if ("next".equals(link.getRelationship())) {
-                return link.getHref();
+        for (Link link : getLinks()) {
+            if ("next".equals(link.getRel())) {
+                return link.getHref().toString();
             }
         }
         return null;
@@ -104,45 +52,14 @@ public class KeyRequestInfos {
 
     @XmlTransient
     public String getPrevious() {
-        for (Link link : links) {
-            if ("previous".equals(link.getRelationship())) {
-                return link.getHref();
+        for (Link link : getLinks()) {
+            if ("previous".equals(link.getRel())) {
+                return link.getHref().toString();
             }
         }
         return null;
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((links == null) ? 0 : links.hashCode());
-        result = prime * result + ((requests == null) ? 0 : requests.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        KeyRequestInfos other = (KeyRequestInfos) obj;
-        if (links == null) {
-            if (other.links != null)
-                return false;
-        } else if (!links.equals(other.links))
-            return false;
-        if (requests == null) {
-            if (other.requests != null)
-                return false;
-        } else if (!requests.equals(other.requests))
-            return false;
-        return true;
-    }
-
     public String toString() {
         try {
             StringWriter sw = new StringWriter();
@@ -172,7 +89,7 @@ public class KeyRequestInfos {
         KeyRequestInfo request = new KeyRequestInfo();
         request.setRequestType("securityDataEnrollment");
         request.setRequestStatus(RequestStatus.COMPLETE);
-        before.addRequest(request);
+        before.addEntry(request);
 
         String string = before.toString();
         System.out.println(string);
diff --git a/base/common/src/com/netscape/certsrv/key/KeyResource.java b/base/common/src/com/netscape/certsrv/key/KeyResource.java
index bcca6bb97..a574abb65 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyResource.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyResource.java
@@ -23,7 +23,9 @@ public interface KeyResource {
     public KeyDataInfos listKeys(@QueryParam("clientID") String clientID,
                                  @QueryParam("status") String status,
                                  @QueryParam("maxResults") Integer maxResults,
-                                 @QueryParam("maxTime") Integer maxTime);
+                                 @QueryParam("maxTime") Integer maxTime,
+                                 @QueryParam("start") Integer start,
+                                 @QueryParam("size") Integer size);
 
 
     /**
diff --git a/base/common/src/com/netscape/certsrv/kra/KRAClient.java b/base/common/src/com/netscape/certsrv/kra/KRAClient.java
index 73ad56454..ebccd664d 100644
--- a/base/common/src/com/netscape/certsrv/kra/KRAClient.java
+++ b/base/common/src/com/netscape/certsrv/kra/KRAClient.java
@@ -63,7 +63,7 @@ public class KRAClient extends SubsystemClient {
         KeyRequestInfos infos = keyRequestClient.listRequests(
                 requestState, requestType, null, new RequestId(0), 100, 100, 10
                 );
-        Collection<KeyRequestInfo> list = infos.getRequests();
+        Collection<KeyRequestInfo> list = infos.getEntries();
         return list;
     }
 
@@ -82,7 +82,7 @@ public class KRAClient extends SubsystemClient {
     }
 
     public KeyDataInfo getKeyData(String clientId, String status) {
-        KeyDataInfos infos = keyClient.listKeys(clientId, status, 100, 10);
+        KeyDataInfos infos = keyClient.listKeys(clientId, status, null, null, null, null);
         Collection<KeyDataInfo> list = infos.getKeyInfos();
         Iterator<KeyDataInfo> iter = list.iterator();
 
diff --git a/base/common/src/com/netscape/certsrv/profile/ProfileClient.java b/base/common/src/com/netscape/certsrv/profile/ProfileClient.java
index eefd0660e..2ea6d8698 100644
--- a/base/common/src/com/netscape/certsrv/profile/ProfileClient.java
+++ b/base/common/src/com/netscape/certsrv/profile/ProfileClient.java
@@ -44,8 +44,8 @@ public class ProfileClient extends Client {
         return profileClient.retrieveProfile(id);
     }
 
-    public ProfileDataInfos listProfiles() {
-        return profileClient.listProfiles();
+    public ProfileDataInfos listProfiles(Integer start, Integer size) {
+        return profileClient.listProfiles(start, size);
     }
 
     public void enableProfile(String id) {
diff --git a/base/common/src/com/netscape/certsrv/profile/ProfileDataInfos.java b/base/common/src/com/netscape/certsrv/profile/ProfileDataInfos.java
index ed2c11cf7..a323491b4 100644
--- a/base/common/src/com/netscape/certsrv/profile/ProfileDataInfos.java
+++ b/base/common/src/com/netscape/certsrv/profile/ProfileDataInfos.java
@@ -18,58 +18,29 @@
 package com.netscape.certsrv.profile;
 
 import java.util.Collection;
-import java.util.List;
 
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import com.netscape.certsrv.base.Link;
+import org.jboss.resteasy.plugins.providers.atom.Link;
 
-@XmlRootElement(name = "ProfileDataInfos")
-public class ProfileDataInfos {
-
-    protected Collection<ProfileDataInfo> profileInfos;
-    protected List<Link> links;
-
-    /**
-     * @return the ProfileInfos
-     */
-    @XmlElementRef
-    public Collection<ProfileDataInfo> getProfileInfos() {
-        return profileInfos;
-    }
+import com.netscape.certsrv.base.DataCollection;
+//import com.netscape.certsrv.base.Link;
 
-    /**
-     * @param ProfileInfos theProfileInfos to set
-     */
-    public void setProfileInfos(Collection<ProfileDataInfo> profileInfos) {
-        this.profileInfos = profileInfos;
-    }
+@XmlRootElement(name = "ProfileDataInfos")
+public class ProfileDataInfos extends DataCollection<ProfileDataInfo> {
 
-    /**
-     * @return the links
-     */
     @XmlElementRef
-    public List<Link> getLinks() {
-        return links;
-    }
-
-    /**
-     * @param links the links to set
-     */
-    public void setLinks(List<Link> links) {
-        this.links = links;
+    public Collection<ProfileDataInfo> getEntries() {
+        return super.getEntries();
     }
 
     @XmlTransient
     public String getNext() {
-        if (links == null) {
-            return null;
-        }
-        for (Link link : links) {
-            if ("next".equals(link.getRelationship())) {
-                return link.getHref();
+        for (Link link : getLinks()) {
+            if ("next".equals(link. getRel())) {
+                return link.getHref().toString();
             }
         }
         return null;
@@ -77,12 +48,9 @@ public class ProfileDataInfos {
 
     @XmlTransient
     public String getPrevious() {
-        if (links == null) {
-            return null;
-        }
-        for (Link link : links) {
-            if ("previous".equals(link.getRelationship())) {
-                return link.getHref();
+        for (Link link : getLinks()) {
+            if ("previous".equals(link.getRel())) {
+                return link.getHref().toString();
             }
         }
         return null;
diff --git a/base/common/src/com/netscape/certsrv/profile/ProfileResource.java b/base/common/src/com/netscape/certsrv/profile/ProfileResource.java
index 06dd785c3..5af61bff7 100644
--- a/base/common/src/com/netscape/certsrv/profile/ProfileResource.java
+++ b/base/common/src/com/netscape/certsrv/profile/ProfileResource.java
@@ -24,7 +24,9 @@ public interface ProfileResource {
     @GET
     @ACLMapping("profile.list")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public ProfileDataInfos listProfiles();
+    public ProfileDataInfos listProfiles(
+            @QueryParam("start") Integer start,
+            @QueryParam("size") Integer size);
 
     @GET
     @Path("{id}")
diff --git a/base/common/src/com/netscape/certsrv/request/CMSRequestInfos.java b/base/common/src/com/netscape/certsrv/request/CMSRequestInfos.java
index 7e9445dbc..157c8db26 100644
--- a/base/common/src/com/netscape/certsrv/request/CMSRequestInfos.java
+++ b/base/common/src/com/netscape/certsrv/request/CMSRequestInfos.java
@@ -17,61 +17,9 @@
 //--- END COPYRIGHT BLOCK ---
 package com.netscape.certsrv.request;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import com.netscape.certsrv.base.Link;
+import com.netscape.certsrv.base.DataCollection;
 
 //Convenience class to simply hold a Collection of CMSRequests and a List of Links.
-public class CMSRequestInfos {
-
-    protected Collection<CMSRequestInfo> requests = new ArrayList<CMSRequestInfo>();
-    protected List<Link> links = new ArrayList<Link>();
-
-    /**
-     * @return the requests
-     */
-    public Collection<CMSRequestInfo> getRequests() {
-        return requests;
-    }
-
-    /**
-     * @param requests the requests to set
-     */
-    public void setRequests(Collection<CMSRequestInfo> requests) {
-        this.requests.clear();
-        if (requests == null) return;
-        this.requests.addAll(requests);
-    }
-
-    /**
-     * @param requests the requests to add
-     */
-    public void addRequest(CMSRequestInfo request) {
-        requests.add(request);
-    }
-
-    /**
-     * @return the links
-     */
-    public List<Link> getLinks() {
-        return links;
-    }
-
-    /**
-     * @param links the links to set
-     */
-    public void setLinks(List<Link> links) {
-        this.links.clear();
-        if (links == null) return;
-        this.links.addAll(links);
-    }
+public class CMSRequestInfos extends DataCollection<CMSRequestInfo> {
 
-    /**
-     * @param links the link to add
-     */
-    public void addLink(Link link) {
-        links.add(link);
-    }
 }
diff --git a/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java b/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java
index c29fa3d19..aeee39071 100644
--- a/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java
+++ b/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java
@@ -43,7 +43,9 @@ import com.netscape.certsrv.key.KeyData;
 public interface TPSConnectorResource {
     @GET
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public TPSConnectorCollection findConnectors(Integer start, Integer size);
+    public TPSConnectorCollection findConnectors(
+            @QueryParam("start") Integer start,
+            @QueryParam("size") Integer size);
 
     @GET
     @Path("{id}")