diff options
Diffstat (limited to 'base/java-tools/src/com')
5 files changed, 39 insertions, 10 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java index 968708440..af117a620 100644 --- a/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java @@ -32,6 +32,7 @@ import com.netscape.certsrv.cert.CertReviewResponse; import com.netscape.certsrv.client.PKIClient; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; +import com.netscape.cmstools.cli.SubsystemCLI; /** * @author Endi S. Dewata @@ -81,8 +82,13 @@ public class CertCLI extends CLI { PKIClient client = getClient(); // determine the subsystem - String subsystem = client.getSubsystem(); - if (subsystem == null) subsystem = "ca"; + String subsystem; + if (parent instanceof SubsystemCLI) { + SubsystemCLI subsystemCLI = (SubsystemCLI)parent; + subsystem = subsystemCLI.getName(); + } else { + subsystem = "ca"; + } // create new cert client certClient = new CertClient(client, subsystem); diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java index bd4651d9e..5ccf70df5 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java @@ -26,6 +26,7 @@ import com.netscape.certsrv.group.GroupClient; import com.netscape.certsrv.group.GroupData; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; +import com.netscape.cmstools.cli.SubsystemCLI; /** * @author Endi S. Dewata @@ -67,8 +68,13 @@ public class GroupCLI extends CLI { PKIClient client = getClient(); // determine the subsystem - String subsystem = client.getSubsystem(); - if (subsystem == null) subsystem = "ca"; + String subsystem; + if (parent instanceof SubsystemCLI) { + SubsystemCLI subsystemCLI = (SubsystemCLI)parent; + subsystem = subsystemCLI.getName(); + } else { + subsystem = "ca"; + } // create new group client groupClient = new GroupClient(client, subsystem); diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java index b9b27d113..d7c087f65 100644 --- a/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java @@ -27,6 +27,7 @@ import com.netscape.certsrv.system.SystemCertClient; import com.netscape.certsrv.util.NSSCryptoProvider; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; +import com.netscape.cmstools.cli.SubsystemCLI; import com.netscape.cmsutil.util.Utils; /** @@ -78,9 +79,13 @@ public class KeyCLI extends CLI { PKIClient client = getClient(); // determine the subsystem - String subsystem = client.getSubsystem(); - if (subsystem == null) + String subsystem; + if (parent instanceof SubsystemCLI) { + SubsystemCLI subsystemCLI = (SubsystemCLI)parent; + subsystem = subsystemCLI.getName(); + } else { subsystem = "kra"; + } // create new key client keyClient = new KeyClient(client, subsystem); diff --git a/base/java-tools/src/com/netscape/cmstools/system/SecurityDomainCLI.java b/base/java-tools/src/com/netscape/cmstools/system/SecurityDomainCLI.java index d9db91eb9..ea6cd2944 100644 --- a/base/java-tools/src/com/netscape/cmstools/system/SecurityDomainCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/system/SecurityDomainCLI.java @@ -25,6 +25,7 @@ import com.netscape.certsrv.system.SecurityDomainHost; import com.netscape.certsrv.system.SecurityDomainSubsystem; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; +import com.netscape.cmstools.cli.SubsystemCLI; /** * @author Endi S. Dewata @@ -60,8 +61,13 @@ public class SecurityDomainCLI extends CLI { PKIClient client = getClient(); // determine the subsystem - String subsystem = client.getSubsystem(); - if (subsystem == null) subsystem = "ca"; + String subsystem; + if (parent instanceof SubsystemCLI) { + SubsystemCLI subsystemCLI = (SubsystemCLI)parent; + subsystem = subsystemCLI.getName(); + } else { + subsystem = "ca"; + } // create new security domain client securityDomainClient = new SecurityDomainClient(client, subsystem); diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java index 57a132c46..1acbf0b72 100644 --- a/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java @@ -27,6 +27,7 @@ import com.netscape.certsrv.user.UserData; import com.netscape.certsrv.user.UserResource; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; +import com.netscape.cmstools.cli.SubsystemCLI; /** * @author Endi S. Dewata @@ -70,8 +71,13 @@ public class UserCLI extends CLI { PKIClient client = getClient(); // determine the subsystem - String subsystem = client.getSubsystem(); - if (subsystem == null) subsystem = "ca"; + String subsystem; + if (parent instanceof SubsystemCLI) { + SubsystemCLI subsystemCLI = (SubsystemCLI)parent; + subsystem = subsystemCLI.getName(); + } else { + subsystem = "ca"; + } // create new user client userClient = new UserClient(client, subsystem); |