From 80aff97bedf8c2ee5f58209f36f18ebbc475ccb1 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Fri, 13 Apr 2012 13:51:32 -0400 Subject: RESTful servlet to configure system in a single servlet. Installation code common to the panels and the installation servlet are extracted to a ConfigurationUtils file. The panel code will be cleaned up to use the code in this class in a later commit. Contains restful client and test driver code. The test driver code should be modified and placed in a junit/system test framework. Installation has been tested to work with the following installations: master CA, clone CA, KRA, OCSP, TKS, subordinate CA, CA signed by external CA (parts 1 and 2). Ticket #155 --- base/common/src/CMakeLists.txt | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'base/common/src/CMakeLists.txt') diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt index 43f3a5a77..3cfd3ba01 100644 --- a/base/common/src/CMakeLists.txt +++ b/base/common/src/CMakeLists.txt @@ -76,6 +76,13 @@ find_file(RESTEASY_JAXRS_JAR /usr/share/java/resteasy ) +find_file(HTTPCLIENT_JAR + NAMES + httpclient.jar + PATHS + /usr/share/java/httpcomponents +) + set(pki-certsrv_java_SRCS com/netscape/certsrv/apps/ICommandQueue.java com/netscape/certsrv/apps/CMS.java @@ -647,6 +654,19 @@ set(pki-cms_java_SRCS com/netscape/cms/servlet/csadmin/DownloadPKCS12.java com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java com/netscape/cms/servlet/csadmin/NamePanel.java + com/netscape/cms/servlet/csadmin/ConfigurationUtils.java + com/netscape/cms/servlet/csadmin/SystemConfigurationResource.java + com/netscape/cms/servlet/csadmin/SystemConfigurationResourceService.java + com/netscape/cms/servlet/csadmin/ConfigurationRESTClient.java + com/netscape/cms/servlet/csadmin/ConfigurationErrorInterceptor.java + com/netscape/cms/servlet/csadmin/model/CertData.java + com/netscape/cms/servlet/csadmin/model/ConfigurationData.java + com/netscape/cms/servlet/csadmin/model/ConfigurationResponseData.java + com/netscape/cms/servlet/csadmin/model/DomainInfo.java + com/netscape/cms/servlet/csadmin/model/InstallToken.java + com/netscape/cms/servlet/csadmin/model/InstallTokenRequest.java + com/netscape/cms/servlet/csadmin/model/SecurityDomainHost.java + com/netscape/cms/servlet/csadmin/model/SecurityDomainHostList.java com/netscape/cms/servlet/wizard/WizardServlet.java com/netscape/cms/servlet/wizard/IWizardPanel.java com/netscape/cms/servlet/processors/PKCS10Processor.java @@ -1042,7 +1062,7 @@ set(pki-cmsbundle_RCS set(CMAKE_JAVA_INCLUDE_PATH ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR} - ${JSS_JAR} ${COMMONS_CODEC_JAR} ${TOMCAT_CATALINA_JAR} ${SYMKEY_JAR} ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR}) + ${JSS_JAR} ${COMMONS_CODEC_JAR} ${TOMCAT_CATALINA_JAR} ${SYMKEY_JAR} ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${HTTPCLIENT_JAR}) set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION}) -- cgit