Reorganized TPS classes.

The TPS classes have been reorganized as follows:
* common: com.netscape.certsrv.tps
* CLI: com.netscape.cmstools.tps
* server: org.dogtagpki.server.tps

TPSConnection and TPSMessage were moved from server package into
common package. The build script and configuration files have been
modified accordingly.

32 files changed, 60 insertions, 60 deletions

diff --git a/base/common/src/com/netscape/certsrv/tps/TPSClient.java b/base/common/src/com/netscape/certsrv/tps/TPSClient.java
index 65a1997ba..94a906cdf 100644
--- a/base/common/src/com/netscape/certsrv/tps/TPSClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/TPSClient.java
@@ -23,8 +23,8 @@ import com.netscape.certsrv.client.PKIClient;
 import com.netscape.certsrv.client.SubsystemClient;
 import com.netscape.certsrv.group.GroupClient;
 import com.netscape.certsrv.logging.ActivityClient;
-import com.netscape.certsrv.token.TokenClient;
 import com.netscape.certsrv.tps.cert.TPSCertClient;
+import com.netscape.certsrv.tps.token.TokenClient;
 import com.netscape.certsrv.user.UserClient;
 
 /**
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/TPSConnection.java b/base/common/src/com/netscape/certsrv/tps/TPSConnection.java
index cd62ff530..00e201c25 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/TPSConnection.java
+++ b/base/common/src/com/netscape/certsrv/tps/TPSConnection.java
@@ -15,7 +15,7 @@
 // (C) 2013 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.tps;
+package com.netscape.certsrv.tps;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/TPSMessage.java b/base/common/src/com/netscape/certsrv/tps/TPSMessage.java
index 522a0f408..c25459b2a 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/TPSMessage.java
+++ b/base/common/src/com/netscape/certsrv/tps/TPSMessage.java
@@ -15,7 +15,7 @@
 // (C) 2013 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.tps;
+package com.netscape.certsrv.tps;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/base/common/src/com/netscape/certsrv/token/TokenClient.java b/base/common/src/com/netscape/certsrv/tps/token/TokenClient.java
index d6fbd4e1f..48bddded6 100644
--- a/base/common/src/com/netscape/certsrv/token/TokenClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/token/TokenClient.java
@@ -15,7 +15,7 @@
 //(C) 2013 Red Hat, Inc.
 //All rights reserved.
 //--- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.token;
+package com.netscape.certsrv.tps.token;
 
 import java.net.URISyntaxException;
 
diff --git a/base/common/src/com/netscape/certsrv/token/TokenCollection.java b/base/common/src/com/netscape/certsrv/tps/token/TokenCollection.java
index e5de21f74..8af483b8a 100644
--- a/base/common/src/com/netscape/certsrv/token/TokenCollection.java
+++ b/base/common/src/com/netscape/certsrv/tps/token/TokenCollection.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package com.netscape.certsrv.token;
+package com.netscape.certsrv.tps.token;
 
 import java.util.Collection;
 
diff --git a/base/common/src/com/netscape/certsrv/token/TokenData.java b/base/common/src/com/netscape/certsrv/tps/token/TokenData.java
index 9dc8a9cec..cbd8275b2 100644
--- a/base/common/src/com/netscape/certsrv/token/TokenData.java
+++ b/base/common/src/com/netscape/certsrv/tps/token/TokenData.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package com.netscape.certsrv.token;
+package com.netscape.certsrv.tps.token;
 
 import java.io.StringReader;
 import java.io.StringWriter;
diff --git a/base/common/src/com/netscape/certsrv/token/TokenModifyRequest.java b/base/common/src/com/netscape/certsrv/tps/token/TokenModifyRequest.java
index bf0c4b6ea..b4168261f 100644
--- a/base/common/src/com/netscape/certsrv/token/TokenModifyRequest.java
+++ b/base/common/src/com/netscape/certsrv/tps/token/TokenModifyRequest.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package com.netscape.certsrv.token;
+package com.netscape.certsrv.tps.token;
 
 import java.io.StringReader;
 import java.io.StringWriter;
diff --git a/base/common/src/com/netscape/certsrv/token/TokenResource.java b/base/common/src/com/netscape/certsrv/tps/token/TokenResource.java
index 8fe733d88..5f98845e3 100644
--- a/base/common/src/com/netscape/certsrv/token/TokenResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/token/TokenResource.java
@@ -15,7 +15,7 @@
 // (C) 2013 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.token;
+package com.netscape.certsrv.tps.token;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/TPSCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/TPSCLI.java
index 8f740662c..2f28ada7d 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/TPSCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/TPSCLI.java
@@ -22,8 +22,8 @@ import com.netscape.certsrv.client.Client;
 import com.netscape.certsrv.tps.TPSClient;
 import com.netscape.cmstools.group.GroupCLI;
 import com.netscape.cmstools.logging.ActivityCLI;
-import com.netscape.cmstools.token.TokenCLI;
 import com.netscape.cmstools.tps.cert.TPSCertCLI;
+import com.netscape.cmstools.tps.token.TokenCLI;
 import com.netscape.cmstools.user.UserCLI;
 
 /**
diff --git a/base/java-tools/src/com/netscape/cmstools/token/TokenAddCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java
index 10405a906..0d495ddc7 100644
--- a/base/java-tools/src/com/netscape/cmstools/token/TokenAddCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java
@@ -16,12 +16,12 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package com.netscape.cmstools.token;
+package com.netscape.cmstools.tps.token;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
-import com.netscape.certsrv.token.TokenData;
+import com.netscape.certsrv.tps.token.TokenData;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 
diff --git a/base/java-tools/src/com/netscape/cmstools/token/TokenCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenCLI.java
index 14e54af3d..16c2b213b 100644
--- a/base/java-tools/src/com/netscape/cmstools/token/TokenCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenCLI.java
@@ -16,14 +16,14 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package com.netscape.cmstools.token;
+package com.netscape.cmstools.tps.token;
 
 import java.util.Arrays;
 
 import org.jboss.resteasy.plugins.providers.atom.Link;
 
-import com.netscape.certsrv.token.TokenClient;
-import com.netscape.certsrv.token.TokenData;
+import com.netscape.certsrv.tps.token.TokenClient;
+import com.netscape.certsrv.tps.token.TokenData;
 import com.netscape.cmstools.cli.CLI;
 
 /**
diff --git a/base/java-tools/src/com/netscape/cmstools/token/TokenFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenFindCLI.java
index b1fa04f47..3ade40bb9 100644
--- a/base/java-tools/src/com/netscape/cmstools/token/TokenFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenFindCLI.java
@@ -16,15 +16,15 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package com.netscape.cmstools.token;
+package com.netscape.cmstools.tps.token;
 
 import java.util.Collection;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
-import com.netscape.certsrv.token.TokenCollection;
-import com.netscape.certsrv.token.TokenData;
+import com.netscape.certsrv.tps.token.TokenCollection;
+import com.netscape.certsrv.tps.token.TokenData;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 
diff --git a/base/java-tools/src/com/netscape/cmstools/token/TokenModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenModifyCLI.java
index 29f1a0741..28559e163 100644
--- a/base/java-tools/src/com/netscape/cmstools/token/TokenModifyCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenModifyCLI.java
@@ -16,12 +16,12 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package com.netscape.cmstools.token;
+package com.netscape.cmstools.tps.token;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
-import com.netscape.certsrv.token.TokenData;
+import com.netscape.certsrv.tps.token.TokenData;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 
diff --git a/base/java-tools/src/com/netscape/cmstools/token/TokenRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenRemoveCLI.java
index 4e986313c..f522991cb 100644
--- a/base/java-tools/src/com/netscape/cmstools/token/TokenRemoveCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenRemoveCLI.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package com.netscape.cmstools.token;
+package com.netscape.cmstools.tps.token;
 
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
diff --git a/base/java-tools/src/com/netscape/cmstools/token/TokenShowCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenShowCLI.java
index 4f074f60f..14190ef01 100644
--- a/base/java-tools/src/com/netscape/cmstools/token/TokenShowCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenShowCLI.java
@@ -16,9 +16,9 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package com.netscape.cmstools.token;
+package com.netscape.cmstools.tps.token;
 
-import com.netscape.certsrv.token.TokenData;
+import com.netscape.certsrv.tps.token.TokenData;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 
diff --git a/base/tps-tomcat/shared/conf/CS.cfg.in b/base/tps-tomcat/shared/conf/CS.cfg.in
index 087ab483b..02ab97415 100644
--- a/base/tps-tomcat/shared/conf/CS.cfg.in
+++ b/base/tps-tomcat/shared/conf/CS.cfg.in
@@ -1380,8 +1380,8 @@ selftests._005=## tps.cert.list = <list of cert tag names deliminated by ",">
 selftests._006=## tps.cert.<cert tag name>.nickname
 selftests._007=## tps.cert.<cert tag name>.certusage
 selftests._008=##
-selftests.container.instance.TPSPresence=org.dogtagpki.tps.selftests.TPSPresence
-selftests.container.instance.TPSValidity=org.dogtagpki.tps.selftests.TPSValidity
+selftests.container.instance.TPSPresence=org.dogtagpki.server.tps.selftests.TPSPresence
+selftests.container.instance.TPSValidity=org.dogtagpki.server.tps.selftests.TPSValidity
 selftests.container.instance.SystemCertsVerification=com.netscape.cms.selftests.common.SystemCertsVerification
 selftests.container.logger.bufferSize=512
 selftests.container.logger.class=com.netscape.cms.logging.RollingLogFile
@@ -1407,7 +1407,7 @@ service.securePort=[PKI_AGENT_SECURE_PORT]
 service.unsecurePort=[PKI_UNSECURE_PORT]
 smtp.host=localhost
 smtp.port=25
-subsystem.0.class=org.dogtagpki.tps.server.TPSSubsystem
+subsystem.0.class=org.dogtagpki.server.tps.TPSSubsystem
 subsystem.0.id=tps
 subsystem.1.class=com.netscape.cmscore.selftests.SelfTestSubsystem
 subsystem.1.id=selftests
diff --git a/base/tps-tomcat/shared/webapps/tps/WEB-INF/web.xml b/base/tps-tomcat/shared/webapps/tps/WEB-INF/web.xml
index 6e6aafb99..69316fa54 100644
--- a/base/tps-tomcat/shared/webapps/tps/WEB-INF/web.xml
+++ b/base/tps-tomcat/shared/webapps/tps/WEB-INF/web.xml
@@ -97,7 +97,7 @@
 
     <servlet>
         <servlet-name>tps</servlet-name>
-        <servlet-class>org.dogtagpki.tps.server.TPSServlet</servlet-class>
+        <servlet-class>org.dogtagpki.server.tps.TPSServlet</servlet-class>
     </servlet>
 
     <listener>
@@ -119,7 +119,7 @@
         <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
-            <param-value>org.dogtagpki.tps.server.TPSApplication</param-value>
+            <param-value>org.dogtagpki.server.tps.TPSApplication</param-value>
         </init-param>
     </servlet>
 
diff --git a/base/tps-tomcat/src/CMakeLists.txt b/base/tps-tomcat/src/CMakeLists.txt
index 2c9af352a..4798d2004 100644
--- a/base/tps-tomcat/src/CMakeLists.txt
+++ b/base/tps-tomcat/src/CMakeLists.txt
@@ -96,7 +96,7 @@ find_file(SYMKEY_JAR
 # build pki-tps
 javac(pki-tps-classes
     SOURCES
-        org/dogtagpki/tps/*.java
+        org/dogtagpki/server/tps/*.java
     CLASSPATH
         ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
         ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
@@ -123,7 +123,7 @@ jar(pki-tps-jar
     INPUT_DIR
         ${CMAKE_BINARY_DIR}/classes
     FILES
-        org/dogtagpki/tps/*.class
+        org/dogtagpki/server/tps/*.class
     DEPENDS
         pki-tps-classes
 )
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/server/TPSApplication.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSApplication.java
index caf43a2f0..b0eac50f8 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/server/TPSApplication.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSApplication.java
@@ -15,16 +15,16 @@
 // (C) 2013 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.tps.server;
+package org.dogtagpki.server.tps;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import javax.ws.rs.core.Application;
 
-import org.dogtagpki.tps.cert.TPSCertService;
-import org.dogtagpki.tps.logging.ActivityService;
-import org.dogtagpki.tps.token.TokenService;
+import org.dogtagpki.server.tps.cert.TPSCertService;
+import org.dogtagpki.server.tps.logging.ActivityService;
+import org.dogtagpki.server.tps.token.TokenService;
 
 import com.netscape.certsrv.base.PKIException;
 import com.netscape.cms.authorization.ACLInterceptor;
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/server/TPSServlet.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSServlet.java
index 78e6df4f8..4fcec9dee 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/server/TPSServlet.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSServlet.java
@@ -15,7 +15,7 @@
 // (C) 2013 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.tps.server;
+package org.dogtagpki.server.tps;
 
 import java.io.IOException;
 
@@ -23,8 +23,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.dogtagpki.tps.TPSConnection;
-import org.dogtagpki.tps.TPSMessage;
+import com.netscape.certsrv.tps.TPSConnection;
+import com.netscape.certsrv.tps.TPSMessage;
 
 /**
  * @author Endi S. Dewata <edewata@redhat.com>
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/server/TPSSubsystem.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java
index 96ba4a9ef..5c27c1233 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/server/TPSSubsystem.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java
@@ -15,11 +15,11 @@
 // (C) 2013 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.tps.server;
+package org.dogtagpki.server.tps;
 
-import org.dogtagpki.tps.cert.TPSCertDatabase;
-import org.dogtagpki.tps.logging.ActivityDatabase;
-import org.dogtagpki.tps.token.TokenDatabase;
+import org.dogtagpki.server.tps.cert.TPSCertDatabase;
+import org.dogtagpki.server.tps.logging.ActivityDatabase;
+import org.dogtagpki.server.tps.token.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/tps/cert/TPSCertDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertDatabase.java
index a575eb7cf..274ef0ec2 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/cert/TPSCertDatabase.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertDatabase.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.tps.cert;
+package org.dogtagpki.server.tps.cert;
 
 import java.util.Date;
 
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/cert/TPSCertRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertRecord.java
index c9303294f..26b2c156d 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/cert/TPSCertRecord.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertRecord.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.tps.cert;
+package org.dogtagpki.server.tps.cert;
 
 import java.util.Date;
 
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/cert/TPSCertService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertService.java
index d49e3b700..e0534e3f5 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/cert/TPSCertService.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/cert/TPSCertService.java
@@ -16,14 +16,14 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.tps.cert;
+package org.dogtagpki.server.tps.cert;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLEncoder;
 import java.util.Iterator;
 
-import org.dogtagpki.tps.server.TPSSubsystem;
+import org.dogtagpki.server.tps.TPSSubsystem;
 import org.jboss.resteasy.plugins.providers.atom.Link;
 
 import com.netscape.certsrv.base.PKIException;
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/logging/ActivityDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityDatabase.java
index 28c0935da..0b74e5fe4 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/logging/ActivityDatabase.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityDatabase.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.tps.logging;
+package org.dogtagpki.server.tps.logging;
 
 import java.util.Date;
 
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/logging/ActivityRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityRecord.java
index e845955ca..387a85f00 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/logging/ActivityRecord.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityRecord.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.tps.logging;
+package org.dogtagpki.server.tps.logging;
 
 import java.util.Date;
 
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/logging/ActivityService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityService.java
index 174fd554f..491447c61 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/logging/ActivityService.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/logging/ActivityService.java
@@ -16,14 +16,14 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.tps.logging;
+package org.dogtagpki.server.tps.logging;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLEncoder;
 import java.util.Iterator;
 
-import org.dogtagpki.tps.server.TPSSubsystem;
+import org.dogtagpki.server.tps.TPSSubsystem;
 import org.jboss.resteasy.plugins.providers.atom.Link;
 
 import com.netscape.certsrv.apps.CMS;
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/selftests/TPSPresence.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/selftests/TPSPresence.java
index 177d7f6a6..65ac197e7 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/selftests/TPSPresence.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/selftests/TPSPresence.java
@@ -16,12 +16,12 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.tps.selftests;
+package org.dogtagpki.server.tps.selftests;
 
 import java.security.PublicKey;
 import java.util.Locale;
 
-import org.dogtagpki.tps.server.TPSSubsystem;
+import org.dogtagpki.server.tps.TPSSubsystem;
 
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/selftests/TPSValidity.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/selftests/TPSValidity.java
index 08c1ab088..f140d6e7c 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/selftests/TPSValidity.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/selftests/TPSValidity.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.tps.selftests;
+package org.dogtagpki.server.tps.selftests;
 
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
@@ -24,7 +24,7 @@ import java.util.Locale;
 
 import netscape.security.x509.X509CertImpl;
 
-import org.dogtagpki.tps.server.TPSSubsystem;
+import org.dogtagpki.server.tps.TPSSubsystem;
 
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/token/TokenDatabase.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenDatabase.java
index 7cc5aca78..87d4cbc5b 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/token/TokenDatabase.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenDatabase.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.tps.token;
+package org.dogtagpki.server.tps.token;
 
 import java.util.Date;
 
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/token/TokenRecord.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenRecord.java
index 85130e8bc..ff3af5776 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/token/TokenRecord.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenRecord.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.tps.token;
+package org.dogtagpki.server.tps.token;
 
 import java.util.Date;
 
diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/token/TokenService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenService.java
index c2787ebf5..66f96f932 100644
--- a/base/tps-tomcat/src/org/dogtagpki/tps/token/TokenService.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.tps.token;
+package org.dogtagpki.server.tps.token;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
@@ -26,14 +26,14 @@ import java.util.Iterator;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.dogtagpki.tps.server.TPSSubsystem;
+import org.dogtagpki.server.tps.TPSSubsystem;
 import org.jboss.resteasy.plugins.providers.atom.Link;
 
 import com.netscape.certsrv.base.PKIException;
-import com.netscape.certsrv.token.TokenCollection;
-import com.netscape.certsrv.token.TokenData;
-import com.netscape.certsrv.token.TokenModifyRequest;
-import com.netscape.certsrv.token.TokenResource;
+import com.netscape.certsrv.tps.token.TokenCollection;
+import com.netscape.certsrv.tps.token.TokenData;
+import com.netscape.certsrv.tps.token.TokenModifyRequest;
+import com.netscape.certsrv.tps.token.TokenResource;
 import com.netscape.cms.servlet.base.PKIService;
 
 /**