diff options
16 files changed, 31 insertions, 26 deletions
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 8e67f5d5f..a230b468a 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 @@ -35,7 +35,8 @@ import org.mozilla.jss.util.Password; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.certsrv.request.RequestId; -import com.netscape.cms.client.cli.ClientConfig; +import com.netscape.cms.client.ClientConfig; +import com.netscape.cms.client.ca.CAClient; import com.netscape.cms.servlet.cert.CertNotFoundException; import com.netscape.cms.servlet.cert.model.CertDataInfo; import com.netscape.cms.servlet.cert.model.CertDataInfos; 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 fd951d9f8..f9fa62d0a 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.cms.client.cli.ClientConfig; -import com.netscape.cms.servlet.csadmin.SystemConfigClient; -import com.netscape.cms.servlet.csadmin.model.SystemCertData; +import com.netscape.cms.client.ClientConfig; +import com.netscape.cms.client.system.SystemConfigClient; import com.netscape.cms.servlet.csadmin.model.ConfigurationRequest; import com.netscape.cms.servlet.csadmin.model.ConfigurationResponse; +import com.netscape.cms.servlet.csadmin.model.SystemCertData; import com.netscape.cmsutil.util.Utils; /** diff --git a/base/common/src/com/netscape/cms/client/cli/ClientConfig.java b/base/common/src/com/netscape/cms/client/ClientConfig.java index 8b5380805..7299d4d22 100644 --- a/base/common/src/com/netscape/cms/client/cli/ClientConfig.java +++ b/base/common/src/com/netscape/cms/client/ClientConfig.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.client.cli; +package com.netscape.cms.client; import java.io.StringReader; import java.io.StringWriter; diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/PKIClient.java b/base/common/src/com/netscape/cms/client/PKIClient.java index 647056bd1..ddd47dab6 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/PKIClient.java +++ b/base/common/src/com/netscape/cms/client/PKIClient.java @@ -1,4 +1,4 @@ -package com.netscape.cms.servlet.csadmin; +package com.netscape.cms.client; import java.io.File; import java.io.IOException; @@ -50,7 +50,6 @@ import org.mozilla.jss.crypto.AlreadyInitializedException; import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; import org.mozilla.jss.ssl.SSLSocket; -import com.netscape.cms.client.cli.ClientConfig; public abstract class PKIClient { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/PKIErrorInterceptor.java b/base/common/src/com/netscape/cms/client/PKIErrorInterceptor.java index 795c0fda3..2c1936a6f 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/PKIErrorInterceptor.java +++ b/base/common/src/com/netscape/cms/client/PKIErrorInterceptor.java @@ -15,7 +15,7 @@ // (C) 2007 Red Hat, Inc. // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.csadmin; +package com.netscape.cms.client; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; diff --git a/base/ca/functional/src/com/netscape/cms/servlet/test/CAClient.java b/base/common/src/com/netscape/cms/client/ca/CAClient.java index 24c53b137..17d017cce 100644 --- a/base/ca/functional/src/com/netscape/cms/servlet/test/CAClient.java +++ b/base/common/src/com/netscape/cms/client/ca/CAClient.java @@ -15,19 +15,19 @@ //(C) 2012 Red Hat, Inc. //All rights reserved. //--- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.test; +package com.netscape.cms.client.ca; import java.net.URISyntaxException; import java.util.Collection; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.certsrv.request.RequestId; -import com.netscape.cms.client.cli.ClientConfig; +import com.netscape.cms.client.ClientConfig; +import com.netscape.cms.client.PKIClient; import com.netscape.cms.servlet.cert.CertResource; import com.netscape.cms.servlet.cert.model.CertDataInfos; import com.netscape.cms.servlet.cert.model.CertSearchRequest; import com.netscape.cms.servlet.cert.model.CertData; -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; diff --git a/base/common/src/com/netscape/cms/client/cert/CertClient.java b/base/common/src/com/netscape/cms/client/cert/CertClient.java index fb2f61c75..254e8a143 100644 --- a/base/common/src/com/netscape/cms/client/cert/CertClient.java +++ b/base/common/src/com/netscape/cms/client/cert/CertClient.java @@ -21,14 +21,14 @@ import java.net.URISyntaxException; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.certsrv.request.RequestId; -import com.netscape.cms.client.cli.ClientConfig; +import com.netscape.cms.client.ClientConfig; +import com.netscape.cms.client.PKIClient; import com.netscape.cms.servlet.cert.CertResource; import com.netscape.cms.servlet.cert.model.CertDataInfos; import com.netscape.cms.servlet.cert.model.CertRevokeRequest; import com.netscape.cms.servlet.cert.model.CertSearchRequest; import com.netscape.cms.servlet.cert.model.CertUnrevokeRequest; import com.netscape.cms.servlet.cert.model.CertData; -import com.netscape.cms.servlet.csadmin.PKIClient; import com.netscape.cms.servlet.request.CertRequestResource; import com.netscape.cms.servlet.request.model.CertReviewResponse; import com.netscape.cms.servlet.request.model.CertRequestInfo; diff --git a/base/common/src/com/netscape/cms/client/cli/MainCLI.java b/base/common/src/com/netscape/cms/client/cli/MainCLI.java index 50c90d892..2398a3837 100644 --- a/base/common/src/com/netscape/cms/client/cli/MainCLI.java +++ b/base/common/src/com/netscape/cms/client/cli/MainCLI.java @@ -30,6 +30,7 @@ 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; diff --git a/base/common/src/com/netscape/cms/client/group/GroupClient.java b/base/common/src/com/netscape/cms/client/group/GroupClient.java index 410c1ad3d..b3784ef46 100644 --- a/base/common/src/com/netscape/cms/client/group/GroupClient.java +++ b/base/common/src/com/netscape/cms/client/group/GroupClient.java @@ -27,8 +27,8 @@ 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.cli.ClientConfig; -import com.netscape.cms.servlet.csadmin.PKIClient; +import com.netscape.cms.client.ClientConfig; +import com.netscape.cms.client.PKIClient; /** * @author Endi S. Dewata diff --git a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMClient.java b/base/common/src/com/netscape/cms/client/kra/DRMClient.java index dfb34ed13..2332eacb2 100644 --- a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMClient.java +++ b/base/common/src/com/netscape/cms/client/kra/DRMClient.java @@ -1,4 +1,4 @@ -package com.netscape.cms.servlet.test; +package com.netscape.cms.client.kra; import java.net.URISyntaxException; import java.util.Collection; @@ -8,10 +8,10 @@ import org.jboss.resteasy.client.ClientResponse; import com.netscape.certsrv.dbs.keydb.KeyId; import com.netscape.certsrv.request.RequestId; -import com.netscape.cms.client.cli.ClientConfig; +import com.netscape.cms.client.ClientConfig; +import com.netscape.cms.client.PKIClient; import com.netscape.cms.servlet.admin.SystemCertificateResource; import com.netscape.cms.servlet.cert.model.CertData; -import com.netscape.cms.servlet.csadmin.PKIClient; import com.netscape.cms.servlet.key.KeyResource; import com.netscape.cms.servlet.key.model.KeyData; import com.netscape.cms.servlet.key.model.KeyDataInfo; diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigClient.java b/base/common/src/com/netscape/cms/client/system/SystemConfigClient.java index 11815a65b..c01558ed3 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigClient.java +++ b/base/common/src/com/netscape/cms/client/system/SystemConfigClient.java @@ -15,11 +15,13 @@ // (C) 2012 Red Hat, Inc. // All rights reserved. // --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.csadmin; +package com.netscape.cms.client.system; import java.net.URISyntaxException; -import com.netscape.cms.client.cli.ClientConfig; +import com.netscape.cms.client.ClientConfig; +import com.netscape.cms.client.PKIClient; +import com.netscape.cms.servlet.csadmin.SystemConfigResource; import com.netscape.cms.servlet.csadmin.model.ConfigurationRequest; import com.netscape.cms.servlet.csadmin.model.ConfigurationResponse; import com.netscape.cms.servlet.csadmin.model.InstallToken; diff --git a/base/common/src/com/netscape/cms/client/user/UserClient.java b/base/common/src/com/netscape/cms/client/user/UserClient.java index ea2991ac8..010468e8a 100644 --- a/base/common/src/com/netscape/cms/client/user/UserClient.java +++ b/base/common/src/com/netscape/cms/client/user/UserClient.java @@ -27,8 +27,8 @@ 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.cli.ClientConfig; -import com.netscape.cms.servlet.csadmin.PKIClient; +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/servlet/csadmin/ConfigurationUtils.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java index be66f5cf7..4c9caf5c1 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java @@ -143,7 +143,8 @@ import com.netscape.certsrv.ocsp.IOCSPAuthority; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; -import com.netscape.cms.client.cli.ClientConfig; +import com.netscape.cms.client.ClientConfig; +import com.netscape.cms.client.system.SystemConfigClient; import com.netscape.cms.servlet.csadmin.model.InstallToken; import com.netscape.cms.servlet.csadmin.model.InstallTokenRequest; import com.netscape.cmsutil.crypto.CryptoUtil; diff --git a/base/deploy/src/scriptlets/configuration.jy b/base/deploy/src/scriptlets/configuration.jy index 290a2cc65..7433ae463 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.cli import ClientConfig +from com.netscape.cms.client import ClientConfig def main(argv): diff --git a/base/deploy/src/scriptlets/pkijython.py b/base/deploy/src/scriptlets/pkijython.py index 18fabf9be..d2e7889ff 100644 --- a/base/deploy/src/scriptlets/pkijython.py +++ b/base/deploy/src/scriptlets/pkijython.py @@ -140,7 +140,7 @@ from org.mozilla.jss.util import Password # PKI Java Imports -from com.netscape.cms.servlet.csadmin import SystemConfigClient +from com.netscape.cms.client.system import SystemConfigClient from com.netscape.cms.servlet.csadmin.model import SystemCertData from com.netscape.cms.servlet.csadmin.model import ConfigurationRequest from com.netscape.cms.servlet.csadmin.model import ConfigurationResponse 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 3ccde1cd2..5a2013a60 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 @@ -39,7 +39,8 @@ import org.mozilla.jss.util.Password; import com.netscape.certsrv.dbs.keydb.KeyId; import com.netscape.certsrv.request.RequestId; -import com.netscape.cms.client.cli.ClientConfig; +import com.netscape.cms.client.ClientConfig; +import com.netscape.cms.client.kra.DRMClient; import com.netscape.cms.servlet.base.PKIService; import com.netscape.cms.servlet.key.model.KeyData; import com.netscape.cms.servlet.key.model.KeyDataInfo; |