Rename pki-tps-tomcat to pki-tps

* PKI TRAC Ticket #1017 - Rename pki-tps-tomcat to pki-tps

181 files changed, 16 insertions, 17 deletions

diff --git a/.classpath b/.classpath
index 728136b3b..a699d9f12 100644
--- a/.classpath
+++ b/.classpath
@@ -18,7 +18,7 @@
 	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/kra/functional/src"/>
 	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/ocsp/src"/>
 	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/tks/src"/>
-	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/tps-tomcat/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/tps/src"/>
 	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/migrate/80"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/usr/share/java/apache-commons-cli.jar"/>
diff --git a/base/tps-tomcat/CMakeLists.txt b/base/tps/CMakeLists.txt
index dac32876c..dac32876c 100644
--- a/base/tps-tomcat/CMakeLists.txt
+++ b/base/tps/CMakeLists.txt
diff --git a/base/tps-tomcat/LICENSE b/base/tps/LICENSE
index af64f0781..af64f0781 100644
--- a/base/tps-tomcat/LICENSE
+++ b/base/tps/LICENSE
diff --git a/base/tps-tomcat/man/man5/pki-tps-connector.5 b/base/tps/man/man5/pki-tps-connector.5
index 85b6792d6..85b6792d6 100644
--- a/base/tps-tomcat/man/man5/pki-tps-connector.5
+++ b/base/tps/man/man5/pki-tps-connector.5
diff --git a/base/tps-tomcat/man/man5/pki-tps-profile.5 b/base/tps/man/man5/pki-tps-profile.5
index 2b864a05f..2b864a05f 100644
--- a/base/tps-tomcat/man/man5/pki-tps-profile.5
+++ b/base/tps/man/man5/pki-tps-profile.5
diff --git a/base/tps-tomcat/setup/CMakeLists.txt b/base/tps/setup/CMakeLists.txt
index d2a1399e6..d2a1399e6 100644
--- a/base/tps-tomcat/setup/CMakeLists.txt
+++ b/base/tps/setup/CMakeLists.txt
diff --git a/base/tps-tomcat/setup/registry_instance b/base/tps/setup/registry_instance
index 6365ecb9e..6365ecb9e 100644
--- a/base/tps-tomcat/setup/registry_instance
+++ b/base/tps/setup/registry_instance
diff --git a/base/tps-tomcat/shared/applets/1.2.4122DFB4.ijc b/base/tps/shared/applets/1.2.4122DFB4.ijc
index 2a8ea0733..2a8ea0733 100644
--- a/base/tps-tomcat/shared/applets/1.2.4122DFB4.ijc
+++ b/base/tps/shared/applets/1.2.4122DFB4.ijc
diff --git a/base/tps-tomcat/shared/applets/1.2.416DA155.ijc b/base/tps/shared/applets/1.2.416DA155.ijc
index 21b0312a8..21b0312a8 100755
--- a/base/tps-tomcat/shared/applets/1.2.416DA155.ijc
+++ b/base/tps/shared/applets/1.2.416DA155.ijc
diff --git a/base/tps-tomcat/shared/applets/1.3.42260AFA.ijc b/base/tps/shared/applets/1.3.42260AFA.ijc
index f17f98281..f17f98281 100755
--- a/base/tps-tomcat/shared/applets/1.3.42260AFA.ijc
+++ b/base/tps/shared/applets/1.3.42260AFA.ijc
diff --git a/base/tps-tomcat/shared/applets/1.3.4255CC01.ijc b/base/tps/shared/applets/1.3.4255CC01.ijc
index 322fe86e2..322fe86e2 100644
--- a/base/tps-tomcat/shared/applets/1.3.4255CC01.ijc
+++ b/base/tps/shared/applets/1.3.4255CC01.ijc
diff --git a/base/tps-tomcat/shared/applets/1.3.42659461.ijc b/base/tps/shared/applets/1.3.42659461.ijc
index ccf8ba451..ccf8ba451 100755
--- a/base/tps-tomcat/shared/applets/1.3.42659461.ijc
+++ b/base/tps/shared/applets/1.3.42659461.ijc
diff --git a/base/tps-tomcat/shared/applets/1.3.427BDDB8.ijc b/base/tps/shared/applets/1.3.427BDDB8.ijc
index 4a633e8d3..4a633e8d3 100644
--- a/base/tps-tomcat/shared/applets/1.3.427BDDB8.ijc
+++ b/base/tps/shared/applets/1.3.427BDDB8.ijc
diff --git a/base/tps-tomcat/shared/applets/1.3.44724DDE.ijc b/base/tps/shared/applets/1.3.44724DDE.ijc
index e56705dff..e56705dff 100755
--- a/base/tps-tomcat/shared/applets/1.3.44724DDE.ijc
+++ b/base/tps/shared/applets/1.3.44724DDE.ijc
diff --git a/base/tps-tomcat/shared/applets/1.3.45787308.ijc b/base/tps/shared/applets/1.3.45787308.ijc
index 164c7e0cd..164c7e0cd 100755
--- a/base/tps-tomcat/shared/applets/1.3.45787308.ijc
+++ b/base/tps/shared/applets/1.3.45787308.ijc
diff --git a/base/tps-tomcat/shared/applets/1.4.499dc06c.ijc b/base/tps/shared/applets/1.4.499dc06c.ijc
index 388482123..388482123 100644
--- a/base/tps-tomcat/shared/applets/1.4.499dc06c.ijc
+++ b/base/tps/shared/applets/1.4.499dc06c.ijc
diff --git a/base/tps-tomcat/shared/applets/1.4.4d40a449.ijc b/base/tps/shared/applets/1.4.4d40a449.ijc
index bd716adb0..bd716adb0 100644
--- a/base/tps-tomcat/shared/applets/1.4.4d40a449.ijc
+++ b/base/tps/shared/applets/1.4.4d40a449.ijc
diff --git a/base/tps-tomcat/shared/applets/3FD00877.ijc b/base/tps/shared/applets/3FD00877.ijc
index 5e6624d5a..5e6624d5a 100644
--- a/base/tps-tomcat/shared/applets/3FD00877.ijc
+++ b/base/tps/shared/applets/3FD00877.ijc
diff --git a/base/tps-tomcat/shared/applets/4003196C.ijc b/base/tps/shared/applets/4003196C.ijc
index bed8a7900..bed8a7900 100644
--- a/base/tps-tomcat/shared/applets/4003196C.ijc
+++ b/base/tps/shared/applets/4003196C.ijc
diff --git a/base/tps-tomcat/shared/applets/402428AD.ijc b/base/tps/shared/applets/402428AD.ijc
index b91a64334..b91a64334 100644
--- a/base/tps-tomcat/shared/applets/402428AD.ijc
+++ b/base/tps/shared/applets/402428AD.ijc
diff --git a/base/tps-tomcat/shared/applets/404E4697.ijc b/base/tps/shared/applets/404E4697.ijc
index 9c927c0f0..9c927c0f0 100644
--- a/base/tps-tomcat/shared/applets/404E4697.ijc
+++ b/base/tps/shared/applets/404E4697.ijc
diff --git a/base/tps-tomcat/shared/applets/4122DFB4.ijc b/base/tps/shared/applets/4122DFB4.ijc
index 2a8ea0733..2a8ea0733 100644
--- a/base/tps-tomcat/shared/applets/4122DFB4.ijc
+++ b/base/tps/shared/applets/4122DFB4.ijc
diff --git a/base/tps-tomcat/shared/applets/listappletdates b/base/tps/shared/applets/listappletdates
index cca5964b7..cca5964b7 100755
--- a/base/tps-tomcat/shared/applets/listappletdates
+++ b/base/tps/shared/applets/listappletdates
diff --git a/base/tps-tomcat/shared/applets/readme.txt b/base/tps/shared/applets/readme.txt
index 773e3bac5..773e3bac5 100644
--- a/base/tps-tomcat/shared/applets/readme.txt
+++ b/base/tps/shared/applets/readme.txt
diff --git a/base/tps-tomcat/shared/conf/CMakeLists.txt b/base/tps/shared/conf/CMakeLists.txt
index 419289d03..419289d03 100644
--- a/base/tps-tomcat/shared/conf/CMakeLists.txt
+++ b/base/tps/shared/conf/CMakeLists.txt
diff --git a/base/tps-tomcat/shared/conf/CS.cfg.in b/base/tps/shared/conf/CS.cfg.in
index 1647acc5d..1647acc5d 100644
--- a/base/tps-tomcat/shared/conf/CS.cfg.in
+++ b/base/tps/shared/conf/CS.cfg.in
diff --git a/base/tps-tomcat/shared/conf/Catalina/localhost/tps.xml b/base/tps/shared/conf/Catalina/localhost/tps.xml
index d80c1296d..d80c1296d 100644
--- a/base/tps-tomcat/shared/conf/Catalina/localhost/tps.xml
+++ b/base/tps/shared/conf/Catalina/localhost/tps.xml
diff --git a/base/tps-tomcat/shared/conf/acl.ldif b/base/tps/shared/conf/acl.ldif
index 41b38137b..41b38137b 100644
--- a/base/tps-tomcat/shared/conf/acl.ldif
+++ b/base/tps/shared/conf/acl.ldif
diff --git a/base/tps-tomcat/shared/conf/acl.properties b/base/tps/shared/conf/acl.properties
index 840c0610e..840c0610e 100644
--- a/base/tps-tomcat/shared/conf/acl.properties
+++ b/base/tps/shared/conf/acl.properties
diff --git a/base/tps-tomcat/shared/conf/auth-method.properties b/base/tps/shared/conf/auth-method.properties
index 4a97df1c6..4a97df1c6 100644
--- a/base/tps-tomcat/shared/conf/auth-method.properties
+++ b/base/tps/shared/conf/auth-method.properties
diff --git a/base/tps-tomcat/shared/conf/catalina.policy b/base/tps/shared/conf/catalina.policy
index 5ccc7959e..5ccc7959e 100644
--- a/base/tps-tomcat/shared/conf/catalina.policy
+++ b/base/tps/shared/conf/catalina.policy
diff --git a/base/tps-tomcat/shared/conf/catalina.properties b/base/tps/shared/conf/catalina.properties
index f6d1d1415..f6d1d1415 100644
--- a/base/tps-tomcat/shared/conf/catalina.properties
+++ b/base/tps/shared/conf/catalina.properties
diff --git a/base/tps-tomcat/shared/conf/database.ldif b/base/tps/shared/conf/database.ldif
index d3c5f9e68..d3c5f9e68 100644
--- a/base/tps-tomcat/shared/conf/database.ldif
+++ b/base/tps/shared/conf/database.ldif
diff --git a/base/tps-tomcat/shared/conf/db.ldif b/base/tps/shared/conf/db.ldif
index afa0c3920..afa0c3920 100644
--- a/base/tps-tomcat/shared/conf/db.ldif
+++ b/base/tps/shared/conf/db.ldif
diff --git a/base/tps-tomcat/shared/conf/index.ldif b/base/tps/shared/conf/index.ldif
index defe17a63..defe17a63 100644
--- a/base/tps-tomcat/shared/conf/index.ldif
+++ b/base/tps/shared/conf/index.ldif
diff --git a/base/tps-tomcat/shared/conf/jk2.manifest b/base/tps/shared/conf/jk2.manifest
index 986d7b874..986d7b874 100644
--- a/base/tps-tomcat/shared/conf/jk2.manifest
+++ b/base/tps/shared/conf/jk2.manifest
diff --git a/base/tps-tomcat/shared/conf/jk2.properties b/base/tps/shared/conf/jk2.properties
index 934d6ed54..934d6ed54 100644
--- a/base/tps-tomcat/shared/conf/jk2.properties
+++ b/base/tps/shared/conf/jk2.properties
diff --git a/base/tps-tomcat/shared/conf/jkconf.ant.xml b/base/tps/shared/conf/jkconf.ant.xml
index 48396f1b7..48396f1b7 100644
--- a/base/tps-tomcat/shared/conf/jkconf.ant.xml
+++ b/base/tps/shared/conf/jkconf.ant.xml
diff --git a/base/tps-tomcat/shared/conf/jkconfig.manifest b/base/tps/shared/conf/jkconfig.manifest
index 3ba1f2e3e..3ba1f2e3e 100644
--- a/base/tps-tomcat/shared/conf/jkconfig.manifest
+++ b/base/tps/shared/conf/jkconfig.manifest
diff --git a/base/tps-tomcat/shared/conf/logging.properties b/base/tps/shared/conf/logging.properties
index 796cfc071..796cfc071 100644
--- a/base/tps-tomcat/shared/conf/logging.properties
+++ b/base/tps/shared/conf/logging.properties
diff --git a/base/tps-tomcat/shared/conf/manager.ldif b/base/tps/shared/conf/manager.ldif
index 18700dd4b..18700dd4b 100644
--- a/base/tps-tomcat/shared/conf/manager.ldif
+++ b/base/tps/shared/conf/manager.ldif
diff --git a/base/tps-tomcat/shared/conf/phoneHome.xml b/base/tps/shared/conf/phoneHome.xml
index 314e1bb64..314e1bb64 100644
--- a/base/tps-tomcat/shared/conf/phoneHome.xml
+++ b/base/tps/shared/conf/phoneHome.xml
diff --git a/base/tps-tomcat/shared/conf/registry.cfg b/base/tps/shared/conf/registry.cfg
index dc26ae861..dc26ae861 100644
--- a/base/tps-tomcat/shared/conf/registry.cfg
+++ b/base/tps/shared/conf/registry.cfg
diff --git a/base/tps-tomcat/shared/conf/schema.ldif b/base/tps/shared/conf/schema.ldif
index bde045630..bde045630 100644
--- a/base/tps-tomcat/shared/conf/schema.ldif
+++ b/base/tps/shared/conf/schema.ldif
diff --git a/base/tps-tomcat/shared/conf/server-minimal.xml b/base/tps/shared/conf/server-minimal.xml
index fc855c6e3..fc855c6e3 100644
--- a/base/tps-tomcat/shared/conf/server-minimal.xml
+++ b/base/tps/shared/conf/server-minimal.xml
diff --git a/base/tps-tomcat/shared/conf/server.xml b/base/tps/shared/conf/server.xml
index 23e4f5fde..23e4f5fde 100644
--- a/base/tps-tomcat/shared/conf/server.xml
+++ b/base/tps/shared/conf/server.xml
diff --git a/base/tps-tomcat/shared/conf/shm.manifest b/base/tps/shared/conf/shm.manifest
index 0505c085b..0505c085b 100644
--- a/base/tps-tomcat/shared/conf/shm.manifest
+++ b/base/tps/shared/conf/shm.manifest
diff --git a/base/tps-tomcat/shared/conf/tomcat-jk2.manifest b/base/tps/shared/conf/tomcat-jk2.manifest
index acfef4a90..acfef4a90 100644
--- a/base/tps-tomcat/shared/conf/tomcat-jk2.manifest
+++ b/base/tps/shared/conf/tomcat-jk2.manifest
diff --git a/base/tps-tomcat/shared/conf/tomcat-users.xml b/base/tps/shared/conf/tomcat-users.xml
index daa9260cc..daa9260cc 100644
--- a/base/tps-tomcat/shared/conf/tomcat-users.xml
+++ b/base/tps/shared/conf/tomcat-users.xml
diff --git a/base/tps-tomcat/shared/conf/tomcat6.conf b/base/tps/shared/conf/tomcat6.conf
index 2d7def5ec..2d7def5ec 100644
--- a/base/tps-tomcat/shared/conf/tomcat6.conf
+++ b/base/tps/shared/conf/tomcat6.conf
diff --git a/base/tps-tomcat/shared/conf/uriworkermap.properties b/base/tps/shared/conf/uriworkermap.properties
index c89dd82a6..c89dd82a6 100644
--- a/base/tps-tomcat/shared/conf/uriworkermap.properties
+++ b/base/tps/shared/conf/uriworkermap.properties
diff --git a/base/tps-tomcat/shared/conf/vlv.ldif b/base/tps/shared/conf/vlv.ldif
index db7988e36..db7988e36 100644
--- a/base/tps-tomcat/shared/conf/vlv.ldif
+++ b/base/tps/shared/conf/vlv.ldif
diff --git a/base/tps-tomcat/shared/conf/vlvtasks.ldif b/base/tps/shared/conf/vlvtasks.ldif
index b1b93aabf..b1b93aabf 100644
--- a/base/tps-tomcat/shared/conf/vlvtasks.ldif
+++ b/base/tps/shared/conf/vlvtasks.ldif
diff --git a/base/tps-tomcat/shared/conf/web.xml b/base/tps/shared/conf/web.xml
index 8330ecca8..8330ecca8 100644
--- a/base/tps-tomcat/shared/conf/web.xml
+++ b/base/tps/shared/conf/web.xml
diff --git a/base/tps-tomcat/shared/conf/workers.properties b/base/tps/shared/conf/workers.properties
index ae26a983c..ae26a983c 100644
--- a/base/tps-tomcat/shared/conf/workers.properties
+++ b/base/tps/shared/conf/workers.properties
diff --git a/base/tps-tomcat/shared/conf/workers.properties.minimal b/base/tps/shared/conf/workers.properties.minimal
index 51980ac49..51980ac49 100644
--- a/base/tps-tomcat/shared/conf/workers.properties.minimal
+++ b/base/tps/shared/conf/workers.properties.minimal
diff --git a/base/tps-tomcat/shared/conf/workers2.properties b/base/tps/shared/conf/workers2.properties
index 3c8e0f4a5..3c8e0f4a5 100644
--- a/base/tps-tomcat/shared/conf/workers2.properties
+++ b/base/tps/shared/conf/workers2.properties
diff --git a/base/tps-tomcat/shared/conf/workers2.properties.minimal b/base/tps/shared/conf/workers2.properties.minimal
index 0e88d14c7..0e88d14c7 100644
--- a/base/tps-tomcat/shared/conf/workers2.properties.minimal
+++ b/base/tps/shared/conf/workers2.properties.minimal
diff --git a/base/tps-tomcat/shared/webapps/tps/404.html b/base/tps/shared/webapps/tps/404.html
index 0bf93578c..0bf93578c 100755
--- a/base/tps-tomcat/shared/webapps/tps/404.html
+++ b/base/tps/shared/webapps/tps/404.html
diff --git a/base/tps-tomcat/shared/webapps/tps/500.html b/base/tps/shared/webapps/tps/500.html
index 3e1e8bb66..3e1e8bb66 100755
--- a/base/tps-tomcat/shared/webapps/tps/500.html
+++ b/base/tps/shared/webapps/tps/500.html
diff --git a/base/tps-tomcat/shared/webapps/tps/GenUnexpectedError.template b/base/tps/shared/webapps/tps/GenUnexpectedError.template
index ea545c145..ea545c145 100644
--- a/base/tps-tomcat/shared/webapps/tps/GenUnexpectedError.template
+++ b/base/tps/shared/webapps/tps/GenUnexpectedError.template
diff --git a/base/tps-tomcat/shared/webapps/tps/WEB-INF/velocity.properties b/base/tps/shared/webapps/tps/WEB-INF/velocity.properties
index c1c6e4ea9..c1c6e4ea9 100644
--- a/base/tps-tomcat/shared/webapps/tps/WEB-INF/velocity.properties
+++ b/base/tps/shared/webapps/tps/WEB-INF/velocity.properties
diff --git a/base/tps-tomcat/shared/webapps/tps/WEB-INF/web.xml b/base/tps/shared/webapps/tps/WEB-INF/web.xml
index 8506b2725..8506b2725 100644
--- a/base/tps-tomcat/shared/webapps/tps/WEB-INF/web.xml
+++ b/base/tps/shared/webapps/tps/WEB-INF/web.xml
diff --git a/base/tps-tomcat/shared/webapps/tps/index.html b/base/tps/shared/webapps/tps/index.html
index c48da3307..c48da3307 100644
--- a/base/tps-tomcat/shared/webapps/tps/index.html
+++ b/base/tps/shared/webapps/tps/index.html
diff --git a/base/tps-tomcat/shared/webapps/tps/js/account.js b/base/tps/shared/webapps/tps/js/account.js
index 97b222aaa..97b222aaa 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/account.js
+++ b/base/tps/shared/webapps/tps/js/account.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/activity.js b/base/tps/shared/webapps/tps/js/activity.js
index cbc724e23..cbc724e23 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/activity.js
+++ b/base/tps/shared/webapps/tps/js/activity.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/audit.js b/base/tps/shared/webapps/tps/js/audit.js
index 986596e1d..986596e1d 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/audit.js
+++ b/base/tps/shared/webapps/tps/js/audit.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/authenticator.js b/base/tps/shared/webapps/tps/js/authenticator.js
index f91cf6bfe..f91cf6bfe 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/authenticator.js
+++ b/base/tps/shared/webapps/tps/js/authenticator.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/cert.js b/base/tps/shared/webapps/tps/js/cert.js
index 016b56ee0..016b56ee0 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/cert.js
+++ b/base/tps/shared/webapps/tps/js/cert.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/config.js b/base/tps/shared/webapps/tps/js/config.js
index 5b651a09d..5b651a09d 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/config.js
+++ b/base/tps/shared/webapps/tps/js/config.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/connector.js b/base/tps/shared/webapps/tps/js/connector.js
index bc7e4c2bd..bc7e4c2bd 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/connector.js
+++ b/base/tps/shared/webapps/tps/js/connector.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/group.js b/base/tps/shared/webapps/tps/js/group.js
index 50d7d6c67..50d7d6c67 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/group.js
+++ b/base/tps/shared/webapps/tps/js/group.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/profile-mapping.js b/base/tps/shared/webapps/tps/js/profile-mapping.js
index 54c042562..54c042562 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/profile-mapping.js
+++ b/base/tps/shared/webapps/tps/js/profile-mapping.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/profile.js b/base/tps/shared/webapps/tps/js/profile.js
index 0454686a9..0454686a9 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/profile.js
+++ b/base/tps/shared/webapps/tps/js/profile.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/selftest.js b/base/tps/shared/webapps/tps/js/selftest.js
index d28907817..d28907817 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/selftest.js
+++ b/base/tps/shared/webapps/tps/js/selftest.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/token.js b/base/tps/shared/webapps/tps/js/token.js
index 2ea17714e..2ea17714e 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/token.js
+++ b/base/tps/shared/webapps/tps/js/token.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/tps.js b/base/tps/shared/webapps/tps/js/tps.js
index 476533759..476533759 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/tps.js
+++ b/base/tps/shared/webapps/tps/js/tps.js
diff --git a/base/tps-tomcat/shared/webapps/tps/js/user.js b/base/tps/shared/webapps/tps/js/user.js
index 3a29f1dd1..3a29f1dd1 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/user.js
+++ b/base/tps/shared/webapps/tps/js/user.js
diff --git a/base/tps-tomcat/shared/webapps/tps/services.template b/base/tps/shared/webapps/tps/services.template
index c6792fea1..c6792fea1 100644
--- a/base/tps-tomcat/shared/webapps/tps/services.template
+++ b/base/tps/shared/webapps/tps/services.template
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/activities.html b/base/tps/shared/webapps/tps/ui/activities.html
index 0762401fd..0762401fd 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/activities.html
+++ b/base/tps/shared/webapps/tps/ui/activities.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/activity.html b/base/tps/shared/webapps/tps/ui/activity.html
index 5ba96a4e1..5ba96a4e1 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/activity.html
+++ b/base/tps/shared/webapps/tps/ui/activity.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/audit.html b/base/tps/shared/webapps/tps/ui/audit.html
index 3e6cc6cbb..3e6cc6cbb 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/audit.html
+++ b/base/tps/shared/webapps/tps/ui/audit.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/authenticator.html b/base/tps/shared/webapps/tps/ui/authenticator.html
index 6da1fbf12..6da1fbf12 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/authenticator.html
+++ b/base/tps/shared/webapps/tps/ui/authenticator.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/authenticators.html b/base/tps/shared/webapps/tps/ui/authenticators.html
index f9b0b0a28..f9b0b0a28 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/authenticators.html
+++ b/base/tps/shared/webapps/tps/ui/authenticators.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/cert.html b/base/tps/shared/webapps/tps/ui/cert.html
index 456f23355..456f23355 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/cert.html
+++ b/base/tps/shared/webapps/tps/ui/cert.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/certs.html b/base/tps/shared/webapps/tps/ui/certs.html
index a87c2dd32..a87c2dd32 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/certs.html
+++ b/base/tps/shared/webapps/tps/ui/certs.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/config.html b/base/tps/shared/webapps/tps/ui/config.html
index d94a0fa28..d94a0fa28 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/config.html
+++ b/base/tps/shared/webapps/tps/ui/config.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/connector.html b/base/tps/shared/webapps/tps/ui/connector.html
index 015a7ac6d..015a7ac6d 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/connector.html
+++ b/base/tps/shared/webapps/tps/ui/connector.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/connectors.html b/base/tps/shared/webapps/tps/ui/connectors.html
index 4d4d59772..4d4d59772 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/connectors.html
+++ b/base/tps/shared/webapps/tps/ui/connectors.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/group.html b/base/tps/shared/webapps/tps/ui/group.html
index 493b79488..493b79488 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/group.html
+++ b/base/tps/shared/webapps/tps/ui/group.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/groups.html b/base/tps/shared/webapps/tps/ui/groups.html
index 9f4239db8..9f4239db8 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/groups.html
+++ b/base/tps/shared/webapps/tps/ui/groups.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/home.html b/base/tps/shared/webapps/tps/ui/home.html
index 8502ca448..8502ca448 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/home.html
+++ b/base/tps/shared/webapps/tps/ui/home.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/index.html b/base/tps/shared/webapps/tps/ui/index.html
index eddceefd7..eddceefd7 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/index.html
+++ b/base/tps/shared/webapps/tps/ui/index.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/profile-mapping.html b/base/tps/shared/webapps/tps/ui/profile-mapping.html
index 139d21262..139d21262 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/profile-mapping.html
+++ b/base/tps/shared/webapps/tps/ui/profile-mapping.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/profile-mappings.html b/base/tps/shared/webapps/tps/ui/profile-mappings.html
index dc797bc18..dc797bc18 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/profile-mappings.html
+++ b/base/tps/shared/webapps/tps/ui/profile-mappings.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/profile.html b/base/tps/shared/webapps/tps/ui/profile.html
index 61811bcc3..61811bcc3 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/profile.html
+++ b/base/tps/shared/webapps/tps/ui/profile.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/profiles.html b/base/tps/shared/webapps/tps/ui/profiles.html
index 00218e5f7..00218e5f7 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/profiles.html
+++ b/base/tps/shared/webapps/tps/ui/profiles.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/selftest.html b/base/tps/shared/webapps/tps/ui/selftest.html
index 8a680355a..8a680355a 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/selftest.html
+++ b/base/tps/shared/webapps/tps/ui/selftest.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/selftests.html b/base/tps/shared/webapps/tps/ui/selftests.html
index 2b428e2d2..2b428e2d2 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/selftests.html
+++ b/base/tps/shared/webapps/tps/ui/selftests.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/token.html b/base/tps/shared/webapps/tps/ui/token.html
index 78384acfe..78384acfe 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/token.html
+++ b/base/tps/shared/webapps/tps/ui/token.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/tokens.html b/base/tps/shared/webapps/tps/ui/tokens.html
index aca579a68..aca579a68 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/tokens.html
+++ b/base/tps/shared/webapps/tps/ui/tokens.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/user.html b/base/tps/shared/webapps/tps/ui/user.html
index 8463d0bef..8463d0bef 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/user.html
+++ b/base/tps/shared/webapps/tps/ui/user.html
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/users.html b/base/tps/shared/webapps/tps/ui/users.html
index 18d59c9de..18d59c9de 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/users.html
+++ b/base/tps/shared/webapps/tps/ui/users.html
diff --git a/base/tps-tomcat/src/CMakeLists.txt b/base/tps/src/CMakeLists.txt
index b36a01526..b36a01526 100644
--- a/base/tps-tomcat/src/CMakeLists.txt
+++ b/base/tps/src/CMakeLists.txt
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSPhoneHome.java b/base/tps/src/org/dogtagpki/server/tps/TPSPhoneHome.java
index e0b3b6b87..e0b3b6b87 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSPhoneHome.java
+++ b/base/tps/src/org/dogtagpki/server/tps/TPSPhoneHome.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSServlet.java b/base/tps/src/org/dogtagpki/server/tps/TPSServlet.java
index 87c416b3e..87c416b3e 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSServlet.java
+++ b/base/tps/src/org/dogtagpki/server/tps/TPSServlet.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSession.java b/base/tps/src/org/dogtagpki/server/tps/TPSSession.java
index 4a175e698..4a175e698 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSession.java
+++ b/base/tps/src/org/dogtagpki/server/tps/TPSSession.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java b/base/tps/src/org/dogtagpki/server/tps/TPSSubsystem.java
index 75cdddadb..75cdddadb 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSSubsystem.java
+++ b/base/tps/src/org/dogtagpki/server/tps/TPSSubsystem.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSTokenPolicy.java b/base/tps/src/org/dogtagpki/server/tps/TPSTokenPolicy.java
index 1a866f737..1a866f737 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSTokenPolicy.java
+++ b/base/tps/src/org/dogtagpki/server/tps/TPSTokenPolicy.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSTokendb.java b/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java
index 914706dd9..914706dd9 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/TPSTokendb.java
+++ b/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/authentication/AuthUIParameter.java b/base/tps/src/org/dogtagpki/server/tps/authentication/AuthUIParameter.java
index 16d57f948..16d57f948 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/authentication/AuthUIParameter.java
+++ b/base/tps/src/org/dogtagpki/server/tps/authentication/AuthUIParameter.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/authentication/AuthenticationManager.java b/base/tps/src/org/dogtagpki/server/tps/authentication/AuthenticationManager.java
index e163bf6b1..e163bf6b1 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/authentication/AuthenticationManager.java
+++ b/base/tps/src/org/dogtagpki/server/tps/authentication/AuthenticationManager.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/authentication/TPSAuthenticator.java b/base/tps/src/org/dogtagpki/server/tps/authentication/TPSAuthenticator.java
index 8d84cf5f6..8d84cf5f6 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/authentication/TPSAuthenticator.java
+++ b/base/tps/src/org/dogtagpki/server/tps/authentication/TPSAuthenticator.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/channel/SecureChannel.java b/base/tps/src/org/dogtagpki/server/tps/channel/SecureChannel.java
index 7c3a01ba7..7c3a01ba7 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/channel/SecureChannel.java
+++ b/base/tps/src/org/dogtagpki/server/tps/channel/SecureChannel.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/CAEnrollCertResponse.java b/base/tps/src/org/dogtagpki/server/tps/cms/CAEnrollCertResponse.java
index 9c83e0842..9c83e0842 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/CAEnrollCertResponse.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/CAEnrollCertResponse.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/CARemoteRequestHandler.java b/base/tps/src/org/dogtagpki/server/tps/cms/CARemoteRequestHandler.java
index 5851d2f69..5851d2f69 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/CARemoteRequestHandler.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/CARemoteRequestHandler.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/CARenewCertResponse.java b/base/tps/src/org/dogtagpki/server/tps/cms/CARenewCertResponse.java
index bb9ebbb44..bb9ebbb44 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/CARenewCertResponse.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/CARenewCertResponse.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/CARetrieveCertResponse.java b/base/tps/src/org/dogtagpki/server/tps/cms/CARetrieveCertResponse.java
index a356907fa..a356907fa 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/CARetrieveCertResponse.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/CARetrieveCertResponse.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/CARevokeCertResponse.java b/base/tps/src/org/dogtagpki/server/tps/cms/CARevokeCertResponse.java
index d7db5976c..d7db5976c 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/CARevokeCertResponse.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/CARevokeCertResponse.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/ConnectionManager.java b/base/tps/src/org/dogtagpki/server/tps/cms/ConnectionManager.java
index 2b5ab2208..2b5ab2208 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/ConnectionManager.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/ConnectionManager.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/KRARecoverKeyResponse.java b/base/tps/src/org/dogtagpki/server/tps/cms/KRARecoverKeyResponse.java
index 9d0c5ff5f..9d0c5ff5f 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/KRARecoverKeyResponse.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/KRARecoverKeyResponse.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/KRARemoteRequestHandler.java b/base/tps/src/org/dogtagpki/server/tps/cms/KRARemoteRequestHandler.java
index 87388ff99..87388ff99 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/KRARemoteRequestHandler.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/KRARemoteRequestHandler.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/KRAServerSideKeyGenResponse.java b/base/tps/src/org/dogtagpki/server/tps/cms/KRAServerSideKeyGenResponse.java
index 1836bcdbd..1836bcdbd 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/KRAServerSideKeyGenResponse.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/KRAServerSideKeyGenResponse.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/RemoteRequestHandler.java b/base/tps/src/org/dogtagpki/server/tps/cms/RemoteRequestHandler.java
index ceed1c11c..ceed1c11c 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/RemoteRequestHandler.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/RemoteRequestHandler.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/RemoteResponse.java b/base/tps/src/org/dogtagpki/server/tps/cms/RemoteResponse.java
index c2c7818b0..c2c7818b0 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/RemoteResponse.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/RemoteResponse.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/TKSComputeRandomDataResponse.java b/base/tps/src/org/dogtagpki/server/tps/cms/TKSComputeRandomDataResponse.java
index f241c88ad..f241c88ad 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/TKSComputeRandomDataResponse.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/TKSComputeRandomDataResponse.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/TKSComputeSessionKeyResponse.java b/base/tps/src/org/dogtagpki/server/tps/cms/TKSComputeSessionKeyResponse.java
index 2fe382539..2fe382539 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/TKSComputeSessionKeyResponse.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/TKSComputeSessionKeyResponse.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/TKSCreateKeySetDataResponse.java b/base/tps/src/org/dogtagpki/server/tps/cms/TKSCreateKeySetDataResponse.java
index f887c63bb..f887c63bb 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/TKSCreateKeySetDataResponse.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/TKSCreateKeySetDataResponse.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/TKSEncryptDataResponse.java b/base/tps/src/org/dogtagpki/server/tps/cms/TKSEncryptDataResponse.java
index 7dba17148..7dba17148 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/TKSEncryptDataResponse.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/TKSEncryptDataResponse.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/TKSRemoteRequestHandler.java b/base/tps/src/org/dogtagpki/server/tps/cms/TKSRemoteRequestHandler.java
index 3c371a45e..3c371a45e 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/TKSRemoteRequestHandler.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/TKSRemoteRequestHandler.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/TKSResponse.java b/base/tps/src/org/dogtagpki/server/tps/cms/TKSResponse.java
index 37269c765..37269c765 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/cms/TKSResponse.java
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/TKSResponse.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/AuthenticatorDatabase.java b/base/tps/src/org/dogtagpki/server/tps/config/AuthenticatorDatabase.java
index 292b80afb..292b80afb 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/AuthenticatorDatabase.java
+++ b/base/tps/src/org/dogtagpki/server/tps/config/AuthenticatorDatabase.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/AuthenticatorRecord.java b/base/tps/src/org/dogtagpki/server/tps/config/AuthenticatorRecord.java
index 937a25e51..937a25e51 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/AuthenticatorRecord.java
+++ b/base/tps/src/org/dogtagpki/server/tps/config/AuthenticatorRecord.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConfigDatabase.java b/base/tps/src/org/dogtagpki/server/tps/config/ConfigDatabase.java
index db0fa9aa6..db0fa9aa6 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConfigDatabase.java
+++ b/base/tps/src/org/dogtagpki/server/tps/config/ConfigDatabase.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConfigRecord.java b/base/tps/src/org/dogtagpki/server/tps/config/ConfigRecord.java
index f1a87ddfe..f1a87ddfe 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConfigRecord.java
+++ b/base/tps/src/org/dogtagpki/server/tps/config/ConfigRecord.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConfigService.java b/base/tps/src/org/dogtagpki/server/tps/config/ConfigService.java
index 6cd5e9f7d..6cd5e9f7d 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConfigService.java
+++ b/base/tps/src/org/dogtagpki/server/tps/config/ConfigService.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectorDatabase.java b/base/tps/src/org/dogtagpki/server/tps/config/ConnectorDatabase.java
index 4b1589797..4b1589797 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectorDatabase.java
+++ b/base/tps/src/org/dogtagpki/server/tps/config/ConnectorDatabase.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectorRecord.java b/base/tps/src/org/dogtagpki/server/tps/config/ConnectorRecord.java
index 3123718b1..3123718b1 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConnectorRecord.java
+++ b/base/tps/src/org/dogtagpki/server/tps/config/ConnectorRecord.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileDatabase.java b/base/tps/src/org/dogtagpki/server/tps/config/ProfileDatabase.java
index 01225d309..01225d309 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileDatabase.java
+++ b/base/tps/src/org/dogtagpki/server/tps/config/ProfileDatabase.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingDatabase.java b/base/tps/src/org/dogtagpki/server/tps/config/ProfileMappingDatabase.java
index 67a21d6ac..67a21d6ac 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingDatabase.java
+++ b/base/tps/src/org/dogtagpki/server/tps/config/ProfileMappingDatabase.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingRecord.java b/base/tps/src/org/dogtagpki/server/tps/config/ProfileMappingRecord.java
index 92793ce5e..92793ce5e 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileMappingRecord.java
+++ b/base/tps/src/org/dogtagpki/server/tps/config/ProfileMappingRecord.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileRecord.java b/base/tps/src/org/dogtagpki/server/tps/config/ProfileRecord.java
index a84b7f5ba..a84b7f5ba 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ProfileRecord.java
+++ b/base/tps/src/org/dogtagpki/server/tps/config/ProfileRecord.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java b/base/tps/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java
index 9b4a4b28d..9b4a4b28d 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java
+++ b/base/tps/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityRecord.java b/base/tps/src/org/dogtagpki/server/tps/dbs/ActivityRecord.java
index fe5b1f91c..fe5b1f91c 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/ActivityRecord.java
+++ b/base/tps/src/org/dogtagpki/server/tps/dbs/ActivityRecord.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertDatabase.java b/base/tps/src/org/dogtagpki/server/tps/dbs/TPSCertDatabase.java
index 7450b0665..7450b0665 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertDatabase.java
+++ b/base/tps/src/org/dogtagpki/server/tps/dbs/TPSCertDatabase.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertRecord.java b/base/tps/src/org/dogtagpki/server/tps/dbs/TPSCertRecord.java
index 288f25f53..288f25f53 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TPSCertRecord.java
+++ b/base/tps/src/org/dogtagpki/server/tps/dbs/TPSCertRecord.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java b/base/tps/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java
index f86c6e203..f86c6e203 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java
+++ b/base/tps/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenRecord.java b/base/tps/src/org/dogtagpki/server/tps/dbs/TokenRecord.java
index a1aef5720..a1aef5720 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/dbs/TokenRecord.java
+++ b/base/tps/src/org/dogtagpki/server/tps/dbs/TokenRecord.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/engine/TPSEngine.java b/base/tps/src/org/dogtagpki/server/tps/engine/TPSEngine.java
index c4b485c45..c4b485c45 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/engine/TPSEngine.java
+++ b/base/tps/src/org/dogtagpki/server/tps/engine/TPSEngine.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/installer/CAInfoPanel.java b/base/tps/src/org/dogtagpki/server/tps/installer/CAInfoPanel.java
index 4c5371f20..4c5371f20 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/installer/CAInfoPanel.java
+++ b/base/tps/src/org/dogtagpki/server/tps/installer/CAInfoPanel.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/installer/DRMInfoPanel.java b/base/tps/src/org/dogtagpki/server/tps/installer/DRMInfoPanel.java
index 2237f9e53..2237f9e53 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/installer/DRMInfoPanel.java
+++ b/base/tps/src/org/dogtagpki/server/tps/installer/DRMInfoPanel.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/installer/TKSInfoPanel.java b/base/tps/src/org/dogtagpki/server/tps/installer/TKSInfoPanel.java
index 0c0cf62a7..0c0cf62a7 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/installer/TKSInfoPanel.java
+++ b/base/tps/src/org/dogtagpki/server/tps/installer/TKSInfoPanel.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/installer/TPSInstaller.java b/base/tps/src/org/dogtagpki/server/tps/installer/TPSInstaller.java
index 2779e5b98..2779e5b98 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/installer/TPSInstaller.java
+++ b/base/tps/src/org/dogtagpki/server/tps/installer/TPSInstaller.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/main/AttributeSpec.java b/base/tps/src/org/dogtagpki/server/tps/main/AttributeSpec.java
index 444f22c4b..444f22c4b 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/main/AttributeSpec.java
+++ b/base/tps/src/org/dogtagpki/server/tps/main/AttributeSpec.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/main/ObjectSpec.java b/base/tps/src/org/dogtagpki/server/tps/main/ObjectSpec.java
index a8dbdb1bc..a8dbdb1bc 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/main/ObjectSpec.java
+++ b/base/tps/src/org/dogtagpki/server/tps/main/ObjectSpec.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/main/PKCS11Obj.java b/base/tps/src/org/dogtagpki/server/tps/main/PKCS11Obj.java
index 6224c3f81..6224c3f81 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/main/PKCS11Obj.java
+++ b/base/tps/src/org/dogtagpki/server/tps/main/PKCS11Obj.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/processor/AppletInfo.java b/base/tps/src/org/dogtagpki/server/tps/processor/AppletInfo.java
index bc46eaba8..bc46eaba8 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/processor/AppletInfo.java
+++ b/base/tps/src/org/dogtagpki/server/tps/processor/AppletInfo.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/processor/CertEnrollInfo.java b/base/tps/src/org/dogtagpki/server/tps/processor/CertEnrollInfo.java
index 9dfb3f114..9dfb3f114 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/processor/CertEnrollInfo.java
+++ b/base/tps/src/org/dogtagpki/server/tps/processor/CertEnrollInfo.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/processor/EnrolledCertsInfo.java b/base/tps/src/org/dogtagpki/server/tps/processor/EnrolledCertsInfo.java
index 87b86f7d7..87b86f7d7 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/processor/EnrolledCertsInfo.java
+++ b/base/tps/src/org/dogtagpki/server/tps/processor/EnrolledCertsInfo.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java b/base/tps/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java
index cff615752..cff615752 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java
+++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/processor/TPSPinResetProcessor.java b/base/tps/src/org/dogtagpki/server/tps/processor/TPSPinResetProcessor.java
index b92cd8b91..b92cd8b91 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/processor/TPSPinResetProcessor.java
+++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSPinResetProcessor.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/processor/TPSProcessor.java b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java
index e23cea0ad..e23cea0ad 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/processor/TPSProcessor.java
+++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/BaseTokenProfileResolver.java b/base/tps/src/org/dogtagpki/server/tps/profile/BaseTokenProfileResolver.java
index c62d1ed2b..c62d1ed2b 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/BaseTokenProfileResolver.java
+++ b/base/tps/src/org/dogtagpki/server/tps/profile/BaseTokenProfileResolver.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/MappingTokenProfileResolver.java b/base/tps/src/org/dogtagpki/server/tps/profile/MappingTokenProfileResolver.java
index 264fba882..264fba882 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/MappingTokenProfileResolver.java
+++ b/base/tps/src/org/dogtagpki/server/tps/profile/MappingTokenProfileResolver.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/TokenProfileParams.java b/base/tps/src/org/dogtagpki/server/tps/profile/TokenProfileParams.java
index d04bc9fb8..d04bc9fb8 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/TokenProfileParams.java
+++ b/base/tps/src/org/dogtagpki/server/tps/profile/TokenProfileParams.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/TokenProfileResolverManager.java b/base/tps/src/org/dogtagpki/server/tps/profile/TokenProfileResolverManager.java
index b6325fcca..b6325fcca 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/TokenProfileResolverManager.java
+++ b/base/tps/src/org/dogtagpki/server/tps/profile/TokenProfileResolverManager.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ActivityService.java b/base/tps/src/org/dogtagpki/server/tps/rest/ActivityService.java
index 6002e7a94..6002e7a94 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ActivityService.java
+++ b/base/tps/src/org/dogtagpki/server/tps/rest/ActivityService.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java b/base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java
index d862e261d..d862e261d 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java
+++ b/base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ConnectorService.java b/base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java
index c281265ef..c281265ef 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ConnectorService.java
+++ b/base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java
index f3a6f2e38..f3a6f2e38 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java
+++ b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileService.java b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java
index e5bfd4663..e5bfd4663 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/ProfileService.java
+++ b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSApplication.java b/base/tps/src/org/dogtagpki/server/tps/rest/TPSApplication.java
index 70c8afd02..70c8afd02 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSApplication.java
+++ b/base/tps/src/org/dogtagpki/server/tps/rest/TPSApplication.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSCertService.java b/base/tps/src/org/dogtagpki/server/tps/rest/TPSCertService.java
index 75314cd5d..75314cd5d 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSCertService.java
+++ b/base/tps/src/org/dogtagpki/server/tps/rest/TPSCertService.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java b/base/tps/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java
index 9c4943b9f..9c4943b9f 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java
+++ b/base/tps/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TokenService.java b/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java
index a58447089..a58447089 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TokenService.java
+++ b/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/selftests/TPSPresence.java b/base/tps/src/org/dogtagpki/server/tps/selftests/TPSPresence.java
index 65ac197e7..65ac197e7 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/selftests/TPSPresence.java
+++ b/base/tps/src/org/dogtagpki/server/tps/selftests/TPSPresence.java
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/selftests/TPSValidity.java b/base/tps/src/org/dogtagpki/server/tps/selftests/TPSValidity.java
index f140d6e7c..f140d6e7c 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/selftests/TPSValidity.java
+++ b/base/tps/src/org/dogtagpki/server/tps/selftests/TPSValidity.java
diff --git a/base/tps-tomcat/src/pki-tps.mf b/base/tps/src/pki-tps.mf
index d77fe8fa9..d77fe8fa9 100644
--- a/base/tps-tomcat/src/pki-tps.mf
+++ b/base/tps/src/pki-tps.mf
diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages
index 9fbde025c..99730beb3 100755
--- a/scripts/compose_pki_core_packages
+++ b/scripts/compose_pki_core_packages
@@ -45,7 +45,7 @@ if [ "$WITHOUT_JAVADOC" = "" ]; then
 fi
 
 if [ "$WITHOUT_SERVER" = "" ]; then
-    PKI_COMPONENT_LIST="$PKI_COMPONENT_LIST server ca kra ocsp tks tps-tomcat setup"
+    PKI_COMPONENT_LIST="$PKI_COMPONENT_LIST server ca kra ocsp tks tps setup"
     # required for native 'tpsclient' utility
     PKI_COMPONENT_LIST="$PKI_COMPONENT_LIST tps-client"
 fi
@@ -161,12 +161,7 @@ else
 	cp -p VERSION ${PKI_CORE_BASE_DIR}
 	for component in ${PKI_COMPONENT_LIST} ;
 	do
-		if [ "${component}" = "tps-tomcat" ] ; then
-			# rename tps-tomcat to tps
-			dest="tps"
-		else
-			dest="${component}"
-		fi
+		dest="${component}"
 
 		# copying ${PKI_BASE_DIR}/${component} to ${PKI_CORE_BASE_DIR}/${dest}
 		cd ${component}
diff --git a/scripts/compose_pki_test_package b/scripts/compose_pki_test_package
index 2aea422e5..a3bdeb952 100755
--- a/scripts/compose_pki_test_package
+++ b/scripts/compose_pki_test_package
@@ -89,7 +89,7 @@ CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/kra/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/kra/functional/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/ocsp/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/tks/src
-CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/tps-tomcat/src
+CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/tps/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/migrate/80
 CLASSPATH=$CLASSPATH:/usr/share/java/junit4.jar
 CLASSPATH=$CLASSPATH:`pwd`/src
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 4a963814e..97d2ef7fd 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -5,7 +5,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:             pki-core
 Version:          10.2.0
-Release:          0.9%{?dist}
+Release:          0.10%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -113,7 +113,7 @@ PKI Core contains ALL top-level java-based Tomcat PKI components:      \
   * pki-kra                                                            \
   * pki-ocsp                                                           \
   * pki-tks                                                            \
-  * pki-tps-tomcat                                                     \
+  * pki-tps                                                            \
   * pki-javadoc                                                        \
                                                                        \
 which comprise the following corresponding PKI subsystems:             \
@@ -447,14 +447,15 @@ provided by the PKI Core used by the Certificate System.
 %{overview}
 
 
-%package -n       pki-tps-tomcat
+%package -n       pki-tps
 Summary:          Certificate System - Token Processing Service
 Group:            System Environment/Daemons
 
-Provides:         pki-tps
-Provides:         pki-tps-client = %{version}-%{release}
+Provides:         pki-tps-tomcat
+Provides:         pki-tps-client
 
-Obsoletes:        pki-tps-client < %{version}-%{release}
+Obsoletes:        pki-tps-tomcat
+Obsoletes:        pki-tps-client
 
 Requires:         java-headless >= 1:1.7.0
 Requires:         pki-server = %{version}-%{release}
@@ -473,7 +474,7 @@ Requires:         openldap-clients
 Requires:         perl-Mozilla-LDAP
 Requires:         pki-symkey = %{version}-%{release}
 
-%description -n   pki-tps-tomcat
+%description -n   pki-tps
 The Token Processing System (TPS) is an optional PKI subsystem that acts
 as a Registration Authority (RA) for authenticating and processing
 enrollment requests, PIN reset requests, and formatting requests from
@@ -804,7 +805,7 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
 %{_datadir}/pki/tks/setup/
 %{_datadir}/pki/tks/webapps/
 
-%files -n pki-tps-tomcat
+%files -n pki-tps
 %defattr(-,root,root,-)
 %doc base/tps/LICENSE
 %{_javadir}/pki/pki-tps.jar
@@ -830,6 +831,9 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
 %endif # %{with server}
 
 %changelog
+* Wed Sep  3 2014 Matthew Harmsen <mharmsen@redhat.com> - 10.2.0-0.10
+- PKI TRAC Ticket #1017 - Rename pki-tps-tomcat to pki-tps
+
 * Fri Aug 29 2014 Matthew Harmsen <mharmsen@redhat.com> - 10.2.0-0.9
 - Merged jmagne@redhat.com's spec file changes from the stand-alone
   'pki-tps-client' package needed to build/run the native 'tpsclient'