diff options
Diffstat (limited to 'base/java-tools/src')
6 files changed, 21 insertions, 8 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorAddCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorAddCLI.java index 82409723b..7c89c50c5 100644 --- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorAddCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorAddCLI.java @@ -22,6 +22,7 @@ import java.util.Arrays; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; +import com.netscape.certsrv.system.TPSConnectorClient; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -70,7 +71,8 @@ public class TPSConnectorAddCLI extends CLI { String tpsHost = cmd.getOptionValue("host"); String tpsPort = cmd.getOptionValue("port"); - tpsConnectorCLI.tpsConnectorClient.createConnector(tpsHost, tpsPort); + TPSConnectorClient tpsConnectorClient = tpsConnectorCLI.getTPSConnectorClient(); + tpsConnectorClient.createConnector(tpsHost, tpsPort); MainCLI.printMessage("Added TPS connector \""+tpsHost + ":" + tpsPort +"\""); } diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorCLI.java index 06527a78f..762dd6459 100644 --- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorCLI.java @@ -19,6 +19,7 @@ package com.netscape.cmstools.system; import org.jboss.resteasy.plugins.providers.atom.Link; +import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.system.TPSConnectorClient; import com.netscape.certsrv.system.TPSConnectorData; import com.netscape.cmstools.cli.CLI; @@ -43,12 +44,14 @@ public class TPSConnectorCLI extends CLI { return parent.getFullName() + "-" + name; } - public void execute(String[] args) throws Exception { + public TPSConnectorClient getTPSConnectorClient() throws Exception { - client = parent.getClient(); + if (tpsConnectorClient != null) return tpsConnectorClient; + + PKIClient client = getClient(); tpsConnectorClient = (TPSConnectorClient)parent.getClient("tpsconnector"); - super.execute(args); + return tpsConnectorClient; } public static void printConnectorInfo(TPSConnectorData data) { diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java index d52c34412..d18400c3f 100644 --- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java @@ -23,6 +23,7 @@ import java.util.Collection; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; +import com.netscape.certsrv.system.TPSConnectorClient; import com.netscape.certsrv.system.TPSConnectorCollection; import com.netscape.certsrv.system.TPSConnectorData; import com.netscape.cmstools.cli.CLI; @@ -77,7 +78,8 @@ public class TPSConnectorFindCLI extends CLI { s = cmd.getOptionValue("size"); Integer size = s == null ? null : Integer.valueOf(s); - TPSConnectorCollection result = tpsConnectorCLI.tpsConnectorClient.findConnectors(start, size); + TPSConnectorClient tpsConnectorClient = tpsConnectorCLI.getTPSConnectorClient(); + TPSConnectorCollection result = tpsConnectorClient.findConnectors(start, size); MainCLI.printMessage(result.getTotal() + " entries matched"); if (result.getTotal() == 0) return; diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorModCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorModCLI.java index 2bc2a644f..1d1bd6607 100644 --- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorModCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorModCLI.java @@ -5,6 +5,7 @@ import java.util.Arrays; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; +import com.netscape.certsrv.system.TPSConnectorClient; import com.netscape.certsrv.system.TPSConnectorData; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -57,7 +58,8 @@ public class TPSConnectorModCLI extends CLI { data.setHost(cmd.getOptionValue("host")); data.setPort(cmd.getOptionValue("port")); - data = tpsConnectorCLI.tpsConnectorClient.modifyConnector(connID, data); + TPSConnectorClient tpsConnectorClient = tpsConnectorCLI.getTPSConnectorClient(); + data = tpsConnectorClient.modifyConnector(connID, data); MainCLI.printMessage("Modified TPS connector \""+connID +"\""); diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorRemoveCLI.java index 96432cf3b..c708f7f0f 100644 --- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorRemoveCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorRemoveCLI.java @@ -22,6 +22,7 @@ import java.util.Arrays; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; +import com.netscape.certsrv.system.TPSConnectorClient; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -70,7 +71,8 @@ public class TPSConnectorRemoveCLI extends CLI { String tpsHost = cmd.getOptionValue("host"); String tpsPort = cmd.getOptionValue("port"); - tpsConnectorCLI.tpsConnectorClient.deleteConnector(tpsHost, tpsPort); + TPSConnectorClient tpsConnectorClient = tpsConnectorCLI.getTPSConnectorClient(); + tpsConnectorClient.deleteConnector(tpsHost, tpsPort); MainCLI.printMessage("Removed TPS connector \""+tpsHost + ":" + tpsPort +"\""); } diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorShowCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorShowCLI.java index c0f09e4f0..8d37ffe5a 100644 --- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorShowCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorShowCLI.java @@ -22,6 +22,7 @@ import java.util.Arrays; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; +import com.netscape.certsrv.system.TPSConnectorClient; import com.netscape.certsrv.system.TPSConnectorData; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -73,7 +74,8 @@ public class TPSConnectorShowCLI extends CLI { String tpsHost = cmd.getOptionValue("host"); String tpsPort = cmd.getOptionValue("port", "443"); - TPSConnectorData data = tpsConnectorCLI.tpsConnectorClient.getConnector(tpsHost, tpsPort); + TPSConnectorClient tpsConnectorClient = tpsConnectorCLI.getTPSConnectorClient(); + TPSConnectorData data = tpsConnectorClient.getConnector(tpsHost, tpsPort); MainCLI.printMessage("TPS Connector \"" + tpsHost + ":" + tpsPort + "\""); TPSConnectorCLI.printConnectorInfo(data); |