6 files changed, 52 insertions, 70 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/CACLI.java b/base/java-tools/src/com/netscape/cmstools/cli/CACLI.java
index 39dd2a2ce..2ec20dcb0 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/CACLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/CACLI.java
@@ -19,7 +19,8 @@
 package com.netscape.cmstools.cli;
 
 import com.netscape.certsrv.ca.CAClient;
-import com.netscape.certsrv.client.Client;
+import com.netscape.certsrv.client.PKIClient;
+import com.netscape.certsrv.client.SubsystemClient;
 import com.netscape.cmstools.authority.AuthorityCLI;
 import com.netscape.cmstools.cert.CertCLI;
 import com.netscape.cmstools.feature.FeatureCLI;
@@ -49,20 +50,13 @@ public class CACLI extends SubsystemCLI {
         addModule(new UserCLI(this));
     }
 
-    public void init() throws Exception {
-        client = parent.getClient();
-        caClient = new CAClient(client);
-    }
+    public SubsystemClient getSubsystemClient() throws Exception {
 
-    public void login() {
-        caClient.login();
-    }
+        if (caClient != null) return caClient;
 
-    public void logout() {
-        caClient.logout();
-    }
+        PKIClient client = getClient();
+        caClient = new CAClient(client);
 
-    public Client getClient(String name) {
-        return caClient.getClient(name);
+        return caClient;
     }
 }
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/KRACLI.java b/base/java-tools/src/com/netscape/cmstools/cli/KRACLI.java
index 8a9f789cd..2db85aafe 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/KRACLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/KRACLI.java
@@ -18,7 +18,8 @@
 
 package com.netscape.cmstools.cli;
 
-import com.netscape.certsrv.client.Client;
+import com.netscape.certsrv.client.PKIClient;
+import com.netscape.certsrv.client.SubsystemClient;
 import com.netscape.certsrv.kra.KRAClient;
 import com.netscape.cmstools.group.GroupCLI;
 import com.netscape.cmstools.key.KeyCLI;
@@ -41,20 +42,13 @@ public class KRACLI extends SubsystemCLI {
         addModule(new UserCLI(this));
     }
 
-    public void init() throws Exception {
-        client = parent.getClient();
-        kraClient = new KRAClient(client);
-    }
+    public SubsystemClient getSubsystemClient() throws Exception {
 
-    public void login() {
-        kraClient.login();
-    }
+        if (kraClient != null) return kraClient;
 
-    public void logout() {
-        kraClient.logout();
-    }
+        PKIClient client = getClient();
+        kraClient = new KRAClient(client);
 
-    public Client getClient(String name) {
-        return kraClient.getClient(name);
+        return kraClient;
     }
 }
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/OCSPCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/OCSPCLI.java
index 3768a48e7..6348359e2 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/OCSPCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/OCSPCLI.java
@@ -18,7 +18,8 @@
 
 package com.netscape.cmstools.cli;
 
-import com.netscape.certsrv.client.Client;
+import com.netscape.certsrv.client.PKIClient;
+import com.netscape.certsrv.client.SubsystemClient;
 import com.netscape.certsrv.ocsp.OCSPClient;
 import com.netscape.cmstools.group.GroupCLI;
 import com.netscape.cmstools.selftests.SelfTestCLI;
@@ -39,20 +40,13 @@ public class OCSPCLI extends SubsystemCLI {
         addModule(new UserCLI(this));
     }
 
-    public void init() throws Exception {
-        client = parent.getClient();
-        ocspClient = new OCSPClient(client);
-    }
+    public SubsystemClient getSubsystemClient() throws Exception {
 
-    public void login() {
-        ocspClient.login();
-    }
+        if (ocspClient != null) return ocspClient;
 
-    public void logout() {
-        ocspClient.logout();
-    }
+        PKIClient client = getClient();
+        ocspClient = new OCSPClient(client);
 
-    public Client getClient(String name) {
-        return ocspClient.getClient(name);
+        return ocspClient;
     }
 }
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/SubsystemCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/SubsystemCLI.java
index b28271dd7..0f9a49781 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/SubsystemCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/SubsystemCLI.java
@@ -18,7 +18,9 @@
 
 package com.netscape.cmstools.cli;
 
+import com.netscape.certsrv.client.Client;
 import com.netscape.certsrv.client.ClientConfig;
+import com.netscape.certsrv.client.SubsystemClient;
 
 
 /**
@@ -35,21 +37,29 @@ public class SubsystemCLI extends CLI {
         return name;
     }
 
-    public void init() throws Exception {
+    public SubsystemClient getSubsystemClient() throws Exception {
+        return null;
     }
 
     public void login() throws Exception {
+        SubsystemClient subsystemClient = getSubsystemClient();
+        subsystemClient.login();
     }
 
     public void logout() throws Exception {
+        SubsystemClient subsystemClient = getSubsystemClient();
+        subsystemClient.logout();
     }
 
-    public void execute(String[] args) throws Exception {
+    public Client getClient(String name) throws Exception {
+        SubsystemClient subsystemClient = getSubsystemClient();
+        return subsystemClient.getClient(name);
+    }
 
-        init();
+    public void execute(String[] args) throws Exception {
 
         // login if username or nickname is specified
-        ClientConfig config = getClient().getConfig();
+        ClientConfig config = getConfig();
         if (config.getUsername() != null || config.getCertNickname() != null) {
             login();
         }
@@ -57,6 +67,8 @@ public class SubsystemCLI extends CLI {
         super.execute(args);
 
         // logout if there is no failures
-        logout();
+        if (config.getUsername() != null || config.getCertNickname() != null) {
+            logout();
+        }
     }
 }
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/TKSCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/TKSCLI.java
index dd4f179c2..1afdf649f 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/TKSCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/TKSCLI.java
@@ -18,7 +18,8 @@
 
 package com.netscape.cmstools.cli;
 
-import com.netscape.certsrv.client.Client;
+import com.netscape.certsrv.client.PKIClient;
+import com.netscape.certsrv.client.SubsystemClient;
 import com.netscape.certsrv.tks.TKSClient;
 import com.netscape.cmstools.group.GroupCLI;
 import com.netscape.cmstools.selftests.SelfTestCLI;
@@ -41,20 +42,13 @@ public class TKSCLI extends SubsystemCLI {
         addModule(new UserCLI(this));
     }
 
-    public void init() throws Exception {
-        client = parent.getClient();
-        tksClient = new TKSClient(client);
-    }
+    public SubsystemClient getSubsystemClient() throws Exception {
 
-    public void login() {
-        tksClient.login();
-    }
+        if (tksClient != null) return tksClient;
 
-    public void logout() {
-        tksClient.logout();
-    }
+        PKIClient client = getClient();
+        tksClient = new TKSClient(client);
 
-    public Client getClient(String name) {
-        return tksClient.getClient(name);
+        return tksClient;
     }
 }
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/TPSCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/TPSCLI.java
index 1931b2baa..95836a45b 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/TPSCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/TPSCLI.java
@@ -18,7 +18,8 @@
 
 package com.netscape.cmstools.cli;
 
-import com.netscape.certsrv.client.Client;
+import com.netscape.certsrv.client.PKIClient;
+import com.netscape.certsrv.client.SubsystemClient;
 import com.netscape.certsrv.tps.TPSClient;
 import com.netscape.cmstools.group.GroupCLI;
 import com.netscape.cmstools.logging.ActivityCLI;
@@ -64,20 +65,13 @@ public class TPSCLI extends SubsystemCLI {
         }
     }
 
-    public void init() throws Exception {
-        client = parent.getClient();
-        tpsClient = new TPSClient(client);
-    }
+    public SubsystemClient getSubsystemClient() throws Exception {
 
-    public void login() {
-        tpsClient.login();
-    }
+        if (tpsClient != null) return tpsClient;
 
-    public void logout() {
-        tpsClient.logout();
-    }
+        PKIClient client = getClient();
+        tpsClient = new TPSClient(client);
 
-    public Client getClient(String name) {
-        return tpsClient.getClient(name);
+        return tpsClient;
     }
 }