Added search filter for TPS resources.

The TPS resources have been modified to accept a basic search filter
for find operation. For resources based on LDAP database, the filtering
is done using LDAP filter. For other resources, the filtering is done
using string comparison. For now the filter is will only be matched
against entry IDs. In the future the filter may be expanded to support
other entry attributes. The CLI has been updated accordingly.

The total attribute in DataCollection was changed from Integer into int
because the total size of the collection cannot be null.

The PKIException constructors have been consolidated into a single
actual constructor. The other constructors have been modified to
call the actual constructor with some default values.

Ticket #847

2 files changed, 5 insertions, 4 deletions

diff --git a/base/common/src/com/netscape/certsrv/logging/ActivityClient.java b/base/common/src/com/netscape/certsrv/logging/ActivityClient.java
index eae2f6f48..1fc3bcc21 100644
--- a/base/common/src/com/netscape/certsrv/logging/ActivityClient.java
+++ b/base/common/src/com/netscape/certsrv/logging/ActivityClient.java
@@ -40,13 +40,13 @@ public class ActivityClient extends Client {
         resource = createProxy(ActivityResource.class);
     }
 
-    public ActivityCollection findActivities(Integer start, Integer size) {
-        Response response = resource.findActivities(start, size);
+    public ActivityCollection findActivities(String filter, Integer start, Integer size) {
+        Response response = resource.findActivities(filter, start, size);
         return client.getEntity(response, ActivityCollection.class);
     }
 
-    public ActivityData getActivity(String tokenID) {
-        Response response = resource.getActivity(tokenID);
+    public ActivityData getActivity(String activityID) {
+        Response response = resource.getActivity(activityID);
         return client.getEntity(response, ActivityData.class);
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/logging/ActivityResource.java b/base/common/src/com/netscape/certsrv/logging/ActivityResource.java
index bc6d375ca..3e0a0502e 100644
--- a/base/common/src/com/netscape/certsrv/logging/ActivityResource.java
+++ b/base/common/src/com/netscape/certsrv/logging/ActivityResource.java
@@ -35,6 +35,7 @@ public interface ActivityResource {
     @GET
     @ClientResponseType(entityType=ActivityCollection.class)
     public Response findActivities(
+            @QueryParam("filter") String filter,
             @QueryParam("start") Integer start,
             @QueryParam("size") Integer size);