diff options
Diffstat (limited to 'base/tps-tomcat/src/org/dogtagpki/server/tps')
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java | 14 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectionDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionDatabase.java) | 5 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectionRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileDatabase.java) | 5 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingDatabase.java) | 5 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityDatabase.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/AuthenticatorDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorDatabase.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/AuthenticatorRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertDatabase.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenDatabase.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenRecord.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenRecord.java) | 2 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ActivityService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityService.java) | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorService.java) | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ConnectionService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionService.java) | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingService.java) | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileService.java) | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSApplication.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/TPSApplication.java) | 27 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSCertService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertService.java) | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TokenService.java (renamed from base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenService.java) | 4 |
23 files changed, 52 insertions, 54 deletions
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java index e17d37d10..eb279d819 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java @@ -17,14 +17,14 @@ // --- END COPYRIGHT BLOCK --- package org.dogtagpki.server.tps; -import org.dogtagpki.server.tps.authenticator.AuthenticatorDatabase; -import org.dogtagpki.server.tps.cert.TPSCertDatabase; import org.dogtagpki.server.tps.config.ConfigDatabase; -import org.dogtagpki.server.tps.connection.ConnectionDatabase; -import org.dogtagpki.server.tps.logging.ActivityDatabase; -import org.dogtagpki.server.tps.profile.ProfileDatabase; -import org.dogtagpki.server.tps.profile.ProfileMappingDatabase; -import org.dogtagpki.server.tps.token.TokenDatabase; +import org.dogtagpki.server.tps.config.ConnectionDatabase; +import org.dogtagpki.server.tps.config.ProfileDatabase; +import org.dogtagpki.server.tps.config.ProfileMappingDatabase; +import org.dogtagpki.server.tps.dbs.ActivityDatabase; +import org.dogtagpki.server.tps.dbs.AuthenticatorDatabase; +import org.dogtagpki.server.tps.dbs.TPSCertDatabase; +import org.dogtagpki.server.tps.dbs.TokenDatabase; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.CryptoManager.NotInitializedException; import org.mozilla.jss.crypto.ObjectNotFoundException; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectionDatabase.java index 1aadc7a07..35eb382ea 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectionDatabase.java @@ -16,15 +16,12 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.connection; +package org.dogtagpki.server.tps.config; import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import org.dogtagpki.server.tps.config.ConfigDatabase; -import org.dogtagpki.server.tps.config.ConfigRecord; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectionRecord.java index 71aac3139..3a2f78037 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectionRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.connection; +package org.dogtagpki.server.tps.config; import com.netscape.cmscore.dbs.CSCfgRecord; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileDatabase.java index 794661281..6054bf38d 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileDatabase.java @@ -16,15 +16,12 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.profile; +package org.dogtagpki.server.tps.config; import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import org.dogtagpki.server.tps.config.ConfigDatabase; -import org.dogtagpki.server.tps.config.ConfigRecord; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.cmscore.dbs.CSCfgDatabase; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingDatabase.java index febb71857..dca0beb02 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingDatabase.java @@ -16,15 +16,12 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.profile; +package org.dogtagpki.server.tps.config; import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import org.dogtagpki.server.tps.config.ConfigDatabase; -import org.dogtagpki.server.tps.config.ConfigRecord; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.cmscore.dbs.CSCfgDatabase; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingRecord.java index e44acd24a..92793ce5e 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.profile; +package org.dogtagpki.server.tps.config; import com.netscape.cmscore.dbs.CSCfgRecord; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileRecord.java index 20c254d03..a84b7f5ba 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.profile; +package org.dogtagpki.server.tps.config; import com.netscape.cmscore.dbs.CSCfgRecord; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java index aecfcad2a..d48d31489 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.logging; +package org.dogtagpki.server.tps.dbs; import java.util.Date; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityRecord.java index 4794ecb8b..815d5ee08 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.logging; +package org.dogtagpki.server.tps.dbs; import java.util.Date; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/AuthenticatorDatabase.java index a4f735b73..f6425bc8d 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/AuthenticatorDatabase.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.authenticator; +package org.dogtagpki.server.tps.dbs; import java.util.ArrayList; import java.util.Collection; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/AuthenticatorRecord.java index a07c05aaa..7586dbb05 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/AuthenticatorRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.authenticator; +package org.dogtagpki.server.tps.dbs; import com.netscape.cmscore.dbs.CSCfgRecord; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertDatabase.java index d07a11f6d..9922c4d50 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertDatabase.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.cert; +package org.dogtagpki.server.tps.dbs; import java.util.Date; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertRecord.java index 6a55e60d6..958913953 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.cert; +package org.dogtagpki.server.tps.dbs; import java.util.Date; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java index d16e4fc25..517d3151e 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenDatabase.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.token; +package org.dogtagpki.server.tps.dbs; import java.util.Date; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenRecord.java index bf0d1b120..bab61ac19 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenRecord.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenRecord.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.token; +package org.dogtagpki.server.tps.dbs; import java.util.Date; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ActivityService.java index 0bed20311..1c331f150 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ActivityService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.logging; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -31,6 +31,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.dbs.ActivityDatabase; +import org.dogtagpki.server.tps.dbs.ActivityRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java index 282ee4c0e..21d15cc10 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.authenticator; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -32,6 +32,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.dbs.AuthenticatorDatabase; +import org.dogtagpki.server.tps.dbs.AuthenticatorRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ConnectionService.java index a78420eda..2cd6f2bfd 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ConnectionService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.connection; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -32,6 +32,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.config.ConnectionDatabase; +import org.dogtagpki.server.tps.config.ConnectionRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java index bcb169578..8336bff7f 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.profile; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -32,6 +32,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.config.ProfileMappingDatabase; +import org.dogtagpki.server.tps.config.ProfileMappingRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileService.java index edc7df1cd..866a1dc7f 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.profile; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -32,6 +32,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.config.ProfileDatabase; +import org.dogtagpki.server.tps.config.ProfileRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSApplication.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSApplication.java index 2571e2604..0dfd2b7c0 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSApplication.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSApplication.java @@ -15,32 +15,25 @@ // (C) 2013 Red Hat, Inc. // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps; +package org.dogtagpki.server.tps.rest; import java.util.LinkedHashSet; import java.util.Set; import javax.ws.rs.core.Application; -import org.dogtagpki.server.tps.authenticator.AuthenticatorService; -import org.dogtagpki.server.tps.cert.TPSCertService; +import org.dogtagpki.server.rest.ACLInterceptor; +import org.dogtagpki.server.rest.AccountService; +import org.dogtagpki.server.rest.AuditService; +import org.dogtagpki.server.rest.AuthMethodInterceptor; +import org.dogtagpki.server.rest.GroupService; +import org.dogtagpki.server.rest.SelfTestService; +import org.dogtagpki.server.rest.SystemCertService; +import org.dogtagpki.server.rest.SystemConfigService; +import org.dogtagpki.server.rest.UserService; import org.dogtagpki.server.tps.config.ConfigService; -import org.dogtagpki.server.tps.connection.ConnectionService; -import org.dogtagpki.server.tps.logging.ActivityService; -import org.dogtagpki.server.tps.profile.ProfileMappingService; -import org.dogtagpki.server.tps.profile.ProfileService; -import org.dogtagpki.server.tps.token.TokenService; import com.netscape.certsrv.base.PKIException; -import com.netscape.cms.authorization.ACLInterceptor; -import com.netscape.cms.authorization.AuthMethodInterceptor; -import com.netscape.cms.servlet.account.AccountService; -import com.netscape.cms.servlet.admin.GroupService; -import com.netscape.cms.servlet.admin.SystemCertService; -import com.netscape.cms.servlet.admin.UserService; -import com.netscape.cms.servlet.csadmin.SystemConfigService; -import com.netscape.cmscore.logging.AuditService; -import com.netscape.cmscore.selftests.SelfTestService; /** * @author Endi S. Dewata <edewata@redhat.com> diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSCertService.java index 0397f5cc1..45e5db6b8 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSCertService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.cert; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -31,6 +31,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.dbs.TPSCertDatabase; +import org.dogtagpki.server.tps.dbs.TPSCertRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TokenService.java index 548c797b7..3f30e973b 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TokenService.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- -package org.dogtagpki.server.tps.token; +package org.dogtagpki.server.tps.rest; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -31,6 +31,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; +import org.dogtagpki.server.tps.dbs.TokenDatabase; +import org.dogtagpki.server.tps.dbs.TokenRecord; import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.apps.CMS; |