543 files changed, 433 insertions, 781 deletions

diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 3410ed876..ad3410c36 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -44,7 +44,7 @@ if (APPLICATION_FLAVOR_PKI_RA)
 endif (APPLICATION_FLAVOR_PKI_RA)
 
 if (APPLICATION_FLAVOR_PKI_TPS)
-    add_subdirectory(tps)
+    add_subdirectory(tps-client)
 endif (APPLICATION_FLAVOR_PKI_TPS)
 
 if (APPLICATION_FLAVOR_PKI_CONSOLE)
diff --git a/base/tps/CMakeLists.txt b/base/tps-client/CMakeLists.txt
index 954146cb4..954146cb4 100644
--- a/base/tps/CMakeLists.txt
+++ b/base/tps-client/CMakeLists.txt
diff --git a/base/tps/LICENSE b/base/tps-client/LICENSE
index e2391a711..e2391a711 100644
--- a/base/tps/LICENSE
+++ b/base/tps-client/LICENSE
diff --git a/base/tps/abrt_checker_21190.log b/base/tps-client/abrt_checker_21190.log
index 97d259eb9..97d259eb9 100644
--- a/base/tps/abrt_checker_21190.log
+++ b/base/tps-client/abrt_checker_21190.log
diff --git a/base/tps/apache/LICENSE-2.0 b/base/tps-client/apache/LICENSE-2.0
index 7b69c6227..7b69c6227 100644
--- a/base/tps/apache/LICENSE-2.0
+++ b/base/tps-client/apache/LICENSE-2.0
diff --git a/base/tps/apache/cgi-bin/demo/Enroll.html b/base/tps-client/apache/cgi-bin/demo/Enroll.html
index 79c660712..79c660712 100755
--- a/base/tps/apache/cgi-bin/demo/Enroll.html
+++ b/base/tps-client/apache/cgi-bin/demo/Enroll.html
diff --git a/base/tps/apache/cgi-bin/demo/enroll.cgi b/base/tps-client/apache/cgi-bin/demo/enroll.cgi
index c0f4bcabf..c0f4bcabf 100755
--- a/base/tps/apache/cgi-bin/demo/enroll.cgi
+++ b/base/tps-client/apache/cgi-bin/demo/enroll.cgi
diff --git a/base/tps/apache/cgi-bin/demo/index.cgi b/base/tps-client/apache/cgi-bin/demo/index.cgi
index 635057182..635057182 100755
--- a/base/tps/apache/cgi-bin/demo/index.cgi
+++ b/base/tps-client/apache/cgi-bin/demo/index.cgi
diff --git a/base/tps/apache/cgi-bin/esc.cgi b/base/tps-client/apache/cgi-bin/esc.cgi
index 70a93c0a0..70a93c0a0 100755
--- a/base/tps/apache/cgi-bin/esc.cgi
+++ b/base/tps-client/apache/cgi-bin/esc.cgi
diff --git a/base/tps/apache/cgi-bin/home.cgi b/base/tps-client/apache/cgi-bin/home.cgi
index 5fdf5ecf8..5fdf5ecf8 100755
--- a/base/tps/apache/cgi-bin/home.cgi
+++ b/base/tps-client/apache/cgi-bin/home.cgi
diff --git a/base/tps/apache/cgi-bin/home/Enroll.html b/base/tps-client/apache/cgi-bin/home/Enroll.html
index 2bcc9c1af..2bcc9c1af 100755
--- a/base/tps/apache/cgi-bin/home/Enroll.html
+++ b/base/tps-client/apache/cgi-bin/home/Enroll.html
diff --git a/base/tps/apache/cgi-bin/home/cachain.cgi b/base/tps-client/apache/cgi-bin/home/cachain.cgi
index 27dc9cd6c..27dc9cd6c 100755
--- a/base/tps/apache/cgi-bin/home/cachain.cgi
+++ b/base/tps-client/apache/cgi-bin/home/cachain.cgi
diff --git a/base/tps/apache/cgi-bin/home/enroll.cgi b/base/tps-client/apache/cgi-bin/home/enroll.cgi
index c0f4bcabf..c0f4bcabf 100755
--- a/base/tps/apache/cgi-bin/home/enroll.cgi
+++ b/base/tps-client/apache/cgi-bin/home/enroll.cgi
diff --git a/base/tps/apache/cgi-bin/home/index.cgi b/base/tps-client/apache/cgi-bin/home/index.cgi
index e347f6720..e347f6720 100755
--- a/base/tps/apache/cgi-bin/home/index.cgi
+++ b/base/tps-client/apache/cgi-bin/home/index.cgi
diff --git a/base/tps/apache/cgi-bin/so/Enroll.html b/base/tps-client/apache/cgi-bin/so/Enroll.html
index 1e4f137e5..1e4f137e5 100755
--- a/base/tps/apache/cgi-bin/so/Enroll.html
+++ b/base/tps-client/apache/cgi-bin/so/Enroll.html
diff --git a/base/tps/apache/cgi-bin/so/enroll.cgi b/base/tps-client/apache/cgi-bin/so/enroll.cgi
index 148cd78c0..148cd78c0 100755
--- a/base/tps/apache/cgi-bin/so/enroll.cgi
+++ b/base/tps-client/apache/cgi-bin/so/enroll.cgi
diff --git a/base/tps/apache/cgi-bin/so/index.cgi b/base/tps-client/apache/cgi-bin/so/index.cgi
index 923d134ee..923d134ee 100755
--- a/base/tps/apache/cgi-bin/so/index.cgi
+++ b/base/tps-client/apache/cgi-bin/so/index.cgi
diff --git a/base/tps/apache/cgi-bin/sow/ajax-list.cgi b/base/tps-client/apache/cgi-bin/sow/ajax-list.cgi
index 0f4ac094f..0f4ac094f 100755
--- a/base/tps/apache/cgi-bin/sow/ajax-list.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/ajax-list.cgi
diff --git a/base/tps/apache/cgi-bin/sow/cfg.pl b/base/tps-client/apache/cgi-bin/sow/cfg.pl
index 64e612aaa..64e612aaa 100755
--- a/base/tps/apache/cgi-bin/sow/cfg.pl
+++ b/base/tps-client/apache/cgi-bin/sow/cfg.pl
diff --git a/base/tps/apache/cgi-bin/sow/enroll.cgi b/base/tps-client/apache/cgi-bin/sow/enroll.cgi
index 8a6431e52..8a6431e52 100755
--- a/base/tps/apache/cgi-bin/sow/enroll.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/enroll.cgi
diff --git a/base/tps/apache/cgi-bin/sow/enroll.html b/base/tps-client/apache/cgi-bin/sow/enroll.html
index 81ec73443..81ec73443 100755
--- a/base/tps/apache/cgi-bin/sow/enroll.html
+++ b/base/tps-client/apache/cgi-bin/sow/enroll.html
diff --git a/base/tps/apache/cgi-bin/sow/enroll_temp.cgi b/base/tps-client/apache/cgi-bin/sow/enroll_temp.cgi
index 5817039a2..5817039a2 100755
--- a/base/tps/apache/cgi-bin/sow/enroll_temp.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/enroll_temp.cgi
diff --git a/base/tps/apache/cgi-bin/sow/enroll_temp.html b/base/tps-client/apache/cgi-bin/sow/enroll_temp.html
index 342eddb1b..342eddb1b 100755
--- a/base/tps/apache/cgi-bin/sow/enroll_temp.html
+++ b/base/tps-client/apache/cgi-bin/sow/enroll_temp.html
diff --git a/base/tps/apache/cgi-bin/sow/format.cgi b/base/tps-client/apache/cgi-bin/sow/format.cgi
index 9b310991d..9b310991d 100755
--- a/base/tps/apache/cgi-bin/sow/format.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/format.cgi
diff --git a/base/tps/apache/cgi-bin/sow/format.html b/base/tps-client/apache/cgi-bin/sow/format.html
index 66b19a624..66b19a624 100755
--- a/base/tps/apache/cgi-bin/sow/format.html
+++ b/base/tps-client/apache/cgi-bin/sow/format.html
diff --git a/base/tps/apache/cgi-bin/sow/formatso.cgi b/base/tps-client/apache/cgi-bin/sow/formatso.cgi
index d53129139..d53129139 100755
--- a/base/tps/apache/cgi-bin/sow/formatso.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/formatso.cgi
diff --git a/base/tps/apache/cgi-bin/sow/formatso.html b/base/tps-client/apache/cgi-bin/sow/formatso.html
index 3508d633e..3508d633e 100755
--- a/base/tps/apache/cgi-bin/sow/formatso.html
+++ b/base/tps-client/apache/cgi-bin/sow/formatso.html
diff --git a/base/tps/apache/cgi-bin/sow/index.cgi b/base/tps-client/apache/cgi-bin/sow/index.cgi
index 454d8ef44..454d8ef44 100755
--- a/base/tps/apache/cgi-bin/sow/index.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/index.cgi
diff --git a/base/tps/apache/cgi-bin/sow/is_agent.cgi b/base/tps-client/apache/cgi-bin/sow/is_agent.cgi
index c6b6a87f7..c6b6a87f7 100755
--- a/base/tps/apache/cgi-bin/sow/is_agent.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/is_agent.cgi
diff --git a/base/tps/apache/cgi-bin/sow/is_user.cgi b/base/tps-client/apache/cgi-bin/sow/is_user.cgi
index d7a551421..d7a551421 100755
--- a/base/tps/apache/cgi-bin/sow/is_user.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/is_user.cgi
diff --git a/base/tps/apache/cgi-bin/sow/main.cgi b/base/tps-client/apache/cgi-bin/sow/main.cgi
index c6f65e42e..c6f65e42e 100755
--- a/base/tps/apache/cgi-bin/sow/main.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/main.cgi
diff --git a/base/tps/apache/cgi-bin/sow/main.html b/base/tps-client/apache/cgi-bin/sow/main.html
index 897be5920..897be5920 100755
--- a/base/tps/apache/cgi-bin/sow/main.html
+++ b/base/tps-client/apache/cgi-bin/sow/main.html
diff --git a/base/tps/apache/cgi-bin/sow/noaccess.cgi b/base/tps-client/apache/cgi-bin/sow/noaccess.cgi
index 17166bcb6..17166bcb6 100755
--- a/base/tps/apache/cgi-bin/sow/noaccess.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/noaccess.cgi
diff --git a/base/tps/apache/cgi-bin/sow/noaccess.html b/base/tps-client/apache/cgi-bin/sow/noaccess.html
index 80cdd11d7..80cdd11d7 100755
--- a/base/tps/apache/cgi-bin/sow/noaccess.html
+++ b/base/tps-client/apache/cgi-bin/sow/noaccess.html
diff --git a/base/tps/apache/cgi-bin/sow/read.cgi b/base/tps-client/apache/cgi-bin/sow/read.cgi
index 8a5793c2b..8a5793c2b 100755
--- a/base/tps/apache/cgi-bin/sow/read.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/read.cgi
diff --git a/base/tps/apache/cgi-bin/sow/read.html b/base/tps-client/apache/cgi-bin/sow/read.html
index ca1c5f9d3..ca1c5f9d3 100755
--- a/base/tps/apache/cgi-bin/sow/read.html
+++ b/base/tps-client/apache/cgi-bin/sow/read.html
diff --git a/base/tps/apache/cgi-bin/sow/read_temp.cgi b/base/tps-client/apache/cgi-bin/sow/read_temp.cgi
index 31c6fd7e3..31c6fd7e3 100755
--- a/base/tps/apache/cgi-bin/sow/read_temp.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/read_temp.cgi
diff --git a/base/tps/apache/cgi-bin/sow/read_temp.html b/base/tps-client/apache/cgi-bin/sow/read_temp.html
index ca1c5f9d3..ca1c5f9d3 100755
--- a/base/tps/apache/cgi-bin/sow/read_temp.html
+++ b/base/tps-client/apache/cgi-bin/sow/read_temp.html
diff --git a/base/tps/apache/cgi-bin/sow/search.cgi b/base/tps-client/apache/cgi-bin/sow/search.cgi
index e681ed100..e681ed100 100755
--- a/base/tps/apache/cgi-bin/sow/search.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/search.cgi
diff --git a/base/tps/apache/cgi-bin/sow/search.html b/base/tps-client/apache/cgi-bin/sow/search.html
index 5b66fcd48..5b66fcd48 100755
--- a/base/tps/apache/cgi-bin/sow/search.html
+++ b/base/tps-client/apache/cgi-bin/sow/search.html
diff --git a/base/tps/apache/cgi-bin/sow/search_temp.cgi b/base/tps-client/apache/cgi-bin/sow/search_temp.cgi
index 5d752a49d..5d752a49d 100755
--- a/base/tps/apache/cgi-bin/sow/search_temp.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/search_temp.cgi
diff --git a/base/tps/apache/cgi-bin/sow/search_temp.html b/base/tps-client/apache/cgi-bin/sow/search_temp.html
index 6f0096305..6f0096305 100755
--- a/base/tps/apache/cgi-bin/sow/search_temp.html
+++ b/base/tps-client/apache/cgi-bin/sow/search_temp.html
diff --git a/base/tps/apache/cgi-bin/sow/seturl.cgi b/base/tps-client/apache/cgi-bin/sow/seturl.cgi
index dfac46d8f..dfac46d8f 100755
--- a/base/tps/apache/cgi-bin/sow/seturl.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/seturl.cgi
diff --git a/base/tps/apache/cgi-bin/sow/seturl.html b/base/tps-client/apache/cgi-bin/sow/seturl.html
index f1cddb186..f1cddb186 100755
--- a/base/tps/apache/cgi-bin/sow/seturl.html
+++ b/base/tps-client/apache/cgi-bin/sow/seturl.html
diff --git a/base/tps/apache/cgi-bin/sow/welcome.cgi b/base/tps-client/apache/cgi-bin/sow/welcome.cgi
index bc76dd3fa..bc76dd3fa 100755
--- a/base/tps/apache/cgi-bin/sow/welcome.cgi
+++ b/base/tps-client/apache/cgi-bin/sow/welcome.cgi
diff --git a/base/tps/apache/cgi-bin/sow/welcome.html b/base/tps-client/apache/cgi-bin/sow/welcome.html
index c539f17b7..c539f17b7 100755
--- a/base/tps/apache/cgi-bin/sow/welcome.html
+++ b/base/tps-client/apache/cgi-bin/sow/welcome.html
diff --git a/base/tps/apache/conf/httpd.conf b/base/tps-client/apache/conf/httpd.conf
index 754f53a34..754f53a34 100644
--- a/base/tps/apache/conf/httpd.conf
+++ b/base/tps-client/apache/conf/httpd.conf
diff --git a/base/tps/apache/conf/magic b/base/tps-client/apache/conf/magic
index 0de73361f..0de73361f 100644
--- a/base/tps/apache/conf/magic
+++ b/base/tps-client/apache/conf/magic
diff --git a/base/tps/apache/conf/mime.types b/base/tps-client/apache/conf/mime.types
index 3485692d1..3485692d1 100644
--- a/base/tps/apache/conf/mime.types
+++ b/base/tps-client/apache/conf/mime.types
diff --git a/base/tps/apache/conf/nss.conf b/base/tps-client/apache/conf/nss.conf
index 2f7c4d91a..2f7c4d91a 100644
--- a/base/tps/apache/conf/nss.conf
+++ b/base/tps-client/apache/conf/nss.conf
diff --git a/base/tps/apache/conf/perl.conf b/base/tps-client/apache/conf/perl.conf
index 60b502285..60b502285 100644
--- a/base/tps/apache/conf/perl.conf
+++ b/base/tps-client/apache/conf/perl.conf
diff --git a/base/tps/apache/docroot/404.html b/base/tps-client/apache/docroot/404.html
index 01a0832c9..01a0832c9 100755
--- a/base/tps/apache/docroot/404.html
+++ b/base/tps-client/apache/docroot/404.html
diff --git a/base/tps/apache/docroot/500.html b/base/tps-client/apache/docroot/500.html
index 94ff29712..94ff29712 100755
--- a/base/tps/apache/docroot/500.html
+++ b/base/tps-client/apache/docroot/500.html
diff --git a/base/tps/apache/docroot/esc/AdminEsc.html b/base/tps-client/apache/docroot/esc/AdminEsc.html
index f17e8c472..f17e8c472 100755
--- a/base/tps/apache/docroot/esc/AdminEsc.html
+++ b/base/tps-client/apache/docroot/esc/AdminEsc.html
diff --git a/base/tps/apache/docroot/esc/AdvancePopup.html b/base/tps-client/apache/docroot/esc/AdvancePopup.html
index 4606539c6..4606539c6 100755
--- a/base/tps/apache/docroot/esc/AdvancePopup.html
+++ b/base/tps-client/apache/docroot/esc/AdvancePopup.html
diff --git a/base/tps/apache/docroot/esc/EnrollPopup.html b/base/tps-client/apache/docroot/esc/EnrollPopup.html
index 02ed47305..02ed47305 100755
--- a/base/tps/apache/docroot/esc/EnrollPopup.html
+++ b/base/tps-client/apache/docroot/esc/EnrollPopup.html
diff --git a/base/tps/apache/docroot/esc/GenericAuth.html b/base/tps-client/apache/docroot/esc/GenericAuth.html
index dc8b88e3f..dc8b88e3f 100755
--- a/base/tps/apache/docroot/esc/GenericAuth.html
+++ b/base/tps-client/apache/docroot/esc/GenericAuth.html
diff --git a/base/tps/apache/docroot/esc/SettingsEsc.html b/base/tps-client/apache/docroot/esc/SettingsEsc.html
index 7bc1efc79..7bc1efc79 100755
--- a/base/tps/apache/docroot/esc/SettingsEsc.html
+++ b/base/tps-client/apache/docroot/esc/SettingsEsc.html
diff --git a/base/tps/apache/docroot/esc/TokenManager.html b/base/tps-client/apache/docroot/esc/TokenManager.html
index 010c21ac9..010c21ac9 100755
--- a/base/tps/apache/docroot/esc/TokenManager.html
+++ b/base/tps-client/apache/docroot/esc/TokenManager.html
diff --git a/base/tps/apache/docroot/esc/TokenPin.html b/base/tps-client/apache/docroot/esc/TokenPin.html
index 54bb8e8c0..54bb8e8c0 100755
--- a/base/tps/apache/docroot/esc/TokenPin.html
+++ b/base/tps-client/apache/docroot/esc/TokenPin.html
diff --git a/base/tps/apache/docroot/esc/demo/EnrollSuccess.html b/base/tps-client/apache/docroot/esc/demo/EnrollSuccess.html
index 7c95a5568..7c95a5568 100644
--- a/base/tps/apache/docroot/esc/demo/EnrollSuccess.html
+++ b/base/tps-client/apache/docroot/esc/demo/EnrollSuccess.html
diff --git a/base/tps/apache/docroot/esc/demo/GenericAuth.html b/base/tps-client/apache/docroot/esc/demo/GenericAuth.html
index dad83a001..dad83a001 100755
--- a/base/tps/apache/docroot/esc/demo/GenericAuth.html
+++ b/base/tps-client/apache/docroot/esc/demo/GenericAuth.html
diff --git a/base/tps/apache/docroot/esc/demo/util.js b/base/tps-client/apache/docroot/esc/demo/util.js
index d5707e0f4..d5707e0f4 100755
--- a/base/tps/apache/docroot/esc/demo/util.js
+++ b/base/tps-client/apache/docroot/esc/demo/util.js
diff --git a/base/tps/apache/docroot/esc/home/EnrollSuccess.html b/base/tps-client/apache/docroot/esc/home/EnrollSuccess.html
index 2dd6b72e5..2dd6b72e5 100644
--- a/base/tps/apache/docroot/esc/home/EnrollSuccess.html
+++ b/base/tps-client/apache/docroot/esc/home/EnrollSuccess.html
diff --git a/base/tps/apache/docroot/esc/home/GenericAuth.html b/base/tps-client/apache/docroot/esc/home/GenericAuth.html
index 219f9a6ad..219f9a6ad 100755
--- a/base/tps/apache/docroot/esc/home/GenericAuth.html
+++ b/base/tps-client/apache/docroot/esc/home/GenericAuth.html
diff --git a/base/tps/apache/docroot/esc/home/util.js b/base/tps-client/apache/docroot/esc/home/util.js
index 6e03a94af..6e03a94af 100755
--- a/base/tps/apache/docroot/esc/home/util.js
+++ b/base/tps-client/apache/docroot/esc/home/util.js
diff --git a/base/tps/apache/docroot/esc/so/EnrollSuccess.html b/base/tps-client/apache/docroot/esc/so/EnrollSuccess.html
index 4c9f3deca..4c9f3deca 100644
--- a/base/tps/apache/docroot/esc/so/EnrollSuccess.html
+++ b/base/tps-client/apache/docroot/esc/so/EnrollSuccess.html
diff --git a/base/tps/apache/docroot/esc/so/GenericAuth.html b/base/tps-client/apache/docroot/esc/so/GenericAuth.html
index 219f9a6ad..219f9a6ad 100755
--- a/base/tps/apache/docroot/esc/so/GenericAuth.html
+++ b/base/tps-client/apache/docroot/esc/so/GenericAuth.html
diff --git a/base/tps/apache/docroot/esc/so/util.js b/base/tps-client/apache/docroot/esc/so/util.js
index ccd81ee84..ccd81ee84 100755
--- a/base/tps/apache/docroot/esc/so/util.js
+++ b/base/tps-client/apache/docroot/esc/so/util.js
diff --git a/base/tps/apache/docroot/esc/sow/EnrollSuccess.html b/base/tps-client/apache/docroot/esc/sow/EnrollSuccess.html
index 41f7b565f..41f7b565f 100644
--- a/base/tps/apache/docroot/esc/sow/EnrollSuccess.html
+++ b/base/tps-client/apache/docroot/esc/sow/EnrollSuccess.html
diff --git a/base/tps/apache/docroot/esc/sow/GenericAuth.html b/base/tps-client/apache/docroot/esc/sow/GenericAuth.html
index 219f9a6ad..219f9a6ad 100755
--- a/base/tps/apache/docroot/esc/sow/GenericAuth.html
+++ b/base/tps-client/apache/docroot/esc/sow/GenericAuth.html
diff --git a/base/tps/apache/docroot/esc/sow/js/ajax-dynamic-list.js b/base/tps-client/apache/docroot/esc/sow/js/ajax-dynamic-list.js
index 4c89ede8a..4c89ede8a 100755
--- a/base/tps/apache/docroot/esc/sow/js/ajax-dynamic-list.js
+++ b/base/tps-client/apache/docroot/esc/sow/js/ajax-dynamic-list.js
diff --git a/base/tps/apache/docroot/esc/sow/js/ajax.js b/base/tps-client/apache/docroot/esc/sow/js/ajax.js
index fc342fdd1..fc342fdd1 100755
--- a/base/tps/apache/docroot/esc/sow/js/ajax.js
+++ b/base/tps-client/apache/docroot/esc/sow/js/ajax.js
diff --git a/base/tps/apache/docroot/esc/sow/js/effects.js b/base/tps-client/apache/docroot/esc/sow/js/effects.js
index d3940a82b..d3940a82b 100755
--- a/base/tps/apache/docroot/esc/sow/js/effects.js
+++ b/base/tps-client/apache/docroot/esc/sow/js/effects.js
diff --git a/base/tps/apache/docroot/esc/sow/js/lightbox.js b/base/tps-client/apache/docroot/esc/sow/js/lightbox.js
index 11856b208..11856b208 100755
--- a/base/tps/apache/docroot/esc/sow/js/lightbox.js
+++ b/base/tps-client/apache/docroot/esc/sow/js/lightbox.js
diff --git a/base/tps/apache/docroot/esc/sow/js/prototype.js b/base/tps-client/apache/docroot/esc/sow/js/prototype.js
index e9ccd3c88..e9ccd3c88 100755
--- a/base/tps/apache/docroot/esc/sow/js/prototype.js
+++ b/base/tps-client/apache/docroot/esc/sow/js/prototype.js
diff --git a/base/tps/apache/docroot/esc/sow/js/scriptaculous.js b/base/tps-client/apache/docroot/esc/sow/js/scriptaculous.js
index dac1228fb..dac1228fb 100755
--- a/base/tps/apache/docroot/esc/sow/js/scriptaculous.js
+++ b/base/tps-client/apache/docroot/esc/sow/js/scriptaculous.js
diff --git a/base/tps/apache/docroot/esc/sow/util.js b/base/tps-client/apache/docroot/esc/sow/util.js
index 967e6e5ed..967e6e5ed 100755
--- a/base/tps/apache/docroot/esc/sow/util.js
+++ b/base/tps-client/apache/docroot/esc/sow/util.js
diff --git a/base/tps/apache/docroot/footer.vm b/base/tps-client/apache/docroot/footer.vm
index a596e45b1..a596e45b1 100755
--- a/base/tps/apache/docroot/footer.vm
+++ b/base/tps-client/apache/docroot/footer.vm
diff --git a/base/tps/apache/docroot/header.vm b/base/tps-client/apache/docroot/header.vm
index 3824b87f3..3824b87f3 100755
--- a/base/tps/apache/docroot/header.vm
+++ b/base/tps-client/apache/docroot/header.vm
diff --git a/base/tps/apache/docroot/index.cgi b/base/tps-client/apache/docroot/index.cgi
index 0e643166b..0e643166b 100755
--- a/base/tps/apache/docroot/index.cgi
+++ b/base/tps-client/apache/docroot/index.cgi
diff --git a/base/tps/apache/docroot/index.html b/base/tps-client/apache/docroot/index.html
index b225251a1..b225251a1 100644
--- a/base/tps/apache/docroot/index.html
+++ b/base/tps-client/apache/docroot/index.html
diff --git a/base/tps/apache/docroot/index.vm b/base/tps-client/apache/docroot/index.vm
index 438d014ef..438d014ef 100755
--- a/base/tps/apache/docroot/index.vm
+++ b/base/tps-client/apache/docroot/index.vm
diff --git a/base/tps/apache/docroot/tokendb/addConfig.template b/base/tps-client/apache/docroot/tokendb/addConfig.template
index ce0177c1a..ce0177c1a 100644
--- a/base/tps/apache/docroot/tokendb/addConfig.template
+++ b/base/tps-client/apache/docroot/tokendb/addConfig.template
diff --git a/base/tps/apache/docroot/tokendb/addResults.template b/base/tps-client/apache/docroot/tokendb/addResults.template
index eca814f8b..eca814f8b 100644
--- a/base/tps/apache/docroot/tokendb/addResults.template
+++ b/base/tps-client/apache/docroot/tokendb/addResults.template
diff --git a/base/tps/apache/docroot/tokendb/agentSelectConfig.template b/base/tps-client/apache/docroot/tokendb/agentSelectConfig.template
index af782c190..af782c190 100644
--- a/base/tps/apache/docroot/tokendb/agentSelectConfig.template
+++ b/base/tps-client/apache/docroot/tokendb/agentSelectConfig.template
diff --git a/base/tps/apache/docroot/tokendb/agentViewConfig.template b/base/tps-client/apache/docroot/tokendb/agentViewConfig.template
index 9abce847a..9abce847a 100644
--- a/base/tps/apache/docroot/tokendb/agentViewConfig.template
+++ b/base/tps-client/apache/docroot/tokendb/agentViewConfig.template
diff --git a/base/tps/apache/docroot/tokendb/auditAdmin.template b/base/tps-client/apache/docroot/tokendb/auditAdmin.template
index ff299530c..ff299530c 100644
--- a/base/tps/apache/docroot/tokendb/auditAdmin.template
+++ b/base/tps-client/apache/docroot/tokendb/auditAdmin.template
diff --git a/base/tps/apache/docroot/tokendb/confirmConfigChanges.template b/base/tps-client/apache/docroot/tokendb/confirmConfigChanges.template
index ef541d732..ef541d732 100644
--- a/base/tps/apache/docroot/tokendb/confirmConfigChanges.template
+++ b/base/tps-client/apache/docroot/tokendb/confirmConfigChanges.template
diff --git a/base/tps/apache/docroot/tokendb/confirmDeleteConfig.template b/base/tps-client/apache/docroot/tokendb/confirmDeleteConfig.template
index 3b1ab8b47..3b1ab8b47 100644
--- a/base/tps/apache/docroot/tokendb/confirmDeleteConfig.template
+++ b/base/tps-client/apache/docroot/tokendb/confirmDeleteConfig.template
diff --git a/base/tps/apache/docroot/tokendb/delete.template b/base/tps-client/apache/docroot/tokendb/delete.template
index 4d3243db1..4d3243db1 100644
--- a/base/tps/apache/docroot/tokendb/delete.template
+++ b/base/tps-client/apache/docroot/tokendb/delete.template
diff --git a/base/tps/apache/docroot/tokendb/deleteResults.template b/base/tps-client/apache/docroot/tokendb/deleteResults.template
index 606e11bb0..606e11bb0 100644
--- a/base/tps/apache/docroot/tokendb/deleteResults.template
+++ b/base/tps-client/apache/docroot/tokendb/deleteResults.template
diff --git a/base/tps/apache/docroot/tokendb/doToken.template b/base/tps-client/apache/docroot/tokendb/doToken.template
index 419a9a240..419a9a240 100644
--- a/base/tps/apache/docroot/tokendb/doToken.template
+++ b/base/tps-client/apache/docroot/tokendb/doToken.template
diff --git a/base/tps/apache/docroot/tokendb/doTokenConfirm.template b/base/tps-client/apache/docroot/tokendb/doTokenConfirm.template
index 16bd2a191..16bd2a191 100644
--- a/base/tps/apache/docroot/tokendb/doTokenConfirm.template
+++ b/base/tps-client/apache/docroot/tokendb/doTokenConfirm.template
diff --git a/base/tps/apache/docroot/tokendb/edit.template b/base/tps-client/apache/docroot/tokendb/edit.template
index 163ae3bd1..163ae3bd1 100644
--- a/base/tps/apache/docroot/tokendb/edit.template
+++ b/base/tps-client/apache/docroot/tokendb/edit.template
diff --git a/base/tps/apache/docroot/tokendb/editConfig.template b/base/tps-client/apache/docroot/tokendb/editConfig.template
index a4091870a..a4091870a 100644
--- a/base/tps/apache/docroot/tokendb/editConfig.template
+++ b/base/tps-client/apache/docroot/tokendb/editConfig.template
diff --git a/base/tps/apache/docroot/tokendb/editResults.template b/base/tps-client/apache/docroot/tokendb/editResults.template
index 783b065c3..783b065c3 100644
--- a/base/tps/apache/docroot/tokendb/editResults.template
+++ b/base/tps-client/apache/docroot/tokendb/editResults.template
diff --git a/base/tps/apache/docroot/tokendb/editUser.template b/base/tps-client/apache/docroot/tokendb/editUser.template
index 55b587cbe..55b587cbe 100644
--- a/base/tps/apache/docroot/tokendb/editUser.template
+++ b/base/tps-client/apache/docroot/tokendb/editUser.template
diff --git a/base/tps/apache/docroot/tokendb/error.template b/base/tps-client/apache/docroot/tokendb/error.template
index 8f629ff72..8f629ff72 100644
--- a/base/tps/apache/docroot/tokendb/error.template
+++ b/base/tps-client/apache/docroot/tokendb/error.template
diff --git a/base/tps/apache/docroot/tokendb/index.template b/base/tps-client/apache/docroot/tokendb/index.template
index 4aa9f0cdd..4aa9f0cdd 100644
--- a/base/tps/apache/docroot/tokendb/index.template
+++ b/base/tps-client/apache/docroot/tokendb/index.template
diff --git a/base/tps/apache/docroot/tokendb/indexAdmin.template b/base/tps-client/apache/docroot/tokendb/indexAdmin.template
index 97086257b..97086257b 100644
--- a/base/tps/apache/docroot/tokendb/indexAdmin.template
+++ b/base/tps-client/apache/docroot/tokendb/indexAdmin.template
diff --git a/base/tps/apache/docroot/tokendb/indexOperator.template b/base/tps-client/apache/docroot/tokendb/indexOperator.template
index 1b1902843..1b1902843 100644
--- a/base/tps/apache/docroot/tokendb/indexOperator.template
+++ b/base/tps-client/apache/docroot/tokendb/indexOperator.template
diff --git a/base/tps/apache/docroot/tokendb/new.template b/base/tps-client/apache/docroot/tokendb/new.template
index f4bf1475d..f4bf1475d 100644
--- a/base/tps/apache/docroot/tokendb/new.template
+++ b/base/tps-client/apache/docroot/tokendb/new.template
diff --git a/base/tps/apache/docroot/tokendb/newUser.template b/base/tps-client/apache/docroot/tokendb/newUser.template
index f1e7e6e35..f1e7e6e35 100644
--- a/base/tps/apache/docroot/tokendb/newUser.template
+++ b/base/tps-client/apache/docroot/tokendb/newUser.template
diff --git a/base/tps/apache/docroot/tokendb/revoke.template b/base/tps-client/apache/docroot/tokendb/revoke.template
index 6a62ea116..6a62ea116 100644
--- a/base/tps/apache/docroot/tokendb/revoke.template
+++ b/base/tps-client/apache/docroot/tokendb/revoke.template
diff --git a/base/tps/apache/docroot/tokendb/search.template b/base/tps-client/apache/docroot/tokendb/search.template
index 305c9cd74..305c9cd74 100644
--- a/base/tps/apache/docroot/tokendb/search.template
+++ b/base/tps-client/apache/docroot/tokendb/search.template
diff --git a/base/tps/apache/docroot/tokendb/searchActivity.template b/base/tps-client/apache/docroot/tokendb/searchActivity.template
index e831a2872..e831a2872 100644
--- a/base/tps/apache/docroot/tokendb/searchActivity.template
+++ b/base/tps-client/apache/docroot/tokendb/searchActivity.template
diff --git a/base/tps/apache/docroot/tokendb/searchActivityAdmin.template b/base/tps-client/apache/docroot/tokendb/searchActivityAdmin.template
index da201d97f..da201d97f 100644
--- a/base/tps/apache/docroot/tokendb/searchActivityAdmin.template
+++ b/base/tps-client/apache/docroot/tokendb/searchActivityAdmin.template
diff --git a/base/tps/apache/docroot/tokendb/searchActivityAdminResults.template b/base/tps-client/apache/docroot/tokendb/searchActivityAdminResults.template
index d8f6587aa..d8f6587aa 100644
--- a/base/tps/apache/docroot/tokendb/searchActivityAdminResults.template
+++ b/base/tps-client/apache/docroot/tokendb/searchActivityAdminResults.template
diff --git a/base/tps/apache/docroot/tokendb/searchActivityResults.template b/base/tps-client/apache/docroot/tokendb/searchActivityResults.template
index 1f97860a0..1f97860a0 100644
--- a/base/tps/apache/docroot/tokendb/searchActivityResults.template
+++ b/base/tps-client/apache/docroot/tokendb/searchActivityResults.template
diff --git a/base/tps/apache/docroot/tokendb/searchAdmin.template b/base/tps-client/apache/docroot/tokendb/searchAdmin.template
index b0960f571..b0960f571 100644
--- a/base/tps/apache/docroot/tokendb/searchAdmin.template
+++ b/base/tps-client/apache/docroot/tokendb/searchAdmin.template
diff --git a/base/tps/apache/docroot/tokendb/searchAdminResults.template b/base/tps-client/apache/docroot/tokendb/searchAdminResults.template
index ab0a471c2..ab0a471c2 100644
--- a/base/tps/apache/docroot/tokendb/searchAdminResults.template
+++ b/base/tps-client/apache/docroot/tokendb/searchAdminResults.template
diff --git a/base/tps/apache/docroot/tokendb/searchCertificate.template b/base/tps-client/apache/docroot/tokendb/searchCertificate.template
index 788491fbf..788491fbf 100644
--- a/base/tps/apache/docroot/tokendb/searchCertificate.template
+++ b/base/tps-client/apache/docroot/tokendb/searchCertificate.template
diff --git a/base/tps/apache/docroot/tokendb/searchCertificateResults.template b/base/tps-client/apache/docroot/tokendb/searchCertificateResults.template
index bb6dcabf3..bb6dcabf3 100644
--- a/base/tps/apache/docroot/tokendb/searchCertificateResults.template
+++ b/base/tps-client/apache/docroot/tokendb/searchCertificateResults.template
diff --git a/base/tps/apache/docroot/tokendb/searchResults.template b/base/tps-client/apache/docroot/tokendb/searchResults.template
index f4644b355..f4644b355 100644
--- a/base/tps/apache/docroot/tokendb/searchResults.template
+++ b/base/tps-client/apache/docroot/tokendb/searchResults.template
diff --git a/base/tps/apache/docroot/tokendb/searchUser.template b/base/tps-client/apache/docroot/tokendb/searchUser.template
index 57e3a5507..57e3a5507 100644
--- a/base/tps/apache/docroot/tokendb/searchUser.template
+++ b/base/tps-client/apache/docroot/tokendb/searchUser.template
diff --git a/base/tps/apache/docroot/tokendb/searchUserResults.template b/base/tps-client/apache/docroot/tokendb/searchUserResults.template
index bbb885f31..bbb885f31 100644
--- a/base/tps/apache/docroot/tokendb/searchUserResults.template
+++ b/base/tps-client/apache/docroot/tokendb/searchUserResults.template
diff --git a/base/tps/apache/docroot/tokendb/selectConfig.template b/base/tps-client/apache/docroot/tokendb/selectConfig.template
index 33f560461..33f560461 100644
--- a/base/tps/apache/docroot/tokendb/selectConfig.template
+++ b/base/tps-client/apache/docroot/tokendb/selectConfig.template
diff --git a/base/tps/apache/docroot/tokendb/selfTest.template b/base/tps-client/apache/docroot/tokendb/selfTest.template
index 163437d17..163437d17 100644
--- a/base/tps/apache/docroot/tokendb/selfTest.template
+++ b/base/tps-client/apache/docroot/tokendb/selfTest.template
diff --git a/base/tps/apache/docroot/tokendb/selfTestResults.template b/base/tps-client/apache/docroot/tokendb/selfTestResults.template
index aeb49d711..aeb49d711 100644
--- a/base/tps/apache/docroot/tokendb/selfTestResults.template
+++ b/base/tps-client/apache/docroot/tokendb/selfTestResults.template
diff --git a/base/tps/apache/docroot/tokendb/show.template b/base/tps-client/apache/docroot/tokendb/show.template
index a9dd39334..a9dd39334 100644
--- a/base/tps/apache/docroot/tokendb/show.template
+++ b/base/tps-client/apache/docroot/tokendb/show.template
diff --git a/base/tps/apache/docroot/tokendb/showAdmin.template b/base/tps-client/apache/docroot/tokendb/showAdmin.template
index fe3292011..fe3292011 100644
--- a/base/tps/apache/docroot/tokendb/showAdmin.template
+++ b/base/tps-client/apache/docroot/tokendb/showAdmin.template
diff --git a/base/tps/apache/docroot/tokendb/showCert.template b/base/tps-client/apache/docroot/tokendb/showCert.template
index 964035887..964035887 100644
--- a/base/tps/apache/docroot/tokendb/showCert.template
+++ b/base/tps-client/apache/docroot/tokendb/showCert.template
diff --git a/base/tps/apache/docroot/tokendb/userDelete.template b/base/tps-client/apache/docroot/tokendb/userDelete.template
index db4b226cd..db4b226cd 100755
--- a/base/tps/apache/docroot/tokendb/userDelete.template
+++ b/base/tps-client/apache/docroot/tokendb/userDelete.template
diff --git a/base/tps/apache/docroot/tps/admin/console/config/adminauthenticatepanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/adminauthenticatepanel.vm
index cfa53c628..cfa53c628 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/adminauthenticatepanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/adminauthenticatepanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/adminpanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/adminpanel.vm
index 46d3e25a2..46d3e25a2 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/adminpanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/adminpanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/agentauthenticatepanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/agentauthenticatepanel.vm
index 738efe5b3..738efe5b3 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/agentauthenticatepanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/agentauthenticatepanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/authdbpanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/authdbpanel.vm
index 3ebb96853..3ebb96853 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/authdbpanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/authdbpanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/cainfopanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/cainfopanel.vm
index 8d2e54251..8d2e54251 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/cainfopanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/cainfopanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/certchainpanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/certchainpanel.vm
index d6b7b3fe4..d6b7b3fe4 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/certchainpanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/certchainpanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/certprettyprintpanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/certprettyprintpanel.vm
index 0e5f05af6..0e5f05af6 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/certprettyprintpanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/certprettyprintpanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/certrequestpanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/certrequestpanel.vm
index 632b27c34..632b27c34 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/certrequestpanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/certrequestpanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/config_addhsm.vm b/base/tps-client/apache/docroot/tps/admin/console/config/config_addhsm.vm
index 90d2f0ea9..90d2f0ea9 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/config_addhsm.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/config_addhsm.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/config_db.vm b/base/tps-client/apache/docroot/tps/admin/console/config/config_db.vm
index ba40c7cee..ba40c7cee 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/config_db.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/config_db.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/config_hsm.vm b/base/tps-client/apache/docroot/tps/admin/console/config/config_hsm.vm
index 7ec82522c..7ec82522c 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/config_hsm.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/config_hsm.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/config_hsmloginpanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/config_hsmloginpanel.vm
index 332f2f470..332f2f470 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/config_hsmloginpanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/config_hsmloginpanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/config_join.vm b/base/tps-client/apache/docroot/tps/admin/console/config/config_join.vm
index 49e43fbc4..49e43fbc4 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/config_join.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/config_join.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/config_rootca.vm b/base/tps-client/apache/docroot/tps/admin/console/config/config_rootca.vm
index 7e17fef35..7e17fef35 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/config_rootca.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/config_rootca.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/createsubsystempanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/createsubsystempanel.vm
index 1ddd7a90c..1ddd7a90c 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/createsubsystempanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/createsubsystempanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/databasepanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/databasepanel.vm
index ce168fd2a..ce168fd2a 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/databasepanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/databasepanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/displaycertchain2panel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/displaycertchain2panel.vm
index 3a13b7cd4..3a13b7cd4 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/displaycertchain2panel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/displaycertchain2panel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/displaycertchainpanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/displaycertchainpanel.vm
index f7b9dee90..f7b9dee90 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/displaycertchainpanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/displaycertchainpanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/donepanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/donepanel.vm
index 3df605d69..3df605d69 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/donepanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/donepanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/drminfopanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/drminfopanel.vm
index 8931bf1c9..8931bf1c9 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/drminfopanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/drminfopanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/footer.vm b/base/tps-client/apache/docroot/tps/admin/console/config/footer.vm
index a596e45b1..a596e45b1 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/footer.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/footer.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/header.vm b/base/tps-client/apache/docroot/tps/admin/console/config/header.vm
index e0fe6a962..e0fe6a962 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/header.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/header.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/hierarchypanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/hierarchypanel.vm
index 0138188e9..0138188e9 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/hierarchypanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/hierarchypanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/importadmincertpanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/importadmincertpanel.vm
index 609b4bf4f..609b4bf4f 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/importadmincertpanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/importadmincertpanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/login.vm b/base/tps-client/apache/docroot/tps/admin/console/config/login.vm
index 73f53afa6..73f53afa6 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/login.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/login.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/modulepanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/modulepanel.vm
index 812d7ca6c..812d7ca6c 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/modulepanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/modulepanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/namepanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/namepanel.vm
index 0ed2d1adb..0ed2d1adb 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/namepanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/namepanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/securitydomainloginpanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/securitydomainloginpanel.vm
index a8c0c8079..a8c0c8079 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/securitydomainloginpanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/securitydomainloginpanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/securitydomainpanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/securitydomainpanel.vm
index adb45cff6..adb45cff6 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/securitydomainpanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/securitydomainpanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/sidemenu.vm b/base/tps-client/apache/docroot/tps/admin/console/config/sidemenu.vm
index c3dbf1410..c3dbf1410 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/sidemenu.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/sidemenu.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/sizepanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/sizepanel.vm
index cfcf15190..cfcf15190 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/sizepanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/sizepanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/tksinfopanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/tksinfopanel.vm
index 1f6ee162f..1f6ee162f 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/tksinfopanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/tksinfopanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/topmenu.vm b/base/tps-client/apache/docroot/tps/admin/console/config/topmenu.vm
index c76b2e8fa..c76b2e8fa 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/topmenu.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/topmenu.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/welcomepanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/welcomepanel.vm
index 619560dd3..619560dd3 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/welcomepanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/welcomepanel.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/wizard.vm b/base/tps-client/apache/docroot/tps/admin/console/config/wizard.vm
index 31d395edf..31d395edf 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/wizard.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/wizard.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/config/xml.vm b/base/tps-client/apache/docroot/tps/admin/console/config/xml.vm
index 31ff72aa2..31ff72aa2 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/xml.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/xml.vm
diff --git a/base/tps/apache/docroot/tps/admin/console/js/misc.js b/base/tps-client/apache/docroot/tps/admin/console/js/misc.js
index d4dc336ab..d4dc336ab 100644
--- a/base/tps/apache/docroot/tps/admin/console/js/misc.js
+++ b/base/tps-client/apache/docroot/tps/admin/console/js/misc.js
diff --git a/base/tps/apache/pki_instance_command_wrapper b/base/tps-client/apache/pki_instance_command_wrapper
index 8ecef8075..8ecef8075 100644
--- a/base/tps/apache/pki_instance_command_wrapper
+++ b/base/tps-client/apache/pki_instance_command_wrapper
diff --git a/base/tps/apache/pki_subsystem_command_wrapper b/base/tps-client/apache/pki_subsystem_command_wrapper
index 4285b767a..4285b767a 100644
--- a/base/tps/apache/pki_subsystem_command_wrapper
+++ b/base/tps-client/apache/pki_subsystem_command_wrapper
diff --git a/base/tps/apache/readme.html b/base/tps-client/apache/readme.html
index 3b741e6ae..3b741e6ae 100644
--- a/base/tps/apache/readme.html
+++ b/base/tps-client/apache/readme.html
diff --git a/base/tps/applets/1.2.4122DFB4.ijc b/base/tps-client/applets/1.2.4122DFB4.ijc
index 2a8ea0733..2a8ea0733 100644
--- a/base/tps/applets/1.2.4122DFB4.ijc
+++ b/base/tps-client/applets/1.2.4122DFB4.ijc
diff --git a/base/tps/applets/1.2.416DA155.ijc b/base/tps-client/applets/1.2.416DA155.ijc
index 21b0312a8..21b0312a8 100755
--- a/base/tps/applets/1.2.416DA155.ijc
+++ b/base/tps-client/applets/1.2.416DA155.ijc
diff --git a/base/tps/applets/1.3.42260AFA.ijc b/base/tps-client/applets/1.3.42260AFA.ijc
index f17f98281..f17f98281 100755
--- a/base/tps/applets/1.3.42260AFA.ijc
+++ b/base/tps-client/applets/1.3.42260AFA.ijc
diff --git a/base/tps/applets/1.3.4255CC01.ijc b/base/tps-client/applets/1.3.4255CC01.ijc
index 322fe86e2..322fe86e2 100644
--- a/base/tps/applets/1.3.4255CC01.ijc
+++ b/base/tps-client/applets/1.3.4255CC01.ijc
diff --git a/base/tps/applets/1.3.42659461.ijc b/base/tps-client/applets/1.3.42659461.ijc
index ccf8ba451..ccf8ba451 100755
--- a/base/tps/applets/1.3.42659461.ijc
+++ b/base/tps-client/applets/1.3.42659461.ijc
diff --git a/base/tps/applets/1.3.427BDDB8.ijc b/base/tps-client/applets/1.3.427BDDB8.ijc
index 4a633e8d3..4a633e8d3 100644
--- a/base/tps/applets/1.3.427BDDB8.ijc
+++ b/base/tps-client/applets/1.3.427BDDB8.ijc
diff --git a/base/tps/applets/1.3.44724DDE.ijc b/base/tps-client/applets/1.3.44724DDE.ijc
index e56705dff..e56705dff 100755
--- a/base/tps/applets/1.3.44724DDE.ijc
+++ b/base/tps-client/applets/1.3.44724DDE.ijc
diff --git a/base/tps/applets/1.3.45787308.ijc b/base/tps-client/applets/1.3.45787308.ijc
index 164c7e0cd..164c7e0cd 100755
--- a/base/tps/applets/1.3.45787308.ijc
+++ b/base/tps-client/applets/1.3.45787308.ijc
diff --git a/base/tps/applets/1.4.499dc06c.ijc b/base/tps-client/applets/1.4.499dc06c.ijc
index 388482123..388482123 100644
--- a/base/tps/applets/1.4.499dc06c.ijc
+++ b/base/tps-client/applets/1.4.499dc06c.ijc
diff --git a/base/tps/applets/1.4.4d40a449.ijc b/base/tps-client/applets/1.4.4d40a449.ijc
index bd716adb0..bd716adb0 100644
--- a/base/tps/applets/1.4.4d40a449.ijc
+++ b/base/tps-client/applets/1.4.4d40a449.ijc
diff --git a/base/tps/applets/3FD00877.ijc b/base/tps-client/applets/3FD00877.ijc
index 5e6624d5a..5e6624d5a 100644
--- a/base/tps/applets/3FD00877.ijc
+++ b/base/tps-client/applets/3FD00877.ijc
diff --git a/base/tps/applets/4003196C.ijc b/base/tps-client/applets/4003196C.ijc
index bed8a7900..bed8a7900 100644
--- a/base/tps/applets/4003196C.ijc
+++ b/base/tps-client/applets/4003196C.ijc
diff --git a/base/tps/applets/402428AD.ijc b/base/tps-client/applets/402428AD.ijc
index b91a64334..b91a64334 100644
--- a/base/tps/applets/402428AD.ijc
+++ b/base/tps-client/applets/402428AD.ijc
diff --git a/base/tps/applets/404E4697.ijc b/base/tps-client/applets/404E4697.ijc
index 9c927c0f0..9c927c0f0 100644
--- a/base/tps/applets/404E4697.ijc
+++ b/base/tps-client/applets/404E4697.ijc
diff --git a/base/tps/applets/4122DFB4.ijc b/base/tps-client/applets/4122DFB4.ijc
index 2a8ea0733..2a8ea0733 100644
--- a/base/tps/applets/4122DFB4.ijc
+++ b/base/tps-client/applets/4122DFB4.ijc
diff --git a/base/tps/applets/listappletdates b/base/tps-client/applets/listappletdates
index a9e5c49ca..a9e5c49ca 100755
--- a/base/tps/applets/listappletdates
+++ b/base/tps-client/applets/listappletdates
diff --git a/base/tps/applets/readme.txt b/base/tps-client/applets/readme.txt
index 9dd2a87ef..9dd2a87ef 100644
--- a/base/tps/applets/readme.txt
+++ b/base/tps-client/applets/readme.txt
diff --git a/base/tps/doc/CMakeLists.txt b/base/tps-client/doc/CMakeLists.txt
index 419289d03..419289d03 100644
--- a/base/tps/doc/CMakeLists.txt
+++ b/base/tps-client/doc/CMakeLists.txt
diff --git a/base/tps/doc/CS.cfg.in b/base/tps-client/doc/CS.cfg.in
index d5c0f312e..d5c0f312e 100644
--- a/base/tps/doc/CS.cfg.in
+++ b/base/tps-client/doc/CS.cfg.in
diff --git a/base/tps/etc/init.d/pki-tpsd b/base/tps-client/etc/init.d/pki-tpsd
index b061d2af8..b061d2af8 100755
--- a/base/tps/etc/init.d/pki-tpsd
+++ b/base/tps-client/etc/init.d/pki-tpsd
diff --git a/base/tps/lib/perl/PKI/Base/Conf.pm b/base/tps-client/lib/perl/PKI/Base/Conf.pm
index 895ab28a3..895ab28a3 100755
--- a/base/tps/lib/perl/PKI/Base/Conf.pm
+++ b/base/tps-client/lib/perl/PKI/Base/Conf.pm
diff --git a/base/tps/lib/perl/PKI/Base/Registry.pm b/base/tps-client/lib/perl/PKI/Base/Registry.pm
index a4fb83f28..a4fb83f28 100755
--- a/base/tps/lib/perl/PKI/Base/Registry.pm
+++ b/base/tps-client/lib/perl/PKI/Base/Registry.pm
diff --git a/base/tps/lib/perl/PKI/Service/Op.pm b/base/tps-client/lib/perl/PKI/Service/Op.pm
index 9e2a63d4f..9e2a63d4f 100755
--- a/base/tps/lib/perl/PKI/Service/Op.pm
+++ b/base/tps-client/lib/perl/PKI/Service/Op.pm
diff --git a/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm b/base/tps-client/lib/perl/PKI/TPS/AdminAuthPanel.pm
index caaf6c65f..caaf6c65f 100755
--- a/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/AdminAuthPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/AdminPanel.pm b/base/tps-client/lib/perl/PKI/TPS/AdminPanel.pm
index d62d611be..d62d611be 100755
--- a/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/AdminPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm b/base/tps-client/lib/perl/PKI/TPS/AgentAuthPanel.pm
index a5130caa1..a5130caa1 100755
--- a/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/AgentAuthPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm b/base/tps-client/lib/perl/PKI/TPS/AuthDBPanel.pm
index 2b189cd0c..2b189cd0c 100755
--- a/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/AuthDBPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/BasePanel.pm b/base/tps-client/lib/perl/PKI/TPS/BasePanel.pm
index eecf99ff5..eecf99ff5 100755
--- a/base/tps/lib/perl/PKI/TPS/BasePanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/BasePanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm b/base/tps-client/lib/perl/PKI/TPS/CAInfoPanel.pm
index 27d0a0048..27d0a0048 100755
--- a/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/CAInfoPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/CertInfo.pm b/base/tps-client/lib/perl/PKI/TPS/CertInfo.pm
index da5377d4f..da5377d4f 100755
--- a/base/tps/lib/perl/PKI/TPS/CertInfo.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/CertInfo.pm
diff --git a/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm b/base/tps-client/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
index 200ef8d74..200ef8d74 100755
--- a/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm b/base/tps-client/lib/perl/PKI/TPS/CertRequestPanel.pm
index fb5d9ccda..fb5d9ccda 100755
--- a/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/CertRequestPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/Common.pm b/base/tps-client/lib/perl/PKI/TPS/Common.pm
index 5b078d882..5b078d882 100755
--- a/base/tps/lib/perl/PKI/TPS/Common.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/Common.pm
diff --git a/base/tps/lib/perl/PKI/TPS/Config.pm b/base/tps-client/lib/perl/PKI/TPS/Config.pm
index 7195dccd9..7195dccd9 100755
--- a/base/tps/lib/perl/PKI/TPS/Config.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/Config.pm
diff --git a/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm b/base/tps-client/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
index 5d36d3da3..5d36d3da3 100755
--- a/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm b/base/tps-client/lib/perl/PKI/TPS/ConfigHSMPanel.pm
index 06697a8c7..06697a8c7 100755
--- a/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/ConfigHSMPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm b/base/tps-client/lib/perl/PKI/TPS/DRMInfoPanel.pm
index 1ccef670d..1ccef670d 100755
--- a/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/DRMInfoPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm b/base/tps-client/lib/perl/PKI/TPS/DatabasePanel.pm
index d8fee06e8..d8fee06e8 100755
--- a/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/DatabasePanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm b/base/tps-client/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
index 3a86ab0bd..3a86ab0bd 100755
--- a/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm b/base/tps-client/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
index 68b64a4b5..68b64a4b5 100755
--- a/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/DonePanel.pm b/base/tps-client/lib/perl/PKI/TPS/DonePanel.pm
index 06c30646e..06c30646e 100755
--- a/base/tps/lib/perl/PKI/TPS/DonePanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/DonePanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/GlobalVar.pm b/base/tps-client/lib/perl/PKI/TPS/GlobalVar.pm
index 73e7b831a..73e7b831a 100755
--- a/base/tps/lib/perl/PKI/TPS/GlobalVar.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/GlobalVar.pm
diff --git a/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm b/base/tps-client/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
index dfec6ea80..dfec6ea80 100755
--- a/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/Login.pm b/base/tps-client/lib/perl/PKI/TPS/Login.pm
index 01aa01f42..01aa01f42 100755
--- a/base/tps/lib/perl/PKI/TPS/Login.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/Login.pm
diff --git a/base/tps/lib/perl/PKI/TPS/LoginPanel.pm b/base/tps-client/lib/perl/PKI/TPS/LoginPanel.pm
index d6592d46e..d6592d46e 100755
--- a/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/LoginPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/ModulePanel.pm b/base/tps-client/lib/perl/PKI/TPS/ModulePanel.pm
index 5e7089812..5e7089812 100755
--- a/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/ModulePanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/Modutil.pm b/base/tps-client/lib/perl/PKI/TPS/Modutil.pm
index 49c248c2e..49c248c2e 100755
--- a/base/tps/lib/perl/PKI/TPS/Modutil.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/Modutil.pm
diff --git a/base/tps/lib/perl/PKI/TPS/NamePanel.pm b/base/tps-client/lib/perl/PKI/TPS/NamePanel.pm
index d3ca4c19f..d3ca4c19f 100755
--- a/base/tps/lib/perl/PKI/TPS/NamePanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/NamePanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm b/base/tps-client/lib/perl/PKI/TPS/ReqCertInfo.pm
index f2faee2c7..f2faee2c7 100755
--- a/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/ReqCertInfo.pm
diff --git a/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm b/base/tps-client/lib/perl/PKI/TPS/SecurityDomainPanel.pm
index 8c52d8b40..8c52d8b40 100755
--- a/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/SecurityDomainPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/SizePanel.pm b/base/tps-client/lib/perl/PKI/TPS/SizePanel.pm
index 88d7fef79..88d7fef79 100755
--- a/base/tps/lib/perl/PKI/TPS/SizePanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/SizePanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm b/base/tps-client/lib/perl/PKI/TPS/SubsystemTypePanel.pm
index 793849332..793849332 100755
--- a/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/SubsystemTypePanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm b/base/tps-client/lib/perl/PKI/TPS/TKSInfoPanel.pm
index 720093ac5..720093ac5 100755
--- a/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/TKSInfoPanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm b/base/tps-client/lib/perl/PKI/TPS/WelcomePanel.pm
index a1c77e7cd..a1c77e7cd 100755
--- a/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/WelcomePanel.pm
diff --git a/base/tps/lib/perl/PKI/TPS/wizard.pm b/base/tps-client/lib/perl/PKI/TPS/wizard.pm
index c11ca999d..c11ca999d 100755
--- a/base/tps/lib/perl/PKI/TPS/wizard.pm
+++ b/base/tps-client/lib/perl/PKI/TPS/wizard.pm
diff --git a/base/tps/lib/perl/Template/Velocity.pm b/base/tps-client/lib/perl/Template/Velocity.pm
index ea5eb6d72..ea5eb6d72 100755
--- a/base/tps/lib/perl/Template/Velocity.pm
+++ b/base/tps-client/lib/perl/Template/Velocity.pm
diff --git a/base/tps/lib/systemd/system/pki-tpsd.target b/base/tps-client/lib/systemd/system/pki-tpsd.target
index 37c693b08..37c693b08 100644
--- a/base/tps/lib/systemd/system/pki-tpsd.target
+++ b/base/tps-client/lib/systemd/system/pki-tpsd.target
diff --git a/base/tps/lib/systemd/system/pki-tpsd@.service b/base/tps-client/lib/systemd/system/pki-tpsd@.service
index 6a0d6a343..6a0d6a343 100644
--- a/base/tps/lib/systemd/system/pki-tpsd@.service
+++ b/base/tps-client/lib/systemd/system/pki-tpsd@.service
diff --git a/base/tps/scripts/addAgents.ldif b/base/tps-client/scripts/addAgents.ldif
index d366bc8a7..d366bc8a7 100644
--- a/base/tps/scripts/addAgents.ldif
+++ b/base/tps-client/scripts/addAgents.ldif
diff --git a/base/tps/scripts/addIndexes.ldif b/base/tps-client/scripts/addIndexes.ldif
index 7a910be3e..7a910be3e 100644
--- a/base/tps/scripts/addIndexes.ldif
+++ b/base/tps-client/scripts/addIndexes.ldif
diff --git a/base/tps/scripts/addTokens.ldif b/base/tps-client/scripts/addTokens.ldif
index 9b8a99e27..9b8a99e27 100644
--- a/base/tps/scripts/addTokens.ldif
+++ b/base/tps-client/scripts/addTokens.ldif
diff --git a/base/tps/scripts/addVLVIndexes.ldif b/base/tps-client/scripts/addVLVIndexes.ldif
index 9dc86ece1..9dc86ece1 100644
--- a/base/tps/scripts/addVLVIndexes.ldif
+++ b/base/tps-client/scripts/addVLVIndexes.ldif
diff --git a/base/tps/scripts/database.ldif b/base/tps-client/scripts/database.ldif
index 706a3327e..706a3327e 100644
--- a/base/tps/scripts/database.ldif
+++ b/base/tps-client/scripts/database.ldif
diff --git a/base/tps/scripts/nss_pcache b/base/tps-client/scripts/nss_pcache
index 5295abb84..5295abb84 100755
--- a/base/tps/scripts/nss_pcache
+++ b/base/tps-client/scripts/nss_pcache
diff --git a/base/tps/scripts/schemaMods.ldif b/base/tps-client/scripts/schemaMods.ldif
index fd7b09331..fd7b09331 100644
--- a/base/tps/scripts/schemaMods.ldif
+++ b/base/tps-client/scripts/schemaMods.ldif
diff --git a/base/tps/scripts/vlvtasks.ldif b/base/tps-client/scripts/vlvtasks.ldif
index b1b93aabf..b1b93aabf 100644
--- a/base/tps/scripts/vlvtasks.ldif
+++ b/base/tps-client/scripts/vlvtasks.ldif
diff --git a/base/tps/setup/CMakeLists.txt b/base/tps-client/setup/CMakeLists.txt
index 0e81ca150..0e81ca150 100644
--- a/base/tps/setup/CMakeLists.txt
+++ b/base/tps-client/setup/CMakeLists.txt
diff --git a/base/tps/setup/create.pl b/base/tps-client/setup/create.pl
index 11efe36f0..11efe36f0 100755
--- a/base/tps/setup/create.pl
+++ b/base/tps-client/setup/create.pl
diff --git a/base/tps/setup/pkidaemon_registry b/base/tps-client/setup/pkidaemon_registry
index dccffdfaf..dccffdfaf 100644
--- a/base/tps/setup/pkidaemon_registry
+++ b/base/tps-client/setup/pkidaemon_registry
diff --git a/base/tps/setup/registry_instance b/base/tps-client/setup/registry_instance
index 01ddad1d2..01ddad1d2 100644
--- a/base/tps/setup/registry_instance
+++ b/base/tps-client/setup/registry_instance
diff --git a/base/tps/src/CMakeLists.txt b/base/tps-client/src/CMakeLists.txt
index b0276f8e2..b0276f8e2 100644
--- a/base/tps/src/CMakeLists.txt
+++ b/base/tps-client/src/CMakeLists.txt
diff --git a/base/tps/src/apdu/APDU.cpp b/base/tps-client/src/apdu/APDU.cpp
index 1ae729cc5..1ae729cc5 100644
--- a/base/tps/src/apdu/APDU.cpp
+++ b/base/tps-client/src/apdu/APDU.cpp
diff --git a/base/tps/src/apdu/APDU_Response.cpp b/base/tps-client/src/apdu/APDU_Response.cpp
index fac9b1ff4..fac9b1ff4 100644
--- a/base/tps/src/apdu/APDU_Response.cpp
+++ b/base/tps-client/src/apdu/APDU_Response.cpp
diff --git a/base/tps/src/apdu/Create_Object_APDU.cpp b/base/tps-client/src/apdu/Create_Object_APDU.cpp
index 2da9f20d3..2da9f20d3 100644
--- a/base/tps/src/apdu/Create_Object_APDU.cpp
+++ b/base/tps-client/src/apdu/Create_Object_APDU.cpp
diff --git a/base/tps/src/apdu/Create_Pin_APDU.cpp b/base/tps-client/src/apdu/Create_Pin_APDU.cpp
index db2ad3d0a..db2ad3d0a 100644
--- a/base/tps/src/apdu/Create_Pin_APDU.cpp
+++ b/base/tps-client/src/apdu/Create_Pin_APDU.cpp
diff --git a/base/tps/src/apdu/Delete_File_APDU.cpp b/base/tps-client/src/apdu/Delete_File_APDU.cpp
index 2306f0255..2306f0255 100644
--- a/base/tps/src/apdu/Delete_File_APDU.cpp
+++ b/base/tps-client/src/apdu/Delete_File_APDU.cpp
diff --git a/base/tps/src/apdu/External_Authenticate_APDU.cpp b/base/tps-client/src/apdu/External_Authenticate_APDU.cpp
index 32c414584..32c414584 100644
--- a/base/tps/src/apdu/External_Authenticate_APDU.cpp
+++ b/base/tps-client/src/apdu/External_Authenticate_APDU.cpp
diff --git a/base/tps/src/apdu/Format_Muscle_Applet_APDU.cpp b/base/tps-client/src/apdu/Format_Muscle_Applet_APDU.cpp
index dff95b8cd..dff95b8cd 100644
--- a/base/tps/src/apdu/Format_Muscle_Applet_APDU.cpp
+++ b/base/tps-client/src/apdu/Format_Muscle_Applet_APDU.cpp
diff --git a/base/tps/src/apdu/Generate_Key_APDU.cpp b/base/tps-client/src/apdu/Generate_Key_APDU.cpp
index 7d78b5513..7d78b5513 100644
--- a/base/tps/src/apdu/Generate_Key_APDU.cpp
+++ b/base/tps-client/src/apdu/Generate_Key_APDU.cpp
diff --git a/base/tps/src/apdu/Generate_Key_ECC_APDU.cpp b/base/tps-client/src/apdu/Generate_Key_ECC_APDU.cpp
index 0e6069a00..0e6069a00 100644
--- a/base/tps/src/apdu/Generate_Key_ECC_APDU.cpp
+++ b/base/tps-client/src/apdu/Generate_Key_ECC_APDU.cpp
diff --git a/base/tps/src/apdu/Get_Data_APDU.cpp b/base/tps-client/src/apdu/Get_Data_APDU.cpp
index 1cb4d9a5b..1cb4d9a5b 100644
--- a/base/tps/src/apdu/Get_Data_APDU.cpp
+++ b/base/tps-client/src/apdu/Get_Data_APDU.cpp
diff --git a/base/tps/src/apdu/Get_IssuerInfo_APDU.cpp b/base/tps-client/src/apdu/Get_IssuerInfo_APDU.cpp
index c83d920df..c83d920df 100644
--- a/base/tps/src/apdu/Get_IssuerInfo_APDU.cpp
+++ b/base/tps-client/src/apdu/Get_IssuerInfo_APDU.cpp
diff --git a/base/tps/src/apdu/Get_Status_APDU.cpp b/base/tps-client/src/apdu/Get_Status_APDU.cpp
index dcf7c9fac..dcf7c9fac 100644
--- a/base/tps/src/apdu/Get_Status_APDU.cpp
+++ b/base/tps-client/src/apdu/Get_Status_APDU.cpp
diff --git a/base/tps/src/apdu/Get_Version_APDU.cpp b/base/tps-client/src/apdu/Get_Version_APDU.cpp
index eb7e53728..eb7e53728 100644
--- a/base/tps/src/apdu/Get_Version_APDU.cpp
+++ b/base/tps-client/src/apdu/Get_Version_APDU.cpp
diff --git a/base/tps/src/apdu/Import_Key_APDU.cpp b/base/tps-client/src/apdu/Import_Key_APDU.cpp
index 18c6c886f..18c6c886f 100644
--- a/base/tps/src/apdu/Import_Key_APDU.cpp
+++ b/base/tps-client/src/apdu/Import_Key_APDU.cpp
diff --git a/base/tps/src/apdu/Import_Key_Enc_APDU.cpp b/base/tps-client/src/apdu/Import_Key_Enc_APDU.cpp
index 6df161157..6df161157 100644
--- a/base/tps/src/apdu/Import_Key_Enc_APDU.cpp
+++ b/base/tps-client/src/apdu/Import_Key_Enc_APDU.cpp
diff --git a/base/tps/src/apdu/Initialize_Update_APDU.cpp b/base/tps-client/src/apdu/Initialize_Update_APDU.cpp
index a87091122..a87091122 100644
--- a/base/tps/src/apdu/Initialize_Update_APDU.cpp
+++ b/base/tps-client/src/apdu/Initialize_Update_APDU.cpp
diff --git a/base/tps/src/apdu/Install_Applet_APDU.cpp b/base/tps-client/src/apdu/Install_Applet_APDU.cpp
index 0a6b9b7c1..0a6b9b7c1 100644
--- a/base/tps/src/apdu/Install_Applet_APDU.cpp
+++ b/base/tps-client/src/apdu/Install_Applet_APDU.cpp
diff --git a/base/tps/src/apdu/Install_Load_APDU.cpp b/base/tps-client/src/apdu/Install_Load_APDU.cpp
index 6169538e5..6169538e5 100644
--- a/base/tps/src/apdu/Install_Load_APDU.cpp
+++ b/base/tps-client/src/apdu/Install_Load_APDU.cpp
diff --git a/base/tps/src/apdu/Lifecycle_APDU.cpp b/base/tps-client/src/apdu/Lifecycle_APDU.cpp
index e7236147e..e7236147e 100644
--- a/base/tps/src/apdu/Lifecycle_APDU.cpp
+++ b/base/tps-client/src/apdu/Lifecycle_APDU.cpp
diff --git a/base/tps/src/apdu/List_Objects_APDU.cpp b/base/tps-client/src/apdu/List_Objects_APDU.cpp
index 86ae570d9..86ae570d9 100644
--- a/base/tps/src/apdu/List_Objects_APDU.cpp
+++ b/base/tps-client/src/apdu/List_Objects_APDU.cpp
diff --git a/base/tps/src/apdu/List_Pins_APDU.cpp b/base/tps-client/src/apdu/List_Pins_APDU.cpp
index 218072f21..218072f21 100644
--- a/base/tps/src/apdu/List_Pins_APDU.cpp
+++ b/base/tps-client/src/apdu/List_Pins_APDU.cpp
diff --git a/base/tps/src/apdu/Load_File_APDU.cpp b/base/tps-client/src/apdu/Load_File_APDU.cpp
index c41f0ec73..c41f0ec73 100644
--- a/base/tps/src/apdu/Load_File_APDU.cpp
+++ b/base/tps-client/src/apdu/Load_File_APDU.cpp
diff --git a/base/tps/src/apdu/Put_Key_APDU.cpp b/base/tps-client/src/apdu/Put_Key_APDU.cpp
index 0a061394f..0a061394f 100644
--- a/base/tps/src/apdu/Put_Key_APDU.cpp
+++ b/base/tps-client/src/apdu/Put_Key_APDU.cpp
diff --git a/base/tps/src/apdu/Read_Buffer_APDU.cpp b/base/tps-client/src/apdu/Read_Buffer_APDU.cpp
index 22f23fe1f..22f23fe1f 100644
--- a/base/tps/src/apdu/Read_Buffer_APDU.cpp
+++ b/base/tps-client/src/apdu/Read_Buffer_APDU.cpp
diff --git a/base/tps/src/apdu/Read_Object_APDU.cpp b/base/tps-client/src/apdu/Read_Object_APDU.cpp
index 21722d331..21722d331 100644
--- a/base/tps/src/apdu/Read_Object_APDU.cpp
+++ b/base/tps-client/src/apdu/Read_Object_APDU.cpp
diff --git a/base/tps/src/apdu/Select_APDU.cpp b/base/tps-client/src/apdu/Select_APDU.cpp
index 4f5917b29..4f5917b29 100644
--- a/base/tps/src/apdu/Select_APDU.cpp
+++ b/base/tps-client/src/apdu/Select_APDU.cpp
diff --git a/base/tps/src/apdu/Set_IssuerInfo_APDU.cpp b/base/tps-client/src/apdu/Set_IssuerInfo_APDU.cpp
index 77b1d0f8d..77b1d0f8d 100644
--- a/base/tps/src/apdu/Set_IssuerInfo_APDU.cpp
+++ b/base/tps-client/src/apdu/Set_IssuerInfo_APDU.cpp
diff --git a/base/tps/src/apdu/Set_Pin_APDU.cpp b/base/tps-client/src/apdu/Set_Pin_APDU.cpp
index 3faaa89ed..3faaa89ed 100644
--- a/base/tps/src/apdu/Set_Pin_APDU.cpp
+++ b/base/tps-client/src/apdu/Set_Pin_APDU.cpp
diff --git a/base/tps/src/apdu/Unblock_Pin_APDU.cpp b/base/tps-client/src/apdu/Unblock_Pin_APDU.cpp
index c580dc9f2..c580dc9f2 100644
--- a/base/tps/src/apdu/Unblock_Pin_APDU.cpp
+++ b/base/tps-client/src/apdu/Unblock_Pin_APDU.cpp
diff --git a/base/tps/src/apdu/Write_Object_APDU.cpp b/base/tps-client/src/apdu/Write_Object_APDU.cpp
index 958ee4384..958ee4384 100644
--- a/base/tps/src/apdu/Write_Object_APDU.cpp
+++ b/base/tps-client/src/apdu/Write_Object_APDU.cpp
diff --git a/base/tps/src/authentication/CMakeLists.txt b/base/tps-client/src/authentication/CMakeLists.txt
index ba8ca07dc..ba8ca07dc 100644
--- a/base/tps/src/authentication/CMakeLists.txt
+++ b/base/tps-client/src/authentication/CMakeLists.txt
diff --git a/base/tps/src/authentication/LDAP_Authentication.cpp b/base/tps-client/src/authentication/LDAP_Authentication.cpp
index 3e073dfff..3e073dfff 100644
--- a/base/tps/src/authentication/LDAP_Authentication.cpp
+++ b/base/tps-client/src/authentication/LDAP_Authentication.cpp
diff --git a/base/tps/src/channel/Channel.cpp b/base/tps-client/src/channel/Channel.cpp
index 6b77d3a19..6b77d3a19 100644
--- a/base/tps/src/channel/Channel.cpp
+++ b/base/tps-client/src/channel/Channel.cpp
diff --git a/base/tps/src/channel/Secure_Channel.cpp b/base/tps-client/src/channel/Secure_Channel.cpp
index 018e3e6f1..018e3e6f1 100644
--- a/base/tps/src/channel/Secure_Channel.cpp
+++ b/base/tps-client/src/channel/Secure_Channel.cpp
diff --git a/base/tps/src/cms/CertEnroll.cpp b/base/tps-client/src/cms/CertEnroll.cpp
index c61e18374..c61e18374 100644
--- a/base/tps/src/cms/CertEnroll.cpp
+++ b/base/tps-client/src/cms/CertEnroll.cpp
diff --git a/base/tps/src/cms/ConnectionInfo.cpp b/base/tps-client/src/cms/ConnectionInfo.cpp
index 3ab503c5d..3ab503c5d 100644
--- a/base/tps/src/cms/ConnectionInfo.cpp
+++ b/base/tps-client/src/cms/ConnectionInfo.cpp
diff --git a/base/tps/src/cms/HttpConnection.cpp b/base/tps-client/src/cms/HttpConnection.cpp
index 89f773557..89f773557 100644
--- a/base/tps/src/cms/HttpConnection.cpp
+++ b/base/tps-client/src/cms/HttpConnection.cpp
diff --git a/base/tps/src/engine/RA.cpp b/base/tps-client/src/engine/RA.cpp
index 82f53c161..82f53c161 100644
--- a/base/tps/src/engine/RA.cpp
+++ b/base/tps-client/src/engine/RA.cpp
diff --git a/base/tps/src/httpClient/Cache.cpp b/base/tps-client/src/httpClient/Cache.cpp
index 2ea628f8c..2ea628f8c 100644
--- a/base/tps/src/httpClient/Cache.cpp
+++ b/base/tps-client/src/httpClient/Cache.cpp
diff --git a/base/tps/src/httpClient/engine.cpp b/base/tps-client/src/httpClient/engine.cpp
index 0e0897e62..0e0897e62 100644
--- a/base/tps/src/httpClient/engine.cpp
+++ b/base/tps-client/src/httpClient/engine.cpp
diff --git a/base/tps/src/httpClient/http.cpp b/base/tps-client/src/httpClient/http.cpp
index 60ca48bf5..60ca48bf5 100644
--- a/base/tps/src/httpClient/http.cpp
+++ b/base/tps-client/src/httpClient/http.cpp
diff --git a/base/tps/src/httpClient/httpClient.cpp b/base/tps-client/src/httpClient/httpClient.cpp
index 7f4e9fff3..7f4e9fff3 100644
--- a/base/tps/src/httpClient/httpClient.cpp
+++ b/base/tps-client/src/httpClient/httpClient.cpp
diff --git a/base/tps/src/httpClient/nscperror.cpp b/base/tps-client/src/httpClient/nscperror.cpp
index 38c722de2..38c722de2 100644
--- a/base/tps/src/httpClient/nscperror.cpp
+++ b/base/tps-client/src/httpClient/nscperror.cpp
diff --git a/base/tps/src/httpClient/request.cpp b/base/tps-client/src/httpClient/request.cpp
index 629f74821..629f74821 100644
--- a/base/tps/src/httpClient/request.cpp
+++ b/base/tps-client/src/httpClient/request.cpp
diff --git a/base/tps/src/httpClient/response.cpp b/base/tps-client/src/httpClient/response.cpp
index 89b900492..89b900492 100644
--- a/base/tps/src/httpClient/response.cpp
+++ b/base/tps-client/src/httpClient/response.cpp
diff --git a/base/tps/src/include/apdu/APDU.h b/base/tps-client/src/include/apdu/APDU.h
index cfb66ad19..cfb66ad19 100644
--- a/base/tps/src/include/apdu/APDU.h
+++ b/base/tps-client/src/include/apdu/APDU.h
diff --git a/base/tps/src/include/apdu/APDU_Response.h b/base/tps-client/src/include/apdu/APDU_Response.h
index 0d5c62b9d..0d5c62b9d 100644
--- a/base/tps/src/include/apdu/APDU_Response.h
+++ b/base/tps-client/src/include/apdu/APDU_Response.h
diff --git a/base/tps/src/include/apdu/Create_Object_APDU.h b/base/tps-client/src/include/apdu/Create_Object_APDU.h
index 7433e7ceb..7433e7ceb 100644
--- a/base/tps/src/include/apdu/Create_Object_APDU.h
+++ b/base/tps-client/src/include/apdu/Create_Object_APDU.h
diff --git a/base/tps/src/include/apdu/Create_Pin_APDU.h b/base/tps-client/src/include/apdu/Create_Pin_APDU.h
index 7f666467d..7f666467d 100644
--- a/base/tps/src/include/apdu/Create_Pin_APDU.h
+++ b/base/tps-client/src/include/apdu/Create_Pin_APDU.h
diff --git a/base/tps/src/include/apdu/Delete_File_APDU.h b/base/tps-client/src/include/apdu/Delete_File_APDU.h
index 9e2eeeeb2..9e2eeeeb2 100644
--- a/base/tps/src/include/apdu/Delete_File_APDU.h
+++ b/base/tps-client/src/include/apdu/Delete_File_APDU.h
diff --git a/base/tps/src/include/apdu/External_Authenticate_APDU.h b/base/tps-client/src/include/apdu/External_Authenticate_APDU.h
index ff9a6bee7..ff9a6bee7 100644
--- a/base/tps/src/include/apdu/External_Authenticate_APDU.h
+++ b/base/tps-client/src/include/apdu/External_Authenticate_APDU.h
diff --git a/base/tps/src/include/apdu/Format_Muscle_Applet_APDU.h b/base/tps-client/src/include/apdu/Format_Muscle_Applet_APDU.h
index b7fbbbea1..b7fbbbea1 100644
--- a/base/tps/src/include/apdu/Format_Muscle_Applet_APDU.h
+++ b/base/tps-client/src/include/apdu/Format_Muscle_Applet_APDU.h
diff --git a/base/tps/src/include/apdu/Generate_Key_APDU.h b/base/tps-client/src/include/apdu/Generate_Key_APDU.h
index d245b8336..d245b8336 100644
--- a/base/tps/src/include/apdu/Generate_Key_APDU.h
+++ b/base/tps-client/src/include/apdu/Generate_Key_APDU.h
diff --git a/base/tps/src/include/apdu/Generate_Key_ECC_APDU.h b/base/tps-client/src/include/apdu/Generate_Key_ECC_APDU.h
index c1a4e3764..c1a4e3764 100644
--- a/base/tps/src/include/apdu/Generate_Key_ECC_APDU.h
+++ b/base/tps-client/src/include/apdu/Generate_Key_ECC_APDU.h
diff --git a/base/tps/src/include/apdu/Get_Data_APDU.h b/base/tps-client/src/include/apdu/Get_Data_APDU.h
index a4f78634d..a4f78634d 100644
--- a/base/tps/src/include/apdu/Get_Data_APDU.h
+++ b/base/tps-client/src/include/apdu/Get_Data_APDU.h
diff --git a/base/tps/src/include/apdu/Get_IssuerInfo_APDU.h b/base/tps-client/src/include/apdu/Get_IssuerInfo_APDU.h
index 075acc6d9..075acc6d9 100644
--- a/base/tps/src/include/apdu/Get_IssuerInfo_APDU.h
+++ b/base/tps-client/src/include/apdu/Get_IssuerInfo_APDU.h
diff --git a/base/tps/src/include/apdu/Get_Status_APDU.h b/base/tps-client/src/include/apdu/Get_Status_APDU.h
index 5d047bf16..5d047bf16 100644
--- a/base/tps/src/include/apdu/Get_Status_APDU.h
+++ b/base/tps-client/src/include/apdu/Get_Status_APDU.h
diff --git a/base/tps/src/include/apdu/Get_Version_APDU.h b/base/tps-client/src/include/apdu/Get_Version_APDU.h
index 8b6ff3c33..8b6ff3c33 100644
--- a/base/tps/src/include/apdu/Get_Version_APDU.h
+++ b/base/tps-client/src/include/apdu/Get_Version_APDU.h
diff --git a/base/tps/src/include/apdu/Import_Key_APDU.h b/base/tps-client/src/include/apdu/Import_Key_APDU.h
index e00d97081..e00d97081 100644
--- a/base/tps/src/include/apdu/Import_Key_APDU.h
+++ b/base/tps-client/src/include/apdu/Import_Key_APDU.h
diff --git a/base/tps/src/include/apdu/Import_Key_Enc_APDU.h b/base/tps-client/src/include/apdu/Import_Key_Enc_APDU.h
index bcc974987..bcc974987 100644
--- a/base/tps/src/include/apdu/Import_Key_Enc_APDU.h
+++ b/base/tps-client/src/include/apdu/Import_Key_Enc_APDU.h
diff --git a/base/tps/src/include/apdu/Initialize_Update_APDU.h b/base/tps-client/src/include/apdu/Initialize_Update_APDU.h
index 8e20d77ab..8e20d77ab 100644
--- a/base/tps/src/include/apdu/Initialize_Update_APDU.h
+++ b/base/tps-client/src/include/apdu/Initialize_Update_APDU.h
diff --git a/base/tps/src/include/apdu/Install_Applet_APDU.h b/base/tps-client/src/include/apdu/Install_Applet_APDU.h
index 08b799a64..08b799a64 100644
--- a/base/tps/src/include/apdu/Install_Applet_APDU.h
+++ b/base/tps-client/src/include/apdu/Install_Applet_APDU.h
diff --git a/base/tps/src/include/apdu/Install_Load_APDU.h b/base/tps-client/src/include/apdu/Install_Load_APDU.h
index 7d0ff9761..7d0ff9761 100644
--- a/base/tps/src/include/apdu/Install_Load_APDU.h
+++ b/base/tps-client/src/include/apdu/Install_Load_APDU.h
diff --git a/base/tps/src/include/apdu/Lifecycle_APDU.h b/base/tps-client/src/include/apdu/Lifecycle_APDU.h
index a3adaf9c4..a3adaf9c4 100644
--- a/base/tps/src/include/apdu/Lifecycle_APDU.h
+++ b/base/tps-client/src/include/apdu/Lifecycle_APDU.h
diff --git a/base/tps/src/include/apdu/List_Objects_APDU.h b/base/tps-client/src/include/apdu/List_Objects_APDU.h
index 7d5b45bff..7d5b45bff 100644
--- a/base/tps/src/include/apdu/List_Objects_APDU.h
+++ b/base/tps-client/src/include/apdu/List_Objects_APDU.h
diff --git a/base/tps/src/include/apdu/List_Pins_APDU.h b/base/tps-client/src/include/apdu/List_Pins_APDU.h
index 04d1102c9..04d1102c9 100644
--- a/base/tps/src/include/apdu/List_Pins_APDU.h
+++ b/base/tps-client/src/include/apdu/List_Pins_APDU.h
diff --git a/base/tps/src/include/apdu/Load_File_APDU.h b/base/tps-client/src/include/apdu/Load_File_APDU.h
index ae5f57445..ae5f57445 100644
--- a/base/tps/src/include/apdu/Load_File_APDU.h
+++ b/base/tps-client/src/include/apdu/Load_File_APDU.h
diff --git a/base/tps/src/include/apdu/Put_Key_APDU.h b/base/tps-client/src/include/apdu/Put_Key_APDU.h
index 63aa54599..63aa54599 100644
--- a/base/tps/src/include/apdu/Put_Key_APDU.h
+++ b/base/tps-client/src/include/apdu/Put_Key_APDU.h
diff --git a/base/tps/src/include/apdu/Read_Buffer_APDU.h b/base/tps-client/src/include/apdu/Read_Buffer_APDU.h
index 3c94b564d..3c94b564d 100644
--- a/base/tps/src/include/apdu/Read_Buffer_APDU.h
+++ b/base/tps-client/src/include/apdu/Read_Buffer_APDU.h
diff --git a/base/tps/src/include/apdu/Read_Object_APDU.h b/base/tps-client/src/include/apdu/Read_Object_APDU.h
index e2357acdd..e2357acdd 100644
--- a/base/tps/src/include/apdu/Read_Object_APDU.h
+++ b/base/tps-client/src/include/apdu/Read_Object_APDU.h
diff --git a/base/tps/src/include/apdu/Select_APDU.h b/base/tps-client/src/include/apdu/Select_APDU.h
index 92c1c8ee8..92c1c8ee8 100644
--- a/base/tps/src/include/apdu/Select_APDU.h
+++ b/base/tps-client/src/include/apdu/Select_APDU.h
diff --git a/base/tps/src/include/apdu/Set_IssuerInfo_APDU.h b/base/tps-client/src/include/apdu/Set_IssuerInfo_APDU.h
index 2507fdc97..2507fdc97 100644
--- a/base/tps/src/include/apdu/Set_IssuerInfo_APDU.h
+++ b/base/tps-client/src/include/apdu/Set_IssuerInfo_APDU.h
diff --git a/base/tps/src/include/apdu/Set_Pin_APDU.h b/base/tps-client/src/include/apdu/Set_Pin_APDU.h
index f649147a1..f649147a1 100644
--- a/base/tps/src/include/apdu/Set_Pin_APDU.h
+++ b/base/tps-client/src/include/apdu/Set_Pin_APDU.h
diff --git a/base/tps/src/include/apdu/Unblock_Pin_APDU.h b/base/tps-client/src/include/apdu/Unblock_Pin_APDU.h
index 583e7ae7d..583e7ae7d 100644
--- a/base/tps/src/include/apdu/Unblock_Pin_APDU.h
+++ b/base/tps-client/src/include/apdu/Unblock_Pin_APDU.h
diff --git a/base/tps/src/include/apdu/Write_Object_APDU.h b/base/tps-client/src/include/apdu/Write_Object_APDU.h
index 670cd6bbd..670cd6bbd 100644
--- a/base/tps/src/include/apdu/Write_Object_APDU.h
+++ b/base/tps-client/src/include/apdu/Write_Object_APDU.h
diff --git a/base/tps/src/include/authentication/AuthParams.h b/base/tps-client/src/include/authentication/AuthParams.h
index e0d39a249..e0d39a249 100644
--- a/base/tps/src/include/authentication/AuthParams.h
+++ b/base/tps-client/src/include/authentication/AuthParams.h
diff --git a/base/tps/src/include/authentication/Authentication.h b/base/tps-client/src/include/authentication/Authentication.h
index ae2b0c6fb..ae2b0c6fb 100644
--- a/base/tps/src/include/authentication/Authentication.h
+++ b/base/tps-client/src/include/authentication/Authentication.h
diff --git a/base/tps/src/include/authentication/LDAP_Authentication.h b/base/tps-client/src/include/authentication/LDAP_Authentication.h
index 2a8c0a7d5..2a8c0a7d5 100644
--- a/base/tps/src/include/authentication/LDAP_Authentication.h
+++ b/base/tps-client/src/include/authentication/LDAP_Authentication.h
diff --git a/base/tps/src/include/channel/Channel.h b/base/tps-client/src/include/channel/Channel.h
index a49af8bf1..a49af8bf1 100644
--- a/base/tps/src/include/channel/Channel.h
+++ b/base/tps-client/src/include/channel/Channel.h
diff --git a/base/tps/src/include/channel/Secure_Channel.h b/base/tps-client/src/include/channel/Secure_Channel.h
index e67f8ebaf..e67f8ebaf 100644
--- a/base/tps/src/include/channel/Secure_Channel.h
+++ b/base/tps-client/src/include/channel/Secure_Channel.h
diff --git a/base/tps/src/include/cms/CertEnroll.h b/base/tps-client/src/include/cms/CertEnroll.h
index ea1acc771..ea1acc771 100644
--- a/base/tps/src/include/cms/CertEnroll.h
+++ b/base/tps-client/src/include/cms/CertEnroll.h
diff --git a/base/tps/src/include/cms/ConnectionInfo.h b/base/tps-client/src/include/cms/ConnectionInfo.h
index 07e9c3a73..07e9c3a73 100644
--- a/base/tps/src/include/cms/ConnectionInfo.h
+++ b/base/tps-client/src/include/cms/ConnectionInfo.h
diff --git a/base/tps/src/include/cms/HttpConnection.h b/base/tps-client/src/include/cms/HttpConnection.h
index da9d3a7fd..da9d3a7fd 100644
--- a/base/tps/src/include/cms/HttpConnection.h
+++ b/base/tps-client/src/include/cms/HttpConnection.h
diff --git a/base/tps/src/include/engine/RA.h b/base/tps-client/src/include/engine/RA.h
index 3ec0143d8..3ec0143d8 100644
--- a/base/tps/src/include/engine/RA.h
+++ b/base/tps-client/src/include/engine/RA.h
diff --git a/base/tps/src/include/engine/audit.h b/base/tps-client/src/include/engine/audit.h
index f8b50de37..f8b50de37 100644
--- a/base/tps/src/include/engine/audit.h
+++ b/base/tps-client/src/include/engine/audit.h
diff --git a/base/tps/src/include/httpClient/httpc/AccessLogger.h b/base/tps-client/src/include/httpClient/httpc/AccessLogger.h
index 2b600d7e6..2b600d7e6 100644
--- a/base/tps/src/include/httpClient/httpc/AccessLogger.h
+++ b/base/tps-client/src/include/httpClient/httpc/AccessLogger.h
diff --git a/base/tps/src/include/httpClient/httpc/Auth.h b/base/tps-client/src/include/httpClient/httpc/Auth.h
index 72a5f77ee..72a5f77ee 100644
--- a/base/tps/src/include/httpClient/httpc/Auth.h
+++ b/base/tps-client/src/include/httpClient/httpc/Auth.h
diff --git a/base/tps/src/include/httpClient/httpc/ByteBuffer.h b/base/tps-client/src/include/httpClient/httpc/ByteBuffer.h
index cd5568c35..cd5568c35 100644
--- a/base/tps/src/include/httpClient/httpc/ByteBuffer.h
+++ b/base/tps-client/src/include/httpClient/httpc/ByteBuffer.h
diff --git a/base/tps/src/include/httpClient/httpc/CERTUtil.h b/base/tps-client/src/include/httpClient/httpc/CERTUtil.h
index 1f26efbb8..1f26efbb8 100644
--- a/base/tps/src/include/httpClient/httpc/CERTUtil.h
+++ b/base/tps-client/src/include/httpClient/httpc/CERTUtil.h
diff --git a/base/tps/src/include/httpClient/httpc/Cache.h b/base/tps-client/src/include/httpClient/httpc/Cache.h
index bc68f04df..bc68f04df 100644
--- a/base/tps/src/include/httpClient/httpc/Cache.h
+++ b/base/tps-client/src/include/httpClient/httpc/Cache.h
diff --git a/base/tps/src/include/httpClient/httpc/Connection.h b/base/tps-client/src/include/httpClient/httpc/Connection.h
index 5619d0dff..5619d0dff 100644
--- a/base/tps/src/include/httpClient/httpc/Connection.h
+++ b/base/tps-client/src/include/httpClient/httpc/Connection.h
diff --git a/base/tps/src/include/httpClient/httpc/ConnectionListener.h b/base/tps-client/src/include/httpClient/httpc/ConnectionListener.h
index 0b55900b3..0b55900b3 100644
--- a/base/tps/src/include/httpClient/httpc/ConnectionListener.h
+++ b/base/tps-client/src/include/httpClient/httpc/ConnectionListener.h
diff --git a/base/tps/src/include/httpClient/httpc/DebugLogger.h b/base/tps-client/src/include/httpClient/httpc/DebugLogger.h
index 37c7971c0..37c7971c0 100644
--- a/base/tps/src/include/httpClient/httpc/DebugLogger.h
+++ b/base/tps-client/src/include/httpClient/httpc/DebugLogger.h
diff --git a/base/tps/src/include/httpClient/httpc/Defines.h b/base/tps-client/src/include/httpClient/httpc/Defines.h
index 90af8e3d0..90af8e3d0 100644
--- a/base/tps/src/include/httpClient/httpc/Defines.h
+++ b/base/tps-client/src/include/httpClient/httpc/Defines.h
diff --git a/base/tps/src/include/httpClient/httpc/ErrorLogger.h b/base/tps-client/src/include/httpClient/httpc/ErrorLogger.h
index df2617b06..df2617b06 100644
--- a/base/tps/src/include/httpClient/httpc/ErrorLogger.h
+++ b/base/tps-client/src/include/httpClient/httpc/ErrorLogger.h
diff --git a/base/tps/src/include/httpClient/httpc/Iterator.h b/base/tps-client/src/include/httpClient/httpc/Iterator.h
index 9b15a93e2..9b15a93e2 100644
--- a/base/tps/src/include/httpClient/httpc/Iterator.h
+++ b/base/tps-client/src/include/httpClient/httpc/Iterator.h
diff --git a/base/tps/src/include/httpClient/httpc/LogRotationTask.h b/base/tps-client/src/include/httpClient/httpc/LogRotationTask.h
index eed098b6b..eed098b6b 100644
--- a/base/tps/src/include/httpClient/httpc/LogRotationTask.h
+++ b/base/tps-client/src/include/httpClient/httpc/LogRotationTask.h
diff --git a/base/tps/src/include/httpClient/httpc/Logger.h b/base/tps-client/src/include/httpClient/httpc/Logger.h
index b41d5dfbf..b41d5dfbf 100644
--- a/base/tps/src/include/httpClient/httpc/Logger.h
+++ b/base/tps-client/src/include/httpClient/httpc/Logger.h
diff --git a/base/tps/src/include/httpClient/httpc/NSPRerrs.h b/base/tps-client/src/include/httpClient/httpc/NSPRerrs.h
index 2e131fd7a..2e131fd7a 100644
--- a/base/tps/src/include/httpClient/httpc/NSPRerrs.h
+++ b/base/tps-client/src/include/httpClient/httpc/NSPRerrs.h
diff --git a/base/tps/src/include/httpClient/httpc/PSBuddy.h b/base/tps-client/src/include/httpClient/httpc/PSBuddy.h
index 4d84b8727..4d84b8727 100644
--- a/base/tps/src/include/httpClient/httpc/PSBuddy.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSBuddy.h
diff --git a/base/tps/src/include/httpClient/httpc/PSBuddyCache.h b/base/tps-client/src/include/httpClient/httpc/PSBuddyCache.h
index 3c880074b..3c880074b 100644
--- a/base/tps/src/include/httpClient/httpc/PSBuddyCache.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSBuddyCache.h
diff --git a/base/tps/src/include/httpClient/httpc/PSBuddyList.h b/base/tps-client/src/include/httpClient/httpc/PSBuddyList.h
index 49155a8a5..49155a8a5 100644
--- a/base/tps/src/include/httpClient/httpc/PSBuddyList.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSBuddyList.h
diff --git a/base/tps/src/include/httpClient/httpc/PSBuddyListener.h b/base/tps-client/src/include/httpClient/httpc/PSBuddyListener.h
index 87e701373..87e701373 100644
--- a/base/tps/src/include/httpClient/httpc/PSBuddyListener.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSBuddyListener.h
diff --git a/base/tps/src/include/httpClient/httpc/PSBuddyService.h b/base/tps-client/src/include/httpClient/httpc/PSBuddyService.h
index 2556420e9..2556420e9 100644
--- a/base/tps/src/include/httpClient/httpc/PSBuddyService.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSBuddyService.h
diff --git a/base/tps/src/include/httpClient/httpc/PSCertExtension.h b/base/tps-client/src/include/httpClient/httpc/PSCertExtension.h
index f528a54b4..f528a54b4 100644
--- a/base/tps/src/include/httpClient/httpc/PSCertExtension.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSCertExtension.h
diff --git a/base/tps/src/include/httpClient/httpc/PSCommonLib.h b/base/tps-client/src/include/httpClient/httpc/PSCommonLib.h
index 09903b38f..09903b38f 100644
--- a/base/tps/src/include/httpClient/httpc/PSCommonLib.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSCommonLib.h
diff --git a/base/tps/src/include/httpClient/httpc/PSConfig.h b/base/tps-client/src/include/httpClient/httpc/PSConfig.h
index 897def3c9..897def3c9 100644
--- a/base/tps/src/include/httpClient/httpc/PSConfig.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSConfig.h
diff --git a/base/tps/src/include/httpClient/httpc/PSConfigManager.h b/base/tps-client/src/include/httpClient/httpc/PSConfigManager.h
index d2f5d3335..d2f5d3335 100644
--- a/base/tps/src/include/httpClient/httpc/PSConfigManager.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSConfigManager.h
diff --git a/base/tps/src/include/httpClient/httpc/PSConfigReader.h b/base/tps-client/src/include/httpClient/httpc/PSConfigReader.h
index a507a26dc..a507a26dc 100644
--- a/base/tps/src/include/httpClient/httpc/PSConfigReader.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSConfigReader.h
diff --git a/base/tps/src/include/httpClient/httpc/PSCrypt.h b/base/tps-client/src/include/httpClient/httpc/PSCrypt.h
index bfd05788d..bfd05788d 100644
--- a/base/tps/src/include/httpClient/httpc/PSCrypt.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSCrypt.h
diff --git a/base/tps/src/include/httpClient/httpc/PSDataSourceListener.h b/base/tps-client/src/include/httpClient/httpc/PSDataSourceListener.h
index 36842904d..36842904d 100644
--- a/base/tps/src/include/httpClient/httpc/PSDataSourceListener.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSDataSourceListener.h
diff --git a/base/tps/src/include/httpClient/httpc/PSDataSourceManager.h b/base/tps-client/src/include/httpClient/httpc/PSDataSourceManager.h
index 1b0662b69..1b0662b69 100644
--- a/base/tps/src/include/httpClient/httpc/PSDataSourceManager.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSDataSourceManager.h
diff --git a/base/tps/src/include/httpClient/httpc/PSGroup.h b/base/tps-client/src/include/httpClient/httpc/PSGroup.h
index 8427c39c3..8427c39c3 100644
--- a/base/tps/src/include/httpClient/httpc/PSGroup.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSGroup.h
diff --git a/base/tps/src/include/httpClient/httpc/PSGroupCache.h b/base/tps-client/src/include/httpClient/httpc/PSGroupCache.h
index 6807e50e4..6807e50e4 100644
--- a/base/tps/src/include/httpClient/httpc/PSGroupCache.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSGroupCache.h
diff --git a/base/tps/src/include/httpClient/httpc/PSHelper.h b/base/tps-client/src/include/httpClient/httpc/PSHelper.h
index 7b9240b1b..7b9240b1b 100644
--- a/base/tps/src/include/httpClient/httpc/PSHelper.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSHelper.h
diff --git a/base/tps/src/include/httpClient/httpc/PSListener.h b/base/tps-client/src/include/httpClient/httpc/PSListener.h
index 1d85a9912..1d85a9912 100644
--- a/base/tps/src/include/httpClient/httpc/PSListener.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSListener.h
diff --git a/base/tps/src/include/httpClient/httpc/PSPRUtil.h b/base/tps-client/src/include/httpClient/httpc/PSPRUtil.h
index f3b104cc0..f3b104cc0 100644
--- a/base/tps/src/include/httpClient/httpc/PSPRUtil.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSPRUtil.h
diff --git a/base/tps/src/include/httpClient/httpc/PSPlugin.h b/base/tps-client/src/include/httpClient/httpc/PSPlugin.h
index f6655591e..f6655591e 100644
--- a/base/tps/src/include/httpClient/httpc/PSPlugin.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSPlugin.h
diff --git a/base/tps/src/include/httpClient/httpc/PSPluginManager.h b/base/tps-client/src/include/httpClient/httpc/PSPluginManager.h
index 7ea12829a..7ea12829a 100644
--- a/base/tps/src/include/httpClient/httpc/PSPluginManager.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSPluginManager.h
diff --git a/base/tps/src/include/httpClient/httpc/PSServer.h b/base/tps-client/src/include/httpClient/httpc/PSServer.h
index 86d2ca326..86d2ca326 100644
--- a/base/tps/src/include/httpClient/httpc/PSServer.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSServer.h
diff --git a/base/tps/src/include/httpClient/httpc/PSServerLib.h b/base/tps-client/src/include/httpClient/httpc/PSServerLib.h
index 079134230..079134230 100644
--- a/base/tps/src/include/httpClient/httpc/PSServerLib.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSServerLib.h
diff --git a/base/tps/src/include/httpClient/httpc/PSServerListener.h b/base/tps-client/src/include/httpClient/httpc/PSServerListener.h
index 152fbf58f..152fbf58f 100644
--- a/base/tps/src/include/httpClient/httpc/PSServerListener.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSServerListener.h
diff --git a/base/tps/src/include/httpClient/httpc/PSServerManager.h b/base/tps-client/src/include/httpClient/httpc/PSServerManager.h
index 6597ad605..6597ad605 100644
--- a/base/tps/src/include/httpClient/httpc/PSServerManager.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSServerManager.h
diff --git a/base/tps/src/include/httpClient/httpc/PSServiceListener.h b/base/tps-client/src/include/httpClient/httpc/PSServiceListener.h
index 358f0c295..358f0c295 100644
--- a/base/tps/src/include/httpClient/httpc/PSServiceListener.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSServiceListener.h
diff --git a/base/tps/src/include/httpClient/httpc/PSServiceManager.h b/base/tps-client/src/include/httpClient/httpc/PSServiceManager.h
index 1fd755c14..1fd755c14 100644
--- a/base/tps/src/include/httpClient/httpc/PSServiceManager.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSServiceManager.h
diff --git a/base/tps/src/include/httpClient/httpc/PSUser.h b/base/tps-client/src/include/httpClient/httpc/PSUser.h
index a66c4e32f..a66c4e32f 100644
--- a/base/tps/src/include/httpClient/httpc/PSUser.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSUser.h
diff --git a/base/tps/src/include/httpClient/httpc/PSWaspLib.h b/base/tps-client/src/include/httpClient/httpc/PSWaspLib.h
index 8fdea6bcc..8fdea6bcc 100644
--- a/base/tps/src/include/httpClient/httpc/PSWaspLib.h
+++ b/base/tps-client/src/include/httpClient/httpc/PSWaspLib.h
diff --git a/base/tps/src/include/httpClient/httpc/Pool.h b/base/tps-client/src/include/httpClient/httpc/Pool.h
index 074b36b3b..074b36b3b 100644
--- a/base/tps/src/include/httpClient/httpc/Pool.h
+++ b/base/tps-client/src/include/httpClient/httpc/Pool.h
diff --git a/base/tps/src/include/httpClient/httpc/PresenceManager.h b/base/tps-client/src/include/httpClient/httpc/PresenceManager.h
index f7f4f753f..f7f4f753f 100644
--- a/base/tps/src/include/httpClient/httpc/PresenceManager.h
+++ b/base/tps-client/src/include/httpClient/httpc/PresenceManager.h
diff --git a/base/tps/src/include/httpClient/httpc/PresenceServer.h b/base/tps-client/src/include/httpClient/httpc/PresenceServer.h
index 1a9b259e9..1a9b259e9 100644
--- a/base/tps/src/include/httpClient/httpc/PresenceServer.h
+++ b/base/tps-client/src/include/httpClient/httpc/PresenceServer.h
diff --git a/base/tps/src/include/httpClient/httpc/PresenceServerImpl.h b/base/tps-client/src/include/httpClient/httpc/PresenceServerImpl.h
index 8c07b9140..8c07b9140 100644
--- a/base/tps/src/include/httpClient/httpc/PresenceServerImpl.h
+++ b/base/tps-client/src/include/httpClient/httpc/PresenceServerImpl.h
diff --git a/base/tps/src/include/httpClient/httpc/SECerrs.h b/base/tps-client/src/include/httpClient/httpc/SECerrs.h
index d7495ff28..d7495ff28 100644
--- a/base/tps/src/include/httpClient/httpc/SECerrs.h
+++ b/base/tps-client/src/include/httpClient/httpc/SECerrs.h
diff --git a/base/tps/src/include/httpClient/httpc/SSLServerSocket.h b/base/tps-client/src/include/httpClient/httpc/SSLServerSocket.h
index a059d7279..a059d7279 100644
--- a/base/tps/src/include/httpClient/httpc/SSLServerSocket.h
+++ b/base/tps-client/src/include/httpClient/httpc/SSLServerSocket.h
diff --git a/base/tps/src/include/httpClient/httpc/SSLSocket.h b/base/tps-client/src/include/httpClient/httpc/SSLSocket.h
index 14d647c60..14d647c60 100644
--- a/base/tps/src/include/httpClient/httpc/SSLSocket.h
+++ b/base/tps-client/src/include/httpClient/httpc/SSLSocket.h
diff --git a/base/tps/src/include/httpClient/httpc/SSLerrs.h b/base/tps-client/src/include/httpClient/httpc/SSLerrs.h
index 818da3e87..818da3e87 100644
--- a/base/tps/src/include/httpClient/httpc/SSLerrs.h
+++ b/base/tps-client/src/include/httpClient/httpc/SSLerrs.h
diff --git a/base/tps/src/include/httpClient/httpc/ScheduledTask.h b/base/tps-client/src/include/httpClient/httpc/ScheduledTask.h
index cbb99ab61..cbb99ab61 100644
--- a/base/tps/src/include/httpClient/httpc/ScheduledTask.h
+++ b/base/tps-client/src/include/httpClient/httpc/ScheduledTask.h
diff --git a/base/tps/src/include/httpClient/httpc/Scheduler.h b/base/tps-client/src/include/httpClient/httpc/Scheduler.h
index a0e77ffb4..a0e77ffb4 100644
--- a/base/tps/src/include/httpClient/httpc/Scheduler.h
+++ b/base/tps-client/src/include/httpClient/httpc/Scheduler.h
diff --git a/base/tps/src/include/httpClient/httpc/SecurityHeaders.h b/base/tps-client/src/include/httpClient/httpc/SecurityHeaders.h
index a54ecb1a2..a54ecb1a2 100644
--- a/base/tps/src/include/httpClient/httpc/SecurityHeaders.h
+++ b/base/tps-client/src/include/httpClient/httpc/SecurityHeaders.h
diff --git a/base/tps/src/include/httpClient/httpc/ServerConnection.h b/base/tps-client/src/include/httpClient/httpc/ServerConnection.h
index bc33aa216..bc33aa216 100644
--- a/base/tps/src/include/httpClient/httpc/ServerConnection.h
+++ b/base/tps-client/src/include/httpClient/httpc/ServerConnection.h
diff --git a/base/tps/src/include/httpClient/httpc/ServerHeaderProcessor.h b/base/tps-client/src/include/httpClient/httpc/ServerHeaderProcessor.h
index 213d3b13b..213d3b13b 100644
--- a/base/tps/src/include/httpClient/httpc/ServerHeaderProcessor.h
+++ b/base/tps-client/src/include/httpClient/httpc/ServerHeaderProcessor.h
diff --git a/base/tps/src/include/httpClient/httpc/ServerSocket.h b/base/tps-client/src/include/httpClient/httpc/ServerSocket.h
index 3cec2444a..3cec2444a 100644
--- a/base/tps/src/include/httpClient/httpc/ServerSocket.h
+++ b/base/tps-client/src/include/httpClient/httpc/ServerSocket.h
diff --git a/base/tps/src/include/httpClient/httpc/Socket.h b/base/tps-client/src/include/httpClient/httpc/Socket.h
index c2ef4afd4..c2ef4afd4 100644
--- a/base/tps/src/include/httpClient/httpc/Socket.h
+++ b/base/tps-client/src/include/httpClient/httpc/Socket.h
diff --git a/base/tps/src/include/httpClient/httpc/SocketINC.h b/base/tps-client/src/include/httpClient/httpc/SocketINC.h
index 43b36c9a0..43b36c9a0 100644
--- a/base/tps/src/include/httpClient/httpc/SocketINC.h
+++ b/base/tps-client/src/include/httpClient/httpc/SocketINC.h
diff --git a/base/tps/src/include/httpClient/httpc/SocketLib.h b/base/tps-client/src/include/httpClient/httpc/SocketLib.h
index 5a00b2ecb..5a00b2ecb 100644
--- a/base/tps/src/include/httpClient/httpc/SocketLib.h
+++ b/base/tps-client/src/include/httpClient/httpc/SocketLib.h
diff --git a/base/tps/src/include/httpClient/httpc/StringList.h b/base/tps-client/src/include/httpClient/httpc/StringList.h
index 80cd61dd6..80cd61dd6 100644
--- a/base/tps/src/include/httpClient/httpc/StringList.h
+++ b/base/tps-client/src/include/httpClient/httpc/StringList.h
diff --git a/base/tps/src/include/httpClient/httpc/StringUtil.h b/base/tps-client/src/include/httpClient/httpc/StringUtil.h
index 5c8955d37..5c8955d37 100644
--- a/base/tps/src/include/httpClient/httpc/StringUtil.h
+++ b/base/tps-client/src/include/httpClient/httpc/StringUtil.h
diff --git a/base/tps/src/include/httpClient/httpc/TaskList.h b/base/tps-client/src/include/httpClient/httpc/TaskList.h
index 779d27ead..779d27ead 100644
--- a/base/tps/src/include/httpClient/httpc/TaskList.h
+++ b/base/tps-client/src/include/httpClient/httpc/TaskList.h
diff --git a/base/tps/src/include/httpClient/httpc/ThreadPool.h b/base/tps-client/src/include/httpClient/httpc/ThreadPool.h
index 389d42606..389d42606 100644
--- a/base/tps/src/include/httpClient/httpc/ThreadPool.h
+++ b/base/tps-client/src/include/httpClient/httpc/ThreadPool.h
diff --git a/base/tps/src/include/httpClient/httpc/URLUtil.h b/base/tps-client/src/include/httpClient/httpc/URLUtil.h
index 379986999..379986999 100644
--- a/base/tps/src/include/httpClient/httpc/URLUtil.h
+++ b/base/tps-client/src/include/httpClient/httpc/URLUtil.h
diff --git a/base/tps/src/include/httpClient/httpc/engine.h b/base/tps-client/src/include/httpClient/httpc/engine.h
index 9a57b024e..9a57b024e 100644
--- a/base/tps/src/include/httpClient/httpc/engine.h
+++ b/base/tps-client/src/include/httpClient/httpc/engine.h
diff --git a/base/tps/src/include/httpClient/httpc/http.h b/base/tps-client/src/include/httpClient/httpc/http.h
index 0dccfddbd..0dccfddbd 100644
--- a/base/tps/src/include/httpClient/httpc/http.h
+++ b/base/tps-client/src/include/httpClient/httpc/http.h
diff --git a/base/tps/src/include/httpClient/httpc/request.h b/base/tps-client/src/include/httpClient/httpc/request.h
index 0399732ef..0399732ef 100644
--- a/base/tps/src/include/httpClient/httpc/request.h
+++ b/base/tps-client/src/include/httpClient/httpc/request.h
diff --git a/base/tps/src/include/httpClient/httpc/response.h b/base/tps-client/src/include/httpClient/httpc/response.h
index 5c45d574c..5c45d574c 100644
--- a/base/tps/src/include/httpClient/httpc/response.h
+++ b/base/tps-client/src/include/httpClient/httpc/response.h
diff --git a/base/tps/src/include/main/AttributeSpec.h b/base/tps-client/src/include/main/AttributeSpec.h
index 3aa0655b5..3aa0655b5 100644
--- a/base/tps/src/include/main/AttributeSpec.h
+++ b/base/tps-client/src/include/main/AttributeSpec.h
diff --git a/base/tps/src/include/main/AuthenticationEntry.h b/base/tps-client/src/include/main/AuthenticationEntry.h
index e4ec0715c..e4ec0715c 100644
--- a/base/tps/src/include/main/AuthenticationEntry.h
+++ b/base/tps-client/src/include/main/AuthenticationEntry.h
diff --git a/base/tps/src/include/main/Base.h b/base/tps-client/src/include/main/Base.h
index 3c5260178..3c5260178 100644
--- a/base/tps/src/include/main/Base.h
+++ b/base/tps-client/src/include/main/Base.h
diff --git a/base/tps/src/include/main/Buffer.h b/base/tps-client/src/include/main/Buffer.h
index e3f08925e..e3f08925e 100644
--- a/base/tps/src/include/main/Buffer.h
+++ b/base/tps-client/src/include/main/Buffer.h
diff --git a/base/tps/src/include/main/ConfigStore.h b/base/tps-client/src/include/main/ConfigStore.h
index d34e0ce7b..d34e0ce7b 100644
--- a/base/tps/src/include/main/ConfigStore.h
+++ b/base/tps-client/src/include/main/ConfigStore.h
diff --git a/base/tps/src/include/main/LogFile.h b/base/tps-client/src/include/main/LogFile.h
index 663929eb2..663929eb2 100644
--- a/base/tps/src/include/main/LogFile.h
+++ b/base/tps-client/src/include/main/LogFile.h
diff --git a/base/tps/src/include/main/Login.h b/base/tps-client/src/include/main/Login.h
index 81a22870e..81a22870e 100644
--- a/base/tps/src/include/main/Login.h
+++ b/base/tps-client/src/include/main/Login.h
diff --git a/base/tps/src/include/main/Memory.h b/base/tps-client/src/include/main/Memory.h
index ca9608466..ca9608466 100644
--- a/base/tps/src/include/main/Memory.h
+++ b/base/tps-client/src/include/main/Memory.h
diff --git a/base/tps/src/include/main/MemoryMgr.h b/base/tps-client/src/include/main/MemoryMgr.h
index 7e2f71dc1..7e2f71dc1 100644
--- a/base/tps/src/include/main/MemoryMgr.h
+++ b/base/tps-client/src/include/main/MemoryMgr.h
diff --git a/base/tps/src/include/main/NameValueSet.h b/base/tps-client/src/include/main/NameValueSet.h
index 6c9055a59..6c9055a59 100644
--- a/base/tps/src/include/main/NameValueSet.h
+++ b/base/tps-client/src/include/main/NameValueSet.h
diff --git a/base/tps/src/include/main/ObjectSpec.h b/base/tps-client/src/include/main/ObjectSpec.h
index 3b0bee72c..3b0bee72c 100644
--- a/base/tps/src/include/main/ObjectSpec.h
+++ b/base/tps-client/src/include/main/ObjectSpec.h
diff --git a/base/tps/src/include/main/PKCS11Obj.h b/base/tps-client/src/include/main/PKCS11Obj.h
index ef3fca964..ef3fca964 100644
--- a/base/tps/src/include/main/PKCS11Obj.h
+++ b/base/tps-client/src/include/main/PKCS11Obj.h
diff --git a/base/tps/src/include/main/PublishEntry.h b/base/tps-client/src/include/main/PublishEntry.h
index 05d5939a4..05d5939a4 100644
--- a/base/tps/src/include/main/PublishEntry.h
+++ b/base/tps-client/src/include/main/PublishEntry.h
diff --git a/base/tps/src/include/main/RA_Context.h b/base/tps-client/src/include/main/RA_Context.h
index e313f45fd..e313f45fd 100644
--- a/base/tps/src/include/main/RA_Context.h
+++ b/base/tps-client/src/include/main/RA_Context.h
diff --git a/base/tps/src/include/main/RA_Msg.h b/base/tps-client/src/include/main/RA_Msg.h
index d94063b00..d94063b00 100644
--- a/base/tps/src/include/main/RA_Msg.h
+++ b/base/tps-client/src/include/main/RA_Msg.h
diff --git a/base/tps/src/include/main/RA_Session.h b/base/tps-client/src/include/main/RA_Session.h
index 520a94b6a..520a94b6a 100644
--- a/base/tps/src/include/main/RA_Session.h
+++ b/base/tps-client/src/include/main/RA_Session.h
diff --git a/base/tps/src/include/main/RA_pblock.h b/base/tps-client/src/include/main/RA_pblock.h
index 685dc321b..685dc321b 100644
--- a/base/tps/src/include/main/RA_pblock.h
+++ b/base/tps-client/src/include/main/RA_pblock.h
diff --git a/base/tps/src/include/main/RollingLogFile.h b/base/tps-client/src/include/main/RollingLogFile.h
index 63239b94b..63239b94b 100644
--- a/base/tps/src/include/main/RollingLogFile.h
+++ b/base/tps-client/src/include/main/RollingLogFile.h
diff --git a/base/tps/src/include/main/SecureId.h b/base/tps-client/src/include/main/SecureId.h
index fd7e6a158..fd7e6a158 100644
--- a/base/tps/src/include/main/SecureId.h
+++ b/base/tps-client/src/include/main/SecureId.h
diff --git a/base/tps/src/include/main/Util.h b/base/tps-client/src/include/main/Util.h
index c4d670483..c4d670483 100644
--- a/base/tps/src/include/main/Util.h
+++ b/base/tps-client/src/include/main/Util.h
diff --git a/base/tps/src/include/modules/tps/AP_Context.h b/base/tps-client/src/include/modules/tps/AP_Context.h
index 4faca55ac..4faca55ac 100644
--- a/base/tps/src/include/modules/tps/AP_Context.h
+++ b/base/tps-client/src/include/modules/tps/AP_Context.h
diff --git a/base/tps/src/include/modules/tps/AP_Session.h b/base/tps-client/src/include/modules/tps/AP_Session.h
index 832166a1b..832166a1b 100644
--- a/base/tps/src/include/modules/tps/AP_Session.h
+++ b/base/tps-client/src/include/modules/tps/AP_Session.h
diff --git a/base/tps/src/include/msg/RA_ASQ_Request_Msg.h b/base/tps-client/src/include/msg/RA_ASQ_Request_Msg.h
index 15f8bd7a4..15f8bd7a4 100644
--- a/base/tps/src/include/msg/RA_ASQ_Request_Msg.h
+++ b/base/tps-client/src/include/msg/RA_ASQ_Request_Msg.h
diff --git a/base/tps/src/include/msg/RA_ASQ_Response_Msg.h b/base/tps-client/src/include/msg/RA_ASQ_Response_Msg.h
index 3614e443f..3614e443f 100644
--- a/base/tps/src/include/msg/RA_ASQ_Response_Msg.h
+++ b/base/tps-client/src/include/msg/RA_ASQ_Response_Msg.h
diff --git a/base/tps/src/include/msg/RA_Begin_Op_Msg.h b/base/tps-client/src/include/msg/RA_Begin_Op_Msg.h
index 48a61a659..48a61a659 100644
--- a/base/tps/src/include/msg/RA_Begin_Op_Msg.h
+++ b/base/tps-client/src/include/msg/RA_Begin_Op_Msg.h
diff --git a/base/tps/src/include/msg/RA_End_Op_Msg.h b/base/tps-client/src/include/msg/RA_End_Op_Msg.h
index fe396f05b..fe396f05b 100644
--- a/base/tps/src/include/msg/RA_End_Op_Msg.h
+++ b/base/tps-client/src/include/msg/RA_End_Op_Msg.h
diff --git a/base/tps/src/include/msg/RA_Extended_Login_Request_Msg.h b/base/tps-client/src/include/msg/RA_Extended_Login_Request_Msg.h
index fdfceedcf..fdfceedcf 100644
--- a/base/tps/src/include/msg/RA_Extended_Login_Request_Msg.h
+++ b/base/tps-client/src/include/msg/RA_Extended_Login_Request_Msg.h
diff --git a/base/tps/src/include/msg/RA_Extended_Login_Response_Msg.h b/base/tps-client/src/include/msg/RA_Extended_Login_Response_Msg.h
index 37da9feb3..37da9feb3 100644
--- a/base/tps/src/include/msg/RA_Extended_Login_Response_Msg.h
+++ b/base/tps-client/src/include/msg/RA_Extended_Login_Response_Msg.h
diff --git a/base/tps/src/include/msg/RA_Login_Request_Msg.h b/base/tps-client/src/include/msg/RA_Login_Request_Msg.h
index 01a7a5acd..01a7a5acd 100644
--- a/base/tps/src/include/msg/RA_Login_Request_Msg.h
+++ b/base/tps-client/src/include/msg/RA_Login_Request_Msg.h
diff --git a/base/tps/src/include/msg/RA_Login_Response_Msg.h b/base/tps-client/src/include/msg/RA_Login_Response_Msg.h
index dcc9e3530..dcc9e3530 100644
--- a/base/tps/src/include/msg/RA_Login_Response_Msg.h
+++ b/base/tps-client/src/include/msg/RA_Login_Response_Msg.h
diff --git a/base/tps/src/include/msg/RA_New_Pin_Request_Msg.h b/base/tps-client/src/include/msg/RA_New_Pin_Request_Msg.h
index 8ebf16259..8ebf16259 100644
--- a/base/tps/src/include/msg/RA_New_Pin_Request_Msg.h
+++ b/base/tps-client/src/include/msg/RA_New_Pin_Request_Msg.h
diff --git a/base/tps/src/include/msg/RA_New_Pin_Response_Msg.h b/base/tps-client/src/include/msg/RA_New_Pin_Response_Msg.h
index f062adcf0..f062adcf0 100644
--- a/base/tps/src/include/msg/RA_New_Pin_Response_Msg.h
+++ b/base/tps-client/src/include/msg/RA_New_Pin_Response_Msg.h
diff --git a/base/tps/src/include/msg/RA_SecureId_Request_Msg.h b/base/tps-client/src/include/msg/RA_SecureId_Request_Msg.h
index 132e04c22..132e04c22 100644
--- a/base/tps/src/include/msg/RA_SecureId_Request_Msg.h
+++ b/base/tps-client/src/include/msg/RA_SecureId_Request_Msg.h
diff --git a/base/tps/src/include/msg/RA_SecureId_Response_Msg.h b/base/tps-client/src/include/msg/RA_SecureId_Response_Msg.h
index 279e07475..279e07475 100644
--- a/base/tps/src/include/msg/RA_SecureId_Response_Msg.h
+++ b/base/tps-client/src/include/msg/RA_SecureId_Response_Msg.h
diff --git a/base/tps/src/include/msg/RA_Status_Update_Request_Msg.h b/base/tps-client/src/include/msg/RA_Status_Update_Request_Msg.h
index bdc037c97..bdc037c97 100644
--- a/base/tps/src/include/msg/RA_Status_Update_Request_Msg.h
+++ b/base/tps-client/src/include/msg/RA_Status_Update_Request_Msg.h
diff --git a/base/tps/src/include/msg/RA_Status_Update_Response_Msg.h b/base/tps-client/src/include/msg/RA_Status_Update_Response_Msg.h
index c5a13eaa4..c5a13eaa4 100644
--- a/base/tps/src/include/msg/RA_Status_Update_Response_Msg.h
+++ b/base/tps-client/src/include/msg/RA_Status_Update_Response_Msg.h
diff --git a/base/tps/src/include/msg/RA_Token_PDU_Request_Msg.h b/base/tps-client/src/include/msg/RA_Token_PDU_Request_Msg.h
index bcbdfc7fc..bcbdfc7fc 100644
--- a/base/tps/src/include/msg/RA_Token_PDU_Request_Msg.h
+++ b/base/tps-client/src/include/msg/RA_Token_PDU_Request_Msg.h
diff --git a/base/tps/src/include/msg/RA_Token_PDU_Response_Msg.h b/base/tps-client/src/include/msg/RA_Token_PDU_Response_Msg.h
index e7c2d538f..e7c2d538f 100644
--- a/base/tps/src/include/msg/RA_Token_PDU_Response_Msg.h
+++ b/base/tps-client/src/include/msg/RA_Token_PDU_Response_Msg.h
diff --git a/base/tps/src/include/processor/RA_Enroll_Processor.h b/base/tps-client/src/include/processor/RA_Enroll_Processor.h
index 9ff2cc74d..9ff2cc74d 100644
--- a/base/tps/src/include/processor/RA_Enroll_Processor.h
+++ b/base/tps-client/src/include/processor/RA_Enroll_Processor.h
diff --git a/base/tps/src/include/processor/RA_Format_Processor.h b/base/tps-client/src/include/processor/RA_Format_Processor.h
index 836c89080..836c89080 100644
--- a/base/tps/src/include/processor/RA_Format_Processor.h
+++ b/base/tps-client/src/include/processor/RA_Format_Processor.h
diff --git a/base/tps/src/include/processor/RA_Pin_Reset_Processor.h b/base/tps-client/src/include/processor/RA_Pin_Reset_Processor.h
index a3d511865..a3d511865 100644
--- a/base/tps/src/include/processor/RA_Pin_Reset_Processor.h
+++ b/base/tps-client/src/include/processor/RA_Pin_Reset_Processor.h
diff --git a/base/tps/src/include/processor/RA_Processor.h b/base/tps-client/src/include/processor/RA_Processor.h
index 74e869a52..74e869a52 100644
--- a/base/tps/src/include/processor/RA_Processor.h
+++ b/base/tps-client/src/include/processor/RA_Processor.h
diff --git a/base/tps/src/include/processor/RA_Renew_Processor.h b/base/tps-client/src/include/processor/RA_Renew_Processor.h
index bb8710a74..bb8710a74 100644
--- a/base/tps/src/include/processor/RA_Renew_Processor.h
+++ b/base/tps-client/src/include/processor/RA_Renew_Processor.h
diff --git a/base/tps/src/include/processor/RA_Unblock_Processor.h b/base/tps-client/src/include/processor/RA_Unblock_Processor.h
index ae28ea593..ae28ea593 100644
--- a/base/tps/src/include/processor/RA_Unblock_Processor.h
+++ b/base/tps-client/src/include/processor/RA_Unblock_Processor.h
diff --git a/base/tps/src/include/publisher/IConnector.h b/base/tps-client/src/include/publisher/IConnector.h
index 9a5caa70e..9a5caa70e 100644
--- a/base/tps/src/include/publisher/IConnector.h
+++ b/base/tps-client/src/include/publisher/IConnector.h
diff --git a/base/tps/src/include/publisher/IPublish_Data.h b/base/tps-client/src/include/publisher/IPublish_Data.h
index 50b7e3247..50b7e3247 100644
--- a/base/tps/src/include/publisher/IPublish_Data.h
+++ b/base/tps-client/src/include/publisher/IPublish_Data.h
diff --git a/base/tps/src/include/publisher/IPublisher.h b/base/tps-client/src/include/publisher/IPublisher.h
index 56a1b7357..56a1b7357 100644
--- a/base/tps/src/include/publisher/IPublisher.h
+++ b/base/tps-client/src/include/publisher/IPublisher.h
diff --git a/base/tps/src/include/publisher/NetkeyPublisher.h b/base/tps-client/src/include/publisher/NetkeyPublisher.h
index 05cf4d191..05cf4d191 100644
--- a/base/tps/src/include/publisher/NetkeyPublisher.h
+++ b/base/tps-client/src/include/publisher/NetkeyPublisher.h
diff --git a/base/tps/src/include/selftests/SelfTest.h b/base/tps-client/src/include/selftests/SelfTest.h
index c52f62f23..c52f62f23 100644
--- a/base/tps/src/include/selftests/SelfTest.h
+++ b/base/tps-client/src/include/selftests/SelfTest.h
diff --git a/base/tps/src/include/selftests/TPSPresence.h b/base/tps-client/src/include/selftests/TPSPresence.h
index 114f4ae57..114f4ae57 100644
--- a/base/tps/src/include/selftests/TPSPresence.h
+++ b/base/tps-client/src/include/selftests/TPSPresence.h
diff --git a/base/tps/src/include/selftests/TPSSystemCertsVerification.h b/base/tps-client/src/include/selftests/TPSSystemCertsVerification.h
index 40a4d3fd4..40a4d3fd4 100644
--- a/base/tps/src/include/selftests/TPSSystemCertsVerification.h
+++ b/base/tps-client/src/include/selftests/TPSSystemCertsVerification.h
diff --git a/base/tps/src/include/selftests/TPSValidity.h b/base/tps-client/src/include/selftests/TPSValidity.h
index 548052a83..548052a83 100644
--- a/base/tps/src/include/selftests/TPSValidity.h
+++ b/base/tps-client/src/include/selftests/TPSValidity.h
diff --git a/base/tps/src/include/service/NK_Context.h b/base/tps-client/src/include/service/NK_Context.h
index e5ed59992..e5ed59992 100644
--- a/base/tps/src/include/service/NK_Context.h
+++ b/base/tps-client/src/include/service/NK_Context.h
diff --git a/base/tps/src/include/service/NK_Session.h b/base/tps-client/src/include/service/NK_Session.h
index 55cd19439..55cd19439 100644
--- a/base/tps/src/include/service/NK_Session.h
+++ b/base/tps-client/src/include/service/NK_Session.h
diff --git a/base/tps/src/include/tus/tus_db.h b/base/tps-client/src/include/tus/tus_db.h
index b1c7ebe86..b1c7ebe86 100644
--- a/base/tps/src/include/tus/tus_db.h
+++ b/base/tps-client/src/include/tus/tus_db.h
diff --git a/base/tps/src/main/AttributeSpec.cpp b/base/tps-client/src/main/AttributeSpec.cpp
index 23c2cd978..23c2cd978 100644
--- a/base/tps/src/main/AttributeSpec.cpp
+++ b/base/tps-client/src/main/AttributeSpec.cpp
diff --git a/base/tps/src/main/AuthParams.cpp b/base/tps-client/src/main/AuthParams.cpp
index 3a124252e..3a124252e 100644
--- a/base/tps/src/main/AuthParams.cpp
+++ b/base/tps-client/src/main/AuthParams.cpp
diff --git a/base/tps/src/main/Authentication.cpp b/base/tps-client/src/main/Authentication.cpp
index 34ab76f0a..34ab76f0a 100644
--- a/base/tps/src/main/Authentication.cpp
+++ b/base/tps-client/src/main/Authentication.cpp
diff --git a/base/tps/src/main/AuthenticationEntry.cpp b/base/tps-client/src/main/AuthenticationEntry.cpp
index eb7f75419..eb7f75419 100644
--- a/base/tps/src/main/AuthenticationEntry.cpp
+++ b/base/tps-client/src/main/AuthenticationEntry.cpp
diff --git a/base/tps/src/main/Buffer.cpp b/base/tps-client/src/main/Buffer.cpp
index 94311fc50..94311fc50 100644
--- a/base/tps/src/main/Buffer.cpp
+++ b/base/tps-client/src/main/Buffer.cpp
diff --git a/base/tps/src/main/ConfigStore.cpp b/base/tps-client/src/main/ConfigStore.cpp
index e526b4039..e526b4039 100644
--- a/base/tps/src/main/ConfigStore.cpp
+++ b/base/tps-client/src/main/ConfigStore.cpp
diff --git a/base/tps/src/main/LogFile.cpp b/base/tps-client/src/main/LogFile.cpp
index d908ca0c5..d908ca0c5 100644
--- a/base/tps/src/main/LogFile.cpp
+++ b/base/tps-client/src/main/LogFile.cpp
diff --git a/base/tps/src/main/Login.cpp b/base/tps-client/src/main/Login.cpp
index 116ac7769..116ac7769 100644
--- a/base/tps/src/main/Login.cpp
+++ b/base/tps-client/src/main/Login.cpp
diff --git a/base/tps/src/main/Memory.cpp b/base/tps-client/src/main/Memory.cpp
index 1ee5027d0..1ee5027d0 100644
--- a/base/tps/src/main/Memory.cpp
+++ b/base/tps-client/src/main/Memory.cpp
diff --git a/base/tps/src/main/NameValueSet.cpp b/base/tps-client/src/main/NameValueSet.cpp
index bd95a8e4a..bd95a8e4a 100644
--- a/base/tps/src/main/NameValueSet.cpp
+++ b/base/tps-client/src/main/NameValueSet.cpp
diff --git a/base/tps/src/main/ObjectSpec.cpp b/base/tps-client/src/main/ObjectSpec.cpp
index b339fcfa6..b339fcfa6 100644
--- a/base/tps/src/main/ObjectSpec.cpp
+++ b/base/tps-client/src/main/ObjectSpec.cpp
diff --git a/base/tps/src/main/PKCS11Obj.cpp b/base/tps-client/src/main/PKCS11Obj.cpp
index 061dc7a91..061dc7a91 100644
--- a/base/tps/src/main/PKCS11Obj.cpp
+++ b/base/tps-client/src/main/PKCS11Obj.cpp
diff --git a/base/tps/src/main/RA_Context.cpp b/base/tps-client/src/main/RA_Context.cpp
index e3a66cdbb..e3a66cdbb 100644
--- a/base/tps/src/main/RA_Context.cpp
+++ b/base/tps-client/src/main/RA_Context.cpp
diff --git a/base/tps/src/main/RA_Msg.cpp b/base/tps-client/src/main/RA_Msg.cpp
index d54db69fb..d54db69fb 100644
--- a/base/tps/src/main/RA_Msg.cpp
+++ b/base/tps-client/src/main/RA_Msg.cpp
diff --git a/base/tps/src/main/RA_Session.cpp b/base/tps-client/src/main/RA_Session.cpp
index 57f7e4efa..57f7e4efa 100644
--- a/base/tps/src/main/RA_Session.cpp
+++ b/base/tps-client/src/main/RA_Session.cpp
diff --git a/base/tps/src/main/RA_pblock.cpp b/base/tps-client/src/main/RA_pblock.cpp
index e59e4c7f1..e59e4c7f1 100644
--- a/base/tps/src/main/RA_pblock.cpp
+++ b/base/tps-client/src/main/RA_pblock.cpp
diff --git a/base/tps/src/main/RollingLogFile.cpp b/base/tps-client/src/main/RollingLogFile.cpp
index 692a94334..692a94334 100644
--- a/base/tps/src/main/RollingLogFile.cpp
+++ b/base/tps-client/src/main/RollingLogFile.cpp
diff --git a/base/tps/src/main/SecureId.cpp b/base/tps-client/src/main/SecureId.cpp
index 46394100e..46394100e 100644
--- a/base/tps/src/main/SecureId.cpp
+++ b/base/tps-client/src/main/SecureId.cpp
diff --git a/base/tps/src/main/Util.cpp b/base/tps-client/src/main/Util.cpp
index 2849121e4..2849121e4 100644
--- a/base/tps/src/main/Util.cpp
+++ b/base/tps-client/src/main/Util.cpp
diff --git a/base/tps/src/modules/CMakeLists.txt b/base/tps-client/src/modules/CMakeLists.txt
index b72b73c0c..b72b73c0c 100644
--- a/base/tps/src/modules/CMakeLists.txt
+++ b/base/tps-client/src/modules/CMakeLists.txt
diff --git a/base/tps/src/modules/tokendb/CMakeLists.txt b/base/tps-client/src/modules/tokendb/CMakeLists.txt
index 7b6edae91..7b6edae91 100644
--- a/base/tps/src/modules/tokendb/CMakeLists.txt
+++ b/base/tps-client/src/modules/tokendb/CMakeLists.txt
diff --git a/base/tps/src/modules/tokendb/mod_tokendb.cpp b/base/tps-client/src/modules/tokendb/mod_tokendb.cpp
index 27fa7f81d..27fa7f81d 100644
--- a/base/tps/src/modules/tokendb/mod_tokendb.cpp
+++ b/base/tps-client/src/modules/tokendb/mod_tokendb.cpp
diff --git a/base/tps/src/modules/tps/AP_Context.cpp b/base/tps-client/src/modules/tps/AP_Context.cpp
index beb573390..beb573390 100644
--- a/base/tps/src/modules/tps/AP_Context.cpp
+++ b/base/tps-client/src/modules/tps/AP_Context.cpp
diff --git a/base/tps/src/modules/tps/AP_Session.cpp b/base/tps-client/src/modules/tps/AP_Session.cpp
index 16d6d4e5e..16d6d4e5e 100644
--- a/base/tps/src/modules/tps/AP_Session.cpp
+++ b/base/tps-client/src/modules/tps/AP_Session.cpp
diff --git a/base/tps/src/modules/tps/CMakeLists.txt b/base/tps-client/src/modules/tps/CMakeLists.txt
index 275d8b30a..275d8b30a 100644
--- a/base/tps/src/modules/tps/CMakeLists.txt
+++ b/base/tps-client/src/modules/tps/CMakeLists.txt
diff --git a/base/tps/src/modules/tps/mod_tps.cpp b/base/tps-client/src/modules/tps/mod_tps.cpp
index 7f3d29ca4..7f3d29ca4 100644
--- a/base/tps/src/modules/tps/mod_tps.cpp
+++ b/base/tps-client/src/modules/tps/mod_tps.cpp
diff --git a/base/tps/src/msg/RA_ASQ_Request_Msg.cpp b/base/tps-client/src/msg/RA_ASQ_Request_Msg.cpp
index 112c42152..112c42152 100644
--- a/base/tps/src/msg/RA_ASQ_Request_Msg.cpp
+++ b/base/tps-client/src/msg/RA_ASQ_Request_Msg.cpp
diff --git a/base/tps/src/msg/RA_ASQ_Response_Msg.cpp b/base/tps-client/src/msg/RA_ASQ_Response_Msg.cpp
index 5e480c1f1..5e480c1f1 100644
--- a/base/tps/src/msg/RA_ASQ_Response_Msg.cpp
+++ b/base/tps-client/src/msg/RA_ASQ_Response_Msg.cpp
diff --git a/base/tps/src/msg/RA_Begin_Op_Msg.cpp b/base/tps-client/src/msg/RA_Begin_Op_Msg.cpp
index 44d568bd9..44d568bd9 100644
--- a/base/tps/src/msg/RA_Begin_Op_Msg.cpp
+++ b/base/tps-client/src/msg/RA_Begin_Op_Msg.cpp
diff --git a/base/tps/src/msg/RA_End_Op_Msg.cpp b/base/tps-client/src/msg/RA_End_Op_Msg.cpp
index 232122d49..232122d49 100644
--- a/base/tps/src/msg/RA_End_Op_Msg.cpp
+++ b/base/tps-client/src/msg/RA_End_Op_Msg.cpp
diff --git a/base/tps/src/msg/RA_Extended_Login_Request_Msg.cpp b/base/tps-client/src/msg/RA_Extended_Login_Request_Msg.cpp
index 9da2f6d8f..9da2f6d8f 100644
--- a/base/tps/src/msg/RA_Extended_Login_Request_Msg.cpp
+++ b/base/tps-client/src/msg/RA_Extended_Login_Request_Msg.cpp
diff --git a/base/tps/src/msg/RA_Extended_Login_Response_Msg.cpp b/base/tps-client/src/msg/RA_Extended_Login_Response_Msg.cpp
index f1d66b558..f1d66b558 100644
--- a/base/tps/src/msg/RA_Extended_Login_Response_Msg.cpp
+++ b/base/tps-client/src/msg/RA_Extended_Login_Response_Msg.cpp
diff --git a/base/tps/src/msg/RA_Login_Request_Msg.cpp b/base/tps-client/src/msg/RA_Login_Request_Msg.cpp
index 7bad331d7..7bad331d7 100644
--- a/base/tps/src/msg/RA_Login_Request_Msg.cpp
+++ b/base/tps-client/src/msg/RA_Login_Request_Msg.cpp
diff --git a/base/tps/src/msg/RA_Login_Response_Msg.cpp b/base/tps-client/src/msg/RA_Login_Response_Msg.cpp
index 67d796e6e..67d796e6e 100644
--- a/base/tps/src/msg/RA_Login_Response_Msg.cpp
+++ b/base/tps-client/src/msg/RA_Login_Response_Msg.cpp
diff --git a/base/tps/src/msg/RA_New_Pin_Request_Msg.cpp b/base/tps-client/src/msg/RA_New_Pin_Request_Msg.cpp
index 71889359e..71889359e 100644
--- a/base/tps/src/msg/RA_New_Pin_Request_Msg.cpp
+++ b/base/tps-client/src/msg/RA_New_Pin_Request_Msg.cpp
diff --git a/base/tps/src/msg/RA_New_Pin_Response_Msg.cpp b/base/tps-client/src/msg/RA_New_Pin_Response_Msg.cpp
index 69b63f934..69b63f934 100644
--- a/base/tps/src/msg/RA_New_Pin_Response_Msg.cpp
+++ b/base/tps-client/src/msg/RA_New_Pin_Response_Msg.cpp
diff --git a/base/tps/src/msg/RA_SecureId_Request_Msg.cpp b/base/tps-client/src/msg/RA_SecureId_Request_Msg.cpp
index 064461225..064461225 100644
--- a/base/tps/src/msg/RA_SecureId_Request_Msg.cpp
+++ b/base/tps-client/src/msg/RA_SecureId_Request_Msg.cpp
diff --git a/base/tps/src/msg/RA_SecureId_Response_Msg.cpp b/base/tps-client/src/msg/RA_SecureId_Response_Msg.cpp
index ff4191a61..ff4191a61 100644
--- a/base/tps/src/msg/RA_SecureId_Response_Msg.cpp
+++ b/base/tps-client/src/msg/RA_SecureId_Response_Msg.cpp
diff --git a/base/tps/src/msg/RA_Status_Update_Request_Msg.cpp b/base/tps-client/src/msg/RA_Status_Update_Request_Msg.cpp
index 7bb0baefc..7bb0baefc 100644
--- a/base/tps/src/msg/RA_Status_Update_Request_Msg.cpp
+++ b/base/tps-client/src/msg/RA_Status_Update_Request_Msg.cpp
diff --git a/base/tps/src/msg/RA_Status_Update_Response_Msg.cpp b/base/tps-client/src/msg/RA_Status_Update_Response_Msg.cpp
index 6053c9af6..6053c9af6 100644
--- a/base/tps/src/msg/RA_Status_Update_Response_Msg.cpp
+++ b/base/tps-client/src/msg/RA_Status_Update_Response_Msg.cpp
diff --git a/base/tps/src/msg/RA_Token_PDU_Request_Msg.cpp b/base/tps-client/src/msg/RA_Token_PDU_Request_Msg.cpp
index 34b3d584b..34b3d584b 100644
--- a/base/tps/src/msg/RA_Token_PDU_Request_Msg.cpp
+++ b/base/tps-client/src/msg/RA_Token_PDU_Request_Msg.cpp
diff --git a/base/tps/src/msg/RA_Token_PDU_Response_Msg.cpp b/base/tps-client/src/msg/RA_Token_PDU_Response_Msg.cpp
index 41b11388c..41b11388c 100644
--- a/base/tps/src/msg/RA_Token_PDU_Response_Msg.cpp
+++ b/base/tps-client/src/msg/RA_Token_PDU_Response_Msg.cpp
diff --git a/base/tps/src/processor/RA_Enroll_Processor.cpp b/base/tps-client/src/processor/RA_Enroll_Processor.cpp
index 73d0e3b7d..73d0e3b7d 100644
--- a/base/tps/src/processor/RA_Enroll_Processor.cpp
+++ b/base/tps-client/src/processor/RA_Enroll_Processor.cpp
diff --git a/base/tps/src/processor/RA_Format_Processor.cpp b/base/tps-client/src/processor/RA_Format_Processor.cpp
index b09a7495b..b09a7495b 100644
--- a/base/tps/src/processor/RA_Format_Processor.cpp
+++ b/base/tps-client/src/processor/RA_Format_Processor.cpp
diff --git a/base/tps/src/processor/RA_Pin_Reset_Processor.cpp b/base/tps-client/src/processor/RA_Pin_Reset_Processor.cpp
index b776b55a4..b776b55a4 100644
--- a/base/tps/src/processor/RA_Pin_Reset_Processor.cpp
+++ b/base/tps-client/src/processor/RA_Pin_Reset_Processor.cpp
diff --git a/base/tps/src/processor/RA_Processor.cpp b/base/tps-client/src/processor/RA_Processor.cpp
index 2951c0e50..2951c0e50 100644
--- a/base/tps/src/processor/RA_Processor.cpp
+++ b/base/tps-client/src/processor/RA_Processor.cpp
diff --git a/base/tps/src/processor/RA_Renew_Processor.cpp b/base/tps-client/src/processor/RA_Renew_Processor.cpp
index 5caa329b4..5caa329b4 100644
--- a/base/tps/src/processor/RA_Renew_Processor.cpp
+++ b/base/tps-client/src/processor/RA_Renew_Processor.cpp
diff --git a/base/tps/src/processor/RA_Unblock_Processor.cpp b/base/tps-client/src/processor/RA_Unblock_Processor.cpp
index 0bdbcfa2b..0bdbcfa2b 100644
--- a/base/tps/src/processor/RA_Unblock_Processor.cpp
+++ b/base/tps-client/src/processor/RA_Unblock_Processor.cpp
diff --git a/base/tps/src/selftests/SelfTest.cpp b/base/tps-client/src/selftests/SelfTest.cpp
index 71266d581..71266d581 100644
--- a/base/tps/src/selftests/SelfTest.cpp
+++ b/base/tps-client/src/selftests/SelfTest.cpp
diff --git a/base/tps/src/selftests/TPSPresence.cpp b/base/tps-client/src/selftests/TPSPresence.cpp
index 7f37fd0fb..7f37fd0fb 100644
--- a/base/tps/src/selftests/TPSPresence.cpp
+++ b/base/tps-client/src/selftests/TPSPresence.cpp
diff --git a/base/tps/src/selftests/TPSSystemCertsVerification.cpp b/base/tps-client/src/selftests/TPSSystemCertsVerification.cpp
index a89d18d04..a89d18d04 100644
--- a/base/tps/src/selftests/TPSSystemCertsVerification.cpp
+++ b/base/tps-client/src/selftests/TPSSystemCertsVerification.cpp
diff --git a/base/tps/src/selftests/TPSValidity.cpp b/base/tps-client/src/selftests/TPSValidity.cpp
index e70263e80..e70263e80 100644
--- a/base/tps/src/selftests/TPSValidity.cpp
+++ b/base/tps-client/src/selftests/TPSValidity.cpp
diff --git a/base/tps/src/test/Test_ConfigStore.cfg b/base/tps-client/src/test/Test_ConfigStore.cfg
index 60f8e8675..60f8e8675 100644
--- a/base/tps/src/test/Test_ConfigStore.cfg
+++ b/base/tps-client/src/test/Test_ConfigStore.cfg
diff --git a/base/tps/src/test/Test_ConfigStore.cpp b/base/tps-client/src/test/Test_ConfigStore.cpp
index d81a67b03..d81a67b03 100644
--- a/base/tps/src/test/Test_ConfigStore.cpp
+++ b/base/tps-client/src/test/Test_ConfigStore.cpp
diff --git a/base/tps/src/tus/CMakeLists.txt b/base/tps-client/src/tus/CMakeLists.txt
index 3148d9e59..3148d9e59 100644
--- a/base/tps/src/tus/CMakeLists.txt
+++ b/base/tps-client/src/tus/CMakeLists.txt
diff --git a/base/tps/src/tus/tus_db.c b/base/tps-client/src/tus/tus_db.c
index 51e319301..51e319301 100644
--- a/base/tps/src/tus/tus_db.c
+++ b/base/tps-client/src/tus/tus_db.c
diff --git a/base/tps/stubs/modules/nss/mod_nss_stub.c b/base/tps-client/stubs/modules/nss/mod_nss_stub.c
index b47fa0edb..b47fa0edb 100644
--- a/base/tps/stubs/modules/nss/mod_nss_stub.c
+++ b/base/tps-client/stubs/modules/nss/mod_nss_stub.c
diff --git a/base/tps/tools/CMakeLists.txt b/base/tps-client/tools/CMakeLists.txt
index 6ed05c43d..6ed05c43d 100644
--- a/base/tps/tools/CMakeLists.txt
+++ b/base/tps-client/tools/CMakeLists.txt
diff --git a/base/tps/tools/raclient/CMakeLists.txt b/base/tps-client/tools/raclient/CMakeLists.txt
index 8f01b34d8..8f01b34d8 100644
--- a/base/tps/tools/raclient/CMakeLists.txt
+++ b/base/tps-client/tools/raclient/CMakeLists.txt
diff --git a/base/tps/tools/raclient/RA_Client.cpp b/base/tps-client/tools/raclient/RA_Client.cpp
index c2a610e33..c2a610e33 100644
--- a/base/tps/tools/raclient/RA_Client.cpp
+++ b/base/tps-client/tools/raclient/RA_Client.cpp
diff --git a/base/tps/tools/raclient/RA_Client.h b/base/tps-client/tools/raclient/RA_Client.h
index 6ab2ecf97..6ab2ecf97 100644
--- a/base/tps/tools/raclient/RA_Client.h
+++ b/base/tps-client/tools/raclient/RA_Client.h
diff --git a/base/tps/tools/raclient/RA_Conn.cpp b/base/tps-client/tools/raclient/RA_Conn.cpp
index 8e7f30e51..8e7f30e51 100644
--- a/base/tps/tools/raclient/RA_Conn.cpp
+++ b/base/tps-client/tools/raclient/RA_Conn.cpp
diff --git a/base/tps/tools/raclient/RA_Conn.h b/base/tps-client/tools/raclient/RA_Conn.h
index 307166eaf..307166eaf 100644
--- a/base/tps/tools/raclient/RA_Conn.h
+++ b/base/tps-client/tools/raclient/RA_Conn.h
diff --git a/base/tps/tools/raclient/RA_Token.cpp b/base/tps-client/tools/raclient/RA_Token.cpp
index dd5170c4c..dd5170c4c 100644
--- a/base/tps/tools/raclient/RA_Token.cpp
+++ b/base/tps-client/tools/raclient/RA_Token.cpp
diff --git a/base/tps/tools/raclient/RA_Token.h b/base/tps-client/tools/raclient/RA_Token.h
index de60857da..de60857da 100644
--- a/base/tps/tools/raclient/RA_Token.h
+++ b/base/tps-client/tools/raclient/RA_Token.h
diff --git a/base/tps/tools/raclient/enroll.tps b/base/tps-client/tools/raclient/enroll.tps
index 08e40b6e1..08e40b6e1 100644
--- a/base/tps/tools/raclient/enroll.tps
+++ b/base/tps-client/tools/raclient/enroll.tps
diff --git a/base/tps/tools/raclient/enroll.tps.ec b/base/tps-client/tools/raclient/enroll.tps.ec
index b6e25069d..b6e25069d 100755
--- a/base/tps/tools/raclient/enroll.tps.ec
+++ b/base/tps-client/tools/raclient/enroll.tps.ec
diff --git a/base/tps/tools/raclient/enroll1.test b/base/tps-client/tools/raclient/enroll1.test
index fdd54f704..fdd54f704 100644
--- a/base/tps/tools/raclient/enroll1.test
+++ b/base/tps-client/tools/raclient/enroll1.test
diff --git a/base/tps/tools/raclient/format.tps b/base/tps-client/tools/raclient/format.tps
index f087a2d25..f087a2d25 100644
--- a/base/tps/tools/raclient/format.tps
+++ b/base/tps-client/tools/raclient/format.tps
diff --git a/base/tps/tools/raclient/nt_enroll.test b/base/tps-client/tools/raclient/nt_enroll.test
index f4faf18fe..f4faf18fe 100644
--- a/base/tps/tools/raclient/nt_enroll.test
+++ b/base/tps-client/tools/raclient/nt_enroll.test
diff --git a/base/tps/tools/raclient/readme.txt b/base/tps-client/tools/raclient/readme.txt
index 8997544ac..8997544ac 100644
--- a/base/tps/tools/raclient/readme.txt
+++ b/base/tps-client/tools/raclient/readme.txt
diff --git a/base/tps/tools/raclient/reset_pin.tps b/base/tps-client/tools/raclient/reset_pin.tps
index 1a81fd2a7..1a81fd2a7 100644
--- a/base/tps/tools/raclient/reset_pin.tps
+++ b/base/tps-client/tools/raclient/reset_pin.tps
diff --git a/base/tps/tools/raclient/reset_pin1.test b/base/tps-client/tools/raclient/reset_pin1.test
index 2169e7ce2..2169e7ce2 100644
--- a/base/tps/tools/raclient/reset_pin1.test
+++ b/base/tps-client/tools/raclient/reset_pin1.test
diff --git a/base/tps/tools/raclient/reset_pin2.test b/base/tps-client/tools/raclient/reset_pin2.test
index 77b5d20d2..77b5d20d2 100644
--- a/base/tps/tools/raclient/reset_pin2.test
+++ b/base/tps-client/tools/raclient/reset_pin2.test
diff --git a/base/tps/tools/tus/add.c b/base/tps-client/tools/tus/add.c
index f88ae9753..f88ae9753 100644
--- a/base/tps/tools/tus/add.c
+++ b/base/tps-client/tools/tus/add.c
diff --git a/base/tps/tools/tus/test.c b/base/tps-client/tools/tus/test.c
index a307d1ccc..a307d1ccc 100644
--- a/base/tps/tools/tus/test.c
+++ b/base/tps-client/tools/tus/test.c
diff --git a/base/tps/ui/perl/Velocity.pm b/base/tps-client/ui/perl/Velocity.pm
index f5f45431f..f5f45431f 100755
--- a/base/tps/ui/perl/Velocity.pm
+++ b/base/tps-client/ui/perl/Velocity.pm
diff --git a/base/tps/wrappers/tpsclient.in b/base/tps-client/wrappers/tpsclient.in
index 5f2f6b3f5..5f2f6b3f5 100755
--- a/base/tps/wrappers/tpsclient.in
+++ b/base/tps-client/wrappers/tpsclient.in
diff --git a/base/tps-tomcat/shared/applets/1.2.4122DFB4.ijc b/base/tps-tomcat/shared/applets/1.2.4122DFB4.ijc
new file mode 100644
index 000000000..2a8ea0733
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/1.2.4122DFB4.ijc
diff --git a/base/tps-tomcat/shared/applets/1.2.416DA155.ijc b/base/tps-tomcat/shared/applets/1.2.416DA155.ijc
new file mode 100755
index 000000000..21b0312a8
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/1.2.416DA155.ijc
diff --git a/base/tps-tomcat/shared/applets/1.3.42260AFA.ijc b/base/tps-tomcat/shared/applets/1.3.42260AFA.ijc
new file mode 100755
index 000000000..f17f98281
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/1.3.42260AFA.ijc
diff --git a/base/tps-tomcat/shared/applets/1.3.4255CC01.ijc b/base/tps-tomcat/shared/applets/1.3.4255CC01.ijc
new file mode 100644
index 000000000..322fe86e2
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/1.3.4255CC01.ijc
diff --git a/base/tps-tomcat/shared/applets/1.3.42659461.ijc b/base/tps-tomcat/shared/applets/1.3.42659461.ijc
new file mode 100755
index 000000000..ccf8ba451
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/1.3.42659461.ijc
diff --git a/base/tps-tomcat/shared/applets/1.3.427BDDB8.ijc b/base/tps-tomcat/shared/applets/1.3.427BDDB8.ijc
new file mode 100644
index 000000000..4a633e8d3
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/1.3.427BDDB8.ijc
diff --git a/base/tps-tomcat/shared/applets/1.3.44724DDE.ijc b/base/tps-tomcat/shared/applets/1.3.44724DDE.ijc
new file mode 100755
index 000000000..e56705dff
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/1.3.44724DDE.ijc
diff --git a/base/tps-tomcat/shared/applets/1.3.45787308.ijc b/base/tps-tomcat/shared/applets/1.3.45787308.ijc
new file mode 100755
index 000000000..164c7e0cd
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/1.3.45787308.ijc
diff --git a/base/tps-tomcat/shared/applets/1.4.499dc06c.ijc b/base/tps-tomcat/shared/applets/1.4.499dc06c.ijc
new file mode 100644
index 000000000..388482123
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/1.4.499dc06c.ijc
diff --git a/base/tps-tomcat/shared/applets/1.4.4d40a449.ijc b/base/tps-tomcat/shared/applets/1.4.4d40a449.ijc
new file mode 100644
index 000000000..bd716adb0
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/1.4.4d40a449.ijc
diff --git a/base/tps-tomcat/shared/applets/3FD00877.ijc b/base/tps-tomcat/shared/applets/3FD00877.ijc
new file mode 100644
index 000000000..5e6624d5a
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/3FD00877.ijc
diff --git a/base/tps-tomcat/shared/applets/4003196C.ijc b/base/tps-tomcat/shared/applets/4003196C.ijc
new file mode 100644
index 000000000..bed8a7900
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/4003196C.ijc
diff --git a/base/tps-tomcat/shared/applets/402428AD.ijc b/base/tps-tomcat/shared/applets/402428AD.ijc
new file mode 100644
index 000000000..b91a64334
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/402428AD.ijc
diff --git a/base/tps-tomcat/shared/applets/404E4697.ijc b/base/tps-tomcat/shared/applets/404E4697.ijc
new file mode 100644
index 000000000..9c927c0f0
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/404E4697.ijc
diff --git a/base/tps-tomcat/shared/applets/4122DFB4.ijc b/base/tps-tomcat/shared/applets/4122DFB4.ijc
new file mode 100644
index 000000000..2a8ea0733
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/4122DFB4.ijc
diff --git a/base/tps-tomcat/shared/applets/listappletdates b/base/tps-tomcat/shared/applets/listappletdates
new file mode 100755
index 000000000..cca5964b7
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/listappletdates
@@ -0,0 +1,42 @@
+#!/usr/bin/perl
+#
+# --- BEGIN COPYRIGHT BLOCK ---
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation;
+# version 2.1 of the License.
+# 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA  02110-1301  USA 
+# 
+# Copyright (C) 2014 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
+#
+
+
+$f = `/bin/ls *.ijc`;
+
+@filenames = split /\n/ms, $f;
+
+foreach $file (@filenames) {
+	$timestamp = $file;
+    $timestamp =~ s/1\.\d\.//;
+
+	($root) = ($timestamp =~ /(.*).ijc/);
+   
+	($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(hex($root));
+	
+	printf "  %16s    %4d/%02d/%02d  %02d:%02d\n", $file, 
+             $year+1900, $mon+1, $mday,
+			 $hour, $min;
+
+}
+
diff --git a/base/tps-tomcat/shared/applets/readme.txt b/base/tps-tomcat/shared/applets/readme.txt
new file mode 100644
index 000000000..773e3bac5
--- /dev/null
+++ b/base/tps-tomcat/shared/applets/readme.txt
@@ -0,0 +1,52 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation;
+# version 2.1 of the License.
+# 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA  02110-1301  USA 
+# 
+# Copyright (C) 2014 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
+#
+This directory contains a list of CoolKey applets
+that can be used by the TPS for applet upgrade.
+
+
+Applet Information:
+------------------
+
+File Name     Creation Date    Applet Ver Major Ver Minor Ver Remark
+============  ================ ========== ========= ========= ==========
+427BDDB8.ijc  2005/05/06  14:12 427BDDB8   1         3         Official Applet
+
+Token Information:
+-----------------
+
+Type                      CUID (Token ID)     ATR       Remark
+======================== ==================== =======  ==================
+Old "E" and ealier cards 40900062ff00ssssssss 
+(Acquired From WebSite)
+"F" cards                40900062ff00ssssssss
+(Acquired From WebSite)
+"G" & later (Oct/Nov)    409000620103ssssssss 
+(Acquired From WebSite)
+Fortezza cards           409000620103ssssssss     
+(Acquired From WebSite)
+Developement Keyed cards 409000620101ssssssss 3B76940000FF6276010000
+
+where ssssssss is the serial number. 
+
+
+Remark
+======
+1.3.45787308.ijc - this is the unofficial jForte applet with hacks
diff --git a/scripts/compose_pki_tps_client_packages b/scripts/compose_pki_tps_client_packages
new file mode 100755
index 000000000..4efd7f874
--- /dev/null
+++ b/scripts/compose_pki_tps_client_packages
@@ -0,0 +1,199 @@
+#!/bin/bash
+# BEGIN COPYRIGHT BLOCK
+# (C) 2014 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+
+##
+## Include common 'compose' functions
+##
+
+COMPOSE_PWD=`dirname $0`
+source ${COMPOSE_PWD}/compose_functions
+
+
+## Always switch into the base directory three levels
+## above this shell script prior to executing it so
+## that all of its output is written to this directory
+
+cd `dirname $0`/../..
+
+
+##
+## Retrieve the name of this base directory
+##
+
+PKI_PWD=`pwd`
+
+
+##
+## Establish the 'pki-tps-client' name and version information
+##
+
+PKI_TPS_CLIENT="pki-tps-client"
+PKI_TPS_CLIENT_VERSION="10.2.0"
+
+
+##
+## Establish the SOURCE files/directories of the 'pki-tps-client' source directory
+##
+
+PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_TPS_CLIENT}.spec"
+PKI_COMPONENT_LIST="tps-client"
+
+
+##
+## Establish the TARGET files/directories of the 'pki-tps-client' source/spec files
+##
+
+if [ $WORK_DIR ]; then
+    PKI_PACKAGES="`cd $WORK_DIR ; pwd`"
+else
+    PKI_PACKAGES="${PKI_PWD}/packages"
+fi
+
+PKI_TPS_CLIENT_BUILD_DIR="${PKI_PACKAGES}/BUILD"
+PKI_TPS_CLIENT_RPMS_DIR="${PKI_PACKAGES}/RPMS"
+PKI_TPS_CLIENT_SOURCES_DIR="${PKI_PACKAGES}/SOURCES"
+PKI_TPS_CLIENT_SPECS_DIR="${PKI_PACKAGES}/SPECS"
+PKI_TPS_CLIENT_SRPMS_DIR="${PKI_PACKAGES}/SRPMS"
+
+PKI_TPS_CLIENT_TARBALL="${PKI_TPS_CLIENT}-${PKI_TPS_CLIENT_VERSION}.tar.gz"
+PKI_TPS_CLIENT_SPEC_FILE="${PKI_TPS_CLIENT_SPECS_DIR}/${PKI_TPS_CLIENT}.spec"
+PKI_TPS_CLIENT_PACKAGE_SCRIPT="${PKI_PACKAGES}/package_${PKI_TPS_CLIENT}"
+PKI_TPS_CLIENT_PACKAGE_COMMAND="${RPMBUILD_CMD} SPECS/${PKI_TPS_CLIENT}.spec"
+
+PKI_TPS_CLIENT_STAGING_DIR="${PKI_PACKAGES}/staging"
+PKI_TPS_CLIENT_DIR="${PKI_TPS_CLIENT_STAGING_DIR}/${PKI_TPS_CLIENT}-${PKI_TPS_CLIENT_VERSION}"
+PKI_TPS_CLIENT_BASE_DIR="${PKI_TPS_CLIENT_DIR}/base"
+
+
+##
+## Always create a top-level 'packages' directory
+##
+
+mkdir -p ${PKI_PACKAGES}
+
+
+##
+## Always create 'pki-tps-client' package directories
+##
+
+mkdir -p ${PKI_TPS_CLIENT_BUILD_DIR}
+mkdir -p ${PKI_TPS_CLIENT_RPMS_DIR}
+mkdir -p ${PKI_TPS_CLIENT_SOURCES_DIR}
+mkdir -p ${PKI_TPS_CLIENT_SPECS_DIR}
+mkdir -p ${PKI_TPS_CLIENT_SRPMS_DIR}
+
+
+##
+## Always start with new 'pki-tps-client' package files
+##
+
+rm -rf ${PKI_TPS_CLIENT_BUILD_DIR}/${PKI_TPS_CLIENT}-${PKI_TPS_CLIENT_VERSION}
+rm -f  ${PKI_TPS_CLIENT_RPMS_DIR}/${PKI_TPS_CLIENT}-${PKI_TPS_CLIENT_VERSION}*.rpm
+rm -f  ${PKI_TPS_CLIENT_SOURCES_DIR}/${PKI_TPS_CLIENT_TARBALL}
+rm -f  ${PKI_TPS_CLIENT_SPEC_FILE}
+rm -f  ${PKI_TPS_CLIENT_SRPMS_DIR}/${PKI_TPS_CLIENT}-${PKI_TPS_CLIENT_VERSION}*.rpm
+
+
+##
+## Copy a new 'pki-tps-client' spec file from the
+## current contents of the PKI working repository
+##
+
+cp -p ${PKI_SPECS_FILE} ${PKI_TPS_CLIENT_SPECS_DIR}
+
+
+##
+## If specified, copy all Patches from the spec file URL to SOURCES
+##
+
+if [ ${FETCH_PATCH_FILES} -eq 1 ] ; then
+	Fetch_Patch_Files ${PKI_SPECS_FILE} ${PKI_TPS_CLIENT_SOURCES_DIR}
+fi
+
+
+##
+## Copy the specified Source Tarball from the spec file URL to SOURCES, or
+## Generate a fresh Source Tarball from the local source
+##
+
+if [ ${FETCH_SOURCE_TARBALL} -eq 1 ] ; then
+	Fetch_Source_Tarball ${PKI_SPECS_FILE} ${PKI_TPS_CLIENT_SOURCES_DIR}
+else
+	##
+	## Always start with a new 'pki-tps-client' staging directory
+	##
+
+	rm -rf ${PKI_TPS_CLIENT_STAGING_DIR}
+
+
+	##
+	## To generate the 'pki-tps-client' tarball, construct a staging area
+	## consisting of the 'pki-tps-client' source components from the
+	## current contents of the PKI working repository
+	##
+
+	mkdir -p ${PKI_TPS_CLIENT_DIR}
+	cd ${PKI_DIR}
+	for file in "${PKI_FILE_LIST}" ;
+	do
+		cp -p ${file} ${PKI_TPS_CLIENT_DIR}
+	done
+	find ${PKI_CMAKE_DIR}             \
+		-name .svn -prune -o          \
+		-name *.swp -prune -o         \
+		-print | cpio -pdum ${PKI_TPS_CLIENT_DIR} > /dev/null 2>&1
+	cd - > /dev/null 2>&1
+
+	mkdir -p ${PKI_TPS_CLIENT_BASE_DIR}
+	cd ${PKI_BASE_DIR}
+	cp -p ${PKI_BASE_MANIFEST} ${PKI_TPS_CLIENT_BASE_DIR}
+	for component in "${PKI_COMPONENT_LIST}" ;
+	do
+		find ${component}             \
+		-name .svn -prune -o          \
+		-name *.swp -prune -o         \
+		-print | cpio -pdum ${PKI_TPS_CLIENT_BASE_DIR} > /dev/null 2>&1
+	done
+	cd - > /dev/null 2>&1
+
+
+	##
+	## Create the 'pki-tps-client' tarball
+	##
+
+	mkdir -p ${PKI_TPS_CLIENT_SOURCES_DIR}
+	cd ${PKI_TPS_CLIENT_STAGING_DIR}
+	gtar -zcvf ${PKI_TPS_CLIENT_TARBALL}    \
+		"${PKI_TPS_CLIENT}-${PKI_TPS_CLIENT_VERSION}" > /dev/null 2>&1
+	mv ${PKI_TPS_CLIENT_TARBALL} ${PKI_TPS_CLIENT_SOURCES_DIR}
+	cd - > /dev/null 2>&1
+
+
+	##
+	## Always remove the PKI staging area
+	##
+
+	rm -rf ${PKI_TPS_CLIENT_STAGING_DIR}
+fi
+
+
+##
+## Always generate a fresh 'pki-tps-client' package script
+##
+
+rm -rf ${PKI_TPS_CLIENT_PACKAGE_SCRIPT}
+printf "#!/bin/bash\n\n"                >  ${PKI_TPS_CLIENT_PACKAGE_SCRIPT}
+printf "${PKI_TPS_CLIENT_PACKAGE_COMMAND}\n\n" >> ${PKI_TPS_CLIENT_PACKAGE_SCRIPT}
+chmod 775 ${PKI_TPS_CLIENT_PACKAGE_SCRIPT}
+
+
+##
+## Automatically invoke RPM/SRPM creation
+##
+
+cd ${PKI_PACKAGES} ;
+bash ./package_${PKI_TPS_CLIENT} | tee package_${PKI_TPS_CLIENT}.log 2>&1
+
diff --git a/scripts/compose_pki_tps_packages b/scripts/compose_pki_tps_packages
deleted file mode 100755
index 0e7f85a44..000000000
--- a/scripts/compose_pki_tps_packages
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/bin/bash
-# BEGIN COPYRIGHT BLOCK
-# (C) 2010 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-##
-## Include common 'compose' functions
-##
-
-COMPOSE_PWD=`dirname $0`
-source ${COMPOSE_PWD}/compose_functions
-
-
-## Always switch into the base directory three levels
-## above this shell script prior to executing it so
-## that all of its output is written to this directory
-
-cd `dirname $0`/../..
-
-
-##
-## Retrieve the name of this base directory
-##
-
-PKI_PWD=`pwd`
-
-
-##
-## Establish the 'pki-tps' name and version information
-##
-
-PKI_TPS="pki-tps"
-PKI_TPS_VERSION="10.2.0"
-
-
-##
-## Establish the SOURCE files/directories of the 'pki-tps' source directory
-##
-
-PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_TPS}.spec"
-PKI_COMPONENT_LIST="tps"
-
-
-##
-## Establish the TARGET files/directories of the 'pki-tps' source/spec files
-##
-
-if [ $WORK_DIR ]; then
-    PKI_PACKAGES="`cd $WORK_DIR ; pwd`"
-else
-    PKI_PACKAGES="${PKI_PWD}/packages"
-fi
-
-PKI_TPS_BUILD_DIR="${PKI_PACKAGES}/BUILD"
-PKI_TPS_RPMS_DIR="${PKI_PACKAGES}/RPMS"
-PKI_TPS_SOURCES_DIR="${PKI_PACKAGES}/SOURCES"
-PKI_TPS_SPECS_DIR="${PKI_PACKAGES}/SPECS"
-PKI_TPS_SRPMS_DIR="${PKI_PACKAGES}/SRPMS"
-
-PKI_TPS_TARBALL="${PKI_TPS}-${PKI_TPS_VERSION}.tar.gz"
-PKI_TPS_SPEC_FILE="${PKI_TPS_SPECS_DIR}/${PKI_TPS}.spec"
-PKI_TPS_PACKAGE_SCRIPT="${PKI_PACKAGES}/package_${PKI_TPS}"
-PKI_TPS_PACKAGE_COMMAND="${RPMBUILD_CMD} SPECS/${PKI_TPS}.spec"
-
-PKI_TPS_STAGING_DIR="${PKI_PACKAGES}/staging"
-PKI_TPS_DIR="${PKI_TPS_STAGING_DIR}/${PKI_TPS}-${PKI_TPS_VERSION}"
-PKI_TPS_BASE_DIR="${PKI_TPS_DIR}/base"
-
-
-##
-## Always create a top-level 'packages' directory
-##
-
-mkdir -p ${PKI_PACKAGES}
-
-
-##
-## Always create 'pki-tps' package directories
-##
-
-mkdir -p ${PKI_TPS_BUILD_DIR}
-mkdir -p ${PKI_TPS_RPMS_DIR}
-mkdir -p ${PKI_TPS_SOURCES_DIR}
-mkdir -p ${PKI_TPS_SPECS_DIR}
-mkdir -p ${PKI_TPS_SRPMS_DIR}
-
-
-##
-## Always start with new 'pki-tps' package files
-##
-
-rm -rf ${PKI_TPS_BUILD_DIR}/${PKI_TPS}-${PKI_TPS_VERSION}
-rm -f  ${PKI_TPS_RPMS_DIR}/${PKI_TPS}-${PKI_TPS_VERSION}*.rpm
-rm -f  ${PKI_TPS_SOURCES_DIR}/${PKI_TPS_TARBALL}
-rm -f  ${PKI_TPS_SPEC_FILE}
-rm -f  ${PKI_TPS_SRPMS_DIR}/${PKI_TPS}-${PKI_TPS_VERSION}*.rpm
-
-
-##
-## Copy a new 'pki-tps' spec file from the
-## current contents of the PKI working repository
-##
-
-cp -p ${PKI_SPECS_FILE} ${PKI_TPS_SPECS_DIR}
-
-
-##
-## If specified, copy all Patches from the spec file URL to SOURCES
-##
-
-if [ ${FETCH_PATCH_FILES} -eq 1 ] ; then
-	Fetch_Patch_Files ${PKI_SPECS_FILE} ${PKI_TPS_SOURCES_DIR}
-fi
-
-
-##
-## Copy the specified Source Tarball from the spec file URL to SOURCES, or
-## Generate a fresh Source Tarball from the local source
-##
-
-if [ ${FETCH_SOURCE_TARBALL} -eq 1 ] ; then
-	Fetch_Source_Tarball ${PKI_SPECS_FILE} ${PKI_TPS_SOURCES_DIR}
-else
-	##
-	## Always start with a new 'pki-tps' staging directory
-	##
-
-	rm -rf ${PKI_TPS_STAGING_DIR}
-
-
-	##
-	## To generate the 'pki-tps' tarball, construct a staging area
-	## consisting of the 'pki-tps' source components from the
-	## current contents of the PKI working repository
-	##
-
-	mkdir -p ${PKI_TPS_DIR}
-	cd ${PKI_DIR}
-	for file in "${PKI_FILE_LIST}" ;
-	do
-		cp -p ${file} ${PKI_TPS_DIR}
-	done
-	find ${PKI_CMAKE_DIR}             \
-		-name .svn -prune -o          \
-		-name *.swp -prune -o         \
-		-print | cpio -pdum ${PKI_TPS_DIR} > /dev/null 2>&1
-	cd - > /dev/null 2>&1
-
-	mkdir -p ${PKI_TPS_BASE_DIR}
-	cd ${PKI_BASE_DIR}
-	cp -p ${PKI_BASE_MANIFEST} ${PKI_TPS_BASE_DIR}
-	for component in "${PKI_COMPONENT_LIST}" ;
-	do
-		find ${component}             \
-		-name .svn -prune -o          \
-		-name *.swp -prune -o         \
-		-print | cpio -pdum ${PKI_TPS_BASE_DIR} > /dev/null 2>&1
-	done
-	cd - > /dev/null 2>&1
-
-
-	##
-	## Create the 'pki-tps' tarball
-	##
-
-	mkdir -p ${PKI_TPS_SOURCES_DIR}
-	cd ${PKI_TPS_STAGING_DIR}
-	gtar -zcvf ${PKI_TPS_TARBALL}    \
-		"${PKI_TPS}-${PKI_TPS_VERSION}" > /dev/null 2>&1
-	mv ${PKI_TPS_TARBALL} ${PKI_TPS_SOURCES_DIR}
-	cd - > /dev/null 2>&1
-
-
-	##
-	## Always remove the PKI staging area
-	##
-
-	rm -rf ${PKI_TPS_STAGING_DIR}
-fi
-
-
-##
-## Always generate a fresh 'pki-tps' package script
-##
-
-rm -rf ${PKI_TPS_PACKAGE_SCRIPT}
-printf "#!/bin/bash\n\n"                >  ${PKI_TPS_PACKAGE_SCRIPT}
-printf "${PKI_TPS_PACKAGE_COMMAND}\n\n" >> ${PKI_TPS_PACKAGE_SCRIPT}
-chmod 775 ${PKI_TPS_PACKAGE_SCRIPT}
-
-
-##
-## Automatically invoke RPM/SRPM creation
-##
-
-cd ${PKI_PACKAGES} ;
-bash ./package_${PKI_TPS} | tee package_${PKI_TPS}.log 2>&1
-
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 198722086..7c10c1ff1 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.6%{?dist}
+Release:          0.7%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -783,6 +783,7 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
 %doc base/tps/LICENSE
 %{_javadir}/pki/pki-tps.jar
 %dir %{_datadir}/pki/tps
+%{_datadir}/pki/tps/applets/
 %{_datadir}/pki/tps/conf/
 %{_datadir}/pki/tps/setup/
 %{_datadir}/pki/tps/webapps/
@@ -798,6 +799,10 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
 %endif # %{with server}
 
 %changelog
+* Wed Aug 13 2014 Jack Magne <jmagne@redhat.com> - 10.2.0-0.7
+- Respin to include the applet files with the rpm install. No change
+  to spec file needed.
+
 * Tue Jul 15 2014 Matthew Harmsen <mharmsen@redhat.com> - 10.2.0-0.6
 - Bugzilla Bug #1120045 - pki-core: Switch to java-headless (build)requires --
   drop dependency on java-atk-wrapper
diff --git a/specs/pki-tps-client.spec b/specs/pki-tps-client.spec
new file mode 100644
index 000000000..686df1f12
--- /dev/null
+++ b/specs/pki-tps-client.spec
@@ -0,0 +1,133 @@
+Name:             pki-tps-client
+Version:          10.2.0
+Release:          0.3%{?dist}
+Summary:          Certificate System - Token Processing System
+URL:              http://pki.fedoraproject.org/
+License:          LGPLv2
+Group:            System Environment/Daemons
+
+%bcond_without    javadoc
+%define _unpackaged_files_terminate_build 0 
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:    cmake >= 2.8.9-1
+BuildRequires:    apr-devel
+BuildRequires:    apr-util-devel
+BuildRequires:    cyrus-sasl-devel
+BuildRequires:    httpd-devel >= 2.4.2
+BuildRequires:    java-devel >= 1:1.7.0
+BuildRequires:    openldap-devel
+BuildRequires:    nspr-devel
+BuildRequires:    nss-devel >= 3.14.3
+BuildRequires:    pcre-devel
+BuildRequires:    pki-server >= 10.2.0
+BuildRequires:    python
+BuildRequires:    systemd
+BuildRequires:    svrcore-devel
+BuildRequires:    zlib
+BuildRequires:    zlib-devel
+
+Requires:         java >= 1:1.7.0
+Requires:         mod_nss
+Requires:         mod_perl
+Requires:         mod_revocator
+Requires:         nss >= 3.14.3
+Requires:         nss-tools >= 3.14.3
+Requires:         openldap-clients
+Requires:         perl-Mozilla-LDAP
+Requires:         pki-server >= 10.2.0
+Requires:         pki-symkey >= 10.2.0
+
+Requires(post):   systemd-units
+Requires(preun):  systemd-units
+Requires(postun): systemd-units
+
+Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
+
+%global overview                                                          \
+Certificate System (CS) is an enterprise software system designed         \
+to manage enterprise Public Key Infrastructure (PKI) deployments.         \
+                                                                          \
+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     \
+the Enterprise Security Client (ESC).                                     \
+                                                                          \
+The utitility "tpsclient"  is a test tool that interacts with TPS         \
+This tool is useful to test TPS server configs without risking a real     \
+smart card.                                                               \                                                                          
+%{nil}
+
+%description %{overview}
+
+
+==================================
+||  ABOUT "CERTIFICATE SYSTEM"  ||
+==================================
+${overview}
+
+
+%prep
+
+%setup -q -n %{name}-%{version}%{?prerel}
+
+cat << \EOF > %{name}-prov
+
+cat << \EOF > %{name}-req
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%build
+%{__mkdir_p} build
+cd build
+%cmake -DVERSION=%{version}-%{release} \
+	-DVAR_INSTALL_DIR:PATH=/var \
+	-DBUILD_PKI_TPS:BOOL=ON \
+	-DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
+%if 0%{?rhel}
+	-DRESTEASY_LIB=/usr/share/java/resteasy-base \
+%else
+	-DRESTEASY_LIB=/usr/share/java/resteasy \
+%endif
+%if ! %{with javadoc}
+	-DWITH_JAVADOC:BOOL=OFF \
+%endif
+	..
+%{__make} VERBOSE=1 %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+cd build
+%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
+
+cd %{buildroot}/%{_datadir}/pki/tps/docroot
+%{__ln_s} tokendb tus
+
+# Internal libraries for 'tps' are present in:
+#
+#     * '/usr/lib/tps'    (i386)
+#     * '/usr/lib64/tps'  (x86_64)
+#
+mkdir %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo %{_libdir}/tps > %{buildroot}%{_sysconfdir}/ld.so.conf.d/tps-%{_arch}.conf
+
+# Details:
+#
+#     * https://fedoraproject.org/wiki/Features/var-run-tmpfs
+#     * https://fedoraproject.org/wiki/Tmpfiles.d_packaging_draft
+#
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/tmpfiles.d
+
+%files
+%defattr(-,root,root,-)
+%doc base/tps-client/LICENSE
+%{_bindir}/tpsclient
+%{_libdir}/tps/libtps.so
+%{_libdir}/tps/libtokendb.so
+
+%changelog
+* Mon Aug 18 2014 jmagne <jmagne@redhat.com> 10.2.0-0.3
+- Initial appearance of pki-tps-client package.
+- Package includes merely the "tpclient" command line utility.
+- Original tps libararies must be built to support such a utility.
diff --git a/specs/pki-tps.spec b/specs/pki-tps.spec
deleted file mode 100644
index d764dde73..000000000
--- a/specs/pki-tps.spec
+++ /dev/null
@@ -1,580 +0,0 @@
-Name:             pki-tps
-Version:          10.2.0
-Release:          0.1%{?dist}
-Summary:          Certificate System - Token Processing System
-URL:              http://pki.fedoraproject.org/
-License:          LGPLv2
-Group:            System Environment/Daemons
-
-%bcond_without    javadoc
-
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:    cmake >= 2.8.9-1
-BuildRequires:    apr-devel
-BuildRequires:    apr-util-devel
-BuildRequires:    cyrus-sasl-devel
-BuildRequires:    httpd-devel >= 2.4.2
-BuildRequires:    java-devel >= 1:1.7.0
-BuildRequires:    openldap-devel
-BuildRequires:    nspr-devel
-BuildRequires:    nss-devel >= 3.14.3
-BuildRequires:    pcre-devel
-BuildRequires:    pki-server >= 10.2.0
-BuildRequires:    python
-BuildRequires:    systemd
-BuildRequires:    svrcore-devel
-BuildRequires:    zlib
-BuildRequires:    zlib-devel
-
-Requires:         java >= 1:1.7.0
-Requires:         mod_nss
-Requires:         mod_perl
-Requires:         mod_revocator
-Requires:         nss >= 3.14.3
-Requires:         nss-tools >= 3.14.3
-Requires:         openldap-clients
-Requires:         perl-Mozilla-LDAP
-Requires:         pki-server >= 10.2.0
-Requires:         pki-symkey >= 10.2.0
-
-Requires(post):   systemd-units
-Requires(preun):  systemd-units
-Requires(postun): systemd-units
-
-Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
-
-%if 0%{?rhel}
-ExcludeArch:      ppc ppc64 ppcle ppc64le s390 s390x
-%endif
-
-%global overview                                                          \
-Certificate System (CS) is an enterprise software system designed         \
-to manage enterprise Public Key Infrastructure (PKI) deployments.         \
-                                                                          \
-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     \
-the Enterprise Security Client (ESC).                                     \
-                                                                          \
-TPS is designed to communicate with tokens that conform to                \
-Global Platform's Open Platform Specification.                            \
-                                                                          \
-TPS communicates over SSL with various PKI backend subsystems (including  \
-the Certificate Authority (CA), the Data Recovery Manager (DRM), and the  \
-Token Key Service (TKS)) to fulfill the user's requests.                  \
-                                                                          \
-TPS also interacts with the token database, an LDAP server that stores    \
-information about individual tokens.                                      \
-                                                                          \
-For deployment purposes, a TPS requires the following components from the \
-PKI Core package:                                                         \
-                                                                          \
-  * pki-server                                                            \
-  * pki-tools                                                             \
-                                                                          \
-Additionally, Certificate System requires ONE AND ONLY ONE of the         \
-following "Mutually-Exclusive" PKI Theme packages:                        \
-                                                                          \
-  * dogtag-pki-theme (Dogtag Certificate System deployments)              \
-    * dogtag-pki-server-theme                                             \
-  * redhat-pki-server-theme (Red Hat Certificate System deployments)      \
-    * redhat-pki-server-theme                                             \
-  * customized pki theme (Customized Certificate System deployments)      \
-    * <customized>-pki-server-theme                                       \
-                                                                          \
-%{nil}
-
-%description %{overview}
-
-
-==================================
-||  ABOUT "CERTIFICATE SYSTEM"  ||
-==================================
-${overview}
-
-
-%prep
-
-
-%setup -q -n %{name}-%{version}%{?prerel}
-
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-sed -e '/perl(PKI.*)/d' -e '/perl(Template.*)/d'
-EOF
-
-%global __perl_provides %{_builddir}/%{name}-%{version}%{?prerel}/%{name}-prov
-chmod +x %{__perl_provides}
-
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-sed -e '/perl(PKI.*)/d' -e '/perl(Template.*)/d'
-EOF
-
-%global __perl_requires %{_builddir}/%{name}-%{version}%{?prerel}/%{name}-req
-chmod +x %{__perl_requires}
-
-
-%clean
-%{__rm} -rf %{buildroot}
-
-
-%build
-%{__mkdir_p} build
-cd build
-%cmake -DVERSION=%{version}-%{release} \
-	-DVAR_INSTALL_DIR:PATH=/var \
-	-DBUILD_PKI_TPS:BOOL=ON \
-	-DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
-%if 0%{?rhel}
-	-DRESTEASY_LIB=/usr/share/java/resteasy-base \
-%else
-	-DRESTEASY_LIB=/usr/share/java/resteasy \
-%endif
-%if ! %{with javadoc}
-	-DWITH_JAVADOC:BOOL=OFF \
-%endif
-	..
-%{__make} VERBOSE=1 %{?_smp_mflags}
-
-
-%install
-%{__rm} -rf %{buildroot}
-cd build
-%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
-
-chmod 755 %{buildroot}%{_datadir}/pki/tps/cgi-bin/demo/*.cgi
-chmod 755 %{buildroot}%{_datadir}/pki/tps/cgi-bin/home/*.cgi
-chmod 755 %{buildroot}%{_datadir}/pki/tps/cgi-bin/so/*.cgi
-chmod 755 %{buildroot}%{_datadir}/pki/tps/cgi-bin/sow/*.cgi
-chmod 755 %{buildroot}%{_datadir}/pki/tps/cgi-bin/sow/cfg.pl
-
-# This should be done in CMAKE
-cd %{buildroot}/%{_datadir}/pki/tps/docroot
-%{__ln_s} tokendb tus
-
-# Internal libraries for 'tps' are present in:
-#
-#     * '/usr/lib/tps'    (i386)
-#     * '/usr/lib64/tps'  (x86_64)
-#
-mkdir %{buildroot}%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}/tps > %{buildroot}%{_sysconfdir}/ld.so.conf.d/tps-%{_arch}.conf
-
-# Details:
-#
-#     * https://fedoraproject.org/wiki/Features/var-run-tmpfs
-#     * https://fedoraproject.org/wiki/Tmpfiles.d_packaging_draft
-#
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/tmpfiles.d
-# generate 'pki-tps.conf' under the 'tmpfiles.d' directory
-echo "D /run/lock/pki 0755 root root -"     >  %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tps.conf
-echo "D /run/lock/pki/tps 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tps.conf
-echo "D /run/pki 0755 root root -"      >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tps.conf
-echo "D /run/pki/tps 0755 root root -"  >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tps.conf
-
-%{__rm} %{buildroot}%{_initrddir}/pki-tpsd
-
-%post
-# Attempt to update ALL old "TPS" instances to "systemd"
-if [ -d /etc/sysconfig/pki/tps ]; then
-    for inst in `ls /etc/sysconfig/pki/tps`; do
-        if [ ! -e "/etc/systemd/system/pki-tpsd.target.wants/pki-tpsd@${inst}.service" ]; then
-            ln -s "/lib/systemd/system/pki-tpsd@.service" \
-                  "/etc/systemd/system/pki-tpsd.target.wants/pki-tpsd@${inst}.service"
-
-            if [ -e /var/run/${inst}.pid ]; then
-                kill -9 `cat /var/run/${inst}.pid` || :
-                rm -f /var/run/${inst}.pid
-                echo "pkicreate.systemd.servicename=pki-tpsd@${inst}.service" >> \
-                     /var/lib/${inst}/conf/CS.cfg || :
-                /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-                /bin/systemctl restart pki-tpsd@${inst}.service || :
-            else
-                echo "pkicreate.systemd.servicename=pki-tpsd@${inst}.service" >> \
-                     /var/lib/${inst}/conf/CS.cfg || :
-            fi
-        else
-            # Conditionally restart this Dogtag 9 instance
-            /bin/systemctl condrestart pki-tpsd@${inst}.service
-        fi
-    done
-fi
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-
-%preun
-if [ $1 = 0 ] ; then
-    /bin/systemctl --no-reload disable pki-tpsd.target > /dev/null 2>&1 || :
-    /bin/systemctl stop pki-tpsd.target > /dev/null 2>&1 || :
-fi
-
-%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ "$1" -ge "1" ] ; then
-    /bin/systemctl try-restart pki-tpsd.target >/dev/null 2>&1 || :
-fi
-
-%files
-%defattr(-,root,root,-)
-%doc base/tps/LICENSE
-%dir %{_sysconfdir}/systemd/system/pki-tpsd.target.wants
-%{_unitdir}/pki-tpsd@.service
-%{_unitdir}/pki-tpsd.target
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/tps-%{_arch}.conf
-%{_bindir}/tpsclient
-%{_libdir}/httpd/modules/*
-%{_libdir}/tps/
-%dir %{_datadir}/pki/tps
-%{_datadir}/pki/tps/applets/
-%{_datadir}/pki/tps/cgi-bin/
-%{_datadir}/pki/tps/conf/
-%{_datadir}/pki/tps/docroot/
-%{_datadir}/pki/tps/lib/
-%{_datadir}/pki/tps/samples/
-%{_datadir}/pki/tps/scripts/
-%{_datadir}/pki/tps/setup/
-%dir %{_localstatedir}/lock/pki/tps
-%dir %{_localstatedir}/run/pki/tps
-# Details:
-#
-#     * https://fedoraproject.org/wiki/Features/var-run-tmpfs
-#     * https://fedoraproject.org/wiki/Tmpfiles.d_packaging_draft
-#
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/pki-tps.conf
-
-
-%changelog
-* Fri Nov 22 2013 Dogtag Team <pki-devel@redhat.com> 10.2.0-0.1
-- Updated version number to 10.2.0-0.1.
-
-* Fri Nov 15 2013 Ade Lee <alee@redhat.com> 10.1.0-1
-- Update release number for release build
-
-* Sun Nov 10 2013 Ade Lee <alee@redhat.com> 10.1.0-0.7
-- Change release number for beta build
-
-* Thu Oct 31 2013 Ade Lee <alee@redhat.com> 10.1.0-0.6
-- Fixed references to /var/run and /var/lock in tmpfiles. 
-
-* Wed Aug 14 2013 Endi S. Dewata <edewata@redhat.com> 10.1.0-0.5
-- Moved Tomcat-based TPS into pki-core.
-
-* Thu Jul 11 2013 Ade Lee <alee@redhat.com> 10.1.0-0.4
-- Add systemd build requirement to fix build failures in f19
-
-* Fri Jun 14 2013 Kevin Wright <kwright@redhat.com> 10.1.0-0.3
-- Added missing build dependency on Java.
-
-* Tue Jun 11 2013 Endi S. Dewata <edewata@redhat.com> 10.1.0-0.2
-- Fixed dependencies on pki-server and pki-symkey.
-
-* Tue May 7 2013 Ade Lee <alee@redhat.com> 10.1.0-0.1
-- Change release number for 10.1 development
-
-* Tue Apr 30 2013 Ade Lee <alee@redhat.com> 10.0.2-2
-- Added nss, nss-tools dependencies
-
-* Fri Apr 26 2013 Ade Lee <alee@redhat.com> 10.0.2-1
-- Change release number for official release.
-
-* Wed Mar 27 2013 Endi S. Dewata <edewata@redhat.com> 10.0.2-0.1
-- Updated version number to 10.0.2-0.1.
-
-* Tue Mar 12 2013 Endi S. Dewata <edewata@redhat.com> 10.0.0-3
-- Added python build-time dependency.
-
-* Mon Mar  4 2013 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-2
-- TRAC Ticket #517 - Clean up theme dependencies
-- TRAC Ticket #518 - Remove UI dependencies from pkispawn . . .
-
-* Fri Dec 7 2012 Ade Lee <alee@redhat.com> 10.0.0-1
-- Update to official release for rc1
-
-* Tue Nov 20 2012 Ade Lee <alee@redhat.com> 10.0.0-0.12.b3
-- Update spec fiel to support fedora >= 17 and rhel 7+
-- Update cmake version
-
-* Mon Nov 12 2012 Ade Lee <alee@redhat.com> 10.0.0-0.11.b3
-- Update release to b3
-
-* Mon Oct 29 2012 Ade Lee <alee@redhat.com> 10.0.0-0.10.b2
-- Update release to b2
-
-* Mon Oct 8 2012 Ade Lee <alee@redhat.com> 10.0.0-0.9.b1
-- Update release to b1
-
-* Fri Oct 5 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.9.a2
-- Merged pki-silent into pki-server.
-
-* Mon Oct 1 2012 Ade Lee <alee@redhat.com> 10.0.0-0.8.a2
-- Update release to a2
-
-* Sun Sep 30 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.8.a1
-- Modified CMake to use RPM version number
-
-* Mon Sep 24 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.7.a1
-- Merged pki-setup into pki-server
-
-* Tue Sep 11 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.6.a1
-- TRAC Ticket #312 - Dogtag 10: Automatically restart any running instances
-  upon RPM "update" . . .
-
-* Mon Aug 20 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.5.a1
-- Removed direct dependency on 'pki-native-tools'.
-
-* Mon Aug 20 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.4.a1
-- Replaced 'pki-deploy' with 'pki-server'.
-
-* Thu Aug 16 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.3.a1
-- Changed 'httpd-devel' build-time dependency to require '2.4.2'
-- Added 'pki-deploy' runtime dependency
-
-* Mon Aug 13 2012 Ade Lee <alee@redhat.com> 10.0.0-0.2.a1
-- Added systemd scripts
-- Ported config files and init scripts to apache 2.4
-
-* Wed Feb  1 2012 Nathan Kinder <nkinder@redhat.com> 10.0.0-0.1.a1
-- Updated package version number
-
-* Thu Sep 22 2011 Jack Magne <jmagne@redhat.com> 9.0.7-1
-- Bugzilla Bug #730146 - SSL handshake picks non-FIPS ciphers in FIPS mode (cfu)
-- Bugzilla Bug #730162 - TPS/TKS token enrollment failure in FIPS mode
-  (hsm+NSS).  (jmagne)
-- Bugzilla Bug #737184 - TPS UI display admin user name as
-  "undefined TUS Administrator". (awnuk)
-- Bugzilla Bug #735191 - in ou=tokens, token_type not getting updated if a
-  card is changed from one type to another (awnuk)
-
-* Wed Aug 10 2011 Jack Magne <jmagne@redhat.com> 9.0.6-1
-- Bugzilla Bug #725572 - Starting TPS subsystem with no pre-existing audit
-  log file does not write audit messages.
-
-* Thu Jul 14 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.5-1
-- Bugzilla Bug #697035 - TPS database schema not populated correctly
-  (alee)
-- Bugzilla Bug #694569 - parameter used by pkiremove not updated (alee)
-- Bugzilla Bug #696851 - TPS crashes that cause AuditVerify on TPS audit
-  logs - some of the signatures are failing. (jmagne)
-- Bugzilla Bug #699837 - service command is not fully backwards
-  compatible with Dogtag pki subsystems (mharmsen)
-- Bugzilla Bug #696443 - ESC display Smartcard renewal operation success
-  for a failed renewal operation. (jmagne)
-- Bugzilla Bug #707095 - tps delete user operation should check for roles
-  (not have them passed in) (alee)
-- Bugzilla Bug #717813 - EV_AUDIT_LOG_SHUTDOWN audit log not generated
-  for tps and ca on server shutdown (alee)
-- Bugzilla Bug #717765 - TPS configuration: logging into security domain
-  from tps does not work with clientauth=want. (alee)
-- Bugzilla Bug #669226 - Remove Legacy Build System (mharmsen)
-
-* Tue Apr 26 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.4-1
-- Bugzilla Bug #697035 - TPS database schema not populated correctly
-- Bugzilla Bug #694569 - parameter used by pkiremove not updated
-- Bugzilla Bug #696851 - TPS crashes that cause AuditVerify on
-  TPS audit logs - some of the signatures are failing.
-- Bugzilla Bug #699837 - service command is not fully backwards compatible
-  with Dogtag pki subsystems
-
-* Tue Apr 5 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.3-1
-- Bugzilla Bug #690950 - Update Dogtag Packages for Fedora 15 (beta)
-- Bugzilla Bug #691867 - add ldaps support through perLDAP
-
-* Fri Mar 25 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.2-1
-- Bugzilla Bug #690950 - Update Dogtag Packages for Fedora 15 (beta)
-- Bugzilla Bug #684381 - CS.cfg specifies incorrect type of comments
-- Bugzilla Bug #689956 - TPS Configuration with nethsm: audit signing
-  certificate location is not configured to nethsm in CS.cfg
-
-* Thu Mar 17 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.1-1
-- Bugzilla Bug #688763 - Rebase updated Dogtag Packages for Fedora 15 (alpha)
-- Bugzilla Bug #676421 - CC: Remove unused TPS interface calls and add
-  audit logging
-- Bugzilla Bug #676678 - Missing audit log messages for Secure Channel
-  Generation.
-- Bugzilla Bug #606944 - Convert TPS to use ldap utilities and API from
-  OpenLDAP instead of the Mozldap
-- Bugzilla Bug #676152 - Token enrollment with symmetric key change over
-  fails.
-- Bugzilla Bug #674396 - TPS: some audit signatures failed to verify
-- Bugzilla Bug #680567 - CC doc: remove update.applet.directory audit
-  message from TPS doc.
-- Bugzilla Bug #681066 - TPS authentication crash when exercising audit
-  log message.
-- Bugzilla Bug #684259 - incorrect group used for tps operators
-
-* Wed Dec 1 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0
-- Bugzilla Bug #620863 - saved CS.cfg files should be moved to a subdirectory
-  to avoid cluttering
-- Bugzilla Bug #607373 - add self test framework to TPS subsytem
-- Bugzilla Bug #607374 - add self test to TPS self test framework
-- Bugzilla Bug #624847 - Installed TPS cannot be started to be configured.
-- Bugzilla Bug #620925 - CC: auditor needs to be able to download audit logs
-  in the java subsystems
-- Bugzilla Bug #547507 - Token renewal: certs on the token is deleted when
-  one of the certs on the token is outside renewal grace period.
-- Bugzilla Bug #622535 - 64 bit host zlib uncompress operation fails when
-  reading data from token.
-- Bugzilla Bug #497931 - CS 8.0 -- Have to download and stall the trust chain
-  through ESC even if it was already installed in the browser.
-- Bugzilla Bug #579790 - errors in ESC communications can leave unusable
-  tokens and inconsistent data in TPS
-- Bugzilla Bug #631474 - Token enrollment with TPS Client fails with error
-  'Applet memory exceeded when writing out final token data'
-- Bugzilla Bug #488762 - Found HTTP TRACE method enabled on TPS
-- Bugzilla Bug #633405 - Tps client unable to perform token enrollment when
-  tried to load certificates with 2048 bit keys
-- Bugzilla Bug #558100 - host challenge of the Secure Channel needs to be
-  generated on TKS instead of TPS.
-- Bugzilla Bug #574942 - TPS database has performance problems with a large
-  number of tokens
-- Bugzilla Bug #637982 - some selftest parameters are not properly substituted
-- Bugzilla Bug #637824 - TPS UI: Profile state in CS.cfg is Pending Approval
-  after agent approve and Enable
-- Bugzilla Bug #223313 - should do random generated IV param
-  for symmetric keys
-- Bugzilla Bug #628995 - TPS CC requirement: Unused predicates for revocation
-  controls for TPS enrollment profiles should be removed.
-- Bugzilla Bug #642084 - CC feature: Key Management -provide signature
-  verification functions (TPS subsystem)
-- Bugzilla Bug #646545 - TPS Agent tab: displays approve list parameter with
-  last character chopped.
-- Bugzilla Bug #532724 - Feature: ESC Security officer work station should
-  display % of operation complete for format SO card
-- Bugzilla Bug #647364 - CC: audit signing certs for JAVA subsystems fail
-  CIMC cert verification (expose updated cert verification function in JSS)
-- Bugzilla Bug #651087 - TPS UI Admin tab display 'null' string in the
-  General configuration
-- Bugzilla Bug #651916 - kra and ocsp are using incorrect ports
-  to talk to CA and complete configuration in DonePanel
-- Bugzilla Bug #632425 - Port to tomcat6
-- Bugzilla Bug #638377 - Generate PKI UI components which exclude
-  a GUI interface
-- Bugzilla Bug #640042 - TPS Installlation Wizard: need to move Module Panel
-  up to before Security Domain Panel
-- Bugzilla Bug #642357 - CC Feature- Self-Test plugins only check for
-  validity
-- Bugzilla Bug #643206 - New CMake based build system for Dogtag
-- Bugzilla Bug #499494 - change CA defaults to SHA2
-- Bugzilla Bug #661128 - incorrect CA ports used for revoke, unrevoke certs
-  in TPS
-- Bugzilla Bug #223314 - AOL: Better activities logs
-- Bugzilla Bug #651001 - TPS does not create a password for entries in ldap.
-  This violates STIG requirements
-- Bugzilla Bug #512248 - Status mismatch for the encryption cert in tps agent
-  and CA when a temporary smart card is issued.
-- Bugzilla Bug #666902 - TPS needs to call CERT_VerifyCertificate() correctly
-- Bugzilla Bug #223319 - Certificate Status inconsistency between token db
-  and CA
-- Bugzilla Bug #669055 - TPS server does not re-start when signedAudit
-  logging is turned ON
-- Bugzilla Bug #606944 - Convert TPS to use ldap utilities and API from
-  OpenLDAP instead of the Mozldap
-- Bugzilla Bug #606944 - Convert TPS to use ldap utilities and API from
-  OpenLDAP instead of the Mozldap
-- Bugzilla Bug #614639 - 64k gemalto usb token no longer works properly
-  after a "logout" request is issued
-- Bugzilla Bug #671522 - TPS AuditVerify fails.
-- Bugzilla Bug #669804 - on active token re-enroll, TPS does not revoke and
-  remove existing certs.
-- Bugzilla Bug #656666 - Please Update Spec File to use 'ghost' on files
-  in /var/run and /var/lock
-
-* Wed Aug 04 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.2-1
-- Bugzilla Bug #601299 - tps installation does not update security domain
-- Bugzilla Bug #527593 - More robust signature digest alg, like SHA256
-  instead of SHA1 for ECC
-- Bugzilla Bug #528236 - rhcs80 web conf wizard - cannot specify CA signing
-  algorithm
-- Bugzilla Bug #533510 - tps exception, cannot start when signed audit true
-- Bugzilla Bug #529280 - TPS returns HTTP data without ending in 0rn
-  per RFC 2616
-- Bugzilla Bug #498299 - Should not be able to change the status manually
-  on a token marked as permanently lost or destroyed
-- Bugzilla Bug #554892 - configurable frequency signed audit
-- Bugzilla Bug #500700 - tps log rotation
-- Bugzilla Bug #562893 - tps shutdown if audit logs full
-- Bugzilla Bug #557346 - Name Constraints Extension cant be marked critical
-- Bugzilla Bug #556152 - ACL changes to CA and OCSP
-- Bugzilla Bug #556167 - ACL changes to CA and OCSP
-- Bugzilla Bug #581004 - add more audit logging to the TPS
-- Bugzilla Bug #566517 - CC: Add client auth to OCSP publishing,
-  and move to a client-auth port
-- Bugzilla Bug #565842 - Clone config throws errors - fix key_algorithm
-- Bugzilla Bug #581017 - enabling log signing from tps ui pages causes tps
-  crash
-- Bugzilla Bug #581004 - add more audit logs
-- Bugzilla Bug #595871 - CC: TKS needed audit message changes
-- Bugzilla Bug #598752 - Common Criteria: TKS ACL analysis result.
-- Bugzilla Bug #598666 - Common Criteria: incorrect ACLs for signedAudit
-- Bugzilla Bug #504905 - Smart card renewal should load old encryption cert
-  on the token.
-- Bugzilla Bug #499292 - TPS - Enrollments where keys are recovered need
-  to do both GenerateNewKey and RecoverLast operation for encryption key.
-- Bugzilla Bug #498299 - fix case where no transitions available
-- Bugzilla Bug #604186 - Common Criteria: TPS: Key Recovery needs
-  to meet CC requirements
-- Bugzilla Bug #604178 - Common Criteria: TPS: cert registration needs
-  to meet CC requirements
-- Bugzilla Bug #600968 - Common Criteria: TPS: cert registration needs
-  to meet CC requirements
-- Bugzilla Bug #607381 - Common Criteria: TPS: cert registration needs
-  to meet CC requirements
-
-* Thu Apr 08 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-1
-- Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text
-  needs correction
-
-* Tue Feb 16 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-8
-- Bugzilla Bug #566060 - Add 'pki-native-tools' as a runtime dependency
-  for RA, and TPS . . .
-
-* Fri Jan 29 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-7
-- Bugzilla Bug #553852 - Review Request: pki-tps - The Dogtag PKI System
-  Token Processing System
-- Bugzilla Bug #553078 - Apply "registry" logic to pki-tps . . .
-- Applied filters for unwanted perl provides and requires
-- Applied %{?_smp_mflags} option to 'make'
-- Removed manual 'strip' commands
-
-* Thu Jan 28 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-6
-- Bugzilla Bug #553078 - Apply "registry" logic to pki-tps . . .
-- Bugzilla Bug #553852 - Review Request: pki-tps - The Dogtag PKI System
-  Token Processing System
-
-* Wed Jan 27 2010 Kevin Wright <kwright@redhat.com> 1.3.0-5
-- Bugzilla Bug #553852 - Review Request: pki-tps - The Dogtag PKI System
-  Token Processing System
-- Per direction from the Fedora community,
-  removed the following explicit "Requires":
-      perl-HTML-Parser
-      perl-HTML-Tagset
-      perl-Parse-RecDescent
-      perl-URI
-      perl-XML-NamespaceSupport
-      perl-XML-Parser
-      perl-XML-Simple
-
-* Thu Jan 14 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-4
-- Bugzilla Bug #512234 - Move pkiuser:pkiuser check from spec file into
-  pkicreate . . .
-- Bugzilla Bug #547471 - Apply PKI SELinux changes to PKI registry model
-- Bugzilla Bug #553076 - Apply "registry" logic to pki-ra . . .
-- Bugzilla Bug #553078 - Apply "registry" logic to pki-tps . . .
-- Bugzilla Bug #553852 - Review Request: pki-tps - Dogtag Certificate System
-  Token Processing System
-
-* Mon Dec 14 2009 Kevin Wright <kwright@redhat.com> 1.3.0-3
-- Removed BuildRequires bash - Removed 'with exceptions' from License
-
-* Mon Nov 02 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-2
-- Bugzilla Bug #X - Packaging for Fedora Dogtag PKI
-- Prepended directory path in front of setup_package
-- Take ownership of pki tps directory.
-
-* Fri Oct 16 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-1
-- Bugzilla Bug #X - Packaging for Fedora Dogtag PKI
-