Renamed TPS connection to TPS connector (part 3).

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

Ticket #977

5 files changed, 45 insertions, 45 deletions

diff --git a/base/common/src/com/netscape/certsrv/tps/TPSClient.java b/base/common/src/com/netscape/certsrv/tps/TPSClient.java
index 7f65784c9..da0022520 100644
--- a/base/common/src/com/netscape/certsrv/tps/TPSClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/TPSClient.java
@@ -28,7 +28,7 @@ import com.netscape.certsrv.selftests.SelfTestClient;
 import com.netscape.certsrv.tps.authenticator.AuthenticatorClient;
 import com.netscape.certsrv.tps.cert.TPSCertClient;
 import com.netscape.certsrv.tps.config.ConfigClient;
-import com.netscape.certsrv.tps.connection.ConnectionClient;
+import com.netscape.certsrv.tps.connector.ConnectorClient;
 import com.netscape.certsrv.tps.profile.ProfileClient;
 import com.netscape.certsrv.tps.profile.ProfileMappingClient;
 import com.netscape.certsrv.tps.token.TokenClient;
@@ -50,7 +50,7 @@ public class TPSClient extends SubsystemClient {
         addClient(new AuthenticatorClient(client, name));
         addClient(new TPSCertClient(client, name));
         addClient(new ConfigClient(client, name));
-        addClient(new ConnectionClient(client, name));
+        addClient(new ConnectorClient(client, name));
         addClient(new GroupClient(client, name));
         addClient(new ProfileClient(client, name));
         addClient(new ProfileMappingClient(client, name));
diff --git a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionResource.java b/base/common/src/com/netscape/certsrv/tps/connector/ConnectionResource.java
index 216e3793b..1fb9fa33c 100644
--- a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/connector/ConnectionResource.java
@@ -15,7 +15,7 @@
 // (C) 2013 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.tps.connection;
+package com.netscape.certsrv.tps.connector;
 
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -41,7 +41,7 @@ import com.netscape.certsrv.base.PATCH;
 public interface ConnectionResource {
 
     @GET
-    @ClientResponseType(entityType=ConnectionCollection.class)
+    @ClientResponseType(entityType=ConnectorCollection.class)
     public Response findConnections(
             @QueryParam("filter") String filter,
             @QueryParam("start") Integer start,
@@ -49,26 +49,26 @@ public interface ConnectionResource {
 
     @GET
     @Path("{connectionID}")
-    @ClientResponseType(entityType=ConnectionData.class)
+    @ClientResponseType(entityType=ConnectorData.class)
     public Response getConnection(@PathParam("connectionID") String connectionID);
 
     @POST
     @ACLMapping("connections.add")
-    @ClientResponseType(entityType=ConnectionData.class)
-    public Response addConnection(ConnectionData connectionData);
+    @ClientResponseType(entityType=ConnectorData.class)
+    public Response addConnection(ConnectorData connectorData);
 
     @PATCH
     @Path("{connectionID}")
     @ACLMapping("connections.modify")
-    @ClientResponseType(entityType=ConnectionData.class)
+    @ClientResponseType(entityType=ConnectorData.class)
     public Response updateConnection(
             @PathParam("connectionID") String connectionID,
-            ConnectionData connectionData);
+            ConnectorData connectorData);
 
     @POST
     @Path("{connectionID}")
     @ACLMapping("connections.approve")
-    @ClientResponseType(entityType=ConnectionData.class)
+    @ClientResponseType(entityType=ConnectorData.class)
     public Response changeConnectionStatus(
             @PathParam("connectionID") String connectionID,
             @QueryParam("action") String action);
diff --git a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionClient.java b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorClient.java
index aaf9e6399..4a86f1eae 100644
--- a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorClient.java
@@ -15,7 +15,7 @@
 //(C) 2013 Red Hat, Inc.
 //All rights reserved.
 //--- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.tps.connection;
+package com.netscape.certsrv.tps.connector;
 
 import java.net.URISyntaxException;
 
@@ -27,12 +27,12 @@ import com.netscape.certsrv.client.PKIClient;
 /**
  * @author Endi S. Dewata
  */
-public class ConnectionClient extends Client {
+public class ConnectorClient extends Client {
 
     public ConnectionResource resource;
 
-    public ConnectionClient(PKIClient client, String subsystem) throws URISyntaxException {
-        super(client, subsystem, "connection");
+    public ConnectorClient(PKIClient client, String subsystem) throws URISyntaxException {
+        super(client, subsystem, "connector");
         init();
     }
 
@@ -40,33 +40,33 @@ public class ConnectionClient extends Client {
         resource = createProxy(ConnectionResource.class);
     }
 
-    public ConnectionCollection findConnections(String filter, Integer start, Integer size) {
+    public ConnectorCollection findConnectors(String filter, Integer start, Integer size) {
         Response response = resource.findConnections(filter, start, size);
-        return client.getEntity(response, ConnectionCollection.class);
+        return client.getEntity(response, ConnectorCollection.class);
     }
 
-    public ConnectionData getConnection(String connectionID) {
-        Response response = resource.getConnection(connectionID);
-        return client.getEntity(response, ConnectionData.class);
+    public ConnectorData getConnector(String connectorID) {
+        Response response = resource.getConnection(connectorID);
+        return client.getEntity(response, ConnectorData.class);
     }
 
-    public ConnectionData addConnection(ConnectionData connectionData) {
-        Response response = resource.addConnection(connectionData);
-        return client.getEntity(response, ConnectionData.class);
+    public ConnectorData addConnector(ConnectorData connectorData) {
+        Response response = resource.addConnection(connectorData);
+        return client.getEntity(response, ConnectorData.class);
     }
 
-    public ConnectionData updateConnection(String connectionID, ConnectionData connectionData) {
-        Response response = resource.updateConnection(connectionID, connectionData);
-        return client.getEntity(response, ConnectionData.class);
+    public ConnectorData updateConnector(String connectorID, ConnectorData connectorData) {
+        Response response = resource.updateConnection(connectorID, connectorData);
+        return client.getEntity(response, ConnectorData.class);
     }
 
-    public ConnectionData changeConnectionStatus(String connectionID, String action) {
-        Response response = resource.changeConnectionStatus(connectionID, action);
-        return client.getEntity(response, ConnectionData.class);
+    public ConnectorData changeConnectorStatus(String connectorID, String action) {
+        Response response = resource.changeConnectionStatus(connectorID, action);
+        return client.getEntity(response, ConnectorData.class);
     }
 
-    public void removeConnection(String connectionID) {
-        Response response = resource.removeConnection(connectionID);
+    public void removeConnector(String connectorID) {
+        Response response = resource.removeConnection(connectorID);
         client.getEntity(response, Void.class);
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionCollection.java b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorCollection.java
index 9d94ee08b..64f301c76 100644
--- a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionCollection.java
+++ b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorCollection.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package com.netscape.certsrv.tps.connection;
+package com.netscape.certsrv.tps.connector;
 
 import java.util.Collection;
 
@@ -28,11 +28,11 @@ import com.netscape.certsrv.base.DataCollection;
 /**
  * @author Endi S. Dewata
  */
-@XmlRootElement(name="Connections")
-public class ConnectionCollection extends DataCollection<ConnectionData> {
+@XmlRootElement(name="Connectors")
+public class ConnectorCollection extends DataCollection<ConnectorData> {
 
     @XmlElementRef
-    public Collection<ConnectionData> getEntries() {
+    public Collection<ConnectorData> getEntries() {
         return super.getEntries();
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionData.java b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorData.java
index 0d1224d3c..3e86f6000 100644
--- a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionData.java
+++ b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorData.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package com.netscape.certsrv.tps.connection;
+package com.netscape.certsrv.tps.connector;
 
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -42,18 +42,18 @@ import org.jboss.resteasy.plugins.providers.atom.Link;
 /**
  * @author Endi S. Dewata
  */
-@XmlRootElement(name="Connection")
+@XmlRootElement(name="Connector")
 @XmlAccessorType(XmlAccessType.NONE)
-public class ConnectionData {
+public class ConnectorData {
 
     public static Marshaller marshaller;
     public static Unmarshaller unmarshaller;
 
     static {
         try {
-            marshaller = JAXBContext.newInstance(ConnectionData.class).createMarshaller();
+            marshaller = JAXBContext.newInstance(ConnectorData.class).createMarshaller();
             marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-            unmarshaller = JAXBContext.newInstance(ConnectionData.class).createUnmarshaller();
+            unmarshaller = JAXBContext.newInstance(ConnectorData.class).createUnmarshaller();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -157,7 +157,7 @@ public class ConnectionData {
             return false;
         if (getClass() != obj.getClass())
             return false;
-        ConnectionData other = (ConnectionData) obj;
+        ConnectorData other = (ConnectorData) obj;
         if (id == null) {
             if (other.id != null)
                 return false;
@@ -192,9 +192,9 @@ public class ConnectionData {
         }
     }
 
-    public static ConnectionData valueOf(String string) throws Exception {
+    public static ConnectorData valueOf(String string) throws Exception {
         try {
-            return (ConnectionData)unmarshaller.unmarshal(new StringReader(string));
+            return (ConnectorData)unmarshaller.unmarshal(new StringReader(string));
         } catch (Exception e) {
             return null;
         }
@@ -202,8 +202,8 @@ public class ConnectionData {
 
     public static void main(String args[]) throws Exception {
 
-        ConnectionData before = new ConnectionData();
-        before.setID("connection1");
+        ConnectorData before = new ConnectorData();
+        before.setID("connector1");
         before.setStatus("ENABLED");
 
         Map<String, String> properties = new LinkedHashMap<String, String>();
@@ -214,7 +214,7 @@ public class ConnectionData {
         String string = before.toString();
         System.out.println(string);
 
-        ConnectionData after = ConnectionData.valueOf(string);
+        ConnectorData after = ConnectorData.valueOf(string);
         System.out.println(before.equals(after));
     }
 }