diff options
author | Endi S. Dewata <edewata@redhat.com> | 2013-08-22 01:48:23 -0400 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2013-08-24 01:39:49 -0400 |
commit | 99c3fc97f3f1c49ffef010896765b716e8359e50 (patch) | |
tree | 7cada88bb2ae5ec7553695cfcaa483fc9f794c2e | |
parent | d2e98fe9aab32097b2928c3f5787b6ca16c9f7d0 (diff) | |
download | pki-99c3fc97f3f1c49ffef010896765b716e8359e50.tar.gz pki-99c3fc97f3f1c49ffef010896765b716e8359e50.tar.xz pki-99c3fc97f3f1c49ffef010896765b716e8359e50.zip |
Added subsystem group commands.
The group client and CLI has been added into each subsystem (e.g. ca-group-*)
while keeping the original command for backward compatibility.
Ticket #652
12 files changed, 28 insertions, 4 deletions
diff --git a/base/common/src/com/netscape/certsrv/ca/CAClient.java b/base/common/src/com/netscape/certsrv/ca/CAClient.java index 7fc6334bc..a58d0236d 100644 --- a/base/common/src/com/netscape/certsrv/ca/CAClient.java +++ b/base/common/src/com/netscape/certsrv/ca/CAClient.java @@ -32,6 +32,7 @@ import com.netscape.certsrv.cert.CertSearchRequest; import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.client.SubsystemClient; import com.netscape.certsrv.dbs.certdb.CertId; +import com.netscape.certsrv.group.GroupClient; import com.netscape.certsrv.profile.ProfileData; import com.netscape.certsrv.profile.ProfileDataInfos; import com.netscape.certsrv.profile.ProfileResource; @@ -51,6 +52,7 @@ public class CAClient extends SubsystemClient { public void init() throws URISyntaxException { + addClient(new GroupClient(client, name)); addClient(new UserClient(client, name)); certRequestClient = createProxy(CertRequestResource.class); diff --git a/base/common/src/com/netscape/certsrv/kra/KRAClient.java b/base/common/src/com/netscape/certsrv/kra/KRAClient.java index 40919f23a..3bebb150e 100644 --- a/base/common/src/com/netscape/certsrv/kra/KRAClient.java +++ b/base/common/src/com/netscape/certsrv/kra/KRAClient.java @@ -10,6 +10,7 @@ import com.netscape.certsrv.cert.CertData; import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.client.SubsystemClient; import com.netscape.certsrv.dbs.keydb.KeyId; +import com.netscape.certsrv.group.GroupClient; import com.netscape.certsrv.key.KeyArchivalRequest; import com.netscape.certsrv.key.KeyData; import com.netscape.certsrv.key.KeyDataInfo; @@ -37,6 +38,7 @@ public class KRAClient extends SubsystemClient { public void init() throws URISyntaxException { + addClient(new GroupClient(client, name)); addClient(new UserClient(client, name)); systemCertClient = createProxy(SystemCertResource.class); diff --git a/base/common/src/com/netscape/certsrv/ocsp/OCSPClient.java b/base/common/src/com/netscape/certsrv/ocsp/OCSPClient.java index fc751f8ec..ed65e8b00 100644 --- a/base/common/src/com/netscape/certsrv/ocsp/OCSPClient.java +++ b/base/common/src/com/netscape/certsrv/ocsp/OCSPClient.java @@ -21,6 +21,7 @@ import java.net.URISyntaxException; import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.client.SubsystemClient; +import com.netscape.certsrv.group.GroupClient; import com.netscape.certsrv.user.UserClient; public class OCSPClient extends SubsystemClient { @@ -31,6 +32,7 @@ public class OCSPClient extends SubsystemClient { } public void init() throws URISyntaxException { + addClient(new GroupClient(client, name)); 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 index ff926cb28..baecf8ddb 100644 --- a/base/common/src/com/netscape/certsrv/tks/TKSClient.java +++ b/base/common/src/com/netscape/certsrv/tks/TKSClient.java @@ -21,6 +21,7 @@ import java.net.URISyntaxException; import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.client.SubsystemClient; +import com.netscape.certsrv.group.GroupClient; import com.netscape.certsrv.user.UserClient; public class TKSClient extends SubsystemClient { @@ -31,6 +32,7 @@ public class TKSClient extends SubsystemClient { } public void init() throws URISyntaxException { + addClient(new GroupClient(client, name)); addClient(new UserClient(client, name)); } } diff --git a/base/common/src/com/netscape/certsrv/tps/TPSClient.java b/base/common/src/com/netscape/certsrv/tps/TPSClient.java index 263b92b3a..0726eb192 100644 --- a/base/common/src/com/netscape/certsrv/tps/TPSClient.java +++ b/base/common/src/com/netscape/certsrv/tps/TPSClient.java @@ -21,6 +21,7 @@ import java.net.URISyntaxException; import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.client.SubsystemClient; +import com.netscape.certsrv.group.GroupClient; import com.netscape.certsrv.logging.ActivityClient; import com.netscape.certsrv.token.TokenClient; import com.netscape.certsrv.user.UserClient; @@ -37,6 +38,7 @@ public class TPSClient extends SubsystemClient { public void init() throws URISyntaxException { addClient(new ActivityClient(client, name)); + addClient(new GroupClient(client, name)); addClient(new TokenClient(client, name)); addClient(new UserClient(client, name)); } 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 c97dbd7ba..ce253d884 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/CACLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/CACLI.java @@ -20,6 +20,7 @@ package com.netscape.cmstools.cli; import com.netscape.certsrv.ca.CAClient; import com.netscape.certsrv.client.Client; +import com.netscape.cmstools.group.GroupCLI; import com.netscape.cmstools.user.UserCLI; /** @@ -32,6 +33,7 @@ public class CACLI extends SubsystemCLI { public CACLI(CLI parent) { super("ca", "CA management commands", parent); + addModule(new GroupCLI(this)); addModule(new UserCLI(this)); } 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 0249d876a..ecc72688a 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/KRACLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/KRACLI.java @@ -20,6 +20,7 @@ package com.netscape.cmstools.cli; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.kra.KRAClient; +import com.netscape.cmstools.group.GroupCLI; import com.netscape.cmstools.user.UserCLI; /** @@ -32,6 +33,7 @@ public class KRACLI extends SubsystemCLI { public KRACLI(CLI parent) { super("kra", "KRA management commands", parent); + addModule(new GroupCLI(this)); addModule(new UserCLI(this)); } 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 7a0be1c3f..e28b97cdb 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/OCSPCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/OCSPCLI.java @@ -20,6 +20,7 @@ package com.netscape.cmstools.cli; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.ocsp.OCSPClient; +import com.netscape.cmstools.group.GroupCLI; import com.netscape.cmstools.user.UserCLI; /** @@ -32,6 +33,7 @@ public class OCSPCLI extends SubsystemCLI { public OCSPCLI(CLI parent) { super("ocsp", "OCSP management commands", parent); + addModule(new GroupCLI(this)); addModule(new UserCLI(this)); } 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 0117432fe..df7050189 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/TKSCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/TKSCLI.java @@ -20,6 +20,7 @@ package com.netscape.cmstools.cli; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.tks.TKSClient; +import com.netscape.cmstools.group.GroupCLI; import com.netscape.cmstools.user.UserCLI; /** @@ -32,6 +33,7 @@ public class TKSCLI extends SubsystemCLI { public TKSCLI(CLI parent) { super("tks", "TKS management commands", parent); + addModule(new GroupCLI(this)); addModule(new UserCLI(this)); } 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 6cd417312..00f0131cb 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/TPSCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/TPSCLI.java @@ -20,6 +20,7 @@ package com.netscape.cmstools.cli; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.tps.TPSClient; +import com.netscape.cmstools.group.GroupCLI; import com.netscape.cmstools.logging.ActivityCLI; import com.netscape.cmstools.token.TokenCLI; import com.netscape.cmstools.user.UserCLI; @@ -35,6 +36,7 @@ public class TPSCLI extends SubsystemCLI { super("tps", "TPS management commands", mainCLI); addModule(new ActivityCLI(this)); + addModule(new GroupCLI(this)); addModule(new TokenCLI(this)); addModule(new UserCLI(this)); } 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 d691c432b..f14d30ebc 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java @@ -63,7 +63,12 @@ public class GroupCLI extends CLI { public void execute(String[] args) throws Exception { client = parent.getClient(); - groupClient = new GroupClient(client); + groupClient = (GroupClient)parent.getClient("group"); + + if (groupClient == null) { + // if parent doesn't have group client then create a new one + groupClient = new GroupClient(client); + } if (args.length == 0) { printHelp(); diff --git a/base/java-tools/src/com/netscape/cmstools/token/TokenCLI.java b/base/java-tools/src/com/netscape/cmstools/token/TokenCLI.java index 4584a5ef7..14e54af3d 100644 --- a/base/java-tools/src/com/netscape/cmstools/token/TokenCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/token/TokenCLI.java @@ -25,7 +25,6 @@ import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.token.TokenClient; import com.netscape.certsrv.token.TokenData; import com.netscape.cmstools.cli.CLI; -import com.netscape.cmstools.cli.SubsystemCLI; /** * @author Endi S. Dewata @@ -34,8 +33,8 @@ public class TokenCLI extends CLI { public TokenClient tokenClient; - public TokenCLI(SubsystemCLI subsystemCLI) { - super("token", "Token management commands", subsystemCLI); + public TokenCLI(CLI parent) { + super("token", "Token management commands", parent); addModule(new TokenAddCLI(this)); addModule(new TokenFindCLI(this)); |