Reorganized CLI user commands.

New CLI modules have been added for each subsystem. The user commands
have been added to these subsystems while keeping the original command
for backward compatibility.

Ticket #701

4 files changed, 80 insertions, 0 deletions

diff --git a/base/common/src/com/netscape/certsrv/ca/CAClient.java b/base/common/src/com/netscape/certsrv/ca/CAClient.java
index abd54a63b..7fc6334bc 100644
--- a/base/common/src/com/netscape/certsrv/ca/CAClient.java
+++ b/base/common/src/com/netscape/certsrv/ca/CAClient.java
@@ -36,6 +36,7 @@ import com.netscape.certsrv.profile.ProfileData;
 import com.netscape.certsrv.profile.ProfileDataInfos;
 import com.netscape.certsrv.profile.ProfileResource;
 import com.netscape.certsrv.request.RequestId;
+import com.netscape.certsrv.user.UserClient;
 
 public class CAClient extends SubsystemClient {
 
@@ -49,6 +50,9 @@ public class CAClient extends SubsystemClient {
     }
 
     public void init() throws URISyntaxException {
+
+        addClient(new UserClient(client, name));
+
         certRequestClient = createProxy(CertRequestResource.class);
         certClient = createProxy(CertResource.class);
         profileClient = createProxy(ProfileResource.class);
diff --git a/base/common/src/com/netscape/certsrv/kra/KRAClient.java b/base/common/src/com/netscape/certsrv/kra/KRAClient.java
index ae91d1853..40919f23a 100644
--- a/base/common/src/com/netscape/certsrv/kra/KRAClient.java
+++ b/base/common/src/com/netscape/certsrv/kra/KRAClient.java
@@ -21,6 +21,7 @@ import com.netscape.certsrv.key.KeyRequestResource;
 import com.netscape.certsrv.key.KeyResource;
 import com.netscape.certsrv.request.RequestId;
 import com.netscape.certsrv.system.SystemCertResource;
+import com.netscape.certsrv.user.UserClient;
 import com.netscape.cmsutil.util.Utils;
 
 public class KRAClient extends SubsystemClient {
@@ -35,6 +36,9 @@ public class KRAClient extends SubsystemClient {
     }
 
     public void init() throws URISyntaxException {
+
+        addClient(new UserClient(client, name));
+
         systemCertClient = createProxy(SystemCertResource.class);
         keyRequestClient = createProxy(KeyRequestResource.class);
         keyClient = createProxy(KeyResource.class);
diff --git a/base/common/src/com/netscape/certsrv/ocsp/OCSPClient.java b/base/common/src/com/netscape/certsrv/ocsp/OCSPClient.java
new file mode 100644
index 000000000..fc751f8ec
--- /dev/null
+++ b/base/common/src/com/netscape/certsrv/ocsp/OCSPClient.java
@@ -0,0 +1,36 @@
+//--- BEGIN COPYRIGHT BLOCK ---
+//This program is free software; you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation; version 2 of the License.
+//
+//This program is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+//
+//You should have received a copy of the GNU General Public License along
+//with this program; if not, write to the Free Software Foundation, Inc.,
+//51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+//(C) 2013 Red Hat, Inc.
+//All rights reserved.
+//--- END COPYRIGHT BLOCK ---
+package com.netscape.certsrv.ocsp;
+
+import java.net.URISyntaxException;
+
+import com.netscape.certsrv.client.PKIClient;
+import com.netscape.certsrv.client.SubsystemClient;
+import com.netscape.certsrv.user.UserClient;
+
+public class OCSPClient extends SubsystemClient {
+
+    public OCSPClient(PKIClient client) throws URISyntaxException {
+        super(client, "ocsp");
+        init();
+    }
+
+    public void init() throws URISyntaxException {
+        addClient(new UserClient(client, name));
+    }
+}
diff --git a/base/common/src/com/netscape/certsrv/tks/TKSClient.java b/base/common/src/com/netscape/certsrv/tks/TKSClient.java
new file mode 100644
index 000000000..ff926cb28
--- /dev/null
+++ b/base/common/src/com/netscape/certsrv/tks/TKSClient.java
@@ -0,0 +1,36 @@
+//--- BEGIN COPYRIGHT BLOCK ---
+//This program is free software; you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation; version 2 of the License.
+//
+//This program is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+//
+//You should have received a copy of the GNU General Public License along
+//with this program; if not, write to the Free Software Foundation, Inc.,
+//51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+//(C) 2013 Red Hat, Inc.
+//All rights reserved.
+//--- END COPYRIGHT BLOCK ---
+package com.netscape.certsrv.tks;
+
+import java.net.URISyntaxException;
+
+import com.netscape.certsrv.client.PKIClient;
+import com.netscape.certsrv.client.SubsystemClient;
+import com.netscape.certsrv.user.UserClient;
+
+public class TKSClient extends SubsystemClient {
+
+    public TKSClient(PKIClient client) throws URISyntaxException {
+        super(client, "tks");
+        init();
+    }
+
+    public void init() throws URISyntaxException {
+        addClient(new UserClient(client, name));
+    }
+}