From 46fda5d944772ac62675570037785e39c517002b Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Fri, 9 Nov 2012 03:36:17 -0500
Subject: Reorganized CA, KRA, OCSP, TKS templates.

All remaining theme files for Tomcat subsystems which include
the templates and JS files have been moved from the theme folder
at <subsystem>-ui/shared/webapps/<subsystem> into the subsystem
webapp folder at base/<subsystem>/shared/webapps/<subsystem>.

The deployment tools have been updated to use the new location.

Ticket #407
---
 base/ocsp/shared/webapps/ocsp/404.html             | 146 +++++
 base/ocsp/shared/webapps/ocsp/500.html             | 139 +++++
 .../webapps/ocsp/GenUnexpectedError.template       |  68 ++
 .../shared/webapps/ocsp/agent/GenError.template    |  78 +++
 .../shared/webapps/ocsp/agent/GenPending.template  |  61 ++
 .../shared/webapps/ocsp/agent/GenRejected.template |  82 +++
 .../shared/webapps/ocsp/agent/GenSuccess.template  |  44 ++
 .../webapps/ocsp/agent/GenSvcPending.template      |  61 ++
 .../webapps/ocsp/agent/GenUnauthorized.template    |  42 ++
 .../webapps/ocsp/agent/GenUnexpectedError.template |  68 ++
 base/ocsp/shared/webapps/ocsp/agent/cms-funcs.js   | 539 ++++++++++++++++
 base/ocsp/shared/webapps/ocsp/agent/funcs.js       | 686 +++++++++++++++++++++
 .../ocsp/shared/webapps/ocsp/agent/header.template |  82 +++
 base/ocsp/shared/webapps/ocsp/agent/helpfun.js     |  35 ++
 base/ocsp/shared/webapps/ocsp/agent/index.html     |  23 +
 base/ocsp/shared/webapps/ocsp/agent/index.template | 140 +++++
 .../ocsp/shared/webapps/ocsp/agent/ocsp/AddCA.html |  69 +++
 .../shared/webapps/ocsp/agent/ocsp/AddCRL.html     |  82 +++
 .../shared/webapps/ocsp/agent/ocsp/CheckCert.html  |  69 +++
 .../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 +++++
 .../ocsp/shared/webapps/ocsp/agent/ocsp/index.html |  33 +
 .../webapps/ocsp/agent/ocsp/listCAs.template       | 146 +++++
 .../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 ++
 .../webapps/ocsp/agent/ocsp/removeCA.template      |  65 ++
 base/ocsp/shared/webapps/ocsp/agent/ports.template | 121 ++++
 base/ocsp/shared/webapps/ocsp/index.html           |  23 +
 base/ocsp/shared/webapps/ocsp/services.template    | 106 ++++
 42 files changed, 3960 insertions(+)
 create mode 100755 base/ocsp/shared/webapps/ocsp/404.html
 create mode 100755 base/ocsp/shared/webapps/ocsp/500.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/GenUnexpectedError.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/GenError.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/GenPending.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/GenRejected.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/GenSuccess.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/GenSvcPending.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/GenUnauthorized.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/GenUnexpectedError.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/cms-funcs.js
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/funcs.js
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/header.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/helpfun.js
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/index.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/index.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCA.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCRL.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/CheckCert.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/addCA.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/addCRL.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/checkCert.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/frameListCA.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/frameStats.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/getStats.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/index.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/listCAs.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/menuListCA.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ocsp/menuStats.html
 create mode 100755 base/ocsp/shared/webapps/ocsp/agent/ocsp/removeCA.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/agent/ports.template
 create mode 100644 base/ocsp/shared/webapps/ocsp/index.html
 create mode 100644 base/ocsp/shared/webapps/ocsp/services.template

(limited to 'base/ocsp/shared')

diff --git a/base/ocsp/shared/webapps/ocsp/404.html b/base/ocsp/shared/webapps/ocsp/404.html
new file mode 100755
index 000000000..fd5264c43
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/404.html
@@ -0,0 +1,146 @@
+<!-- --- 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) 2009 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>
+<script language=javascript>
+var url = document.URL;
+var protocol = location.protocol;
+var hostname = location.hostname;
+var port = location.port;
+</script>
+
+<head>
+<title>OCSP 404 Error!</title>
+<!-- always expand ALL relative paths -->
+<script language=javascript>
+document.write('<link rel="shortcut icon" href="');
+document.write(protocol);
+document.write('//');
+document.write(hostname);
+document.write(':');
+document.write(port);
+document.write('/pki/images/favicon.ico');
+document.write('" />');
+document.write('<link rel="stylesheet" href="');
+document.write(protocol);
+document.write('//');
+document.write(hostname);
+document.write(':');
+document.write(port);
+document.write('/pki/css/pki-base.css');
+document.write('" type="text/css" />');
+document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8">');
+</script>
+</head>
+<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
+<div id="header">
+<!-- always expand ALL relative paths -->
+<script language=javascript>
+document.write('<a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="');
+document.write(protocol);
+document.write('//');
+document.write(hostname);
+document.write(':');
+document.write(port);
+document.write('/pki/images/logo_header.gif');
+document.write('" alt="Dogtag" id="myLogo" /></a>');
+</script>
+    <div id="headertitle">
+    <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
+    </div>
+    <div id="account">
+          <dl><dt><span></span></dt><dd></dd></dl>
+    </div>
+</div>
+
+<div id="mainNavOuter">
+<div id="mainNav">
+<div id="mainNavInner">
+
+</div><!-- end mainNavInner -->
+</div><!-- end mainNav -->
+</div><!-- end mainNavOuter -->
+                                                                                
+                                                                                
+<div id="bar">
+                                                                                
+<div id="systembar">
+<div id="systembarinner">
+                                                                                
+<div>
+  -
+</div>
+                                                                                
+                                                                                
+</div>
+</div>
+                                                                                
+</div>
+<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
+Certificate System OCSP Error Page 
+</font><br>
+<p> 
+</font>
+<p>
+<script language=javascript>
+document.write('<center>');
+document.write('<table border="1" cellspacing="0" cellpadding="0">');
+document.write('<tr valign="TOP">');
+document.write('<td bgcolor="grey" align="center"><b><font color="BLACK">HTTP STATUS</font></b></td>');
+document.write('<td bgcolor="grey" align="center"><b><font color="BLACK">DESCRIPTION</font></b></td>');
+document.write('</tr>');
+document.write('<tr valign="TOP">');
+document.write('<td align="center"><b><font size="+3" color="red">');
+document.write('404');
+document.write('</font></b></td>');
+document.write('<td><b><font size="+1" color="RED">');
+document.write('The requested resource could not be found but may be available again in the future.');
+document.write('</font></b><br><b><font size="+1" color="RED">');
+document.write('Please check the validity of the URL listed below:');
+document.write('</font></b><br><br>');
+document.write('<center><b><font size="+1"><a href="');
+document.write(url);
+document.write('">');
+document.write(url);
+document.write('</a>');
+document.write('</font></b></center><br></td>');
+document.write('</tr>');
+document.write('</table>');
+document.write('</center>');
+</script>
+<div id="footer">
+</div>
+<!--
+To prevent Internet Explorer from overriding the display of this custom error
+page by displaying it's own "Friendly HTTP Error Message", always include the
+following 'padding' to ensure that the text size exceeds 512 bytes:
+
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+-->
+</body>
+</html>
+
diff --git a/base/ocsp/shared/webapps/ocsp/500.html b/base/ocsp/shared/webapps/ocsp/500.html
new file mode 100755
index 000000000..2749fc752
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/500.html
@@ -0,0 +1,139 @@
+<!-- --- 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) 2009 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>
+<script language=javascript>
+var url = document.URL;
+var protocol = location.protocol;
+var hostname = location.hostname;
+var port = location.port;
+</script>
+
+<head>
+<title>OCSP 500 Error!</title>
+<!-- always expand ALL relative paths -->
+<script language=javascript>
+document.write('<link rel="shortcut icon" href="');
+document.write(protocol);
+document.write('//');
+document.write(hostname);
+document.write(':');
+document.write(port);
+document.write('/pki/images/favicon.ico');
+document.write('" />');
+document.write('<link rel="stylesheet" href="');
+document.write(protocol);
+document.write('//');
+document.write(hostname);
+document.write(':');
+document.write(port);
+document.write('/pki/css/pki-base.css');
+document.write('" type="text/css" />');
+document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8">');
+</script>
+</head>
+<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
+<div id="header">
+<!-- always expand ALL relative paths -->
+<script language=javascript>
+document.write('<a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="');
+document.write(protocol);
+document.write('//');
+document.write(hostname);
+document.write(':');
+document.write(port);
+document.write('/pki/images/logo_header.gif');
+document.write('" alt="Dogtag" id="myLogo" /></a>');
+</script>
+    <div id="headertitle">
+    <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
+    </div>
+    <div id="account">
+          <dl><dt><span></span></dt><dd></dd></dl>
+    </div>
+</div>
+
+<div id="mainNavOuter">
+<div id="mainNav">
+<div id="mainNavInner">
+
+</div><!-- end mainNavInner -->
+</div><!-- end mainNav -->
+</div><!-- end mainNavOuter -->
+                                                                                
+                                                                                
+<div id="bar">
+                                                                                
+<div id="systembar">
+<div id="systembarinner">
+                                                                                
+<div>
+  -
+</div>
+                                                                                
+                                                                                
+</div>
+</div>
+                                                                                
+</div>
+<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
+Certificate System OCSP Error Page 
+</font><br>
+<p> 
+</font>
+<p>
+<script language=javascript>
+document.write('<center>');
+document.write('<table border="1" cellspacing="0" cellpadding="0">');
+document.write('<tr valign="TOP">');
+document.write('<td bgcolor="grey" align="center"><b><font color="BLACK">HTTP STATUS</font></b></td>');
+document.write('<td bgcolor="grey" align="center"><b><font color="BLACK">DESCRIPTION</font></b></td>');
+document.write('</tr>');
+document.write('<tr valign="TOP">');
+document.write('<td align="center"><b><font size="+3" color="red">');
+document.write('500');
+document.write('</font></b></td>');
+document.write('<td><b><font size="+1" color="RED">');
+document.write('The server encountered an unexpected condition which prevented it from fulfilling the request.<br>');
+document.write('Please consult your local administrator for further assistance. The Certificate System logs may provide further information.');
+document.write('</font></b><br></td>');
+document.write('</tr>');
+document.write('</table>');
+document.write('</center>');
+</script>
+<div id="footer">
+</div>
+<!--
+To prevent Internet Explorer from overriding the display of this custom error
+page by displaying it's own "Friendly HTTP Error Message", always include the
+following 'padding' to ensure that the text size exceeds 512 bytes:
+
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+[IE padding][IE padding][IE padding][IE padding][IE padding][IE padding]
+-->
+</body>
+</html>
+
diff --git a/base/ocsp/shared/webapps/ocsp/GenUnexpectedError.template b/base/ocsp/shared/webapps/ocsp/GenUnexpectedError.template
new file mode 100644
index 000000000..824bdb9e9
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/GenUnexpectedError.template
@@ -0,0 +1,68 @@
+<!-- --- 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>OCSP 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="/pki/images/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/base/ocsp/shared/webapps/ocsp/agent/GenError.template b/base/ocsp/shared/webapps/ocsp/agent/GenError.template
new file mode 100644
index 000000000..13996d5d4
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenError.template
@@ -0,0 +1,78 @@
+<!-- --- 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>OCSP Agent 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="/pki/images/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/base/ocsp/shared/webapps/ocsp/agent/GenPending.template b/base/ocsp/shared/webapps/ocsp/agent/GenPending.template
new file mode 100644
index 000000000..9264d1bd0
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenPending.template
@@ -0,0 +1,61 @@
+<!-- --- 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>OCSP Agent 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/base/ocsp/shared/webapps/ocsp/agent/GenRejected.template b/base/ocsp/shared/webapps/ocsp/agent/GenRejected.template
new file mode 100644
index 000000000..5e5155541
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenRejected.template
@@ -0,0 +1,82 @@
+<!-- --- 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>OCSP Agent 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/base/ocsp/shared/webapps/ocsp/agent/GenSuccess.template b/base/ocsp/shared/webapps/ocsp/agent/GenSuccess.template
new file mode 100644
index 000000000..9d9022b2b
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenSuccess.template
@@ -0,0 +1,44 @@
+<!-- --- 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>OCSP Agent 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/base/ocsp/shared/webapps/ocsp/agent/GenSvcPending.template b/base/ocsp/shared/webapps/ocsp/agent/GenSvcPending.template
new file mode 100644
index 000000000..248f3e592
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenSvcPending.template
@@ -0,0 +1,61 @@
+<!-- --- 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>OCSP Agent 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/base/ocsp/shared/webapps/ocsp/agent/GenUnauthorized.template b/base/ocsp/shared/webapps/ocsp/agent/GenUnauthorized.template
new file mode 100644
index 000000000..af2aede06
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenUnauthorized.template
@@ -0,0 +1,42 @@
+<!-- --- 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>OCSP Agent 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/base/ocsp/shared/webapps/ocsp/agent/GenUnexpectedError.template b/base/ocsp/shared/webapps/ocsp/agent/GenUnexpectedError.template
new file mode 100644
index 000000000..a929c760f
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenUnexpectedError.template
@@ -0,0 +1,68 @@
+<!-- --- 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>OCSP Agent 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="/pki/images/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/base/ocsp/shared/webapps/ocsp/agent/cms-funcs.js b/base/ocsp/shared/webapps/ocsp/agent/cms-funcs.js
new file mode 100644
index 000000000..473fb1795
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/cms-funcs.js
@@ -0,0 +1,539 @@
+// --- 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/base/ocsp/shared/webapps/ocsp/agent/funcs.js b/base/ocsp/shared/webapps/ocsp/agent/funcs.js
new file mode 100644
index 000000000..daef83d17
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/funcs.js
@@ -0,0 +1,686 @@
+// --- 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/base/ocsp/shared/webapps/ocsp/agent/header.template b/base/ocsp/shared/webapps/ocsp/agent/header.template
new file mode 100644
index 000000000..d1221b14b
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/header.template
@@ -0,0 +1,82 @@
+<!-- --- 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>
+<CMS_TEMPLATE>
+<title>Header</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body onResize=location.reload() bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+  <tr>
+    <td> 
+      <table border="0" cellspacing="12" cellpadding="0">
+        <tr>
+          <td><img src="/pki/images/logo_header.gif"></td>
+          <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
+          <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
+        </tr>
+      </table>
+      <table border="0" cellspacing="0" cellpadding="0">
+        <tr> 
+          <td><img src="/pki/images/spacer.gif" alt="" width="12" height="21"></td>
+<SCRIPT type="text/javascript">
+	for (var i = 0; i < result.recordSet.length; ++i) {
+		if (result.recordSet[i].id == header.selected) {
+          		document.write('<td><img src="/pki/images/lgLeftTab.gif" width="13" height="21"><\/td>');
+          		document.write('<td bgcolor="#cccccc" nowrap>');
+		} else {
+          		document.write('<td><img src="/pki/images/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="/pki/images/lgRightTab.gif" width="16" height="21" alt=""><\/td>');
+		} else {
+          		document.write('<td><img src="/pki/images/dgRightTab.gif" width="16" height="21" alt=""><\/td>');
+		}
+	}
+</SCRIPT>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+</body>
+</html>
+
diff --git a/base/ocsp/shared/webapps/ocsp/agent/helpfun.js b/base/ocsp/shared/webapps/ocsp/agent/helpfun.js
new file mode 100644
index 000000000..14a80bb95
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/helpfun.js
@@ -0,0 +1,35 @@
+// --- 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/base/ocsp/shared/webapps/ocsp/agent/index.html b/base/ocsp/shared/webapps/ocsp/agent/index.html
new file mode 100644
index 000000000..30662d47a
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/index.html
@@ -0,0 +1,23 @@
+<!-- --- 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>
+<script lang="javascript">
+    // redirect to 'ROOT'
+    window.location = "/";
+</script>
+</html>
diff --git a/base/ocsp/shared/webapps/ocsp/agent/index.template b/base/ocsp/shared/webapps/ocsp/agent/index.template
new file mode 100644
index 000000000..be2c39d9e
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/index.template
@@ -0,0 +1,140 @@
+<!-- --- 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>
+<CMS_TEMPLATE>
+<title>OCSP Agent</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
+<table border="0" width="100%" cellspacing="0" cellpadding="6">
+  <tr bgcolor="#000080"> 
+    <td> 
+      <table border="0" cellspacing="12" cellpadding="0">
+        <tr> 
+          <td><img src="/pki/images/logo_header.gif"></td>
+          <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
+          <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
+        </tr>
+      </table>
+    </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 type="text/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="/pki/images/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="/pki/images/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>');
+</SCRIPT>
+
+</table>
+</body>
+</html>
diff --git a/base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCA.html
new file mode 100644
index 000000000..43f2503a1
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCA.html
@@ -0,0 +1,69 @@
+<!-- --- 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="/pki/images/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="/pki/images/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/base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCRL.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCRL.html
new file mode 100644
index 000000000..4a6878a00
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCRL.html
@@ -0,0 +1,82 @@
+<!-- --- 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="/pki/images/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="/pki/images/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/base/ocsp/shared/webapps/ocsp/agent/ocsp/CheckCert.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/CheckCert.html
new file mode 100644
index 000000000..ca15f1404
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/CheckCert.html
@@ -0,0 +1,69 @@
+<!-- --- 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=UTF-8">
+<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="/pki/images/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="/pki/images/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/base/ocsp/shared/webapps/ocsp/agent/ocsp/addCA.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/addCA.template
new file mode 100644
index 000000000..3205ee0b9
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/addCA.template
@@ -0,0 +1,59 @@
+<!-- --- 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="/pki/images/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/base/ocsp/shared/webapps/ocsp/agent/ocsp/addCRL.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/addCRL.template
new file mode 100644
index 000000000..99f227c47
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/addCRL.template
@@ -0,0 +1,59 @@
+<!-- --- 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="/pki/images/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/base/ocsp/shared/webapps/ocsp/agent/ocsp/checkCert.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/checkCert.template
new file mode 100644
index 000000000..5e8b8938c
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/checkCert.template
@@ -0,0 +1,79 @@
+<!-- --- 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=UTF-8">
+<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="/pki/images/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/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
new file mode 100644
index 000000000..afb888caf
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
@@ -0,0 +1,32 @@
+<!-- --- 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/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
new file mode 100644
index 000000000..28be03545
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
@@ -0,0 +1,32 @@
+<!-- --- 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/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
new file mode 100644
index 000000000..21335c8a0
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
@@ -0,0 +1,32 @@
+<!-- --- 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/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameListCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameListCA.html
new file mode 100644
index 000000000..90530fd42
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameListCA.html
@@ -0,0 +1,32 @@
+<!-- --- 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/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameOCSP.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
new file mode 100644
index 000000000..00fad0f36
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
@@ -0,0 +1,32 @@
+<!-- --- 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/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameStats.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameStats.html
new file mode 100644
index 000000000..8efa27a78
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameStats.html
@@ -0,0 +1,32 @@
+<!-- --- 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/base/ocsp/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
new file mode 100644
index 000000000..9a2769777
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
@@ -0,0 +1,118 @@
+<!-- --- 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="/pki/images/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/base/ocsp/shared/webapps/ocsp/agent/ocsp/getStats.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/getStats.template
new file mode 100644
index 000000000..59ae3e6d3
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/getStats.template
@@ -0,0 +1,141 @@
+<!-- --- 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="/pki/images/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/base/ocsp/shared/webapps/ocsp/agent/ocsp/index.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/index.html
new file mode 100644
index 000000000..b94135258
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/index.html
@@ -0,0 +1,33 @@
+<!-- --- 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>OCSP Agent</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="shortcut icon" href="/pki/images/favicon.ico" />
+</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/base/ocsp/shared/webapps/ocsp/agent/ocsp/listCAs.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/listCAs.template
new file mode 100644
index 000000000..93cc6cdf3
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/listCAs.template
@@ -0,0 +1,146 @@
+<!-- --- 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="/pki/images/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('&bull;&nbsp;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('&bull;&nbsp;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('&bull;&nbsp;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('&bull;&nbsp;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('&bull;&nbsp;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('&bull;&nbsp;Requests Served Since Startup:' + result.recordSet[i].ReqCount);
+	    document.writeln('</font></td>');
+	    document.writeln('</tr>');
+	    document.writeln('<tr>');
+       	    document.writeln('<td align="left" width="5%"><b>');
+            document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
+            document.writeln('&bull;&nbsp; Remove this CA from the list -');
+            document.writeln('</font></b></td>');
+            document.writeln('</tr>');
+            document.writeln('<tr>');
+            document.writeln('<td align ="left" width="5%">');
+            document.writeln('<button  onClick="removeCertificateAuthority( ' + i  + ')" VALUE="removeca">Remove CA </button>');
+            document.writeln('</td>');
+            document.writeln('</tr>');
+            document.writeln('<tr><td><br></td></tr>');
+      }
+    document.writeln('</table>');
+    document.writeln('</td></tr></table>');
+
+    function removeCertificateAuthority(caIndex)
+    {
+        var id = result.recordSet[caIndex].Id;
+        var url = null;
+        var sure = true;
+
+        if(id)
+           url = "/ocsp/agent/ocsp/removeCA?caID="+id;
+
+        if(url) {
+           if(caIndex == 0)
+              sure = confirm("Are you sure you want to remove the initial CA?\n" + id);
+           if(sure) 
+              document.location=url;    
+        }
+    }
+
+//-->
+</SCRIPT>
+
+</BODY>
+</HTML>
+
diff --git a/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
new file mode 100644
index 000000000..6b4419f78
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
@@ -0,0 +1,50 @@
+<!-- --- 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/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
new file mode 100644
index 000000000..7da3025e3
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
@@ -0,0 +1,50 @@
+<!-- --- 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/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
new file mode 100644
index 000000000..2e4773a28
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
@@ -0,0 +1,50 @@
+<!-- --- 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/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuListCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuListCA.html
new file mode 100644
index 000000000..ac99b752a
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuListCA.html
@@ -0,0 +1,50 @@
+<!-- --- 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/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuOCSP.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
new file mode 100644
index 000000000..b019fe81f
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
@@ -0,0 +1,50 @@
+<!-- --- 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/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuStats.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuStats.html
new file mode 100644
index 000000000..f86dd059e
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuStats.html
@@ -0,0 +1,54 @@
+<!-- --- 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/base/ocsp/shared/webapps/ocsp/agent/ocsp/removeCA.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/removeCA.template
new file mode 100755
index 000000000..7da892454
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/removeCA.template
@@ -0,0 +1,65 @@
+<!-- --- 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>Removing 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">
+Removing Certificate Authority
+</font><br>
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
+  <tr> 
+    <td>&nbsp;</td>
+  </tr>
+</table>
+<br>
+
+<SCRIPT LANGUAGE="JavaScript">
+<!--
+    document.writeln('Certificate authority has been removed');
+    setTimeout ( goBackToList, 2000 );
+
+    if (result.header.error != null) {
+        document.write('\nAdditional information:\n    ');
+        document.writeln(result.header.error);
+    }
+
+    function goBackToList() {
+       document.location="/ocsp/agent/ocsp/listCAs";
+    }
+//-->
+</SCRIPT>
+
+</BODY>
+</HTML>
+
diff --git a/base/ocsp/shared/webapps/ocsp/agent/ports.template b/base/ocsp/shared/webapps/ocsp/agent/ports.template
new file mode 100644
index 000000000..8413ada1b
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/agent/ports.template
@@ -0,0 +1,121 @@
+<!-- --- 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>
+<CMS_TEMPLATE>
+<title>OCSP Agent Ports</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
+<table border="0" width="100%" cellspacing="0" cellpadding="6">
+  <tr bgcolor="#000080"> 
+    <td> 
+      <table border="0" cellspacing="12" cellpadding="0">
+        <tr> 
+          <td><img src="/pki/images/logo_header.gif"></td>
+          <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
+          <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Services Summary</b></font></td>
+        </tr>
+      </table>
+    </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 type="text/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="/pki/images/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>
+</table>
+</body>
+</html>
diff --git a/base/ocsp/shared/webapps/ocsp/index.html b/base/ocsp/shared/webapps/ocsp/index.html
new file mode 100644
index 000000000..30662d47a
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/index.html
@@ -0,0 +1,23 @@
+<!-- --- 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>
+<script lang="javascript">
+    // redirect to 'ROOT'
+    window.location = "/";
+</script>
+</html>
diff --git a/base/ocsp/shared/webapps/ocsp/services.template b/base/ocsp/shared/webapps/ocsp/services.template
new file mode 100644
index 000000000..4b4511889
--- /dev/null
+++ b/base/ocsp/shared/webapps/ocsp/services.template
@@ -0,0 +1,106 @@
+<!-- --- 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>OCSP Services</title>
+    <link rel="shortcut icon" href="/pki/images/favicon.ico" />
+    <link rel="stylesheet" href="/pki/css/pki-base.css" type="text/css" />
+    <META http-equiv=Content-Type content="text/html; charset=UTF-8">
+
+</head>
+<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
+
+<div id="header">
+    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <div id="headertitle">
+    <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
+    </div>
+    <div id="account">
+          <dl><dt><span></span></dt><dd></dd></dl>
+    </div>
+</div>
+
+<div id="mainNavOuter">
+<div id="mainNav">
+<div id="mainNavInner">
+
+</div><!-- end mainNavInner -->
+</div><!-- end mainNav -->
+</div><!-- end mainNavOuter -->
+                                                                                
+                                                                                
+<div id="bar">
+                                                                                
+<div id="systembar">
+<div id="systembarinner">
+                                                                                
+<div>
+  -
+</div>
+                                                                                
+                                                                                
+</div>
+</div>
+                                                                                
+</div>
+
+
+<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
+Certificate System OCSP Services Page 
+</font><br>
+<p> 
+</font>
+<p>
+<center>
+<table border="0" cellspacing="0" cellpadding="0">
+<tr valign="TOP">
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+</tr>
+<script language=javascript>
+for (var i=0; i<result.recordSet.length; ++i) {
+    document.write('<tr valign="TOP">');
+    document.write('<td>');
+    document.write('<td>');
+    document.write('<font size=4 face="PrimaSans BT, Verdana, sans-serif">');
+    document.write('<li><a href="');
+    document.write(result.recordSet[i].prefix + "://" +
+      result.recordSet[i].host + ":" + result.recordSet[i].port + "/"+
+      result.recordSet[i].uri);
+    if (result.recordSet[i].type == "admin") {
+        document.write('">Admin Services</a></font>');
+    } else if (result.recordSet[i].type == "agent") {
+        document.write('">Agent Services</a></font>');
+    } else if (result.recordSet[i].type == "ee") {
+        document.write('">SSL End Users Services</a></font>');
+    }
+
+    document.write('</font></td></tr>');
+}
+</script>
+<tr valign="TOP">
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+</tr>
+</table>
+</center>
+<div id="footer">
+</div>
+</body>
+</html>
-- 
cgit