diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-18 02:30:44 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-29 23:42:53 -0500 |
commit | 60835ed008586f85a22737d0161cb026f2dbffec (patch) | |
tree | 363e447f38aa7bfe9835955e7f1f7345228c14ff | |
parent | 88176c5c8caf146a1a408dc3a7f6b23e1a8e63b7 (diff) | |
download | pki-60835ed008586f85a22737d0161cb026f2dbffec.tar.gz pki-60835ed008586f85a22737d0161cb026f2dbffec.tar.xz pki-60835ed008586f85a22737d0161cb026f2dbffec.zip |
Moved REST CLI into pki-tools.
The pki-client.jar has been split and merged into pki-certsrv.jar
and pki-tools.jar. The REST client classes are now packaged in
com.netscape.certsrv.<component> packages. The REST CLI classes
are now packaged in com.netscape.cmstools.<component> packages.
The "pki" script has been moved into pki-tools RPM package.
Ticket #215
-rw-r--r-- | base/CMakeLists.txt | 6 | ||||
-rw-r--r-- | base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java | 4 | ||||
-rw-r--r-- | base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java | 4 | ||||
-rw-r--r-- | base/common/src/CMakeLists.txt | 47 | ||||
-rw-r--r-- | base/common/src/com/netscape/certsrv/ca/CAClient.java (renamed from base/common/src/com/netscape/cms/client/ca/CAClient.java) | 6 | ||||
-rw-r--r-- | base/common/src/com/netscape/certsrv/cert/CertClient.java (renamed from base/common/src/com/netscape/cms/client/cert/CertClient.java) | 17 | ||||
-rw-r--r-- | base/common/src/com/netscape/certsrv/client/ClientConfig.java (renamed from base/common/src/com/netscape/cms/client/ClientConfig.java) | 2 | ||||
-rw-r--r-- | base/common/src/com/netscape/certsrv/client/PKIClient.java (renamed from base/common/src/com/netscape/cms/client/PKIClient.java) | 2 | ||||
-rw-r--r-- | base/common/src/com/netscape/certsrv/client/PKIErrorInterceptor.java (renamed from base/common/src/com/netscape/cms/client/PKIErrorInterceptor.java) | 2 | ||||
-rw-r--r-- | base/common/src/com/netscape/certsrv/group/GroupClient.java (renamed from base/common/src/com/netscape/cms/client/group/GroupClient.java) | 12 | ||||
-rw-r--r-- | base/common/src/com/netscape/certsrv/kra/DRMClient.java (renamed from base/common/src/com/netscape/cms/client/kra/DRMClient.java) | 12 | ||||
-rw-r--r-- | base/common/src/com/netscape/certsrv/system/SystemCertResource.java (renamed from base/common/src/com/netscape/certsrv/system/SystemCertificateResource.java) | 2 | ||||
-rw-r--r-- | base/common/src/com/netscape/certsrv/system/SystemConfigClient.java (renamed from base/common/src/com/netscape/cms/client/system/SystemConfigClient.java) | 11 | ||||
-rw-r--r-- | base/common/src/com/netscape/certsrv/user/UserClient.java (renamed from base/common/src/com/netscape/cms/client/user/UserClient.java) | 12 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java | 4 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java | 4 | ||||
-rw-r--r-- | base/deploy/src/scriptlets/configuration.jy | 2 | ||||
-rw-r--r-- | base/deploy/src/scriptlets/pkijython.py | 2 | ||||
-rw-r--r-- | base/java-tools/CMakeLists.txt | 12 | ||||
-rwxr-xr-x | base/java-tools/pki (renamed from base/setup/pki) | 4 | ||||
-rw-r--r-- | base/java-tools/src/CMakeLists.txt | 61 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java (renamed from base/common/src/com/netscape/cms/client/cert/CertCLI.java) | 7 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java (renamed from base/common/src/com/netscape/cms/client/cert/CertFindCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cert/CertHoldCLI.java (renamed from base/common/src/com/netscape/cms/client/cert/CertHoldCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cert/CertReleaseHoldCLI.java (renamed from base/common/src/com/netscape/cms/client/cert/CertReleaseHoldCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cert/CertRequestApproveCLI.java (renamed from base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cert/CertRequestReviewCLI.java (renamed from base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java (renamed from base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cert/CertRevokeCLI.java (renamed from base/common/src/com/netscape/cms/client/cert/CertRevokeCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cert/CertShowCLI.java (renamed from base/common/src/com/netscape/cms/client/cert/CertShowCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cli/CLI.java (renamed from base/common/src/com/netscape/cms/client/cli/CLI.java) | 2 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java (renamed from base/common/src/com/netscape/cms/client/cli/MainCLI.java) | 10 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/group/GroupAddCLI.java (renamed from base/common/src/com/netscape/cms/client/group/GroupAddCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/group/GroupAddMemberCLI.java (renamed from base/common/src/com/netscape/cms/client/group/GroupAddMemberCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java (renamed from base/common/src/com/netscape/cms/client/group/GroupCLI.java) | 7 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java (renamed from base/common/src/com/netscape/cms/client/group/GroupFindCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/group/GroupFindMemberCLI.java (renamed from base/common/src/com/netscape/cms/client/group/GroupFindMemberCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/group/GroupModifyCLI.java (renamed from base/common/src/com/netscape/cms/client/group/GroupModifyCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/group/GroupRemoveCLI.java (renamed from base/common/src/com/netscape/cms/client/group/GroupRemoveCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/group/GroupRemoveMemberCLI.java (renamed from base/common/src/com/netscape/cms/client/group/GroupRemoveMemberCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/group/GroupShowCLI.java (renamed from base/common/src/com/netscape/cms/client/group/GroupShowCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/group/GroupShowMemberCLI.java (renamed from base/common/src/com/netscape/cms/client/group/GroupShowMemberCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java (renamed from base/common/src/com/netscape/cms/client/user/UserAddCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/user/UserAddCertCLI.java (renamed from base/common/src/com/netscape/cms/client/user/UserAddCertCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/user/UserCLI.java (renamed from base/common/src/com/netscape/cms/client/user/UserCLI.java) | 7 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/user/UserFindCLI.java (renamed from base/common/src/com/netscape/cms/client/user/UserFindCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/user/UserFindCertCLI.java (renamed from base/common/src/com/netscape/cms/client/user/UserFindCertCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/user/UserModifyCLI.java (renamed from base/common/src/com/netscape/cms/client/user/UserModifyCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/user/UserRemoveCLI.java (renamed from base/common/src/com/netscape/cms/client/user/UserRemoveCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/user/UserRemoveCertCLI.java (renamed from base/common/src/com/netscape/cms/client/user/UserRemoveCertCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/user/UserShowCLI.java (renamed from base/common/src/com/netscape/cms/client/user/UserShowCLI.java) | 6 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/user/UserShowCertCLI.java (renamed from base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java) | 6 | ||||
-rw-r--r-- | base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java | 4 | ||||
-rw-r--r-- | base/setup/CMakeLists.txt | 1 | ||||
-rwxr-xr-x | scripts/compose_pki_core_packages | 2 | ||||
-rw-r--r-- | specs/pki-core.spec | 9 |
56 files changed, 218 insertions, 215 deletions
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 1c6e909ad..d8fcecdb6 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -3,13 +3,13 @@ project(base) # The order is important! if (APPLICATION_FLAVOR_PKI_CORE) add_subdirectory(test) - add_subdirectory(deploy) add_subdirectory(setup) add_subdirectory(symkey) - add_subdirectory(native-tools) add_subdirectory(util) - add_subdirectory(java-tools) add_subdirectory(common) + add_subdirectory(native-tools) + add_subdirectory(java-tools) + add_subdirectory(deploy) add_subdirectory(selinux) add_subdirectory(ca) add_subdirectory(kra) 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 b00084d42..59293e81c 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 @@ -33,6 +33,7 @@ import org.mozilla.jss.crypto.AlreadyInitializedException; import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.util.Password; +import com.netscape.certsrv.ca.CAClient; import com.netscape.certsrv.cert.CertData; import com.netscape.certsrv.cert.CertDataInfo; import com.netscape.certsrv.cert.CertDataInfos; @@ -42,6 +43,7 @@ import com.netscape.certsrv.cert.CertRequestInfo; import com.netscape.certsrv.cert.CertRequestInfos; import com.netscape.certsrv.cert.CertReviewResponse; import com.netscape.certsrv.cert.CertSearchRequest; +import com.netscape.certsrv.client.ClientConfig; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.certsrv.profile.ProfileData; import com.netscape.certsrv.profile.ProfileDataInfo; @@ -49,8 +51,6 @@ import com.netscape.certsrv.profile.ProfileDataInfos; import com.netscape.certsrv.profile.ProfileInput; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestNotFoundException; -import com.netscape.cms.client.ClientConfig; -import com.netscape.cms.client.ca.CAClient; public class CATest { diff --git a/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java b/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java index 462137ec7..c23081513 100644 --- a/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java +++ b/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java @@ -56,11 +56,11 @@ import org.mozilla.jss.pkix.primitive.Name; import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; import org.mozilla.jss.util.Password; +import com.netscape.certsrv.client.ClientConfig; import com.netscape.certsrv.system.ConfigurationRequest; import com.netscape.certsrv.system.ConfigurationResponse; import com.netscape.certsrv.system.SystemCertData; -import com.netscape.cms.client.ClientConfig; -import com.netscape.cms.client.system.SystemConfigClient; +import com.netscape.certsrv.system.SystemConfigClient; import com.netscape.cmsutil.util.Utils; /** diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt index fc6204b2a..dc61b4ca7 100644 --- a/base/common/src/CMakeLists.txt +++ b/base/common/src/CMakeLists.txt @@ -30,13 +30,6 @@ find_file(COMMONS_HTTPCLIENT_JAR /usr/share/java ) -find_file(APACHE_COMMONS_CLI_JAR - NAMES - apache-commons-cli.jar - PATHS - /usr/share/java -) - find_file(APACHE_COMMONS_LANG_JAR NAMES apache-commons-lang.jar @@ -133,7 +126,7 @@ javac(pki-certsrv-classes ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR} ${JSS_JAR} ${COMMONS_CODEC_JAR} ${COMMONS_HTTPCLIENT_JAR} - ${APACHE_COMMONS_CLI_JAR} ${APACHE_COMMONS_LANG_JAR} + ${APACHE_COMMONS_LANG_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR} ${SYMKEY_JAR} ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} ${HTTPCLIENT_JAR} ${HTTPCORE_JAR} @@ -182,7 +175,7 @@ javac(pki-cms-classes ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR} ${JSS_JAR} ${COMMONS_CODEC_JAR} ${COMMONS_HTTPCLIENT_JAR} - ${APACHE_COMMONS_CLI_JAR} ${APACHE_COMMONS_LANG_JAR} + ${APACHE_COMMONS_LANG_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR} ${SYMKEY_JAR} ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} ${HTTPCLIENT_JAR} ${HTTPCORE_JAR} @@ -233,7 +226,7 @@ if(WITH_JAVADOC) ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR} ${JSS_JAR} ${COMMONS_CODEC_JAR} ${COMMONS_HTTPCLIENT_JAR} - ${APACHE_COMMONS_CLI_JAR} ${APACHE_COMMONS_LANG_JAR} + ${APACHE_COMMONS_LANG_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR} ${SYMKEY_JAR} ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} ${HTTPCLIENT_JAR} ${HTTPCORE_JAR} @@ -264,7 +257,7 @@ javac(pki-cmscore-classes ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR} ${JSS_JAR} ${COMMONS_CODEC_JAR} ${COMMONS_HTTPCLIENT_JAR} - ${APACHE_COMMONS_CLI_JAR} ${APACHE_COMMONS_LANG_JAR} + ${APACHE_COMMONS_LANG_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR} ${SYMKEY_JAR} ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} ${HTTPCLIENT_JAR} ${HTTPCORE_JAR} @@ -334,35 +327,3 @@ install( ) set(PKI_CMSBUNDLE_JAR ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar INTERNAL "pki-cmsbundle jar file") - - -# build pki-client -jar(pki-client-jar - CREATE - ${CMAKE_BINARY_DIR}/dist/pki-client-${APPLICATION_VERSION}.jar - INPUT_DIR - ${CMAKE_BINARY_DIR}/classes - FILES - com/netscape/cms/client/*.class - DEPENDS - pki-cms -) - -link(pki-client - SOURCE - ${CMAKE_BINARY_DIR}/dist/pki-client.jar - DEST - pki-client-${APPLICATION_VERSION}.jar - DEPENDS - pki-client-jar -) - -install( - FILES - ${CMAKE_BINARY_DIR}/dist/pki-client.jar - ${CMAKE_BINARY_DIR}/dist/pki-client-${APPLICATION_VERSION}.jar - DESTINATION - ${JAVA_JAR_INSTALL_DIR}/pki -) - -set(PKI_CLIENT_JAR ${CMAKE_BINARY_DIR}/dist/pki-client.jar CACHE INTERNAL "pki-client jar file") diff --git a/base/common/src/com/netscape/cms/client/ca/CAClient.java b/base/common/src/com/netscape/certsrv/ca/CAClient.java index a72f95962..62e7a2438 100644 --- a/base/common/src/com/netscape/cms/client/ca/CAClient.java +++ b/base/common/src/com/netscape/certsrv/ca/CAClient.java @@ -15,7 +15,7 @@ //(C) 2012 Red Hat, Inc. //All rights reserved. //--- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.ca; +package com.netscape.certsrv.ca; import java.net.URISyntaxException; import java.util.Collection; @@ -29,13 +29,13 @@ import com.netscape.certsrv.cert.CertRequestResource; import com.netscape.certsrv.cert.CertResource; import com.netscape.certsrv.cert.CertReviewResponse; import com.netscape.certsrv.cert.CertSearchRequest; +import com.netscape.certsrv.client.ClientConfig; +import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.certsrv.profile.ProfileData; import com.netscape.certsrv.profile.ProfileDataInfos; import com.netscape.certsrv.profile.ProfileResource; import com.netscape.certsrv.request.RequestId; -import com.netscape.cms.client.ClientConfig; -import com.netscape.cms.client.PKIClient; public class CAClient extends PKIClient { diff --git a/base/common/src/com/netscape/cms/client/cert/CertClient.java b/base/common/src/com/netscape/certsrv/cert/CertClient.java index 1fcb9e40d..a92e63522 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertClient.java +++ b/base/common/src/com/netscape/certsrv/cert/CertClient.java @@ -15,25 +15,14 @@ //(C) 2012 Red Hat, Inc. //All rights reserved. //--- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.cert; +package com.netscape.certsrv.cert; import java.net.URISyntaxException; -import com.netscape.certsrv.cert.CertData; -import com.netscape.certsrv.cert.CertDataInfos; -import com.netscape.certsrv.cert.CertEnrollmentRequest; -import com.netscape.certsrv.cert.CertRequestInfo; -import com.netscape.certsrv.cert.CertRequestInfos; -import com.netscape.certsrv.cert.CertRequestResource; -import com.netscape.certsrv.cert.CertResource; -import com.netscape.certsrv.cert.CertReviewResponse; -import com.netscape.certsrv.cert.CertRevokeRequest; -import com.netscape.certsrv.cert.CertSearchRequest; -import com.netscape.certsrv.cert.CertUnrevokeRequest; +import com.netscape.certsrv.client.ClientConfig; +import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.certsrv.request.RequestId; -import com.netscape.cms.client.ClientConfig; -import com.netscape.cms.client.PKIClient; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/ClientConfig.java b/base/common/src/com/netscape/certsrv/client/ClientConfig.java index 7299d4d22..885b60a26 100644 --- a/base/common/src/com/netscape/cms/client/ClientConfig.java +++ b/base/common/src/com/netscape/certsrv/client/ClientConfig.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client; +package com.netscape.certsrv.client; import java.io.StringReader; import java.io.StringWriter; diff --git a/base/common/src/com/netscape/cms/client/PKIClient.java b/base/common/src/com/netscape/certsrv/client/PKIClient.java index ddd47dab6..5127c052d 100644 --- a/base/common/src/com/netscape/cms/client/PKIClient.java +++ b/base/common/src/com/netscape/certsrv/client/PKIClient.java @@ -1,4 +1,4 @@ -package com.netscape.cms.client; +package com.netscape.certsrv.client; import java.io.File; import java.io.IOException; diff --git a/base/common/src/com/netscape/cms/client/PKIErrorInterceptor.java b/base/common/src/com/netscape/certsrv/client/PKIErrorInterceptor.java index 445778db4..7d29b9fd9 100644 --- a/base/common/src/com/netscape/cms/client/PKIErrorInterceptor.java +++ b/base/common/src/com/netscape/certsrv/client/PKIErrorInterceptor.java @@ -15,7 +15,7 @@ // (C) 2007 Red Hat, Inc. // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client; +package com.netscape.certsrv.client; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; diff --git a/base/common/src/com/netscape/cms/client/group/GroupClient.java b/base/common/src/com/netscape/certsrv/group/GroupClient.java index b3784ef46..43d0ae5d5 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupClient.java +++ b/base/common/src/com/netscape/certsrv/group/GroupClient.java @@ -15,20 +15,14 @@ //(C) 2012 Red Hat, Inc. //All rights reserved. //--- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.group; +package com.netscape.certsrv.group; import java.net.URISyntaxException; import org.jboss.resteasy.client.ClientResponse; -import com.netscape.certsrv.group.GroupCollection; -import com.netscape.certsrv.group.GroupData; -import com.netscape.certsrv.group.GroupMemberCollection; -import com.netscape.certsrv.group.GroupMemberData; -import com.netscape.certsrv.group.GroupMemberResource; -import com.netscape.certsrv.group.GroupResource; -import com.netscape.cms.client.ClientConfig; -import com.netscape.cms.client.PKIClient; +import com.netscape.certsrv.client.ClientConfig; +import com.netscape.certsrv.client.PKIClient; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/kra/DRMClient.java b/base/common/src/com/netscape/certsrv/kra/DRMClient.java index 4bcf52987..3454e0995 100644 --- a/base/common/src/com/netscape/cms/client/kra/DRMClient.java +++ b/base/common/src/com/netscape/certsrv/kra/DRMClient.java @@ -1,4 +1,4 @@ -package com.netscape.cms.client.kra; +package com.netscape.certsrv.kra; import java.net.URISyntaxException; import java.util.Collection; @@ -7,6 +7,8 @@ import java.util.Iterator; import org.jboss.resteasy.client.ClientResponse; import com.netscape.certsrv.cert.CertData; +import com.netscape.certsrv.client.ClientConfig; +import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.dbs.keydb.KeyId; import com.netscape.certsrv.key.KeyArchivalRequest; import com.netscape.certsrv.key.KeyData; @@ -18,21 +20,19 @@ import com.netscape.certsrv.key.KeyRequestInfos; import com.netscape.certsrv.key.KeyRequestResource; import com.netscape.certsrv.key.KeyResource; import com.netscape.certsrv.request.RequestId; -import com.netscape.certsrv.system.SystemCertificateResource; -import com.netscape.cms.client.ClientConfig; -import com.netscape.cms.client.PKIClient; +import com.netscape.certsrv.system.SystemCertResource; import com.netscape.cmsutil.util.Utils; public class DRMClient extends PKIClient { private KeyResource keyClient; private KeyRequestResource keyRequestClient; - private SystemCertificateResource systemCertClient; + private SystemCertResource systemCertClient; public DRMClient(ClientConfig config) throws URISyntaxException { super(config); - systemCertClient = createProxy(SystemCertificateResource.class); + systemCertClient = createProxy(SystemCertResource.class); keyRequestClient = createProxy(KeyRequestResource.class); keyClient = createProxy(KeyResource.class); } diff --git a/base/common/src/com/netscape/certsrv/system/SystemCertificateResource.java b/base/common/src/com/netscape/certsrv/system/SystemCertResource.java index 1096520fc..d13be9ab4 100644 --- a/base/common/src/com/netscape/certsrv/system/SystemCertificateResource.java +++ b/base/common/src/com/netscape/certsrv/system/SystemCertResource.java @@ -11,7 +11,7 @@ import org.jboss.resteasy.annotations.ClientResponseType; import com.netscape.certsrv.cert.CertData; @Path("config/cert") -public interface SystemCertificateResource { +public interface SystemCertResource { /** * Used to retrieve the transport certificate diff --git a/base/common/src/com/netscape/cms/client/system/SystemConfigClient.java b/base/common/src/com/netscape/certsrv/system/SystemConfigClient.java index c9ee28718..876ed9bac 100644 --- a/base/common/src/com/netscape/cms/client/system/SystemConfigClient.java +++ b/base/common/src/com/netscape/certsrv/system/SystemConfigClient.java @@ -15,17 +15,12 @@ // (C) 2012 Red Hat, Inc. // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.system; +package com.netscape.certsrv.system; import java.net.URISyntaxException; -import com.netscape.certsrv.system.ConfigurationRequest; -import com.netscape.certsrv.system.ConfigurationResponse; -import com.netscape.certsrv.system.InstallToken; -import com.netscape.certsrv.system.InstallTokenRequest; -import com.netscape.certsrv.system.SystemConfigResource; -import com.netscape.cms.client.ClientConfig; -import com.netscape.cms.client.PKIClient; +import com.netscape.certsrv.client.ClientConfig; +import com.netscape.certsrv.client.PKIClient; /** diff --git a/base/common/src/com/netscape/cms/client/user/UserClient.java b/base/common/src/com/netscape/certsrv/user/UserClient.java index 010468e8a..95960e53f 100644 --- a/base/common/src/com/netscape/cms/client/user/UserClient.java +++ b/base/common/src/com/netscape/certsrv/user/UserClient.java @@ -15,20 +15,14 @@ //(C) 2012 Red Hat, Inc. //All rights reserved. //--- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.user; +package com.netscape.certsrv.user; import java.net.URISyntaxException; import org.jboss.resteasy.client.ClientResponse; -import com.netscape.certsrv.user.UserCertCollection; -import com.netscape.certsrv.user.UserCertData; -import com.netscape.certsrv.user.UserCertResource; -import com.netscape.certsrv.user.UserCollection; -import com.netscape.certsrv.user.UserData; -import com.netscape.certsrv.user.UserResource; -import com.netscape.cms.client.ClientConfig; -import com.netscape.cms.client.PKIClient; +import com.netscape.certsrv.client.ClientConfig; +import com.netscape.certsrv.client.PKIClient; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java b/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java index bd84f1141..8c2d8d9b9 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java +++ b/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.cert.CertData; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.security.ITransportKeyUnit; -import com.netscape.certsrv.system.SystemCertificateResource; +import com.netscape.certsrv.system.SystemCertResource; import com.netscape.cms.servlet.base.PKIService; /** @@ -36,7 +36,7 @@ import com.netscape.cms.servlet.base.PKIService; * @author alee * */ -public class SystemCertService extends PKIService implements SystemCertificateResource { +public class SystemCertService extends PKIService implements SystemCertResource { /** * Used to retrieve the transport certificate diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java index 4397251b5..d63a35b31 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java @@ -135,6 +135,7 @@ import com.netscape.certsrv.base.EPropertyNotFound; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.client.ClientConfig; import com.netscape.certsrv.dbs.IDBSubsystem; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; import com.netscape.certsrv.ldap.ILdapConnFactory; @@ -142,11 +143,10 @@ import com.netscape.certsrv.ocsp.IDefStore; import com.netscape.certsrv.ocsp.IOCSPAuthority; import com.netscape.certsrv.system.InstallToken; import com.netscape.certsrv.system.InstallTokenRequest; +import com.netscape.certsrv.system.SystemConfigClient; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; -import com.netscape.cms.client.ClientConfig; -import com.netscape.cms.client.system.SystemConfigClient; import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.cmsutil.http.HttpClient; import com.netscape.cmsutil.http.HttpRequest; diff --git a/base/deploy/src/scriptlets/configuration.jy b/base/deploy/src/scriptlets/configuration.jy index 7433ae463..a53cf9d76 100644 --- a/base/deploy/src/scriptlets/configuration.jy +++ b/base/deploy/src/scriptlets/configuration.jy @@ -17,7 +17,7 @@ from java.lang import System as javasystem # PKI Java Imports -from com.netscape.cms.client import ClientConfig +from com.netscape.certsrv.client import ClientConfig def main(argv): diff --git a/base/deploy/src/scriptlets/pkijython.py b/base/deploy/src/scriptlets/pkijython.py index 503e687d0..c489fb13f 100644 --- a/base/deploy/src/scriptlets/pkijython.py +++ b/base/deploy/src/scriptlets/pkijython.py @@ -141,7 +141,7 @@ from org.mozilla.jss.util import Password # PKI Java Imports -from com.netscape.cms.client.system import SystemConfigClient +from com.netscape.certsrv.system import SystemConfigClient from com.netscape.certsrv.system import SystemCertData from com.netscape.certsrv.system import ConfigurationRequest from com.netscape.certsrv.system import ConfigurationResponse diff --git a/base/java-tools/CMakeLists.txt b/base/java-tools/CMakeLists.txt index 427ded555..0ba83caa3 100644 --- a/base/java-tools/CMakeLists.txt +++ b/base/java-tools/CMakeLists.txt @@ -1,4 +1,16 @@ project(java-tools Java) + +install( + FILES + pki + DESTINATION + ${BIN_INSTALL_DIR} + PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ +) + add_subdirectory(src) add_subdirectory(templates) diff --git a/base/setup/pki b/base/java-tools/pki index 4b9432fa0..e465fa926 100755 --- a/base/setup/pki +++ b/base/java-tools/pki @@ -72,8 +72,8 @@ if( $ARCHITECTURE eq "i386" ) { ############################################################################### $ENV{CLASSPATH} = "/usr/share/java/${PRODUCT}/pki-certsrv.jar:" - . "/usr/share/java/${PRODUCT}/pki-client.jar:" . "/usr/share/java/${PRODUCT}/pki-nsutil.jar:" + . "/usr/share/java/${PRODUCT}/pki-tools.jar:" . "/usr/share/java/apache-commons-cli.jar:" . "/usr/share/java/apache-commons-codec.jar:" . "/usr/share/java/apache-commons-lang.jar:" @@ -108,4 +108,4 @@ foreach (@ARGV) { push(@args, quotemeta($_)); } -system("java -cp $ENV{CLASSPATH} com.netscape.cms.client.cli.MainCLI @args"); +system("java -cp $ENV{CLASSPATH} com.netscape.cmstools.cli.MainCLI @args"); diff --git a/base/java-tools/src/CMakeLists.txt b/base/java-tools/src/CMakeLists.txt index 8249a0086..a0c50d25b 100644 --- a/base/java-tools/src/CMakeLists.txt +++ b/base/java-tools/src/CMakeLists.txt @@ -8,6 +8,20 @@ find_file(JSS_JAR /usr/share/java ) +find_file(APACHE_COMMONS_CLI_JAR + NAMES + apache-commons-cli.jar + PATHS + /usr/share/java +) + +find_file(APACHE_COMMONS_LANG_JAR + NAMES + apache-commons-lang.jar + PATHS + /usr/share/java +) + find_file(COMMONS_CODEC_JAR NAMES commons-codec.jar @@ -31,18 +45,56 @@ find_file(XERCES_JAR /usr/share/java ) +find_file(JAXRS_API_JAR + NAMES + jaxrs-api.jar + PATHS + /usr/share/java/resteasy +) + +find_file(RESTEASY_JAXRS_JAR + NAMES + resteasy-jaxrs.jar + PATHS + /usr/share/java/resteasy +) + +find_file(RESTEASY_ATOM_PROVIDER_JAR + NAMES + resteasy-atom-provider.jar + PATHS + /usr/share/java/resteasy +) + +find_file(HTTPCLIENT_JAR + NAMES + httpclient.jar + PATHS + /usr/share/java/httpcomponents +) + +find_file(HTTPCORE_JAR + NAMES + httpcore.jar + PATHS + /usr/share/java/httpcomponents +) + # build pki-tools javac(pki-tools-classes SOURCES com/netscape/cmstools/*.java CLASSPATH - ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} + ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR} ${XALAN_JAR} ${XERCES_JAR} ${JSS_JAR} ${COMMONS_CODEC_JAR} + ${APACHE_COMMONS_CLI_JAR} ${APACHE_COMMONS_LANG_JAR} + ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} + ${HTTPCLIENT_JAR} ${HTTPCORE_JAR} OUTPUT_DIR ${CMAKE_BINARY_DIR}/classes DEPENDS - pki-nsutil pki-cmsutil + pki-nsutil pki-cmsutil pki-certsrv ) jar(pki-tools-jar @@ -89,9 +141,12 @@ if(WITH_JAVADOC) SUBPACKAGES com.netscape.cmstools CLASSPATH - ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} + ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR} ${XALAN_JAR} ${XERCES_JAR} ${JSS_JAR} ${COMMONS_CODEC_JAR} + ${APACHE_COMMONS_CLI_JAR} ${APACHE_COMMONS_LANG_JAR} + ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} + ${HTTPCLIENT_JAR} ${HTTPCORE_JAR} OPTIONS -windowtitle 'pki-java-tools' -doctitle '<h1>pki-java-tools</h1>' diff --git a/base/common/src/com/netscape/cms/client/cert/CertCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java index f7bb27597..6857b689e 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java @@ -16,18 +16,19 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.cert; +package com.netscape.cmstools.cert; import java.util.Arrays; import org.apache.commons.lang.StringUtils; import org.jboss.resteasy.plugins.providers.atom.Link; +import com.netscape.certsrv.cert.CertClient; import com.netscape.certsrv.cert.CertData; import com.netscape.certsrv.cert.CertDataInfo; import com.netscape.certsrv.cert.CertRequestInfo; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java index f69506224..397df3f93 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.cert; +package com.netscape.cmstools.cert; import java.io.FileNotFoundException; import java.io.FileReader; @@ -32,8 +32,8 @@ import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.cert.CertDataInfo; import com.netscape.certsrv.cert.CertDataInfos; import com.netscape.certsrv.cert.CertSearchRequest; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/cert/CertHoldCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertHoldCLI.java index 33667f3f0..b5c604a86 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertHoldCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cert/CertHoldCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.cert; +package com.netscape.cmstools.cert; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -31,8 +31,8 @@ import com.netscape.certsrv.cert.CertRequestInfo; import com.netscape.certsrv.cert.CertRevokeRequest; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.certsrv.request.RequestStatus; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/cert/CertReleaseHoldCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertReleaseHoldCLI.java index 10408273f..184976f1e 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertReleaseHoldCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cert/CertReleaseHoldCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.cert; +package com.netscape.cmstools.cert; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -28,8 +28,8 @@ import com.netscape.certsrv.cert.CertRequestInfo; import com.netscape.certsrv.cert.CertUnrevokeRequest; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.certsrv.request.RequestStatus; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestApproveCLI.java index c96f482c8..98a3a2b4f 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestApproveCLI.java @@ -1,4 +1,4 @@ -package com.netscape.cms.client.cert; +package com.netscape.cmstools.cert; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -12,8 +12,8 @@ import org.apache.commons.cli.ParseException; import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.cert.CertReviewResponse; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; public class CertRequestApproveCLI extends CLI { CertCLI parent; diff --git a/base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestReviewCLI.java index 22b1faed3..682314b25 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestReviewCLI.java @@ -1,4 +1,4 @@ -package com.netscape.cms.client.cert; +package com.netscape.cmstools.cert; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -14,8 +14,8 @@ import org.apache.commons.cli.ParseException; import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.cert.CertReviewResponse; import com.netscape.certsrv.request.RequestId; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; public class CertRequestReviewCLI extends CLI { diff --git a/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java index cd974b031..3562d48f0 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java @@ -1,4 +1,4 @@ -package com.netscape.cms.client.cert; +package com.netscape.cmstools.cert; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -14,8 +14,8 @@ import org.apache.commons.cli.ParseException; import com.netscape.certsrv.cert.CertEnrollmentRequest; import com.netscape.certsrv.cert.CertRequestInfo; import com.netscape.certsrv.cert.CertRequestInfos; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; public class CertRequestSubmitCLI extends CLI { diff --git a/base/common/src/com/netscape/cms/client/cert/CertRevokeCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRevokeCLI.java index de5dddc09..d8a4d5295 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertRevokeCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cert/CertRevokeCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.cert; +package com.netscape.cmstools.cert; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -31,8 +31,8 @@ import com.netscape.certsrv.cert.CertRequestInfo; import com.netscape.certsrv.cert.CertRevokeRequest; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.certsrv.request.RequestStatus; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertShowCLI.java index 4fcfc8c3d..798514814 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cert/CertShowCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.cert; +package com.netscape.cmstools.cert; import java.io.FileWriter; import java.io.PrintWriter; @@ -26,8 +26,8 @@ import org.apache.commons.cli.Option; import com.netscape.certsrv.cert.CertData; import com.netscape.certsrv.dbs.certdb.CertId; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/cli/CLI.java b/base/java-tools/src/com/netscape/cmstools/cli/CLI.java index 1fd0c0dc4..a1fc4f7f9 100644 --- a/base/common/src/com/netscape/cms/client/cli/CLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/CLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.cli; +package com.netscape.cmstools.cli; import java.util.LinkedHashMap; import java.util.Map; diff --git a/base/common/src/com/netscape/cms/client/cli/MainCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java index 7df2224e9..a6350e5d8 100644 --- a/base/common/src/com/netscape/cms/client/cli/MainCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.cli; +package com.netscape.cmstools.cli; import java.io.File; import java.net.URISyntaxException; @@ -30,10 +30,10 @@ import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.util.IncorrectPasswordException; import org.mozilla.jss.util.Password; -import com.netscape.cms.client.ClientConfig; -import com.netscape.cms.client.cert.CertCLI; -import com.netscape.cms.client.group.GroupCLI; -import com.netscape.cms.client.user.UserCLI; +import com.netscape.certsrv.client.ClientConfig; +import com.netscape.cmstools.cert.CertCLI; +import com.netscape.cmstools.group.GroupCLI; +import com.netscape.cmstools.user.UserCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/group/GroupAddCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupAddCLI.java index f32fffd5d..b4814fbcc 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupAddCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupAddCLI.java @@ -16,14 +16,14 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.group; +package com.netscape.cmstools.group; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import com.netscape.certsrv.group.GroupData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/group/GroupAddMemberCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupAddMemberCLI.java index 965ad4ee9..92766cf99 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupAddMemberCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupAddMemberCLI.java @@ -16,11 +16,11 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.group; +package com.netscape.cmstools.group; import com.netscape.certsrv.group.GroupMemberData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/group/GroupCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java index b106c6fc1..ce28af243 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java @@ -16,17 +16,18 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.group; +package com.netscape.cmstools.group; import java.util.Arrays; import org.apache.commons.lang.StringUtils; import org.jboss.resteasy.plugins.providers.atom.Link; +import com.netscape.certsrv.group.GroupClient; import com.netscape.certsrv.group.GroupData; import com.netscape.certsrv.group.GroupMemberData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/group/GroupFindCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java index 41263c7b9..272e3a8fd 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.group; +package com.netscape.cmstools.group; import java.util.Collection; @@ -25,8 +25,8 @@ import org.apache.commons.cli.Option; import com.netscape.certsrv.group.GroupCollection; import com.netscape.certsrv.group.GroupData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/group/GroupFindMemberCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupFindMemberCLI.java index ca8273270..f0498f0d2 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupFindMemberCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupFindMemberCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.group; +package com.netscape.cmstools.group; import java.util.Collection; @@ -25,8 +25,8 @@ import org.apache.commons.cli.Option; import com.netscape.certsrv.group.GroupMemberCollection; import com.netscape.certsrv.group.GroupMemberData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/group/GroupModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupModifyCLI.java index b2b5c8553..2869ce19d 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupModifyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupModifyCLI.java @@ -16,14 +16,14 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.group; +package com.netscape.cmstools.group; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import com.netscape.certsrv.group.GroupData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/group/GroupRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupRemoveCLI.java index 45e779860..744f13b8c 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupRemoveCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupRemoveCLI.java @@ -16,10 +16,10 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.group; +package com.netscape.cmstools.group; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** diff --git a/base/common/src/com/netscape/cms/client/group/GroupRemoveMemberCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupRemoveMemberCLI.java index 25807ae31..f46885631 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupRemoveMemberCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupRemoveMemberCLI.java @@ -16,10 +16,10 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.group; +package com.netscape.cmstools.group; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/group/GroupShowCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupShowCLI.java index 3e24f3e5d..3209c2b37 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupShowCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupShowCLI.java @@ -16,11 +16,11 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.group; +package com.netscape.cmstools.group; import com.netscape.certsrv.group.GroupData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/group/GroupShowMemberCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupShowMemberCLI.java index 9d828416f..8a4afb688 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupShowMemberCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupShowMemberCLI.java @@ -16,11 +16,11 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.group; +package com.netscape.cmstools.group; import com.netscape.certsrv.group.GroupMemberData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/user/UserAddCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java index f65d75cd9..3db8fe533 100644 --- a/base/common/src/com/netscape/cms/client/user/UserAddCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java @@ -16,14 +16,14 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.user; +package com.netscape.cmstools.user; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import com.netscape.certsrv.user.UserData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/user/UserAddCertCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserAddCertCLI.java index 61ca60137..7bec2ff19 100644 --- a/base/common/src/com/netscape/cms/client/user/UserAddCertCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserAddCertCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.user; +package com.netscape.cmstools.user; import java.io.File; import java.util.Scanner; @@ -25,8 +25,8 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import com.netscape.certsrv.user.UserCertData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/user/UserCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java index cc9bc8aa5..301754a22 100644 --- a/base/common/src/com/netscape/cms/client/user/UserCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.user; +package com.netscape.cmstools.user; import java.util.Arrays; @@ -24,9 +24,10 @@ import org.apache.commons.lang.StringUtils; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.user.UserCertData; +import com.netscape.certsrv.user.UserClient; import com.netscape.certsrv.user.UserData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/user/UserFindCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserFindCLI.java index c40149872..a5b96d1c3 100644 --- a/base/common/src/com/netscape/cms/client/user/UserFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserFindCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.user; +package com.netscape.cmstools.user; import java.util.Collection; @@ -25,8 +25,8 @@ import org.apache.commons.cli.Option; import com.netscape.certsrv.user.UserCollection; import com.netscape.certsrv.user.UserData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/user/UserFindCertCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserFindCertCLI.java index c06d21faf..08f687933 100644 --- a/base/common/src/com/netscape/cms/client/user/UserFindCertCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserFindCertCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.user; +package com.netscape.cmstools.user; import java.util.Collection; @@ -25,8 +25,8 @@ import org.apache.commons.cli.Option; import com.netscape.certsrv.user.UserCertCollection; import com.netscape.certsrv.user.UserCertData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/user/UserModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserModifyCLI.java index 2eca31f01..706224ef9 100644 --- a/base/common/src/com/netscape/cms/client/user/UserModifyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserModifyCLI.java @@ -16,14 +16,14 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.user; +package com.netscape.cmstools.user; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import com.netscape.certsrv.user.UserData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/user/UserRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserRemoveCLI.java index 6c367ec48..6bafba8a4 100644 --- a/base/common/src/com/netscape/cms/client/user/UserRemoveCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserRemoveCLI.java @@ -16,10 +16,10 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.user; +package com.netscape.cmstools.user; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/user/UserRemoveCertCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserRemoveCertCLI.java index 096e46d64..203e48f52 100644 --- a/base/common/src/com/netscape/cms/client/user/UserRemoveCertCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserRemoveCertCLI.java @@ -16,12 +16,12 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.user; +package com.netscape.cmstools.user; import java.net.URLEncoder; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** diff --git a/base/common/src/com/netscape/cms/client/user/UserShowCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserShowCLI.java index d46c5578c..679b67791 100644 --- a/base/common/src/com/netscape/cms/client/user/UserShowCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserShowCLI.java @@ -16,11 +16,11 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.user; +package com.netscape.cmstools.user; import com.netscape.certsrv.user.UserData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserShowCertCLI.java index 99bc55af0..f30c72327 100644 --- a/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserShowCertCLI.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.user; +package com.netscape.cmstools.user; import java.io.FileWriter; import java.io.PrintWriter; @@ -26,8 +26,8 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import com.netscape.certsrv.user.UserCertData; -import com.netscape.cms.client.cli.CLI; -import com.netscape.cms.client.cli.MainCLI; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Endi S. Dewata diff --git a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java index 7035803ab..ec277e5dc 100644 --- a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java +++ b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java @@ -37,15 +37,15 @@ import org.mozilla.jss.crypto.KeyGenAlgorithm; import org.mozilla.jss.crypto.SymmetricKey; import org.mozilla.jss.util.Password; +import com.netscape.certsrv.client.ClientConfig; import com.netscape.certsrv.dbs.keydb.KeyId; import com.netscape.certsrv.key.KeyData; import com.netscape.certsrv.key.KeyDataInfo; import com.netscape.certsrv.key.KeyRequestInfo; import com.netscape.certsrv.key.KeyRequestResource; +import com.netscape.certsrv.kra.DRMClient; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestNotFoundException; -import com.netscape.cms.client.ClientConfig; -import com.netscape.cms.client.kra.DRMClient; import com.netscape.cms.servlet.base.PKIService; import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.cmsutil.util.Utils; diff --git a/base/setup/CMakeLists.txt b/base/setup/CMakeLists.txt index 54fe3b7f6..05f18332d 100644 --- a/base/setup/CMakeLists.txt +++ b/base/setup/CMakeLists.txt @@ -2,7 +2,6 @@ project(setup) install( FILES - pki pkicreate pkiremove pki-setup-proxy diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages index 8e8395180..628462a2e 100755 --- a/scripts/compose_pki_core_packages +++ b/scripts/compose_pki_core_packages @@ -39,7 +39,7 @@ PKI_CORE_VERSION="10.0.0.a1" ## PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_CORE}.spec" -PKI_COMPONENT_LIST="test deploy setup symkey native-tools util java-tools common selinux ca kra ocsp tks silent" +PKI_COMPONENT_LIST="test setup symkey util common native-tools java-tools deploy selinux ca kra ocsp tks silent" ## diff --git a/specs/pki-core.spec b/specs/pki-core.spec index a3edac2f8..3a49a3395 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: pki-core Version: 10.0.0 -Release: %{?relprefix}25%{?prerel}%{?dist} +Release: %{?relprefix}26%{?prerel}%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -1084,7 +1084,6 @@ fi %files -n pki-setup %defattr(-,root,root,-) %doc base/setup/LICENSE -%{_bindir}/pki %{_bindir}/pkicreate %{_bindir}/pkiremove %{_bindir}/pki-setup-proxy @@ -1131,8 +1130,6 @@ fi %{_javadir}/pki/pki-nsutil.jar %{_javadir}/pki/pki-certsrv-%{version}.jar %{_javadir}/pki/pki-certsrv.jar -%{_javadir}/pki/pki-client-%{version}.jar -%{_javadir}/pki/pki-client.jar %if %{?_without_javadoc:0}%{!?_without_javadoc:1} %files -n pki-common-javadoc @@ -1144,6 +1141,7 @@ fi %files -n pki-tools %defattr(-,root,root,-) %doc base/native-tools/LICENSE base/native-tools/doc/README +%{_bindir}/pki %{_bindir}/p7tool %{_bindir}/revoker %{_bindir}/setpin @@ -1372,6 +1370,9 @@ fi %changelog +* Mon Aug 20 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.26.a1 +- Split pki-client.jar into pki-certsrv.jar and pki-tools.jar. + * Mon Aug 20 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.25.a1 - Merged pki-native-tools and pki-java-tools into pki-tools. - Modified pki-server to depend on pki-tools. |