Renamed TPS connection to TPS connector (part 3).

The TPS connection client library has been renamed to TPS connector.

Ticket #977

6 files changed, 33 insertions, 33 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorAddCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorAddCLI.java
index 72653dac3..acc55f4c9 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorAddCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorAddCLI.java
@@ -27,7 +27,7 @@ import java.util.Arrays;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
-import com.netscape.certsrv.tps.connection.ConnectionData;
+import com.netscape.certsrv.tps.connector.ConnectorData;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 
@@ -85,7 +85,7 @@ public class ConnectorAddCLI extends CLI {
 
         String input = cmd.getOptionValue("input");
 
-        ConnectionData connectionData;
+        ConnectorData connectorData;
 
         try (BufferedReader in = new BufferedReader(new FileReader(input));
             StringWriter sw = new StringWriter();
@@ -96,13 +96,13 @@ public class ConnectorAddCLI extends CLI {
                 out.println(line);
             }
 
-            connectionData = ConnectionData.valueOf(sw.toString());
+            connectorData = ConnectorData.valueOf(sw.toString());
         }
 
-        connectionData = connectorCLI.connectionClient.addConnection(connectionData);
+        connectorData = connectorCLI.connectorClient.addConnector(connectorData);
 
-        MainCLI.printMessage("Added connector \"" + connectionData.getID() + "\"");
+        MainCLI.printMessage("Added connector \"" + connectorData.getID() + "\"");
 
-        ConnectorCLI.printConnectionData(connectionData, true);
+        ConnectorCLI.printConnectorData(connectorData, true);
     }
 }
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorCLI.java
index 73422f12e..6b2653825 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorCLI.java
@@ -23,8 +23,8 @@ import java.util.Map;
 
 import org.jboss.resteasy.plugins.providers.atom.Link;
 
-import com.netscape.certsrv.tps.connection.ConnectionClient;
-import com.netscape.certsrv.tps.connection.ConnectionData;
+import com.netscape.certsrv.tps.connector.ConnectorData;
+import com.netscape.certsrv.tps.connector.ConnectorClient;
 import com.netscape.cmstools.cli.CLI;
 
 /**
@@ -32,7 +32,7 @@ import com.netscape.cmstools.cli.CLI;
  */
 public class ConnectorCLI extends CLI {
 
-    public ConnectionClient connectionClient;
+    public ConnectorClient connectorClient;
 
     public ConnectorCLI(CLI parent) {
         super("connector", "Connector management commands", parent);
@@ -47,18 +47,18 @@ public class ConnectorCLI extends CLI {
     public void execute(String[] args) throws Exception {
 
         client = parent.getClient();
-        connectionClient = (ConnectionClient)parent.getClient("connection");
+        connectorClient = (ConnectorClient)parent.getClient("connector");
 
         super.execute(args);
     }
 
-    public static void printConnectionData(ConnectionData connectionData, boolean showProperties) throws IOException {
-        System.out.println("  Connector ID: " + connectionData.getID());
-        if (connectionData.getStatus() != null) System.out.println("  Status: " + connectionData.getStatus());
+    public static void printConnectorData(ConnectorData connectorData, boolean showProperties) throws IOException {
+        System.out.println("  Connector ID: " + connectorData.getID());
+        if (connectorData.getStatus() != null) System.out.println("  Status: " + connectorData.getStatus());
 
         if (showProperties) {
             System.out.println("  Properties:");
-            Map<String, String> properties = connectionData.getProperties();
+            Map<String, String> properties = connectorData.getProperties();
             if (properties != null) {
                 for (String name : properties.keySet()) {
                     String value = properties.get(name);
@@ -67,7 +67,7 @@ public class ConnectorCLI extends CLI {
             }
         }
 
-        Link link = connectionData.getLink();
+        Link link = connectorData.getLink();
         if (verbose && link != null) {
             System.out.println("  Link: " + link.getHref());
         }
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorFindCLI.java
index cc93fbb94..8e1e39f20 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorFindCLI.java
@@ -24,8 +24,8 @@ import java.util.Collection;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
-import com.netscape.certsrv.tps.connection.ConnectionCollection;
-import com.netscape.certsrv.tps.connection.ConnectionData;
+import com.netscape.certsrv.tps.connector.ConnectorCollection;
+import com.netscape.certsrv.tps.connector.ConnectorData;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 
@@ -85,15 +85,15 @@ public class ConnectorFindCLI extends CLI {
         s = cmd.getOptionValue("size");
         Integer size = s == null ? null : Integer.valueOf(s);
 
-        ConnectionCollection result = connectorCLI.connectionClient.findConnections(filter, start, size);
+        ConnectorCollection result = connectorCLI.connectorClient.findConnectors(filter, start, size);
 
         MainCLI.printMessage(result.getTotal() + " entries matched");
         if (result.getTotal() == 0) return;
 
-        Collection<ConnectionData> connections = result.getEntries();
+        Collection<ConnectorData> connectors = result.getEntries();
         boolean first = true;
 
-        for (ConnectionData connectionData : connections) {
+        for (ConnectorData connectorData : connectors) {
 
             if (first) {
                 first = false;
@@ -101,9 +101,9 @@ public class ConnectorFindCLI extends CLI {
                 System.out.println();
             }
 
-            ConnectorCLI.printConnectionData(connectionData, false);
+            ConnectorCLI.printConnectorData(connectorData, false);
         }
 
-        MainCLI.printMessage("Number of entries returned " + connections.size());
+        MainCLI.printMessage("Number of entries returned " + connectors.size());
     }
 }
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorModifyCLI.java
index f92e7c153..8180934dc 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorModifyCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorModifyCLI.java
@@ -27,7 +27,7 @@ import java.util.Arrays;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
-import com.netscape.certsrv.tps.connection.ConnectionData;
+import com.netscape.certsrv.tps.connector.ConnectorData;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 
@@ -90,7 +90,7 @@ public class ConnectorModifyCLI extends CLI {
         String action = cmd.getOptionValue("action", "update");
         String input = cmd.getOptionValue("input");
 
-        ConnectionData connectionData;
+        ConnectorData connectorData;
 
         if (action.equals("update")) {
 
@@ -110,17 +110,17 @@ public class ConnectorModifyCLI extends CLI {
                     out.println(line);
                 }
 
-                connectionData = ConnectionData.valueOf(sw.toString());
+                connectorData = ConnectorData.valueOf(sw.toString());
             }
 
-            connectionData = connectorCLI.connectionClient.updateConnection(connectorID, connectionData);
+            connectorData = connectorCLI.connectorClient.updateConnector(connectorID, connectorData);
 
         } else { // other actions
-            connectionData = connectorCLI.connectionClient.changeConnectionStatus(connectorID, action);
+            connectorData = connectorCLI.connectorClient.changeConnectorStatus(connectorID, action);
         }
 
         MainCLI.printMessage("Modified connector \"" + connectorID + "\"");
 
-        ConnectorCLI.printConnectionData(connectionData, true);
+        ConnectorCLI.printConnectorData(connectorData, true);
     }
 }
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorRemoveCLI.java
index d8c9b2a71..97df95230 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorRemoveCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorRemoveCLI.java
@@ -70,7 +70,7 @@ public class ConnectorRemoveCLI extends CLI {
 
         String connectorID = args[0];
 
-        connectorCLI.connectionClient.removeConnection(connectorID);
+        connectorCLI.connectorClient.removeConnector(connectorID);
 
         MainCLI.printMessage("Deleted connector \"" + connectorID + "\"");
     }
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorShowCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorShowCLI.java
index 57eac7d33..dacccf2e2 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorShowCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/connector/ConnectorShowCLI.java
@@ -25,7 +25,7 @@ import java.util.Arrays;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
-import com.netscape.certsrv.tps.connection.ConnectionData;
+import com.netscape.certsrv.tps.connector.ConnectorData;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 
@@ -83,15 +83,15 @@ public class ConnectorShowCLI extends CLI {
         String connectorID = args[0];
         String output = cmd.getOptionValue("output");
 
-        ConnectionData connectionData = connectorCLI.connectionClient.getConnection(connectorID);
+        ConnectorData connectorData = connectorCLI.connectorClient.getConnector(connectorID);
 
         if (output == null) {
             MainCLI.printMessage("Connector \"" + connectorID + "\"");
-            ConnectorCLI.printConnectionData(connectionData, true);
+            ConnectorCLI.printConnectorData(connectorData, true);
 
         } else {
             try (PrintWriter out = new PrintWriter(new FileWriter(output))) {
-                out.println(connectionData);
+                out.println(connectorData);
             }
             MainCLI.printMessage("Stored connector \"" + connectorID + "\" into " + output);
         }