From fe389a989ca983779e0abd34018c61f805deeea4 Mon Sep 17 00:00:00 2001
From: mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Fri, 28 Nov 2008 21:10:42 +0000
Subject: Bugzilla Bug #445402:  Rename 'linux' to 'dogtag'.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@148 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
---
 .../shared/webapps/ocsp/agent/GenError.template    |  80 ---
 .../shared/webapps/ocsp/agent/GenPending.template  |  63 --
 .../shared/webapps/ocsp/agent/GenRejected.template |  84 ---
 .../shared/webapps/ocsp/agent/GenSuccess.template  |  46 --
 .../webapps/ocsp/agent/GenSvcPending.template      |  63 --
 .../webapps/ocsp/agent/GenUnauthorized.template    |  44 --
 .../webapps/ocsp/agent/GenUnexpectedError.template |  70 ---
 .../ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js | 539 ----------------
 .../ocsp-ui/shared/webapps/ocsp/agent/funcs.js     | 686 ---------------------
 .../webapps/ocsp/agent/graphics/dgLeftTab.gif      | Bin 89 -> 0 bytes
 .../webapps/ocsp/agent/graphics/dgRightTab.gif     | Bin 102 -> 0 bytes
 .../webapps/ocsp/agent/graphics/goto-tall.gif      | Bin 86 -> 0 bytes
 .../webapps/ocsp/agent/graphics/graphics.tmp       |   0
 .../shared/webapps/ocsp/agent/graphics/gray90.gif  | Bin 66 -> 0 bytes
 .../shared/webapps/ocsp/agent/graphics/hr.gif      | Bin 60 -> 0 bytes
 .../webapps/ocsp/agent/graphics/lgLeftTab.gif      | Bin 89 -> 0 bytes
 .../webapps/ocsp/agent/graphics/lgRightTab.gif     | Bin 102 -> 0 bytes
 .../shared/webapps/ocsp/agent/graphics/spacer.gif  | Bin 43 -> 0 bytes
 .../shared/webapps/ocsp/agent/header.template      |  89 ---
 .../ocsp-ui/shared/webapps/ocsp/agent/helpfun.js   |  35 --
 .../ocsp-ui/shared/webapps/ocsp/agent/index.html   |  20 -
 .../shared/webapps/ocsp/agent/index.template       | 149 -----
 .../shared/webapps/ocsp/agent/ocsp/AddCA.html      |  68 --
 .../shared/webapps/ocsp/agent/ocsp/AddCRL.html     |  81 ---
 .../shared/webapps/ocsp/agent/ocsp/CheckCert.html  |  68 --
 .../shared/webapps/ocsp/agent/ocsp/addCA.template  |  59 --
 .../shared/webapps/ocsp/agent/ocsp/addCRL.template |  59 --
 .../webapps/ocsp/agent/ocsp/checkCert.template     |  79 ---
 .../shared/webapps/ocsp/agent/ocsp/frameAddCA.html |  32 -
 .../webapps/ocsp/agent/ocsp/frameAddCRL.html       |  32 -
 .../webapps/ocsp/agent/ocsp/frameCheckCert.html    |  32 -
 .../webapps/ocsp/agent/ocsp/frameListCA.html       |  32 -
 .../shared/webapps/ocsp/agent/ocsp/frameOCSP.html  |  32 -
 .../shared/webapps/ocsp/agent/ocsp/frameStats.html |  32 -
 .../webapps/ocsp/agent/ocsp/getOCSPInfo.template   | 118 ----
 .../webapps/ocsp/agent/ocsp/getStats.template      | 141 -----
 .../shared/webapps/ocsp/agent/ocsp/index.html      |  32 -
 .../webapps/ocsp/agent/ocsp/listCAs.template       | 116 ----
 .../shared/webapps/ocsp/agent/ocsp/menuAddCA.html  |  50 --
 .../shared/webapps/ocsp/agent/ocsp/menuAddCRL.html |  50 --
 .../webapps/ocsp/agent/ocsp/menuCheckCert.html     |  50 --
 .../shared/webapps/ocsp/agent/ocsp/menuListCA.html |  50 --
 .../shared/webapps/ocsp/agent/ocsp/menuOCSP.html   |  50 --
 .../shared/webapps/ocsp/agent/ocsp/menuStats.html  |  54 --
 .../shared/webapps/ocsp/agent/ports.template       | 130 ----
 45 files changed, 3415 deletions(-)
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/graphics.tmp
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/header.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/index.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/index.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
 delete mode 100644 pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ports.template

(limited to 'pki/linux/ocsp-ui/shared/webapps/ocsp/agent')

diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenError.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
deleted file mode 100644
index f0cca1ea8..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<CMS_TEMPLATE>
-
-<TITLE>
-CS Processing Error
-</TITLE>
-
-<BODY BGCOLOR="white">
-
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Problem Processing Your Request
-</font>
-
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-<font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-
-<SCRIPT LANGUAGE="JavaScript">
-
-document.writeln('<P>');
-document.write('The '+result.fixed.authorityName+' ');
-document.writeln('encountered a problem while processing your request. ');
-document.writeln(
-	'The following is a detailed message of the error that occurred.'); 
-
-document.writeln('<P>');
-document.writeln('<BLOCKQUOTE><B><PRE>');
-if (result.fixed.errorDetails != null) {
-    document.write(result.fixed.errorDetails);
-} else {
-    document.write('No further details provided.');
-}
-document.writeln('</PRE></B></BLOCKQUOTE>');
-
-if (result != null && result.recordSet != null && result.recordSet.length > 0){
-	document.writeln('<P>');
-    document.write('Additional Information:');
-	document.writeln('<P>');
-    document.write('<BLOCKQUOTE><B><PRE>');
-	document.writeln('<UL>');
-	for (var i = 0; i < result.recordSet.length; i++) {
-		if (result.recordSet[i].errorDescription != null) {
-			document.writeln(result.recordSet[i].errorDescription);
-		}
-	}
-	document.writeln('</UL>');
-	document.write('</PRE></B></BLOCKQUOTE>');
-}
-</SCRIPT>
-
-<P>
-Please consult your local administrator for further assistance.
-The Certificate System logs may provide further information.
-
-</font>
-</BODY>
-</HTML>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
deleted file mode 100644
index 0ff5f4383..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<CMS_TEMPLATE>
-
-<TITLE>
-CS Request Pending 
-</TITLE>
-
-<BODY bgcolor="white">
-
-
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Request Successfully Submitted
-</font>
-
-<font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-
-<SCRIPT LANGUAGE="JavaScript">
-var authority = 'Certificate Managment System';
-if (result.fixed.authorityName != null) 
-	authority = result.fixed.authorityName;
-document.writeln('<P>');
-document.write('Congratulations, your request has been successfully ');
-document.write('submitted to the '+authority+'. ');
-document.write('Your request will be processed when an authorized agent ');
-document.writeln('verifies and validates the information in your request.');
-
-document.writeln('<P>');
-document.write('Your request ID is ');
-if (result.fixed.requestId != null) {
-    document.write('<B>'+result.fixed.requestId+'</B>.');
-	document.writeln('<P>');
-	document.write('Your can check on the status of your request with ');
-	document.write('an authorized agent or local administrator ');
-	document.writeln('by referring to this request ID.'); 
-} else {
-    document.write('<B>not provided.</B> ');
-    document.write('<P>');
-	document.writeln('Please consult your local administrator for assistance.');
-}
-</SCRIPT>
-
-</font>
-</BODY>
-</HTML>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
deleted file mode 100644
index a5dd68f49..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<CMS_TEMPLATE>
-
-<TITLE>
-CS Request Rejected
-</TITLE>
-
-<BODY bgcolor="white">
-
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Request Rejected
-</font>
-
-<font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-
-<SCRIPT LANGUAGE="JavaScript">
-
-var authority = 'Certificate System'; 
-if (result.fixed.authorityName != null) {
-	authority = result.fixed.authorityName;
-}
-
-document.writeln('<P>');
-document.write('Your request has been rejected by the '+authority+'. ' );
-document.write('This may indicate that some attributes of the request ');
-document.write('violate the policies of this '+authority+'. ');
-
-document.writeln('<P>');
-document.writeln('Violation details: ');
-
-document.writeln('<P>');
-document.writeln('<BLOCKQUOTE><B><PRE>');
-if (result == null || result.recordSet == null || result.recordSet.length == 0){
-	document.writeln('No further details provided.');
-}
-else {
-	document.writeln('<UL>');
-	for (var i = 0; i < result.recordSet.length; i++) {
-		if (result.recordSet[i].policyMessage != null) {
-			document.writeln(result.recordSet[i].policyMessage);
-		}
-	}
-	document.writeln('</UL>');
-}
-document.writeln('</PRE></B></BLOCKQUOTE>');
-
-document.writeln('<P>');
-document.write('Your request ID is ');
-if (result.fixed.requestId == null) {
-	document.write('<B>not provided</B>.');
-	document.writeln('<P>');
-	document.write(
-		'Please consult your local administrator for further assistance.');
-} else {
-	document.write('<B>'+result.fixed.requestId+'</B>. ');
-	document.writeln('<P>');
-	document.write(
-		'You can contact an authorized agent or local administrator for ');
-	document.writeln('further assistance by referring to the request ID.');
-}
-</SCRIPT>
-
-</font>
-</BODY>
-</HTML>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
deleted file mode 100644
index 9a0ead814..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<!-- This template is intended to be replaced by request specific results !  -->
-<CMS_TEMPLATE>
-
-<TITLE> 
-Generic Request Success 
-</TITLE>
-
-<BODY BGCOLOR=white>
-
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Request Successfully Submited
-</font>
-
-<font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-
-<SCRIPT LANGUAGE="Javascript">
-var authority = 'Certificate System';
-if (request.fixed.authorityName != null) 
-	authority = request.fixed.authorityName;
-
-document.writeln('<P>');
-document.write('Congratulations, your request has been successfully ');
-document.write('submitted and processed by the '+authority+'.');
-</SCRIPT>
-
-</font>
-</body>
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
deleted file mode 100644
index f639a39a9..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<CMS_TEMPLATE>
-
-<TITLE>
-CS Request Svc Pending 
-</TITLE>
-
-<BODY bgcolor="white">
-
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Request Successfully Submitted
-</font>
-
-<font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-
-<SCRIPT LANGUAGE="JavaScript">
-document.writeln('<P>');
-document.write('Your request has been successfully submitted and processed ');
-document.writeln('by the '+result.fixed.authorityName+'.');
-document.write('The '+result.fixed.authorityName+' is waiting for a remote ');
-if (result.fixed.remoteAuthorityName != null)
-	document.write(result.fixed.remoteAuthorityName);
-else
-	document.write('Certificate Manager or Data Recovery manager');
-document.write(' to fill your request.');
-
-document.writeln('<P>');
-document.write('Your request ID is ');
-if (result.fixed.requestId != null) {
-    document.write('<B>'+result.fixed.requestId+'</B>.');
-	document.write('<P>');
-	document.write('Your can check on status of your request with an '+
-				   'authorized agent or local administrator by referring '+
-				   'to this request ID.');
-} else {
-    document.write('not provided. ');
-	document.writeln('Please consult your local administrator for assistance.');
-}
-</SCRIPT>
-
-
-</font>
-</BODY>
-</HTML>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
deleted file mode 100644
index c29372843..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<!-- This template is intended to be replaced by request specific results !  -->
-<CMS_TEMPLATE>
-
-<TITLE> 
-Generic Unauthorized
-</TITLE>
-
-<BODY BGCOLOR=white>
-
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Unauthorized Access
-</font>
-
-<font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-
-<SCRIPT LANGUAGE="Javascript">
-document.writeln('<P>');
-document.write('You are not authorized for this operation.');
-document.write('<BR>');
-document.write('If you think this is an error please contact your ');
-document.writeln('local administrator for further assistance.');
-</SCRIPT>
-
-</font>
-</body>
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
deleted file mode 100644
index c69aaad1f..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
+++ /dev/null
@@ -1,70 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<CMS_TEMPLATE>
-
-<TITLE>
-CS Processing Error
-</TITLE>
-
-<BODY BGCOLOR="white">
-
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-Problem Processing Your Request
-</font>
-
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-<font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-
-<SCRIPT LANGUAGE="JavaScript">
-var authority = 'Certificate System'; 
-if (result.fixed.authorityName != null)  {
-	authority = result.fixed.authorityName;
-}
-
-document.writeln('<P>');
-document.write('The '+authority+' encountered an unexpected error ');
-document.writeln(' while processing your request.');
-document.writeln(
-	'The following is a detailed message of the error that occurred.'); 
-
-document.writeln('<P>');
-document.writeln('<BLOCKQUOTE><B><PRE>');
-if (result.fixed.unexpectedError != null) {
-    document.write(result.fixed.unexpectedError);
-} else {
-    document.write('No further details provided.');
-}
-document.writeln('</PRE></B></BLOCKQUOTE>');
-
-document.writeln('<P>');
-document.writeln(
-	'Please consult your local administrator for further assistance.');
-document.writeln('The Certificate System logs may provide further information.');
-</SCRIPT>
-
-</font>
-</BODY>
-</HTML>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
deleted file mode 100644
index 473fb1795..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
+++ /dev/null
@@ -1,539 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program 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 General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Copyright (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-
-//<!--
-
-
-function checkClientTime()
-{
-   var speed;
-   var server_date = new Date(serverdate); 
-   var client_date = new Date();
-   var zone = client_date.getTimezoneOffset(); 
-   var timediff = 0;
-
-   var serverutc = server_date.getTime();
-   var clientutc = client_date.getTime();
-
-   var offset = clientutc - serverutc;
-   if (offset >0) { 
-      speed = 'fast'; 
-      } else { 
-	  speed = 'slow'; 
-   } 
-   timediff = Math.round(Math.abs(offset/1000/60)); 
-
-    if (timediff > 10) { 
-       msg = 'Your computer\'s clock is '+ timediff+ ' minutes '+ speed  +
-             '\n\nYou may encounter problems using your certificate\n' +
-			 'as your clock is set incorrectly.\n\n' +
-			 'According to the server, the time is:\n  ' + server_date +
-			 '\n\nPlease correct your clock before proceeding with enrollment'+
-             '\n\nYour timezone is set to ' + (-zone/60) +' hours relative to GMT.\n' +
-			 'If you change your timezone, you may need to restart your browser\n'+
-             'before continuing.';
-			 alert(msg);
-			 return false;
-       }
-	return true;
-}
-
-
-
-
-function doubleQuotes(componentName)
-{
-    for (i=0; i < componentName.length; i++) {
-        if (componentName.charAt(i) == '"') {
-            return true;
-        }
-    }
-    return false;
-}
-
-function escapeDNComponent(str)
-{
-    var outStr = "";
-    var escapeValue = false;
-
-    // Do we need to escape any characters
-    for (i=0; i < str.length; i++) {
-        c = str.charAt(i);
-        if (c == ',' || c == '=' || c == '+' || c == '<' ||
-            c == '>' || c == '#' || c == ';' || c == '\r' ||
-            c == '\n') {
-            escapeValue = true;
-            break;
-        }
-    }
-
-    if (escapeValue == true) {
-        outStr += '"';
-        outStr += str;
-        outStr += '"';
-    } else {
-        outStr += str;
-    }
-    return outStr;
-}
-
-function formulateDN(form, distinguishedName)
-{
-    // Note: The alerts about double quotes are here to avoid
-    // problems with the code dealing with quoting and escaping in the
-    // Netscape Directory Server 1.0 implementation.
-    with (form) {
-        distinguishedName.value = '';
-	if (form.E != null) {
-	    if (E.value != '') {
-		if (doubleQuotes(E.value) == true) {
-		    alert('Double quotes are not allowed in the E-mail field');
-		    E.value = '';
-		    E.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'E=' + escapeDNComponent(E.value);
-	    }
-	}
-	if (form.CN!= null) {
-	    if (CN.value != '') {
-		if (doubleQuotes(CN.value) == true) {
-		    alert('Double quotes are not allowed in Common Name field');
-		    CN.value = '';
-		    CN.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'CN=' + escapeDNComponent(CN.value);
-	    }
-        }
-	if (form.UID1 != null) {
-	    if (UID1.value != '') {
-		if (doubleQuotes(UID1.value) == true) {
-		    alert('Double quotes are not allowed in the user id field');
-		    UID1.value = '';
-		    UID1.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'UID=' + escapeDNComponent(UID1.value);
-	    }
-        }
-	if (form.OU != null) {
-	    if (OU.value != '') {
-		if (doubleQuotes(OU.value) == true) {
-		    alert('Double quotes are not allowed in Org Unit field');
-		    OU.value = '';
-		    OU.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'OU=' + escapeDNComponent(OU.value);
-	    }  
-        }
-	if (form.O != null) {
-	    if (O.value != '') {
-		if (doubleQuotes(O.value) == true) {
-		    alert('Double quotes are not allowed in Organization field.');
-		    O.value = '';
-		    O.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'O=' + escapeDNComponent(O.value);
-	    }  
-	}
-	if (form.L != null) {
-	    if (L.value != '') {
-		if (doubleQuotes(L.value) == true) {
-		    alert('Double quotes are not allowed in Locality field.');
-		    L.value = '';
-		    L.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'L=' + escapeDNComponent(L.value);
-	    }
-	}
-	if (form.ST != null) {
-	    if (ST.value != '') {
-		if (doubleQuotes(ST.value) == true) {
-		    alert('Double quotes are not allowed in State field.');
-		    ST.value = '';
-		    ST.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'ST=' + escapeDNComponent(ST.value);
-	    }
-	}
-	if (form.C != null) {
-	    if (C.value != '') {
-		if (doubleQuotes(C.value) == true) {
-		    alert('Double quotes are not allowed in Country field.');
-		    C.value = '';
-		    C.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'C=' + escapeDNComponent(C.value);
-	    }
-	}
-    }
-}
-
-function isValidIssuerDN(form)
-{
-    // Note: The check here is to avoid a bug in Netscape Navigator 3.0 and 3.01
-    // that are triggered on formation of the nickname on import of a CA cert if
-    // that cert does not contain an OU or O component.
-    if ((form.OU.value == '') && (form.O.value == '')) {
-        alert("You must enter an Organization Unit or an Organization.");
-        return false;
-    } else {
-        return true;
-    }
-}
-
-function isValidAdminDN(form)
-{
-    // Note: The check here is to avoid a bug in Netscape Navigator 3.0 and 3.01
-    // that are triggered on formation of the nickname on import of a personal cert if
-    // that cert does not contain a common name.
-
-    if (form.CN.value == '') {
-        alert("You must enter a Common Name.");
-        return false;
-    } else {
-        return true;
-    }
-}
-
-function isValidCSR(form)
-{
-    // Note: the checks here are of mixed origin.  Some are required for Navigator
-    // and Communicator.  The CSR field checks are to avoid server side rejection of the
-    // submission.  These checks can be split up to be different for different types of
-    // certificates.
-    
-    formulateDN(form, form.subject);
-	// DEBUG 
-	//alert(form.subject);
-
-    with (form) {
-		if (email != null) {
-	   		if (E.value == "" && email.checked) {
-              alert("E-mail certificates must include an E-mail address.");
-	      return false;
-	   }
-        }
-        if (CN.value == "") {
-            alert("You must supply your name for the certificate.");
-            return false;
-        }
-	return true;
-    }
-}
-
-function isNumber(string, radix) {
-  var i = 0; 
-  var legalDigits;
-  if (radix == null || radix == 10) {
-     legalDigits = "0123456789";
-  } else if (radix == 16) {
-     legalDigits = "0123456789abcdefABCDEF:";
-  } else {
-     return false;
-  }
-  for(; i < string.length; ++i) {
-     if (string.charAt(i) != ' ')
-     	break;
-  }
-  if (string.charAt(i) == '+' || string.charAt(i) == '-' ) {
-     ++i;
-  }
-  if (radix == 16 && i < string.length - 2 &&
-      string.charAt(i) == '0' &&
-      (string.charAt(i+1) == 'x' || string.charAt(i+1) == 'X') &&
-      legalDigits.indexOf(string.charAt(i+2)) != -1) {
-	i += 3;
-  }
-  for(; i < string.length; ++i) {
-     if (legalDigits.indexOf(string.charAt(i)) == -1)
-     	break;
-  }
-  for(; i < string.length; ++i) {
-     if (string.charAt(i) != ' ')
-     	return false;
-  }
-  return true;
-}
-
-function dateForm(name)
-{
-	var i;
-	document.write('<FORM NAME=\"'+ name +'\">');
-	document.write('<SELECT NAME=\"day\"><OPTION VALUE=0> ');
-	for (i=1; i <=31; ++i)
-		document.write('<OPTION VALUE='+i+'>'+i);
-	document.write('</SELECT>');
-	document.write('<SELECT NAME=\"month\">'+
-		'<OPTION VALUE=13> '+
-		'<OPTION VALUE=0>January'+
-		'<OPTION VALUE=1>February'+
-		'<OPTION VALUE=2>March'+
-		'<OPTION VALUE=3>April'+
-		'<OPTION VALUE=4>May'+
-		'<OPTION VALUE=5>June'+
-		'<OPTION VALUE=6>July'+
-		'<OPTION VALUE=7>August'+
-		'<OPTION VALUE=8>September'+
-		'<OPTION VALUE=9>October'+
-		'<OPTION VALUE=10>November'+
-		'<OPTION VALUE=11>December'+
-		'</SELECT>'
-	);
-	
-	document.write('<SELECT NAME=\"year\"><OPTION VALUE=0> ');
-	for (i=1996; i <=2006; ++i)
-		document.write('<OPTION VALUE='+i+'>'+i);
-	document.write('</SELECT>');
-	document.write('</FORM>');
-}
-
-function dateIsEmpty(form)
-{
-     return form.day.selectedIndex == 0  && 
-            form.month.selectedIndex == 0 &&
-	    form.year.selectedIndex == 0;
-}
- 
-
-function convertDate(form, fieldName)
-{
-     var date;
-     var day = form.day.options[form.day.selectedIndex].value;
-     var month = form.month.options[form.month.selectedIndex].value;
-     var year = form.year.options[form.year.selectedIndex].value;
-     date = new Date(year,month,day);
-
-     // see if normalization was required
-     if (date.getMonth() != month || date.getDate() != day ) {
-        alert(fieldName + " is invalid");
-	return null;
-     }
-     else 
-     	return Math.round(date.getTime() / 1000);
-}
-
-function daysToSeconds(days){
-    return 3600 * 24 * days;
-}
- 
-// encloses value in double quotes preceding all embedded double quotes with \
-function escapeValue(value)
-{
-    var result;
-    var fromIndex = 0, toIndex = 0;
-
-    // kludgy work-around for indexOf JavaScript bug on empty string
-    if (value == "")
-        return '\"\"';
-    
-    result = '\"';
-    while ((toIndex = value.indexOf('\"',fromIndex)) != -1) {
-    	result += value.substring(fromIndex,toIndex);
-     	result += '\\"';
-	fromIndex = toIndex + 1;
-    }
-    result += value.substring(fromIndex,value.length);
-    result += '\"';
-    return result;
-}
-
-// encloses value in double quotes preceding all embedded double quotes and 
-// backslashes with backslash
-function escapeValueJSString(value)
-{
-    var result = "";
-
-    // Do we need to escape any characters
-    for (i=0; i < value.length; i++) {
-        c = value.charAt(i);
-        if (c == '\\' | c == '"') {
-			result += '\\';
-        }
-		result += c;
-    }
-    return '\"' + result + '\"';
-}
-
-function escapeValueRfc1779(value)
-{
-    var result = "";
-
-    // Do we need to escape any characters
-    for (i=0; i < value.length; i++) {
-        c = value.charAt(i);
-        if (c == ',' || c == '=' || c == '+' || c == '<' ||
-            c == '>' || c == '#' || c == ';' || c == '\r' ||
-            c == '\n' || c == '\\' | c == '"') {
-			result += '\\';
-        }
-		result += c;
-    }
-    return result;
-}
-
-// helper function to construct name component(pattern)
-function makeComponent(list,tag,value,asPattern)
-{
-   var last = list.length;
-   if (asPattern) { 
-   	list[last] = (value == "") ? "*" : (tag+"="+escapeValueRfc1779(value));
-   }
-   else if (value != "")
-   	list[last] = tag+"="+escapeValueRfc1779(value);
-}
-
-// If asPattern is false formulates the RFC 1779 format subject name 
-// from the component parts skipping all components with blank values,
-// otherwise builds RFC 1779-like matching pattern from components
-function computeNameCriterion(form)
-{
-    var asPattern = form.match[1].checked;
-    var result = new Array;
-
-    with (form) {
-	// The order of clauses here determines how components are ordered
-	// in the name sent in the client's request.  A site may wish to
-	// re-order the clauses here if their conventions produce names
-	// with components in a different order.
-    	makeComponent(result,"E",E.value,asPattern);
-    	makeComponent(result,"CN",CN.value,asPattern);
-    	makeComponent(result,"UID",UID.value,asPattern);
-    	makeComponent(result,"OU",OU.value,asPattern);
-    	makeComponent(result,"O",O.value,asPattern);
-   	makeComponent(result,"L",L.value,asPattern);
-    	makeComponent(result,"ST",ST.value,asPattern);
-	makeComponent(result,"C",C.value,asPattern);
-    }
-    if (result.length == 0)
-    	return asPattern ? "0 == 0" : "0 == 1";
-    else 
-        return "subject" + ( asPattern ? " ~= " : " == ") +
-    				escapeValue(result.join(', '));
-}
-
-function booleanCrit(crit,radioArg)
-{
-    for (var i = 0; i < radioArg.length; ++i ){
-       if( radioArg[i].checked ) {
-          if (radioArg[i].value.length != 0) {
-	     crit[crit.length] = radioArg[i].name + " == " + radioArg[i].value;
-          }
-	  return;
-       }
-    }
-}
-
-function isHTTPEscapeChar(c)
-{
-    if (c == '%' || c == '#' || c == '+' || c == '=' || c == '\n' ||
-        c == '\r' || c == '\t' || c == ';' || c == '&' ||
-        c == '>') {
-        return true;
-    }
-
-    return false;
-}
-
-function produceHTTPEscapedString(inString)
-{
-    table = new Object();
-    table["%"] = "25";
-    table["#"] = "23";
-    table["+"] = "2B";
-    table["="] = "3D";
-    table["\n"] = "0A";
-    table["\r"] = "0D";
-    table["\t"] = "09";
-    table[";"] = "3B";
-    table["&"] = "26";
-    table[">"] = "3E";
-
-    outString = "";
-
-    for (i=0; i < inString.length; i++) {
-        if (inString.charAt(i) == ' ') {
-            outString += '+';
-        } else {
-            if (isHTTPEscapeChar(inString.charAt(i))) {
-                outString += "%" + table[inString.substring(i, i+1)];
-            } else {
-                outString += inString.charAt(i);
-            }
-        }
-    }
-
-    return outString;
-}
-
-// strips (optional) spaces and 0[xX] prefix at the beginning of s
-function stripPrefix(s)
-{
-  var i;
-  for(i = 0; i < s.length - 1; ++i) {
-     if (s.charAt(i) != ' ' )
-	break;
-  }
-  if (s.charAt(i) == '0' && (s.charAt(i+1) == 'x' || s.charAt(i+1) == 'X')) {
-	return s.substring(i+2,s.length);
-  } else {
-  	return  s.substring(i,s.length);;
-  }
-}
-
-// removes colons from value and returns the result
-// used as helper to convert colon-separated hexadecimal numbers
-// to regular numbers
-function removeColons(value)
-{
-    var result = "";
-
-    for (i=0; i < value.length; i++) {
-        c = value.charAt(i);
-        if (c != ':' ){
-		result += c;
-        }
-    }
-    return result;
-}
-
-function navMajorVersion()
-{
-    return parseInt(navigator.appVersion.substring(0, navigator.appVersion.indexOf(".")));
-}
-//-->
-
-
-
-
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/funcs.js b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
deleted file mode 100644
index daef83d17..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
+++ /dev/null
@@ -1,686 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program 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 General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Copyright (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-//<!--
-function doubleQuotes(componentName)
-{
-    for (i=0; i < componentName.length; i++) {
-        if (componentName.charAt(i) == '"') {
-            return true;
-        }
-    }
-    return false;
-}
-
-function escapeDNComponent(str)
-{
-    var outStr = "";
-    var escapeValue = false;
-
-    // Do we need to escape any characters
-    for (i=0; i < str.length; i++) {
-        c = str.charAt(i);
-        if (c == ',' || c == '=' || c == '+' || c == '<' ||
-            c == '>' || c == '#' || c == ';' || c == '\r' ||
-            c == '\n') {
-            escapeValue = true;
-            break;
-        }
-    }
-
-    if (escapeValue == true) {
-        outStr += '"';
-        outStr += str;
-        outStr += '"';
-    } else {
-        outStr += str;
-    }
-    return outStr;
-}
-
-function formulateDN(form, distinguishedName)
-{
-    // Note: The alerts about double quotes are here to avoid
-    // problems with the code dealing with quoting and escaping in the
-    // Netscape Directory Server 1.0 implementation.
-    with (form) {
-        distinguishedName.value = '';
-	if (form.eMail != null) {
-	    if (eMail.value != '') {
-		if (doubleQuotes(eMail.value) == true) {
-		    alert('Double quotes are not allowed in the E-mail field');
-		    eMail.value = '';
-		    eMail.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'E=' + escapeDNComponent(eMail.value);
-	    }
-	}
-	if (form.commonName != null) {
-	    if (commonName.value != '') {
-		if (doubleQuotes(commonName.value) == true) {
-		    alert('Double quotes are not allowed in Common Name field');
-		    commonName.value = '';
-		    commonName.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'CN=' + escapeDNComponent(commonName.value);
-	    }
-        }
-	if (form.userID != null) {
-	    if (userID.value != '') {
-		if (doubleQuotes(userID.value) == true) {
-		    alert('Double quotes are not allowed in the user id field');
-		    userID.value = '';
-		    userID.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'UID=' + escapeDNComponent(userID.value);
-	    }
-        }
-	if (form.orgUnit != null) {
-	    if (orgUnit.value != '') {
-		if (doubleQuotes(orgUnit.value) == true) {
-		    alert('Double quotes are not allowed in Org Unit field');
-		    orgUnit.value = '';
-		    orgUnit.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'OU=' + escapeDNComponent(orgUnit.value);
-	    }  
-        }
-	if (form.org != null) {
-	    if (org.value != '') {
-		if (doubleQuotes(org.value) == true) {
-		    alert('Double quotes are not allowed in Organization field.');
-		    org.value = '';
-		    org.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'O=' + escapeDNComponent(org.value);
-	    }  
-	}
-	if (form.locality != null) {
-	    if (locality.value != '') {
-		if (doubleQuotes(locality.value) == true) {
-		    alert('Double quotes are not allowed in Locality field.');
-		    locality.value = '';
-		    locality.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'L=' + escapeDNComponent(locality.value);
-	    }
-	}
-	if (form.state != null) {
-	    if (state.value != '') {
-		if (doubleQuotes(state.value) == true) {
-		    alert('Double quotes are not allowed in State field.');
-		    state.value = '';
-		    state.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'ST=' + escapeDNComponent(state.value);
-	    }
-	}
-	if (form.country != null) {
-	    if (country.value != '') {
-		if (doubleQuotes(country.value) == true) {
-		    alert('Double quotes are not allowed in Country field.');
-		    country.value = '';
-		    country.focus();
-		    return;
-		}
-		if (distinguishedName.value != '') distinguishedName.value += ', ';
-		distinguishedName.value += 'C=' + escapeDNComponent(country.value);
-	    }
-	}
-    }
-}
-
-function isValidIssuerDN(form)
-{
-    // Note: The check here is to avoid a bug in Netscape Navigator 3.0 and 3.01
-    // that are triggered on formation of the nickname on import of a CA cert if
-    // that cert does not contain an OU or O component.
-    if ((form.orgUnit.value == '') && (form.org.value == '')) {
-        alert("You must enter an Organization Unit or an Organization.");
-        return false;
-    } else {
-        return true;
-    }
-}
-
-function isValidAdminDN(form)
-{
-    // Note: The check here is to avoid a bug in Netscape Navigator 3.0 and 3.01
-    // that are triggered on formation of the nickname on import of a personal cert if
-    // that cert does not contain a common name.
-
-    if (form.commonName.value == '') {
-        alert("You must enter a Common Name.");
-        return false;
-    } else {
-        return true;
-    }
-}
-
-function isValidCSR(form)
-{
-    // Note: the checks here are of mixed origin.  Some are required for Navigator
-    // and Communicator.  The CSR field checks are to avoid server side rejection of the
-    // submission.  These checks can be split up to be different for different types of
-    // certificates.
-    
-    formulateDN(form, form.subject);
-
-    with (form) {
-	if (isEmailCert != null) {
-	   if (eMail.value == "" && isEmailCert.checked) {
-              alert("E-mail certificates must include an E-mail address.");
-	      return false;
-	   }
-        }
-        if (commonName.value == "") {
-            alert("You must supply your name for the certificate.");
-            return false;
-        }
-        if (csrRequestorName.value == "") {
-            csrRequestorName.value = commonName.value;
-        }
-        if (csrRequestorPhone.value == "" && csrRequestorEmail.value == "") {
-            alert("You must supply a contact phone number or e-mail address.");
-            return false;
-        }
-        return true;
-    }
-}
-
-function isNegative(string) {
-  if (string.charAt(0) == '-')
-     return true;
-  else
-     return false;
-}
-
-function isNumber(string, radix) {
-  var i = 0; 
-  var legalDigits;
-  if (radix == null || radix == 10) {
-     legalDigits = "0123456789";
-  } else if (radix == 16) {
-     legalDigits = "0123456789abcdefABCDEF:";
-  } else {
-     return false;
-  }
-  for(; i < string.length; ++i) {
-     if (string.charAt(i) != ' ')
-     	break;
-  }
-  if (string.charAt(i) == '+' || string.charAt(i) == '-' ) {
-     ++i;
-  }
-  if (radix == 16 && i < string.length - 2 &&
-      string.charAt(i) == '0' &&
-      (string.charAt(i+1) == 'x' || string.charAt(i+1) == 'X') &&
-      legalDigits.indexOf(string.charAt(i+2)) != -1) {
-	i += 3;
-  }
-  for(; i < string.length; ++i) {
-     if (legalDigits.indexOf(string.charAt(i)) == -1)
-     	break;
-  }
-  for(; i < string.length; ++i) {
-     if (string.charAt(i) != ' ')
-     	return false;
-  }
-  return true;
-}
-
-function isDecimalNumber(string) {
-    var i = 0; 
-    var legalDigits = "0123456789";
-
-    for (; i < string.length; i++) {
-        if (string.charAt(i) != ' ')
-            break;
-    }
-    if (i < string.length &&
-        legalDigits.indexOf(string.charAt(i)) != -1) {
-        i++;
-    } else
-        return false;
-
-    for (; i < string.length; i++) {
-        if (legalDigits.indexOf(string.charAt(i)) == -1)
-            break;
-    }
-    for (; i < string.length; i++) {
-        if (string.charAt(i) != ' ')
-            return false;
-    }
-
-    return true;
-}
-
-function isHexNumber(string) {
-    var i = 0; 
-    var legalDigits = "0123456789abcdefABCDEF";
-
-    for (; i < string.length; i++) {
-        if (string.charAt(i) != ' ')
-            break;
-    }
-    if (i < string.length - 2 &&
-        string.charAt(i) == '0' &&
-        (string.charAt(i+1) == 'x' || string.charAt(i+1) == 'X') &&
-        legalDigits.indexOf(string.charAt(i+2)) != -1) {
-        i += 3;
-    } else
-        return false;
-
-    for (; i < string.length; i++) {
-        if (legalDigits.indexOf(string.charAt(i)) == -1)
-            break;
-    }
-    for (; i < string.length; i++) {
-        if (string.charAt(i) != ' ')
-            return false;
-    }
-
-    return true;
-}
-
-function trim(string) {
-    var i, k, newString;
-
-    for (i = 0; i < string.length; i++) {
-        if (string.charAt(i) != ' ' )
-            break;
-    }
-    for (k = string.length - 1; k > i; k--) {
-        if (string.charAt(k) != ' ' )
-            break;
-    }
-    k++;
-
-    if (k > i)
-        newString = string.substring(i, k);
-    else
-        newString = null;
-
-    return  newString;
-}
-
-
-function dateForm(name)
-{
-	var i;
-	document.write('<FORM NAME=\"'+ name +'\">');
-	document.write('<SELECT NAME=\"day\"><OPTION VALUE=0> ');
-	for (i=1; i <=31; ++i)
-		document.write('<OPTION VALUE='+i+'>'+i);
-	document.write('</SELECT>');
-	document.write('<SELECT NAME=\"month\">'+
-		'<OPTION VALUE=13> '+
-		'<OPTION VALUE=0>January'+
-		'<OPTION VALUE=1>February'+
-		'<OPTION VALUE=2>March'+
-		'<OPTION VALUE=3>April'+
-		'<OPTION VALUE=4>May'+
-		'<OPTION VALUE=5>June'+
-		'<OPTION VALUE=6>July'+
-		'<OPTION VALUE=7>August'+
-		'<OPTION VALUE=8>September'+
-		'<OPTION VALUE=9>October'+
-		'<OPTION VALUE=10>November'+
-		'<OPTION VALUE=11>December'+
-		'</SELECT>'
-	);
-	
-	document.write('<SELECT NAME=\"year\"><OPTION VALUE=0> ');
-	for (i=1996; i <=2006; ++i)
-		document.write('<OPTION VALUE='+i+'>'+i);
-	document.write('</SELECT>');
-	document.write('</FORM>');
-}
-
-function dateIsEmpty(form)
-{
-     return form.day.selectedIndex == 0  && 
-            form.month.selectedIndex == 0 &&
-	    form.year.selectedIndex == 0;
-}
- 
-
-function convertDate(form, fieldName)
-{
-     var date;
-     var day = form.day.options[form.day.selectedIndex].value;
-     var month = form.month.options[form.month.selectedIndex].value;
-     var year = form.year.options[form.year.selectedIndex].value;
-     date = new Date(year,month,day);
-
-     // see if normalization was required
-     if (date.getMonth() != month || date.getDate() != day || year == 0) {
-        alert(fieldName + " is invalid");
-        return null;
-     }
-     else 
-     	return date.getTime();
-//     	return Math.round(date.getTime() / 1000);
-}
-
-function daysToSeconds(days){
-    return 3600 * 24 * days;
-}
- 
-// encloses value in double quotes preceding all embedded double quotes with \
-function escapeValue(value)
-{
-    var result;
-    var fromIndex = 0, toIndex = 0;
-
-    // kludgy work-around for indexOf JavaScript bug on empty string
-    if (value == "")
-        return '\"\"';
-    
-    result = '\"';
-    while ((toIndex = value.indexOf('\"',fromIndex)) != -1) {
-    	result += value.substring(fromIndex,toIndex);
-     	result += '\\"';
-	fromIndex = toIndex + 1;
-    }
-    result += value.substring(fromIndex,value.length);
-    result += '\"';
-    return result;
-}
-
-// encloses value in double quotes preceding all embedded double quotes and 
-// backslashes with backslash
-function escapeValueJSString(value)
-{
-    var result = "";
-
-    // Do we need to escape any characters
-    for (i=0; i < value.length; i++) {
-        c = value.charAt(i);
-        if (c == '\\' | c == '"') {
-			result += '\\';
-        }
-		result += c;
-    }
-    return '\"' + result + '\"';
-}
-
-function escapeValueRfc1779(value)
-{
-    var result = "";
-
-    // Do we need to escape any characters
-    for (i=0; i < value.length; i++) {
-        c = value.charAt(i);
-        if (c == ',' || c == '=' || c == '+' || c == '<' ||
-            c == '>' || c == '#' || c == ';' || c == '\r' ||
-            c == '\n' || c == '\\' || c == '"') {
-			result += '\\';
-        }
-		result += c;
-    }
-    return result;
-}
-
-// helper function to construct name component(pattern)
-function makeComponent(list,tag,value,asPattern)
-{
-   var last = list.length;
-//   if (asPattern) { 
-//   	list[last] = (value == "") ? "*" : (tag+"="+escapeValueRfc1779(value));
-//   }
-//   else if (value != "")
-   if (value != "") {
-      list[last] = tag+"="+escapeValueRfc1779(value);
-//   } else if (!asPattern) {
-//      list[last] = tag+"=*";
-   }
-//   alert("asPattern = " + asPattern);
-}
-
-// If asPattern is false formulates the RFC 1779 format subject name 
-// from the component parts skipping all components with blank values,
-// otherwise builds RFC 1779-like matching pattern from components
-function computeNameCriterion(form)
-{
-    var asPattern = form.match[1].checked;
-    var result = new Array;
-
-	with (form) {
-	// The order of clauses here determines how components are ordered
-	// in the name sent in the client's request.  A site may wish to
-	// re-order the clauses here if their conventions produce names
-	// with components in a different order.
-		makeComponent(result,"E",eMail.value,asPattern);
-		makeComponent(result,"CN",commonName.value,asPattern);
-		makeComponent(result,"UID",userID.value,asPattern);
-		makeComponent(result,"OU",orgUnit.value,asPattern);
-		makeComponent(result,"O",org.value,asPattern);
-		makeComponent(result,"L",locality.value,asPattern);
-		makeComponent(result,"ST",state.value,asPattern);
-		makeComponent(result,"C",country.value,asPattern);
-	}
-    if (result.length == 0)
-//    	return asPattern ? "0 == 0" : "0 == 1";
-    	return "(x509Cert.subject=*)";
-    else  {
-        return "(x509Cert.subject" + (asPattern ? "~=" : "=") + escapeValue(nsjoin(result,",")) + ")";
-        }
-// escapeValue(result.join(', '));
-}
-
-// helper function to construct name component(pattern)
-function makeComponentFilter(list,tag,value,asPattern)
-{
-   var last = list.length;
-   if (value != "") {
-	if (asPattern) {
-		list[last] = "(x509Cert.subject=*"+tag+"=*"+
-			escapeValueRfc1779(value)+"*)";
-	} else {
-		// exact match (either the end, or appended with ",")
-		list[last] = "(|(x509Cert.subject=*"+tag+"="+
-			escapeValueRfc1779(value)+",*)"
-			+"(x509Cert.subject=*"+tag+"="+
-			escapeValueRfc1779(value)+"))";
-	}
-   }
-}
-
-function computeNameFilter(form)
-{
-    var asPattern = form.match[1].checked;
-    var result = new Array;
-
-	with (form) {
-	// The order of clauses here determines how components are ordered
-	// in the name sent in the client's request.  A site may wish to
-	// re-order the clauses here if their conventions produce names
-	// with components in a different order.
-		makeComponentFilter(result,"E",eMail.value,asPattern);
-		makeComponentFilter(result,"CN",commonName.value,asPattern);
-		makeComponentFilter(result,"UID",userID.value,asPattern);
-		makeComponentFilter(result,"OU",orgUnit.value,asPattern);
-		makeComponentFilter(result,"O",org.value,asPattern);
-		makeComponentFilter(result,"L",locality.value,asPattern);
-		makeComponentFilter(result,"ST",state.value,asPattern);
-		makeComponentFilter(result,"C",country.value,asPattern);
-	}
-	if (result.length == 0) {
-		return "(x509Cert.subject=*)";
-	} else  {
-		if (asPattern) {
-        		return "(|" + nsjoin(result,"") + ")";
-		} else {
-        		return "(&" + nsjoin(result,"") + ")";
-		}
-	}
-}
-
-function booleanCrit(crit,radioArg)
-{
-    for (var i = 0; i < radioArg.length; ++i ){
-       if( radioArg[i].checked ) {
-          if (radioArg[i].value.length != 0) {
-	     crit[crit.length] = radioArg[i].name + " == " + radioArg[i].value;
-          }
-	  return;
-       }
-    }
-}
-
-function isHTTPEscapeChar(c)
-{
-    if (c == '%' || c == '#' || c == '+' || c == '=' || c == '\n' ||
-        c == '\r' || c == '\t' || c == ';' || c == '&' ||
-        c == '>') {
-        return true;
-    }
-
-    return false;
-}
-
-function produceHTTPEscapedString(inString)
-{
-    table = new Object();
-    table["%"] = "25";
-    table["#"] = "23";
-    table["+"] = "2B";
-    table["="] = "3D";
-    table["\n"] = "0A";
-    table["\r"] = "0D";
-    table["\t"] = "09";
-    table[";"] = "3B";
-    table["&"] = "26";
-    table[">"] = "3E";
-
-    outString = "";
-
-    for (i=0; i < inString.length; i++) {
-        if (inString.charAt(i) == ' ') {
-            outString += '+';
-        } else {
-            if (isHTTPEscapeChar(inString.charAt(i))) {
-                outString += "%" + table[inString.substring(i, i+1)];
-            } else {
-                outString += inString.charAt(i);
-            }
-        }
-    }
-
-    return outString;
-}
-
-function isHex(string)
-{
-      if (string.charAt(0) == '0' &&
-      (string.charAt(1) == 'x' || string.charAt(1) == 'X')) {
-        return true;
-      } else {
-        return false;
-      }
-}
-
-function writeError(errorDetails)
-{
-        document.write("<center><h2><b>" +
-                "Problem Processing Your Request" +
-                "</b></h2></center><p>" +
-                "The service encountered a problem " +
-                "when processing your request. This problem may " +
-                "indicate a flaw in the form used to submit your " +
-                "request or the values that were entered into the form." +
-                "The following message supplies more information " +
-                "about the error that occurred.<p>");
-        document.write("<blockquote><b><pre>");
-        if (errorDetails != null) {
-                document.write(errorDetails);
-        } else {
-                document.write("Unable to provide details. " +
-                 "Contact Administrator.");
-        }
-        document.write("</pre></b></blockquote>");
-        if (result.header.errorDescription != null) {
-                document.write('<p>Additional Information:<p>');
-                document.write('<blockquote><b>');
-                document.write(result.header.errorDescription);
-                document.write('</b></blockquote>');
-        }
-        document.write("<p>");
-        document.write("Please consult your local administrator for " +
-                "further assistance.");
-        document.write("The certificate server's log may provide " +
-              "further information.");
-}
-
-// strips (optional) spaces and 0[xX] prefix at the beginning of s
-function stripPrefix(s)
-{
-  var i;
-  for(i = 0; i < s.length - 1; ++i) {
-     if (s.charAt(i) != ' ' )
-	break;
-  }
-  if (s.charAt(i) == '0' && (s.charAt(i+1) == 'x' || s.charAt(i+1) == 'X')) {
-	return s.substring(i+2,s.length);
-  } else {
-  	return  s.substring(i,s.length);;
-  }
-}
-
-// removes colons from value and returns the result
-// used as helper to convert colon-separated hexadecimal numbers
-// to regular numbers
-function removeColons(value)
-{
-    var result = "";
-
-    for (i=0; i < value.length; i++) {
-        c = value.charAt(i);
-        if (c != ':' ){
-		result += c;
-        }
-    }
-    return result;
-}
-
-// Replacement for the array.join() function which isn't in MSIE 3.0
-
-function nsjoin(array,str) {
-  val = "";
-  for (i=0; i<array.length; i++) {
-    val = val + array[i];
-    if (i < (array.length-1)) val = val+str;
-    }
-  return val;
-}
-//-->
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif
deleted file mode 100644
index 35a76c859..000000000
Binary files a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif and /dev/null differ
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif
deleted file mode 100644
index a519bc759..000000000
Binary files a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif and /dev/null differ
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif
deleted file mode 100644
index 6eea3ef5c..000000000
Binary files a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif and /dev/null differ
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/graphics.tmp b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/graphics.tmp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif
deleted file mode 100644
index c6f811102..000000000
Binary files a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif and /dev/null differ
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif
deleted file mode 100644
index 14f8acf92..000000000
Binary files a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif and /dev/null differ
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif
deleted file mode 100644
index a78fbc89d..000000000
Binary files a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif and /dev/null differ
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif
deleted file mode 100644
index 71852402d..000000000
Binary files a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif and /dev/null differ
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif
deleted file mode 100644
index 13acffe53..000000000
Binary files a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif and /dev/null differ
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/header.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/header.template
deleted file mode 100644
index 4396a67bb..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/header.template
+++ /dev/null
@@ -1,89 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<CMS_TEMPLATE>
-<head>
-<title>Header</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body onResize=location.reload() bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF">
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#666699">
-  <tr>
-    <td> 
-      <table border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td>
-            <table border="0" cellspacing="12" cellpadding="0" width="100%">
-              <tr> 
-                <td><font size="-1" face="PrimaSans BT, Verdana, sans-serif" color="white">Dogtag<font color="#999999" size="-2">&reg;</font><b><br>
-                  Certificate<br>System</b></font><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b></b></font></td>
-                <td></td>
-                <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Agent Services</font> </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-      <table border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td><img src="/ocsp/agent/graphics/spacer.gif" width="12" height="21"></td>
-<SCRIPT LANGUAGE="JavaScript">
-	for (var i = 0; i < result.recordSet.length; ++i) {
-		if (result.recordSet[i].id == header.selected) {
-          		document.write('<td><img src="/ocsp/agent/graphics/lgLeftTab.gif" width="13" height="21"></td>');
-          		document.write('<td bgcolor="#cccccc" nowrap>');
-		} else {
-          		document.write('<td><img src="/ocsp/agent/graphics/dgLeftTab.gif" width="13" height="21"></td>');
-          		document.write('<td bgcolor="#999999" nowrap>');
-		}
-		document.write('<font size="-1" face="PrimaSans BT, Verdana, sans-serif">');
-                if (result.recordSet[i].type == "CertificateAuthority") {
-			type = "Certificate Manager";
-		} else if (result.recordSet[i].type == "KeyRecoveryAuthority") {
-			type = "Data Recovery Manager";
-		} else if (result.recordSet[i].type == "OCSPAuthority") {
-			type = "Online Certificate Status Manager";
-		} else if (result.recordSet[i].type == "RegistrationAuthority") {
-			type = "Registration Manager";
-		}
-		if (result.recordSet[i].id == header.selected) {
-          		document.write('<b>' + type + '</b>');
-		} else {
-          		document.write('<a href="../' + 
-				result.recordSet[i].id + 
-				'/index.html" target="_top">' + 
-				type + '</a>');
-		}
-		document.write('</font></td>');
-		if (result.recordSet[i].id == header.selected) {
-          		document.write('<td><img src="/ocsp/agent/graphics/lgRightTab.gif" width="16" height="21"></td>');
-		} else {
-          		document.write('<td><img src="/ocsp/agent/graphics/dgRightTab.gif" width="16" height="21"></td>');
-		}
-	}
-</SCRIPT>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
deleted file mode 100644
index 14a80bb95..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program 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 General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Copyright (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-function help(helptopic) { 
-
-     var HelpWin=window.open("","MyWin", "toolbar=no,directories=no,menubar=no,status=no,scrollbars=yes,resizable=yes,width=500,height=500"); 
-
-     HelpWin.location = helptopic;
-     HelpWin.focus();
-
-}
-
-function helpstatus(helpline) {
-
-     window.status = helpline;
-
-     return true;
-
-}
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/index.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/index.html
deleted file mode 100644
index d9873116c..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<HTML>
-<meta http-equiv="Refresh" content="0;URL=/index">
-</HTML>
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/index.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/index.template
deleted file mode 100644
index 4995377d7..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/index.template
+++ /dev/null
@@ -1,149 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<CMS_TEMPLATE>
-<head>
-<title>Index</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
-<table border="0" width="100%" cellspacing="0" cellpadding="6">
-  <tr bgcolor="#666699"> 
-    <td width=25%> 
-      <table border="0" cellspacing="0" cellpadding="6">
-        <tr> 
-          <td nowrap><font size="-1" face="PrimaSans BT, Verdana, sans-serif" color="white">Dogtag<b>&reg;<br>
-            Certificate<br>System</b></font> </td>
-        </tr>
-      </table>
-    </td>
-    <td width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Agent Services</font></td>
-    <td width="10%">&nbsp;</td>
-  </tr>
-  <tr valign="TOP"> 
-    <td>&nbsp;</td>
-    <td> 
-      <table border="0" cellspacing="0" cellpadding="0">
-        <tr valign="TOP"> 
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </tr>
-<SCRIPT LANGUAGE="JavaScript">
-function displayError()
-{
-        document.write("<center><h2><b>" +
-                "Problem Processing Your Request" +
-                "</b></h2></center><p>" +
-                "The service encountered a problem " +
-                "when processing your request. This problem may " +
-                "indicate a flaw in the form used to submit your " +
-                "request or the values that were entered into the form." +
-                "The following message supplies more information " +
-                "about the error that occurred.<p>");
-        document.write("<blockquote><b><pre>");
-        if (result.header.errorDetails != null) {
-                document.write(result.header.errorDetails);
-        } else {
-                document.write("Unable to provide details. " +
-                 "Contact Administrator.");
-        }
-        document.write("</pre></b></blockquote>");
-        if (result.header.errorDescription != null) {
-                document.write('<p>Additional Information:<p>');
-                document.write('<blockquote><b>');
-                document.write(result.header.errorDescription);
-                document.write('</b></blockquote>');
-        }
-        document.write("<p>");
-        document.write("Please consult your local administrator for " +
-                "further assistance.");
-        document.write("The certificate server's log may provide " +
-                "further information.");
-}
-
-if (result.header.errorDetails != null) {
-        displayError();
-} else {
-	var displayServices = 'true';
-	for (var i = 0; i < result.recordSet.length; ++i) {
-        	document.write('<tr valign="TOP">');
-          	document.write('<td>');
-		document.write('<img src="/graphics/goto-tall.gif" width="10" height="15">&nbsp;</td>');
-          	document.write('<td>');
-		document.write('<font face="PrimaSans BT, Verdana, sans-serif">');
-		document.write('<a href="');
-		document.write(result.recordSet[i].id + '/index.html');
-		if (result.recordSet[i].type == "RegistrationAuthority") {
-			document.write('">Registration Manager Agent Services</a></font>');
-			document.write('<font size="-1" face="PrimaSans BT, Verdana, sans-serif"><br>');
-			document.write('The operations available through this menu are used to process certificate requests, revoke certificates, and update information in the directory server.');
-		} else if (result.recordSet[i].type == "CertificateAuthority") {
-			document.write('">Certificate Manager Agent Services</a></font>');
-			document.write('<font size="-1" face="PrimaSans BT, Verdana, sans-serif"><br>');
-			document.write('The operations available through this menu are used to process certificate requests, revoke certificates, and update information in the directory server.');
-		} else if (result.recordSet[i].type == "OCSPAuthority") {
-			displayServices = 'false';
-			document.write('">Online Certificate Status Manager Agent Services</a></font>');
-			document.write('<font size="-1" face="PrimaSans BT, Verdana, sans-serif"><br>');
-			document.write('The operations available through this menu are used to check certificate status.');
-		} else if (result.recordSet[i].type == "KeyRecoveryAuthority") {
-			displayServices = 'false';
-			document.write('">Data Recovery Manager Agent Services</a></font>');
-			document.write('<font size="-1" face="PrimaSans BT, Verdana, sans-serif"><br>');
-			document.write('The operations available through this menu are used to process key requests, and recover keys.');
-		} else {
-			document.write('">Internal Error</a></font>');
-		}
-		document.write('</font></td></tr>');
-	}
-}
-document.write('<tr valign="TOP">'); 
-document.write('<td>&nbsp;</td>');
-document.write('<td>&nbsp;</td>');
-document.write('</tr>');
-if (displayServices== 'true')
-{	
-	document.write('<tr valign="TOP">');
-	document.write('<TD><IMG src="/graphics/goto-tall.gif" width="10" height="15"></TD>');
-	document.write('<TD><FONT face="PrimaSans BT, Verdana, sans-serif">');
-	document.write('<A href="ports">Services Summary</A></FONT></TD>');
-	document.write('</tr>');
-}
-document.write('<TR valign="TOP">');
-document.write('<TD> </TD>');
-document.write('<TD> </TD>');
-document.write('</tr>');
-document.write('</table>');
-document.write('</td>');
-document.write('<td>&nbsp;</td>');
-document.write('</tr>');
-document.write('<tr valign="TOP">'); 
-document.write('<td>&nbsp;</td>');
-document.write('<td><font size="-1" face="PrimaSans BT, Verdana, sans-serif">');
-document.write('&copy; 2001 Sun Microsystems, Inc. Used by permission. &copy; 2005 Red Hat, Inc.. All rights reserved.');
-document.write('</font></td>');
-document.write('<td>&nbsp;</td>');
-document.write('</tr>');
-
-</SCRIPT>
-
-</table>
-</body>
-</html>
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
deleted file mode 100644
index b221f10e8..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>Add Certificate Authority</TITLE>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<SCRIPT LANGUAGE="JavaScript" SRC="/helpfun.js"></SCRIPT>
-</HEAD>
-
-<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
-<font size="+1" face="PrimaSans BT, Verdana, sans-serif">Add Certificate Authority<br></font>
-<font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-Use this form to add the certificate chain of a Certificate Authority whose CRL will be accepted by this OCSP Authority.</font>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
-  <tr> 
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-<FORM ACTION="/ocsp/agent/ocsp/addCA" METHOD=POST>
-
-<table border="0" cellspacing="2" cellpadding="2">
-  <tr> 
-    <td valign="top">
-       <font size="-1" face="PrimaSans BT, Verdana, sans-serif">Base 64 encoded certificate (including header and footer):</font>
-    </td>
-  </tr>
-  <tr> 
-    <td valign="top">
-      <textarea cols="50" rows="20" name="cert"></textarea>
-    </td>
-  </tr>
-</table>
-
-<p>
-<br>
-<TABLE cellpadding="6" cellspacing="0" border="0" width="100%" BACKGROUND="/graphics/gray90.gif">
-  <TR>
-    <TD align="right" bgcolor="#e5e5e5">
-      <INPUT TYPE="submit" VALUE="Add" width="72">&nbsp;&nbsp;
-        <font size=-1 face="PrimaSans BT, Verdana, sans-serif"></font>&nbsp;
-        <font size=-1 face="PrimaSans BT, Verdana, sans-serif"></font>&nbsp;&nbsp;&nbsp;
-      <INPUT TYPE="button" VALUE="Help" width="72"
-	    onClick="help('/manual/agent_guide/ocspagt.htm#Identifying a CA to Online Certificate Status Manager')">
-    </TD>
-  </TR>
-</TABLE>
- 
-</FORM>
-</BODY>
-
-</HTML>
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
deleted file mode 100644
index 97e6b8978..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>Add Certificate Revocation List</TITLE>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<SCRIPT LANGUAGE="JavaScript" SRC="/helpfun.js"></SCRIPT>
-</HEAD>
-
-<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
-<font size="+1" face="PrimaSans BT, Verdana, sans-serif">Add Certificate Revocation List<br></font>
-<font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-Use this form to add the certificate revocation list of a Certificate Authority.</font>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
-  <tr> 
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-<FORM ACTION="/ocsp/agent/ocsp/addCRL" METHOD=POST>
-
-<table border="0" cellspacing="2" cellpadding="2">
-  <tr> 
-    <td valign="top">
-       <font size="-1" face="PrimaSans BT, Verdana, sans-serif">Base 64 encoded Certificate revocation list (including header and footer):</font>
-    </td>
-  </tr>
-  <tr> 
-    <td valign="top">
-      <textarea cols="50" rows="20" name="crl"></textarea>
-    </td>
-  </tr>
-  <tr>
-    <td valign="top" align="right">
-      <font size="-1" face="PrimaSans BT, Verdana, sans-serif"></font>
-    </td>
-    <td valign="top">
-    </td>
-  </tr>
-  <tr>
-    <td  valign="top" align="right">
-      <font size="-1" face="PrimaSans BT, Verdana, sans-serif"><br></font>
-    </td>
-    <td></td>
-  </tr>
-</table>
-
-<p>
-<br>
-<TABLE cellpadding="6" cellspacing="0" border="0" width="100%" BACKGROUND="/graphics/gray90.gif">
-  <TR>
-    <TD align="right" bgcolor="#e5e5e5">
-      <INPUT TYPE="submit" VALUE="Add" width="72">&nbsp;&nbsp;
-        <font size=-1 face="PrimaSans BT, Verdana, sans-serif"></font>&nbsp;
-        <font size=-1 face="PrimaSans BT, Verdana, sans-serif"></font>&nbsp;&nbsp;&nbsp;
-      <INPUT TYPE="button" VALUE="Help" width="72"
-	    onClick="help('/manual/agent_guide/ocspagt.htm#Adding a CRL to Online Certificate Status Manager')">
-    </TD>
-  </TR>
-</TABLE>
- 
-</FORM>
-</BODY>
-
-</HTML>
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
deleted file mode 100644
index 03e706e3a..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>Check Certificate Status</TITLE>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<SCRIPT LANGUAGE="JavaScript" SRC="/helpfun.js"></SCRIPT>
-</HEAD>
-
-<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
-<font size="+1" face="PrimaSans BT, Verdana, sans-serif">Check Certificate Status<br></font>
-<font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-Use this form to confirm the status of a certificate.</font>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
-  <tr> 
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-<FORM ACTION="/ocsp/agent/ocsp/checkCert" METHOD=POST>
-
-<table border="0" cellspacing="2" cellpadding="2">
-  <tr> 
-    <td valign="top">
-       <font size="-1" face="PrimaSans BT, Verdana, sans-serif">Base 64 encoded certificate:</font>
-    </td>
-  </tr>
-  <tr> 
-    <td valign="top">
-      <textarea cols="50" rows="20" name="cert"></textarea>
-    </td>
-  </tr>
-</table>
-
-<p>
-<br>
-<TABLE cellpadding="6" cellspacing="0" border="0" width="100%" BACKGROUND="/graphics/gray90.gif">
-  <TR>
-    <TD align="right" bgcolor="#e5e5e5">
-      <INPUT TYPE="submit" VALUE="Check" width="72">&nbsp;&nbsp;
-        <font size=-1 face="PrimaSans BT, Verdana, sans-serif"></font>&nbsp;
-        <font size=-1 face="PrimaSans BT, Verdana, sans-serif"></font>&nbsp;&nbsp;&nbsp;
-      <INPUT TYPE="button" VALUE="Help" width="72"
-	    onClick="help('/manual/agent_guide/ocspagt.htm#Checking the Revocation Status of a Certificate')">
-    </TD>
-  </TR>
-</TABLE>
- 
-</FORM>
-</BODY>
-
-</HTML>
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
deleted file mode 100644
index 8ce61e83b..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
+++ /dev/null
@@ -1,59 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-   <title>Adding Certificate Authority</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<SCRIPT LANGUAGE="JavaScript"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript" SRC="/helpfun.js"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-if (navigator.appName == "Microsoft Internet Explorer") {
-    document.writeln('<META HTTP-EQUIV="Pragma" CONTENT="no-cache">');
-}
-//-->
-</SCRIPT>
-</head>
-
-<CMS_TEMPLATE>
-
-<body bgcolor="#FFFFFF" link="#6666CC" vlink="#6666CC" alink="#333399">
-<font face="PrimaSans BT, Verdana, sans-serif" size="+1">
-Adding Certificate Authority
-</font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
-  <tr> 
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<br>
-
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-    document.writeln('Certificate authority is added');
-    if (result.header.error != null) {
-        document.write('\nAdditional information:\n    ');
-        document.writeln(result.header.error);
-    }
-//-->
-</SCRIPT>
-
-</BODY>
-</HTML>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
deleted file mode 100644
index a7e160418..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
+++ /dev/null
@@ -1,59 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-   <title>Adding Certificate Revocation List</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<SCRIPT LANGUAGE="JavaScript"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript" SRC="/helpfun.js"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-if (navigator.appName == "Microsoft Internet Explorer") {
-    document.writeln('<META HTTP-EQUIV="Pragma" CONTENT="no-cache">');
-}
-//-->
-</SCRIPT>
-</head>
-
-<CMS_TEMPLATE>
-
-<body bgcolor="#FFFFFF" link="#6666CC" vlink="#6666CC" alink="#333399">
-<font face="PrimaSans BT, Verdana, sans-serif" size="+1">
-Adding Certificate Revocation List
-</font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
-  <tr> 
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<br>
-
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-    document.writeln('Certificate revocation list is added');
-    if (result.header.error != null) {
-        document.write('\nAdditional information:\n    ');
-        document.writeln(result.header.error);
-    }
-//-->
-</SCRIPT>
-
-</BODY>
-</HTML>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
deleted file mode 100644
index b9cffede1..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
+++ /dev/null
@@ -1,79 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-   <title>Check Certificate Status</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<SCRIPT LANGUAGE="JavaScript"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript" SRC="/helpfun.js"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-if (navigator.appName == "Microsoft Internet Explorer") {
-    document.writeln('<META HTTP-EQUIV="Pragma" CONTENT="no-cache">');
-}
-//-->
-</SCRIPT>
-</head>
-
-<CMS_TEMPLATE>
-
-<body bgcolor="#FFFFFF" link="#6666CC" vlink="#6666CC" alink="#333399">
-<font face="PrimaSans BT, Verdana, sans-serif" size="+1">
-Online Certificate Status
-</font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
-  <tr> 
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<br>
-
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-    document.writeln('<table border="0" cellspacing="2" cellpadding="2" width="100%">');
-    document.writeln('<tr align="left" bgcolor="#e5e5e5"><td align="left">');
-    document.writeln('<font face="PrimaSans BT, Verdana, sans-serif" size="-1">');
-    document.writeln('Certificate status summary</font></td></tr></table>');
-
-    document.writeln('<table border="0" cellspacing="2" cellpadding="2" width="100%">');
-    document.writeln('<tr><td align="left" width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('Status: ' + result.header.status + '</font></td>');
-    document.writeln('</tr>');
-    document.writeln('<tr><td align="left" width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('Serial Number: ' + result.header.serialno + '</font></td>');
-    document.writeln('</tr>');
-    document.writeln('<tr><td align="left" width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('Issuer DN: ' + result.header.issuerDN + '</font></td>');
-    document.writeln('</tr>');
-    document.writeln('<tr><td align="left" width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('Subject DN: ' + result.header.subjectDN + '</font></td>');
-    document.writeln('</tr>');
-
-    document.writeln('</table>');
-    document.writeln('</td></tr></table>');
-//-->
-</SCRIPT>
-
-</BODY>
-</HTML>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
deleted file mode 100644
index afb888caf..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<frameset cols="140,1*" border="0" frameborder="NO">
-  <frame src="menuAddCA.html" scrolling="NO" noresize frameborder="NO" name="left">
-  <frame src="addCA.html" marginwidth="16" marginheight="16" frameborder="NO" noresize name="content">
-</frameset>
-<noframes><body bgcolor="#FFFFFF">
-</body></noframes>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
deleted file mode 100644
index 28be03545..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<frameset cols="140,1*" border="0" frameborder="NO">
-  <frame src="menuAddCRL.html" scrolling="NO" noresize frameborder="NO" name="left">
-  <frame src="addCRL.html" marginwidth="16" marginheight="16" frameborder="NO" noresize name="content">
-</frameset>
-<noframes><body bgcolor="#FFFFFF">
-</body></noframes>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
deleted file mode 100644
index 21335c8a0..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<frameset cols="140,1*" border="0" frameborder="NO">
-  <frame src="menuCheckCert.html" scrolling="NO" noresize frameborder="NO" name="left">
-  <frame src="CheckCert.html" marginwidth="16" marginheight="16" frameborder="NO" noresize name="content">
-</frameset>
-<noframes><body bgcolor="#FFFFFF">
-</body></noframes>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
deleted file mode 100644
index 90530fd42..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<frameset cols="140,1*" border="0" frameborder="NO">
-  <frame src="menuListCA.html" scrolling="NO" noresize frameborder="NO" name="left">
-  <frame src="/ocsp/agent/ocsp/listCAs" marginwidth="16" marginheight="16" frameborder="NO" noresize name="content">
-</frameset>
-<noframes><body bgcolor="#FFFFFF">
-</body></noframes>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
deleted file mode 100644
index 00fad0f36..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<frameset cols="140,1*" border="0" frameborder="NO">
-  <frame src="menuOCSP.html" scrolling="NO" noresize frameborder="NO" name="left">
-  <frame src="/ocsp/agent/ocsp/getOCSPInfo" marginwidth="16" marginheight="16" frameborder="NO" noresize name="content">
-</frameset>
-<noframes><body bgcolor="#FFFFFF">
-</body></noframes>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
deleted file mode 100644
index 8efa27a78..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<frameset cols="140,1*" border="0" frameborder="NO">
-  <frame src="menuStats.html" scrolling="NO" noresize frameborder="NO" name="left">
-  <frame src="/getStats" marginwidth="16" marginheight="16" frameborder="NO" noresize name="content">
-</frameset>
-<noframes><body bgcolor="#FFFFFF">
-</body></noframes>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
deleted file mode 100644
index 4cbf9f714..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
+++ /dev/null
@@ -1,118 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-   <title>Display CRL</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<SCRIPT LANGUAGE="JavaScript"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript" SRC="/helpfun.js"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-if (navigator.appName == "Microsoft Internet Explorer") {
-    document.writeln('<META HTTP-EQUIV="Pragma" CONTENT="no-cache">');
-}
-//-->
-</SCRIPT>
-</head>
-
-<CMS_TEMPLATE>
-
-<body bgcolor="#FFFFFF" link="#6666CC" vlink="#6666CC" alink="#333399">
-<font face="PrimaSans BT, Verdana, sans-serif" size="+1">
-OCSP Service
-</font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
-  <tr> 
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<br>
-
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-    document.writeln('<table border="0" cellspacing="2" cellpadding="2" width="100%">');
-    document.writeln('<tr align="left" bgcolor="#e5e5e5"><td align="left">');
-    document.writeln('<font face="PrimaSans BT, Verdana, sans-serif" size="-1">');
-    document.writeln('Detailed Information (Since Startup)</font></td></tr></table>');
-
-    document.writeln('<table border="0" cellspacing="2" cellpadding="2" width="100%">');
-    document.writeln('<tr><td align="right" width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('OCSP Responses:</font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln(result.header.numReq+'</font></td></tr>');
-    document.writeln('<tr><td align="right" width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('Total Signed Response Data (in bytes):</font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln(result.header.totalData+'</font></td></tr>');
-    document.writeln('<tr><td align="right" width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('Processing Time (in ms):</font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln((result.header.totalSec-result.header.totalSignSec)+'</font></td></tr>');
-    document.writeln('<tr><td align="right" width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('Signing Time (in ms):</font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln(result.header.totalSignSec+'</font></td></tr>');
-    document.writeln('<tr><td align="right" width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('Total Time (in ms):</font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln(result.header.totalSec+'</font></td></tr>');
-    document.writeln('<tr><td align="right" width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('Signing Time Per Response (in ms):</font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    if (result.header.numReq == '0') {
-      document.writeln(result.header.numReq+'</font></td></tr>');
-    } else {
-      document.writeln((result.header.totalSignSec/result.header.numReq)+'</font></td></tr>');
-    }
-    document.writeln('<tr><td align="right" width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('Total Time Per Response (in ms):</font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    if (result.header.numReq == '0') {
-      document.writeln(result.header.numReq+'</font></td></tr>');
-    } else {
-      document.writeln((result.header.totalSec/result.header.numReq)+'</font></td></tr>');
-    }
-    document.writeln('<tr><td align="right" width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('Responses Per Second:</font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln(result.header.ReqSec+'</font></td></tr>');
-    document.writeln('</table><br>');
-
-//-->
-</SCRIPT>
-
-</BODY>
-</HTML>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
deleted file mode 100644
index c6f56b1f7..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
+++ /dev/null
@@ -1,141 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-   <title>Display CRL</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<SCRIPT LANGUAGE="JavaScript"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript" SRC="/helpfun.js"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-if (navigator.appName == "Microsoft Internet Explorer") {
-    document.writeln('<META HTTP-EQUIV="Pragma" CONTENT="no-cache">');
-}
-//-->
-</SCRIPT>
-</head>
-
-<CMS_TEMPLATE>
-
-<body bgcolor="#FFFFFF" link="#6666CC" vlink="#6666CC" alink="#333399">
-<font face="PrimaSans BT, Verdana, sans-serif" size="+1">
-Statistics
-</font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
-  <tr> 
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<br>
-
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-    document.writeln('<table border="0" cellspacing="0" cellpadding="0" width="100%">');
-    document.writeln('<tr align="left" bgcolor="#e5e5e5"><td align="left">');
-    document.writeln('<font face="PrimaSans BT, Verdana, sans-serif" size="-1">');
-    document.writeln('Detailed Information (Start Time <b>' + header.startTime + '</b>, Current Time: <b>' + header.curTime + '</b>)</font></td><td align=right><a href="getStats?op=clear">Clear Statistics</a></td></tr></table>');
-
-    document.writeln('<table border="0" cellspacing="2" cellpadding="2" width="100%">');
-    document.writeln('<tr>');
-    document.writeln('<td width="40%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('<b>Action</b></font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('<b># of operations</b></font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('<b>Time Taken (in msec)</b></font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('<b>Min</b></font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('<b>Max</b></font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('<b>Std Dev</b></font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('<b>Avg</b></font></td>');
-    document.writeln('<td align="left">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('<b>Percentage</b></font></td>');
-    document.writeln('</tr>');
-    for (var i = 0; i <=  recordCount; i++) {
-      if (result.recordSet[i].name.charAt(0) == '-') {
-        document.writeln('<tr><td>');
-      } else {
-        document.writeln('<tr bgcolor="#cccccc"><td>');
-      }
-      document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-      document.writeln(result.recordSet[i].name + '</font></td>');
-      document.writeln('<td>');
-      document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-      document.writeln(result.recordSet[i].noOfOp+'</font></td>');
-      document.writeln('<td>');
-      document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-      document.writeln(result.recordSet[i].timeTaken+'</font></td>');
-      document.writeln('<td>');
-      document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-      if (result.recordSet[i].max == -1) {
-        document.writeln('-</font></td>');
-      } else {
-        document.writeln(result.recordSet[i].min+'</font></td>');
-      }
-      document.writeln('<td>');
-      document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-      if (result.recordSet[i].max == -1) {
-        document.writeln('-</font></td>');
-      } else {
-        document.writeln(result.recordSet[i].max+'</font></td>');
-      }
-      document.writeln('<td>');
-      document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-      if (result.recordSet[i].stddev == -1) {
-        document.writeln('-</font></td>');
-      } else {
-        document.writeln(result.recordSet[i].stddev+'</font></td>');
-      }
-      document.writeln('<td>');
-      document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-      if (result.recordSet[i].noOfOp == 0) {
-        document.writeln('-');
-      } else {
-        document.writeln(Math.round(100*(result.recordSet[i].avg))/100);
-      }
-      document.writeln('</font></td>');
-      document.writeln('<td>');
-      document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-      if (result.recordSet[i].noOfOp == 0) {
-        document.writeln('-');
-      } else {
-        document.writeln(Math.round(100*(result.recordSet[i].percentage))/100 + '%');
-      }
-      document.writeln('</font></td>');
-      document.writeln('</tr>');
-    }
-    document.writeln('</table><br>');
-
-//-->
-</SCRIPT>
-
-</BODY>
-</HTML>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
deleted file mode 100644
index 2736b25cb..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Online Certificate Status Authority</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<frameset rows="105,1*" frameborder="NO" border="0" cols="*"> 
-  <frame src="/ocsp/agent/header?selected=ocsp" name="top" frameborder="NO" noresize scrolling="NO" marginwidth="0" marginheight="0">
-  <frame src="frameListCA.html" scrolling="NO" noresize frameborder="NO" marginwidth="0" marginheight="0" name="middle">
-</frameset>
-<noframes><body bgcolor="#FFFFFF">
-</body></noframes>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
deleted file mode 100644
index 1cccf9e08..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
+++ /dev/null
@@ -1,116 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-   <title>List Certificate Authorities</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<SCRIPT LANGUAGE="JavaScript"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript" SRC="/helpfun.js"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-if (navigator.appName == "Microsoft Internet Explorer") {
-    document.writeln('<META HTTP-EQUIV="Pragma" CONTENT="no-cache">');
-}
-//-->
-</SCRIPT>
-</head>
-
-<CMS_TEMPLATE>
-
-<body bgcolor="#FFFFFF" link="#6666CC" vlink="#6666CC" alink="#333399">
-<font face="PrimaSans BT, Verdana, sans-serif" size="+1">
-List Certificate Authorities
-</font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
-  <tr> 
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<br>
-
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-    document.writeln('<table border="0" cellspacing="2" cellpadding="2" width="100%">');
-    document.writeln('<tr align="left" bgcolor="#e5e5e5"><td align="left">');
-    document.writeln('<font face="PrimaSans BT, Verdana, sans-serif" size="-1">');
-    document.writeln('Server Status</font></td></tr></table>');
-
-    document.writeln('<table border="0" cellspacing="2" cellpadding="2" width="100%">');
-    document.writeln('<tr>');
-    document.writeln('<td align="left" width="5%">');
-    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('<li>Number of pending updates:' + header.stateCount);
-    document.writeln('</font></td>');
-    document.writeln('</tr>');
-
-    document.writeln('</table>');
-
-    document.writeln('<table border="0" cellspacing="2" cellpadding="2" width="100%">');
-    document.writeln('<tr align="left" bgcolor="#e5e5e5"><td align="left">');
-    document.writeln('<font face="PrimaSans BT, Verdana, sans-serif" size="-1">');
-    document.writeln('Certificate Authorities</font></td></tr></table>');
-
-    document.writeln('<table border="0" cellspacing="2" cellpadding="2" width="100%">');
-
-      for(var i = 0; i < result.recordSet.length; ++i ) {
-	    document.writeln('<tr>');
-	    document.writeln('<td align="left"><b>');
-	    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-	    document.writeln(result.recordSet[i].Id);
-	    document.writeln('</font></b></td>');
-	    document.writeln('</tr>');
-	    document.writeln('<tr>');
-	    document.writeln('<td align="left" width="5%">');
-	    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-	    document.writeln('<li>CRL Number:' + result.recordSet[i].CRLNumber);
-	    document.writeln('</font></td>');
-	    document.writeln('</tr>');
-	    document.writeln('<tr>');
-	    document.writeln('<td align="left" width="5%">');
-	    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-	    document.writeln('<li>This Update:' + result.recordSet[i].ThisUpdate);
-	    document.writeln('</font></td>');
-	    document.writeln('</tr>');
-	    document.writeln('<tr>');
-	    document.writeln('<td align="left" width="5%">');
-	    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-            document.writeln('<li>Next Update:' + result.recordSet[i].NextUpdate);
-	    document.writeln('</font></td>');
-	    document.writeln('</tr>');
-	    document.writeln('<tr>');
-	    document.writeln('<td align="left" width="5%">');
-	    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-            document.writeln('<li>Number of Revoked Certificates:' + result.recordSet[i].NumRevoked);
-	    document.writeln('</font></td>');
-	    document.writeln('</tr>');
-	    document.writeln('<tr>');
-	    document.writeln('<td align="left" width="5%">');
-	    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-            document.writeln('<li>Requests Served Since Startup:' + result.recordSet[i].ReqCount);
-	    document.writeln('</font></td>');
-	    document.writeln('</tr>');
-      }
-    document.writeln('</table>');
-    document.writeln('</td></tr></table>');
-//-->
-</SCRIPT>
-
-</BODY>
-</HTML>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
deleted file mode 100644
index 6b4419f78..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#333399">
-  <table border="0" cellspacing="4" cellpadding="4" width="100%">
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameListCA.html" target="middle"><b>List Certificate Authorities</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="white"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameAddCA.html" target="middle"><b><font color=black>Add Certificate Authority</font></b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameAddCRL.html" target="middle"><b>Add Certificate Revocation List</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameCheckCert.html" target="middle"><b>Check Certificate Status</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameOCSP.html" target="middle"><b>OCSP Service</b></a></font></td>
-    </tr>
-  </table>
-</body>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
deleted file mode 100644
index 7da3025e3..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#333399">
-  <table border="0" cellspacing="4" cellpadding="4" width="100%">
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameListCA.html" target="middle"><b>List Certificate Authorities</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameAddCA.html" target="middle"><b>Add Certificate Authority</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="white"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameAddCRL.html" target="middle"><b><font color=black>Add Certificate Revocation List</font></b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameCheckCert.html" target="middle"><b>Check Certificate Status</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameOCSP.html" target="middle"><b>OCSP Service</b></a></font></td>
-    </tr>
-  </table>
-</body>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
deleted file mode 100644
index 2e4773a28..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#333399">
-  <table border="0" cellspacing="4" cellpadding="4" width="100%">
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameListCA.html" target="middle"><b>List Certificate Authorities</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameAddCA.html" target="middle"><b>Add Certificate Authority</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameAddCRL.html" target="middle"><b>Add Certificate Revocation List</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="white"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameCheckCert.html" target="middle"><b><font color=black>Check Certificate Status</font></b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameOCSP.html" target="middle"><b>OCSP Service</b></a></font></td>
-    </tr>
-  </table>
-</body>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
deleted file mode 100644
index ac99b752a..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#333399">
-  <table border="0" cellspacing="4" cellpadding="4" width="100%">
-    <tr> 
-      <td bgcolor="white"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="/ocsp/agent/ocsp/listCAs" target="content"><b><font color=black>List Certificate Authorities</font></b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameAddCA.html" target="middle"><b>Add Certificate Authority</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameAddCRL.html" target="middle"><b>Add Certificate Revocation List</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameCheckCert.html" target="middle"><b>Check Certificate Status</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameOCSP.html" target="middle"><b>OCSP Service</b></a></font></td>
-    </tr>
-  </table>
-</body>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
deleted file mode 100644
index b019fe81f..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#333399">
-  <table border="0" cellspacing="4" cellpadding="4" width="100%">
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameListCA.html" target="middle"><b>List Certificate Authorities</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameAddCA.html" target="middle"><b>Add Certificate Authority</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameAddCRL.html" target="middle"><b>Add Certificate Revocation List</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameCheckCert.html" target="middle"><b>Check Certificate Status</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="white"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameOCSP.html" target="middle"><b><font color=black>OCSP Service</font></b></a></font></td>
-    </tr>
-  </table>
-</body>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
deleted file mode 100644
index f86dd059e..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#333399">
-  <table border="0" cellspacing="4" cellpadding="4" width="100%">
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameListCA.html" target="middle"><b>List Certificate Authorities</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameAddCA.html" target="middle"><b>Add Certificate Authority</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameAddCRL.html" target="middle"><b>Add Certificate Revocation List</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameCheckCert.html" target="middle"><b>Check Certificate Status</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="#999999"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameOCSP.html" target="middle"><b>OCSP Service</b></a></font></td>
-    </tr>
-    <tr> 
-      <td bgcolor="white"><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-        <a href="frameStats.html" target="middle"><b><font color=black>Statistics</font></b></a></font></td>
-    </tr>
-  </table>
-</body>
-</html>
-
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ports.template b/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ports.template
deleted file mode 100644
index d2bd028aa..000000000
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ports.template
+++ /dev/null
@@ -1,130 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program 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 General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<CMS_TEMPLATE>
-<head>
-<title>Index</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
-<table border="0" width="100%" cellspacing="0" cellpadding="6">
-  <tr bgcolor="#666699"> 
-    <td width=25%> 
-      <table border="0" cellspacing="0" cellpadding="6">
-        <tr> 
-          <td nowrap><font size="-1" face="PrimaSans BT, Verdana, sans-serif" color="white">Dogtag<b>&reg;<br>
-            Certificate<br>System</b></font> </td>
-        </tr>
-      </table>
-    </td>
-    <td width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Services Summary</font></td>
-    <td width="10%">&nbsp;</td>
-  </tr>
-  <tr valign="TOP"> 
-    <td>&nbsp;</td>
-    <td> 
-      <table border="0" cellspacing="0" cellpadding="0">
-        <tr valign="TOP"> 
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </tr>
-<SCRIPT LANGUAGE="JavaScript">
-function displayError()
-{
-        document.write("<center><h2><b>" +
-                "Problem Processing Your Request" +
-                "</b></h2></center><p>" +
-                "The service encountered a problem " +
-                "when processing your request. This problem may " +
-                "indicate a flaw in the form used to submit your " +
-                "request or the values that were entered into the form." +
-                "The following message supplies more information " +
-                "about the error that occurred.<p>");
-        document.write("<blockquote><b><pre>");
-        if (result.header.errorDetails != null) {
-                document.write(result.header.errorDetails);
-        } else {
-                document.write("Unable to provide details. " +
-                 "Contact Administrator.");
-        }
-        document.write("</pre></b></blockquote>");
-        if (result.header.errorDescription != null) {
-                document.write('<p>Additional Information:<p>');
-                document.write('<blockquote><b>');
-                document.write(result.header.errorDescription);
-                document.write('</b></blockquote>');
-        }
-        document.write("<p>");
-        document.write("Please consult your local administrator for " +
-                "further assistance.");
-        document.write("The certificate server's log may provide " +
-                "further information.");
-}
-
-if (result.header.errorDetails != null) {
-        displayError();
-} else {
-	for (var i = 0; i < result.recordSet.length; ++i) {
-          if (result.recordSet[i].port == -1)
-                  continue;
-        	document.write('<tr valign="TOP">');
-          	document.write('<td>');
-		document.write('<img src="/ca/agent/graphics/goto-tall.gif" width="10" height="15">&nbsp;</td>');
-          	document.write('<td>');
-		document.write('<font face="PrimaSans BT, Verdana, sans-serif">');
-		document.write('<a href="');
-		document.write(result.recordSet[i].prefix + "://" +
-			result.header.hostname + ":" +
-			result.recordSet[i].port);
-		if (result.recordSet[i].type == "eeGateway.http.port") {
-			document.write('">End Users Services</a></font>');
-			document.write('<font size="-1" face="PrimaSans BT, Verdana, sans-serif"><br>');
-		} else if (result.recordSet[i].type == "eeGateway.https.port") {
-			document.write('">SSL End Users Services</a></font>');
-			document.write('<font size="-1" face="PrimaSans BT, Verdana, sans-serif"><br>');
-		} else if (result.recordSet[i].type == "agentGateway.https.port") {
-			document.write('">Agent Services</a></font>');
-			document.write('<font size="-1" face="PrimaSans BT, Verdana, sans-serif"><br>');
-		} else {
-			document.write('">Internal Error</a></font>');
-		}
-		document.write('</font></td></tr>');
-	}
-}
-</SCRIPT>
-        <tr valign="TOP"> 
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </tr>
-      </table>
-    </td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr valign="TOP"> 
-    <td>&nbsp;</td>
-    <td><font size="-1" face="PrimaSans BT, Verdana, sans-serif">
-    &copy; 2001 Sun Microsystems, Inc. Used by permission.
-    &copy; 2005 Red Hat, Inc.. All rights reserved.
-    </font></td>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-</body>
-</html>
-- 
cgit