diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-11 04:53:30 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-15 12:07:04 -0500 |
commit | 56768d1bd274228a391ac8a4272ab9ccf5ac3e51 (patch) | |
tree | 470e4d05ea650e9475c82265182557bd240ef3b5 /base/ca | |
parent | c70859039d60db53a1966f3b1781defd032a4062 (diff) | |
download | pki-56768d1bd274228a391ac8a4272ab9ccf5ac3e51.tar.gz pki-56768d1bd274228a391ac8a4272ab9ccf5ac3e51.tar.xz pki-56768d1bd274228a391ac8a4272ab9ccf5ac3e51.zip |
Cleaned up REST client class names.
The REST client classes have been renamed for better clarity
and consistency.
Ticket #259
Diffstat (limited to 'base/ca')
-rw-r--r-- | base/ca/functional/src/com/netscape/cms/servlet/test/CAClient.java (renamed from base/ca/functional/src/com/netscape/cms/servlet/test/CARestClient.java) | 6 | ||||
-rw-r--r-- | base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/base/ca/functional/src/com/netscape/cms/servlet/test/CARestClient.java b/base/ca/functional/src/com/netscape/cms/servlet/test/CAClient.java index 24ce21277..cc6aa19d5 100644 --- a/base/ca/functional/src/com/netscape/cms/servlet/test/CARestClient.java +++ b/base/ca/functional/src/com/netscape/cms/servlet/test/CAClient.java @@ -27,7 +27,7 @@ import com.netscape.cms.servlet.cert.CertResource; import com.netscape.cms.servlet.cert.model.CertDataInfos; import com.netscape.cms.servlet.cert.model.CertSearchData; import com.netscape.cms.servlet.cert.model.CertificateData; -import com.netscape.cms.servlet.csadmin.CMSRestClient; +import com.netscape.cms.servlet.csadmin.PKIClient; import com.netscape.cms.servlet.profile.ProfileResource; import com.netscape.cms.servlet.profile.model.ProfileData; import com.netscape.cms.servlet.profile.model.ProfileDataInfos; @@ -37,13 +37,13 @@ import com.netscape.cms.servlet.request.model.CertRequestInfo; import com.netscape.cms.servlet.request.model.CertRequestInfos; import com.netscape.cms.servlet.request.model.EnrollmentRequestData; -public class CARestClient extends CMSRestClient { +public class CAClient extends PKIClient { private CertResource certClient; private CertRequestResource certRequestClient; private ProfileResource profileClient; - public CARestClient(ClientConfig config) throws URISyntaxException { + public CAClient(ClientConfig config) throws URISyntaxException { super(config); certRequestClient = createProxy(CertRequestResource.class); diff --git a/base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java b/base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java index 8fa4b9bb4..185f01f24 100644 --- a/base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java +++ b/base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java @@ -148,13 +148,13 @@ public class CATest { log("Exception in logging into token:" + e.toString()); } - CARestClient client; + CAClient client; try { ClientConfig config = new ClientConfig(); config.setServerURI(protocol + "://" + host + ":" + port + "/ca"); config.setCertNickname(clientCertNickname); - client = new CARestClient(config); + client = new CAClient(config); } catch (Exception e) { e.printStackTrace(); return; @@ -275,7 +275,7 @@ public class CATest { } - private static void enrollAndApproveCertRequest(CARestClient client, EnrollmentRequestData data) { + private static void enrollAndApproveCertRequest(CAClient client, EnrollmentRequestData data) { CertRequestInfos reqInfo = null; try { reqInfo = client.enrollCertificate(data); @@ -295,7 +295,7 @@ public class CATest { } } - private static void enrollCertRequest(CARestClient client, EnrollmentRequestData data) { + private static void enrollCertRequest(CAClient client, EnrollmentRequestData data) { CertRequestInfos reqInfo = null; try { reqInfo = client.enrollCertificate(data); @@ -560,7 +560,7 @@ public class CATest { private static void usage(Options options) { HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp("CARestClient Test:", options); + formatter.printHelp("CAClient Test:", options); System.exit(1); } |