geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r476291 [3/9] - in /geronimo/server/trunk: applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/ applications/geronimo-ca...
Date Fri, 17 Nov 2006 20:05:29 GMT
Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java Fri Nov 17 12:05:24 2006
@@ -1,106 +1,106 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.console.ca;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.PublicKey;
-import java.security.cert.Certificate;
-import java.security.interfaces.RSAPublicKey;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.management.geronimo.CertificationAuthority;
-import org.apache.geronimo.util.CertificateUtil;
-
-/**
- * Handler for view certificate screen.
- *
- * @version $Rev$ $Date$
- */
-public class ViewCertificateHandler extends BaseCAHandler {
-    private final static Log log = LogFactory.getLog(ViewCertificateHandler.class);
-    public ViewCertificateHandler() {
-        super(VIEW_CERT_MODE, "/WEB-INF/view/ca/viewCertificate.jsp");
-    }
-
-    public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG, "sNo"};
-        for(int i = 0; i < params.length; ++i) {
-            String value = request.getParameter(params[i]);
-            if(value != null) response.setRenderParameter(params[i], value);
-        }
-        return getMode();
-    }
-
-    public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG};
-        for(int i = 0; i < params.length; ++i) {
-            String value = request.getParameter(params[i]);
-            if(value != null) request.setAttribute(params[i], value);
-        }
-        String errorMsg = request.getParameter(ERROR_MSG);
-        String sNo = request.getParameter("sNo");
-        try {
-            if(!request.getParameterMap().containsKey("sNo")) {
-                // Show the page to get serial number of the certificate to be viewed
-                request.setAttribute("sNo", null);
-                return;
-            }
-            CertificationAuthority ca = getCertificationAuthority(request);
-            
-            String certText = ca.getCertificateBase64Text(new BigInteger(sNo.trim()));
-            Certificate cert = ca.getCertificate(new BigInteger(sNo.trim()));
-            PublicKey publickey = cert.getPublicKey();
-            String keySize = null;
-            if(publickey instanceof RSAPublicKey) {
-                keySize = ""+((RSAPublicKey)publickey).getModulus().bitLength();
-            }
-            request.setAttribute("sNo", sNo);
-            request.setAttribute("cert", cert);
-            request.setAttribute("certText", certText);
-            request.setAttribute("keySize", keySize);
-            // Generate Certificate Fingerprints
-            Map fingerPrints = new HashMap();
-            fingerPrints.put("MD5", CertificateUtil.generateFingerprint(cert, "MD5"));
-            fingerPrints.put("SHA1", CertificateUtil.generateFingerprint(cert, "SHA1"));
-            request.setAttribute("fingerPrints", fingerPrints);
-            // Check if the certificate issue process started from "requests to be fulfilled" page.
-            // If so, provide a link to go back to that page
-            if("true".equalsIgnoreCase(request.getParameter("linkToListRequests")))
-                request.setAttribute("linkToListRequests", Boolean.TRUE);
-        } catch (Exception e) {
-            errorMsg = e.toString();
-            log.error("Errors trying to view certificate with serial number '"+sNo+"'", e);
-        }
-        request.setAttribute(ERROR_MSG, errorMsg);
-    }
-
-    public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
-        return getMode()+BEFORE_ACTION;
-    }
-}
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.ca;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
+import java.security.interfaces.RSAPublicKey;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.management.geronimo.CertificationAuthority;
+import org.apache.geronimo.util.CertificateUtil;
+
+/**
+ * Handler for view certificate screen.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ViewCertificateHandler extends BaseCAHandler {
+    private final static Log log = LogFactory.getLog(ViewCertificateHandler.class);
+    public ViewCertificateHandler() {
+        super(VIEW_CERT_MODE, "/WEB-INF/view/ca/viewCertificate.jsp");
+    }
+
+    public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        String[] params = {ERROR_MSG, INFO_MSG, "sNo"};
+        for(int i = 0; i < params.length; ++i) {
+            String value = request.getParameter(params[i]);
+            if(value != null) response.setRenderParameter(params[i], value);
+        }
+        return getMode();
+    }
+
+    public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
+        String[] params = {ERROR_MSG, INFO_MSG};
+        for(int i = 0; i < params.length; ++i) {
+            String value = request.getParameter(params[i]);
+            if(value != null) request.setAttribute(params[i], value);
+        }
+        String errorMsg = request.getParameter(ERROR_MSG);
+        String sNo = request.getParameter("sNo");
+        try {
+            if(!request.getParameterMap().containsKey("sNo")) {
+                // Show the page to get serial number of the certificate to be viewed
+                request.setAttribute("sNo", null);
+                return;
+            }
+            CertificationAuthority ca = getCertificationAuthority(request);
+            
+            String certText = ca.getCertificateBase64Text(new BigInteger(sNo.trim()));
+            Certificate cert = ca.getCertificate(new BigInteger(sNo.trim()));
+            PublicKey publickey = cert.getPublicKey();
+            String keySize = null;
+            if(publickey instanceof RSAPublicKey) {
+                keySize = ""+((RSAPublicKey)publickey).getModulus().bitLength();
+            }
+            request.setAttribute("sNo", sNo);
+            request.setAttribute("cert", cert);
+            request.setAttribute("certText", certText);
+            request.setAttribute("keySize", keySize);
+            // Generate Certificate Fingerprints
+            Map fingerPrints = new HashMap();
+            fingerPrints.put("MD5", CertificateUtil.generateFingerprint(cert, "MD5"));
+            fingerPrints.put("SHA1", CertificateUtil.generateFingerprint(cert, "SHA1"));
+            request.setAttribute("fingerPrints", fingerPrints);
+            // Check if the certificate issue process started from "requests to be fulfilled" page.
+            // If so, provide a link to go back to that page
+            if("true".equalsIgnoreCase(request.getParameter("linkToListRequests")))
+                request.setAttribute("linkToListRequests", Boolean.TRUE);
+        } catch (Exception e) {
+            errorMsg = e.toString();
+            log.error("Errors trying to view certificate with serial number '"+sNo+"'", e);
+        }
+        request.setAttribute(ERROR_MSG, errorMsg);
+    }
+
+    public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        return getMode()+BEFORE_ACTION;
+    }
+}

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/_header.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/_header.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/_header.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/_header.jsp Fri Nov 17 12:05:24 2006
@@ -1,25 +1,25 @@
-<%--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<c:if test="${!empty(infoMsg)}">
-<p><font color="blue"><b>${infoMsg}</b></font></p>
-</c:if>
-
-<c:if test="${!empty(errorMsg)}">
-<p><font color="red"><b>Error: ${errorMsg}</b></font></p>
-</c:if>
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<c:if test="${!empty(infoMsg)}">
+<p><font color="blue"><b>${infoMsg}</b></font></p>
+</c:if>
+
+<c:if test="${!empty(errorMsg)}">
+<p><font color="red"><b>Error: ${errorMsg}</b></font></p>
+</c:if>

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/_header.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/_header.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/_header.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/caDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/caDetails.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/caDetails.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/caDetails.jsp Fri Nov 17 12:05:24 2006
@@ -1,132 +1,132 @@
-<%--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<portlet:defineObjects/>
-
-<p><b>Certification Authority Details</b></p>
-
-<p>This screen shows the details of CA's certificate and keypair.  <i>Highest Serial Number</i> shows
-the highest of serial number of any certificate issued by this CA.  <i>Certificate Text</i> shows the CA's
-certificate in base64 encoded form.  This text can be used by the certificate requestors to designate
-this CA as a trusted CA in their software.</p>
-
-<jsp:include page="_header.jsp" />
-
-<c:if test="${empty(caLocked) || !caLocked}">
-  <table border="0">
-    <tr>
-        <th colspan="2" align="left" class="DarkBackground">Certificate Details</th>
-    </tr>
-    <tr>
-        <th class="LightBackground" align="right">Version:</th>
-        <td class="LightBackground">${cert.version}</td>
-    </tr>
-    <tr>
-        <th class="MediumBackground" align="right">Subject:</th>
-        <td class="MediumBackground">${cert.subjectDN.name}</td>
-    </tr>
-    <tr>
-        <th class="LightBackground" align="right">Issuer:</th>
-        <td class="LightBackground">${cert.issuerDN.name}</td>
-    </tr>
-    <tr>
-        <th class="MediumBackground" align="right">Serial Number:</th>
-        <td class="MediumBackground">${cert.serialNumber}</td>
-    </tr>
-    <tr>
-        <th class="LightBackground" align="right">Valid From:</th>
-        <td class="LightBackground">${cert.notBefore}</td>
-    </tr>
-    <tr>
-        <th class="MediumBackground" align="right">Valid To:</th>
-        <td class="MediumBackground">${cert.notAfter}</td>
-    </tr>
-    <tr>
-        <th class="LightBackground" align="right">Signature Alg:</th>
-        <td class="LightBackground">${cert.sigAlgName}</td>
-    </tr>
-    <tr>
-        <th class="MediumBackground" align="right">Public Key Alg:</th>
-        <td class="MediumBackground">${cert.publicKey.algorithm}</td>
-    </tr>
-    <tr>
-        <th class="LightBackground" align="right">Key Size:</th>
-        <td class="LightBackground">${keySize}</td>
-    </tr>
-  <c:set var="backgroundClass" value='LightBackground'/> <!-- This should be set from the row above. -->
-  <c:forEach items="${cert.criticalExtensionOIDs}" var="extoid">
-    <c:choose>
-        <c:when test="${backgroundClass == 'MediumBackground'}" >
-            <c:set var="backgroundClass" value='LightBackground'/>
-        </c:when>
-        <c:otherwise>
-            <c:set var="backgroundClass" value='MediumBackground'/>
-        </c:otherwise>
-    </c:choose>
-    <tr>
-        <th class="${backgroundClass}" align="right">critical ext: </th>
-        <td class="${backgroundClass}">${extoid}</td>
-    </tr>
-  </c:forEach>
-  <c:forEach items="${cert.nonCriticalExtensionOIDs}" var="extoid">
-    <c:choose>
-        <c:when test="${backgroundClass == 'MediumBackground'}" >
-            <c:set var="backgroundClass" value='LightBackground'/>
-        </c:when>
-        <c:otherwise>
-            <c:set var="backgroundClass" value='MediumBackground'/>
-        </c:otherwise>
-    </c:choose>
-    <tr>
-        <th class="${backgroundClass}" align="right">non-critical ext: </th>
-        <td class="${backgroundClass}">${extoid}</td>
-    </tr>
-  </c:forEach>
-    <c:choose>
-        <c:when test="${backgroundClass == 'MediumBackground'}" >
-            <c:set var="backgroundClass" value='LightBackground'/>
-        </c:when>
-        <c:otherwise>
-            <c:set var="backgroundClass" value='MediumBackground'/>
-        </c:otherwise>
-    </c:choose>
-    <tr>
-        <th class="${backgroundClass}" align="right">Finger prints:</th>
-        <td class="${backgroundClass}">
-  <c:forEach items="${fingerPrints}" var="fp">
-            ${fp.key} = &nbsp; ${fp.value} <br/>
-  </c:forEach>
-        </td>
-    </tr>
-    <tr><td>&nbsp;</td></tr>
-    <tr>
-        <th align="right">Highest Serial Number:</th>
-        <td>${highestSerial}</td>
-    </tr>
-    <tr><td>&nbsp;</td></tr>
-    <tr>
-        <th colspan="2" align="left">Base64 encoded Certificate Text</th>
-    </tr>
-    <tr>
-        <td colspan="2"><form><textarea rows="15" cols="80" READONLY>${certText}</textarea></form></td>
-    </tr>
-  </table>
-</c:if>
-<p><a href="<portlet:actionURL portletMode="view">
-              <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Back to CA home</a></p>
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Certification Authority Details</b></p>
+
+<p>This screen shows the details of CA's certificate and keypair.  <i>Highest Serial Number</i> shows
+the highest of serial number of any certificate issued by this CA.  <i>Certificate Text</i> shows the CA's
+certificate in base64 encoded form.  This text can be used by the certificate requestors to designate
+this CA as a trusted CA in their software.</p>
+
+<jsp:include page="_header.jsp" />
+
+<c:if test="${empty(caLocked) || !caLocked}">
+  <table border="0">
+    <tr>
+        <th colspan="2" align="left" class="DarkBackground">Certificate Details</th>
+    </tr>
+    <tr>
+        <th class="LightBackground" align="right">Version:</th>
+        <td class="LightBackground">${cert.version}</td>
+    </tr>
+    <tr>
+        <th class="MediumBackground" align="right">Subject:</th>
+        <td class="MediumBackground">${cert.subjectDN.name}</td>
+    </tr>
+    <tr>
+        <th class="LightBackground" align="right">Issuer:</th>
+        <td class="LightBackground">${cert.issuerDN.name}</td>
+    </tr>
+    <tr>
+        <th class="MediumBackground" align="right">Serial Number:</th>
+        <td class="MediumBackground">${cert.serialNumber}</td>
+    </tr>
+    <tr>
+        <th class="LightBackground" align="right">Valid From:</th>
+        <td class="LightBackground">${cert.notBefore}</td>
+    </tr>
+    <tr>
+        <th class="MediumBackground" align="right">Valid To:</th>
+        <td class="MediumBackground">${cert.notAfter}</td>
+    </tr>
+    <tr>
+        <th class="LightBackground" align="right">Signature Alg:</th>
+        <td class="LightBackground">${cert.sigAlgName}</td>
+    </tr>
+    <tr>
+        <th class="MediumBackground" align="right">Public Key Alg:</th>
+        <td class="MediumBackground">${cert.publicKey.algorithm}</td>
+    </tr>
+    <tr>
+        <th class="LightBackground" align="right">Key Size:</th>
+        <td class="LightBackground">${keySize}</td>
+    </tr>
+  <c:set var="backgroundClass" value='LightBackground'/> <!-- This should be set from the row above. -->
+  <c:forEach items="${cert.criticalExtensionOIDs}" var="extoid">
+    <c:choose>
+        <c:when test="${backgroundClass == 'MediumBackground'}" >
+            <c:set var="backgroundClass" value='LightBackground'/>
+        </c:when>
+        <c:otherwise>
+            <c:set var="backgroundClass" value='MediumBackground'/>
+        </c:otherwise>
+    </c:choose>
+    <tr>
+        <th class="${backgroundClass}" align="right">critical ext: </th>
+        <td class="${backgroundClass}">${extoid}</td>
+    </tr>
+  </c:forEach>
+  <c:forEach items="${cert.nonCriticalExtensionOIDs}" var="extoid">
+    <c:choose>
+        <c:when test="${backgroundClass == 'MediumBackground'}" >
+            <c:set var="backgroundClass" value='LightBackground'/>
+        </c:when>
+        <c:otherwise>
+            <c:set var="backgroundClass" value='MediumBackground'/>
+        </c:otherwise>
+    </c:choose>
+    <tr>
+        <th class="${backgroundClass}" align="right">non-critical ext: </th>
+        <td class="${backgroundClass}">${extoid}</td>
+    </tr>
+  </c:forEach>
+    <c:choose>
+        <c:when test="${backgroundClass == 'MediumBackground'}" >
+            <c:set var="backgroundClass" value='LightBackground'/>
+        </c:when>
+        <c:otherwise>
+            <c:set var="backgroundClass" value='MediumBackground'/>
+        </c:otherwise>
+    </c:choose>
+    <tr>
+        <th class="${backgroundClass}" align="right">Finger prints:</th>
+        <td class="${backgroundClass}">
+  <c:forEach items="${fingerPrints}" var="fp">
+            ${fp.key} = &nbsp; ${fp.value} <br/>
+  </c:forEach>
+        </td>
+    </tr>
+    <tr><td>&nbsp;</td></tr>
+    <tr>
+        <th align="right">Highest Serial Number:</th>
+        <td>${highestSerial}</td>
+    </tr>
+    <tr><td>&nbsp;</td></tr>
+    <tr>
+        <th colspan="2" align="left">Base64 encoded Certificate Text</th>
+    </tr>
+    <tr>
+        <td colspan="2"><form><textarea rows="15" cols="80" READONLY>${certText}</textarea></form></td>
+    </tr>
+  </table>
+</c:if>
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="index-before" />
+            </portlet:actionURL>">Back to CA home</a></p>

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/caDetails.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/caDetails.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/caDetails.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp Fri Nov 17 12:05:24 2006
@@ -1,111 +1,111 @@
-<%--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<portlet:defineObjects/>
-
-<script language="JavaScript">
-var <portlet:namespace/>formName = "<portlet:namespace/>certReqDetailsForm";
-var <portlet:namespace/>dateFields = new Array("validFrom", "validTo");
-
-function <portlet:namespace/>validateForm(){
-    for(i in <portlet:namespace/>dateFields) {
-        if(!checkDateMMDDYYYY(<portlet:namespace/>formName, <portlet:namespace/>dateFields[i]))
-            return false;
-    }
-    // Check if from date is before to date
-    var fromDate = new Date(document.forms[<portlet:namespace/>formName].validFrom.value);
-    var toDate = new Date(document.forms[<portlet:namespace/>formName].validTo.value);
-    if(fromDate >= toDate) {
-        alert('validFrom date must be before validTo date');
-        return false;
-    }
-    return true;
-}
-</script>
-
-<b>Issue New Certificate</b> - Step 2: Review Request and enter Certificate details
-
-<p> This screen shows the details of the Certficate Signing Request (CSR) and allows you to input
-the validity period and signature algorithm for the certificate to be issued.  The certificate
-serial number is automatically generated by incrementing the serial number of the last certificate
-issued.  The next screen will allow you to review & confirm these details and issue a certificate.</p>
-
-<jsp:include page="_header.jsp" />
-
-<form name="<portlet:namespace/>certReqDetailsForm" action="<portlet:actionURL/>">
-    <input type="hidden" name="mode" value="certReqDetails-after"/>
-    <input type="hidden" name="pkcs10certreq" value="${pkcs10certreq}"/>
-    <input type="hidden" name="requestId" value="${requestId}"/>
-    <table border="0">
-        <tr>
-            <th class="DarkBackground" colspan="2" align="left">Certificate Requestor Details</th>
-        </tr>
-        <tr>
-            <th class="LightBackground" align="right">Subject:</th>
-            <td class="LightBackground">
-                <input type="hidden" name="subject" value="${subject}" /> ${subject}
-            </td>
-        </tr>
-        <tr>
-            <th class="MediumBackground" align="right">Public Key:</th>
-            <td class="MediumBackground">
-                <input type="hidden" name="publickey" value="${publickey}" /><pre>${publickey}</pre>
-            </td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-    </table>
-    <table border="0">
-        <tr>
-            <th colspan="2" align="left">Details of the Certificate to be issued</th>
-        </tr>
-        <tr>
-            <th align="right">Certificate Serial No.:</th>
-            <td>
-                <input type="text" name="sNo" size="20" maxlength="200" value="${sNo}" READONLY/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">Valid From Date (mm/dd/yyyy):</th>
-            <td>
-                <input type="text" name="validFrom" size="20" maxlength="200" value="${validFrom}"/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">Valid To Date (mm/dd/yyyy):</th>
-            <td>
-                <input type="text" name="validTo" size="20" maxlength="200" value="${validTo}"/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">Signature Algorithm:</th>
-            <td>
-                <select name="algorithm">
-                    <option <c:if test="${algorithm eq 'MD2withRSA'}">selected</c:if> >MD2withRSA</option>
-                    <option <c:if test="${algorithm eq 'MD5withRSA' || algorithm eq '' || empty(algorithm)}">selected</c:if> >MD5withRSA</option>
-                    <option <c:if test="${algorithm eq 'SHA1withRSA'}">selected</c:if> >SHA1withRSA</option>
-                </select>
-            </td>
-        </tr>
-    </table>
-    <input type="submit" value="Review Client Cert Details" onClick="return <portlet:namespace/>validateForm();"/>
-    <input type="reset" name="reset" value="Reset">
-</form>
-
-<p><a href="<portlet:actionURL portletMode="view">
-              <portlet:param name="mode" value="index-before"/>
-            </portlet:actionURL>">Cancel</a></p>
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>certReqDetailsForm";
+var <portlet:namespace/>dateFields = new Array("validFrom", "validTo");
+
+function <portlet:namespace/>validateForm(){
+    for(i in <portlet:namespace/>dateFields) {
+        if(!checkDateMMDDYYYY(<portlet:namespace/>formName, <portlet:namespace/>dateFields[i]))
+            return false;
+    }
+    // Check if from date is before to date
+    var fromDate = new Date(document.forms[<portlet:namespace/>formName].validFrom.value);
+    var toDate = new Date(document.forms[<portlet:namespace/>formName].validTo.value);
+    if(fromDate >= toDate) {
+        alert('validFrom date must be before validTo date');
+        return false;
+    }
+    return true;
+}
+</script>
+
+<b>Issue New Certificate</b> - Step 2: Review Request and enter Certificate details
+
+<p> This screen shows the details of the Certficate Signing Request (CSR) and allows you to input
+the validity period and signature algorithm for the certificate to be issued.  The certificate
+serial number is automatically generated by incrementing the serial number of the last certificate
+issued.  The next screen will allow you to review & confirm these details and issue a certificate.</p>
+
+<jsp:include page="_header.jsp" />
+
+<form name="<portlet:namespace/>certReqDetailsForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="certReqDetails-after"/>
+    <input type="hidden" name="pkcs10certreq" value="${pkcs10certreq}"/>
+    <input type="hidden" name="requestId" value="${requestId}"/>
+    <table border="0">
+        <tr>
+            <th class="DarkBackground" colspan="2" align="left">Certificate Requestor Details</th>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">Subject:</th>
+            <td class="LightBackground">
+                <input type="hidden" name="subject" value="${subject}" /> ${subject}
+            </td>
+        </tr>
+        <tr>
+            <th class="MediumBackground" align="right">Public Key:</th>
+            <td class="MediumBackground">
+                <input type="hidden" name="publickey" value="${publickey}" /><pre>${publickey}</pre>
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+    </table>
+    <table border="0">
+        <tr>
+            <th colspan="2" align="left">Details of the Certificate to be issued</th>
+        </tr>
+        <tr>
+            <th align="right">Certificate Serial No.:</th>
+            <td>
+                <input type="text" name="sNo" size="20" maxlength="200" value="${sNo}" READONLY/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">Valid From Date (mm/dd/yyyy):</th>
+            <td>
+                <input type="text" name="validFrom" size="20" maxlength="200" value="${validFrom}"/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">Valid To Date (mm/dd/yyyy):</th>
+            <td>
+                <input type="text" name="validTo" size="20" maxlength="200" value="${validTo}"/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">Signature Algorithm:</th>
+            <td>
+                <select name="algorithm">
+                    <option <c:if test="${algorithm eq 'MD2withRSA'}">selected</c:if> >MD2withRSA</option>
+                    <option <c:if test="${algorithm eq 'MD5withRSA' || algorithm eq '' || empty(algorithm)}">selected</c:if> >MD5withRSA</option>
+                    <option <c:if test="${algorithm eq 'SHA1withRSA'}">selected</c:if> >SHA1withRSA</option>
+                </select>
+            </td>
+        </tr>
+    </table>
+    <input type="submit" value="Review Client Cert Details" onClick="return <portlet:namespace/>validateForm();"/>
+    <input type="reset" name="reset" value="Reset">
+</form>
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="index-before"/>
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp Fri Nov 17 12:05:24 2006
@@ -1,135 +1,135 @@
-<%--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<portlet:defineObjects/>
-
-<b>Setup Certification Authority</b> - Step 2: Review and Confirm CA details
-
-<p>This screen lets you review the CA details entered in the previous screen.  If you need to modify any
-information shown here, please go back to the previous screen.  Upon clicking the <i>Setup Certification Authority</i>
-button, a keypair and a self-signed certificate will be generated and stored in a keystore.  CA's certificate serial
-number is stored in a text file and the number is incremented each time a CSR is processed by the CA.</p>
-
-<jsp:include page="_header.jsp" />
-
-<form name="<portlet:namespace/>confirmCAForm" action="<portlet:actionURL/>">
-    <input type="hidden" name="mode" value="confirmCA-after" />
-    <table border="0">
-        <tr>
-            <th class="DarkBackground" colspan="2" align="left">Certification Authority's Identity</th>
-        </tr>
-        <tr>
-            <th class="LightBackground" align="right">Common Name (CN):</th>
-            <td class="LightBackground">
-                <input type="hidden" name="caCN" value="${caCN}" /> ${caCN}
-            </td>
-        </tr>
-        <tr>
-            <th class="MediumBackground" align="right">Division/Business Unit (OU):</th>
-            <td class="MediumBackground">
-                <input type="hidden" name="caOU" value="${caOU}" /> ${caOU}
-            </td>
-        </tr>
-        <tr>
-            <th class="LightBackground" align="right">Company/Organization (O):</th>
-            <td class="LightBackground">
-                <input type="hidden" name="caO" value="${caO}" /> ${caO}
-            </td>
-        </tr>
-        <tr>
-            <th class="MediumBackground" align="right">City/Locality (L):</th>
-            <td class="MediumBackground">
-                <input type="hidden" name="caL" value="${caL}" /> ${caL}
-            </td>
-        </tr>
-        <tr>
-            <th class="LightBackground" align="right">State/Province (ST):</th>
-            <td class="LightBackground">
-                <input type="hidden" name="caST" value="${caST}" /> ${caST}
-            </td>
-        </tr>
-        <tr>
-            <th class="MediumBackground" align="right">Country Code (2 char) (C):</th>
-            <td class="MediumBackground">
-                <input type="hidden" name="caC" value="${caC}" /> ${caC}
-            </td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-            <th class="DarkBackground" colspan="2" align="left">Key Details</th>
-        </tr>
-        <tr>
-            <th class="LightBackground" align="right">Alias for CA's keypair:</th>
-            <td class="LightBackground">
-                <input type="hidden" name="alias" value="${alias}" /> ${alias}
-            </td>
-        </tr>
-        <tr>
-            <th class="MediumBackground" align="right">Key Algorithm:</th>
-            <td class="MediumBackground">
-                <input type="hidden" name="keyAlgorithm" value="${keyAlgorithm}" /> ${keyAlgorithm}
-            </td>
-        </tr>
-        <tr>
-            <th class="LightBackground" align="right">Key Size:</th>
-            <td class="LightBackground">
-                <input type="hidden" name="keySize" value="${keySize}" /> ${keySize}
-            </td>
-        </tr>
-        <tr>
-            <th class="MediumBackground" align="right">Password:</th>
-            <td class="MediumBackground">
-                <input type="hidden" name="password" value="${password}" /> ********
-            </td>
-        </tr>
-        <tr><td>&nbsp</td></tr>
-        <tr>
-            <th class="DarkBackground" colspan="2" align="left">Certificate Details</th>
-        </tr>
-        <tr>
-            <th class="LightBackground" align="right">Certificate Serial Number:</th>
-            <td class="LightBackground">
-                <input type="hidden" name="sNo" value="${sNo}" /> ${sNo}
-            </td>
-        </tr>
-        <tr>
-            <th class="MediumBackground" align="right">Valid From Date(mm/dd/yyyy):</th>
-            <td class="MediumBackground">
-                <input type="hidden" name="validFrom" value="${validFrom}" /> ${validFrom}
-            </td>
-        </tr>
-        <tr>
-            <th class="LightBackground" align="right">Valid To Date(mm/dd/yyyy):</th>
-            <td class="LightBackground">
-                <input type="hidden" name="validTo" value="${validTo}" /> ${validTo}
-            </td>
-        </tr>
-        <tr>
-            <th class="MediumBackground" align="right">Signature Algorithm:</th>
-            <td class="MediumBackground">
-                <input type="hidden" name="algorithm" value="${algorithm}" /> ${algorithm}
-            </td>
-        </tr>
-    </table>
-    <input type="submit" value="Setup Certification Authority" />
-</form>
-
-
-<p><a href="<portlet:actionURL portletMode="view">
-              <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Cancel</a></p>
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<b>Setup Certification Authority</b> - Step 2: Review and Confirm CA details
+
+<p>This screen lets you review the CA details entered in the previous screen.  If you need to modify any
+information shown here, please go back to the previous screen.  Upon clicking the <i>Setup Certification Authority</i>
+button, a keypair and a self-signed certificate will be generated and stored in a keystore.  CA's certificate serial
+number is stored in a text file and the number is incremented each time a CSR is processed by the CA.</p>
+
+<jsp:include page="_header.jsp" />
+
+<form name="<portlet:namespace/>confirmCAForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="confirmCA-after" />
+    <table border="0">
+        <tr>
+            <th class="DarkBackground" colspan="2" align="left">Certification Authority's Identity</th>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">Common Name (CN):</th>
+            <td class="LightBackground">
+                <input type="hidden" name="caCN" value="${caCN}" /> ${caCN}
+            </td>
+        </tr>
+        <tr>
+            <th class="MediumBackground" align="right">Division/Business Unit (OU):</th>
+            <td class="MediumBackground">
+                <input type="hidden" name="caOU" value="${caOU}" /> ${caOU}
+            </td>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">Company/Organization (O):</th>
+            <td class="LightBackground">
+                <input type="hidden" name="caO" value="${caO}" /> ${caO}
+            </td>
+        </tr>
+        <tr>
+            <th class="MediumBackground" align="right">City/Locality (L):</th>
+            <td class="MediumBackground">
+                <input type="hidden" name="caL" value="${caL}" /> ${caL}
+            </td>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">State/Province (ST):</th>
+            <td class="LightBackground">
+                <input type="hidden" name="caST" value="${caST}" /> ${caST}
+            </td>
+        </tr>
+        <tr>
+            <th class="MediumBackground" align="right">Country Code (2 char) (C):</th>
+            <td class="MediumBackground">
+                <input type="hidden" name="caC" value="${caC}" /> ${caC}
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <th class="DarkBackground" colspan="2" align="left">Key Details</th>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">Alias for CA's keypair:</th>
+            <td class="LightBackground">
+                <input type="hidden" name="alias" value="${alias}" /> ${alias}
+            </td>
+        </tr>
+        <tr>
+            <th class="MediumBackground" align="right">Key Algorithm:</th>
+            <td class="MediumBackground">
+                <input type="hidden" name="keyAlgorithm" value="${keyAlgorithm}" /> ${keyAlgorithm}
+            </td>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">Key Size:</th>
+            <td class="LightBackground">
+                <input type="hidden" name="keySize" value="${keySize}" /> ${keySize}
+            </td>
+        </tr>
+        <tr>
+            <th class="MediumBackground" align="right">Password:</th>
+            <td class="MediumBackground">
+                <input type="hidden" name="password" value="${password}" /> ********
+            </td>
+        </tr>
+        <tr><td>&nbsp</td></tr>
+        <tr>
+            <th class="DarkBackground" colspan="2" align="left">Certificate Details</th>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">Certificate Serial Number:</th>
+            <td class="LightBackground">
+                <input type="hidden" name="sNo" value="${sNo}" /> ${sNo}
+            </td>
+        </tr>
+        <tr>
+            <th class="MediumBackground" align="right">Valid From Date(mm/dd/yyyy):</th>
+            <td class="MediumBackground">
+                <input type="hidden" name="validFrom" value="${validFrom}" /> ${validFrom}
+            </td>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">Valid To Date(mm/dd/yyyy):</th>
+            <td class="LightBackground">
+                <input type="hidden" name="validTo" value="${validTo}" /> ${validTo}
+            </td>
+        </tr>
+        <tr>
+            <th class="MediumBackground" align="right">Signature Algorithm:</th>
+            <td class="MediumBackground">
+                <input type="hidden" name="algorithm" value="${algorithm}" /> ${algorithm}
+            </td>
+        </tr>
+    </table>
+    <input type="submit" value="Setup Certification Authority" />
+</form>
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="index-before" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp Fri Nov 17 12:05:24 2006
@@ -1,55 +1,55 @@
-<%--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<portlet:defineObjects/>
-
-<b>Confirm Certificate Request</b>
-
-<p> This screen shows the details of the Certficate Signing Request (CSR) and allows you to approve the request.
-Once the request is approved, it will be considered for issue of a certificate.</p>
-
-<jsp:include page="_header.jsp" />
-
-<form name="<portlet:namespace/>confirmCertReqForm" action="<portlet:actionURL/>">
-    <input type="hidden" name="mode" value="confirmCertReq-after"/>
-    <input type="hidden" name="requestId" value="${requestId}"/>
-    <table border="0">
-        <tr>
-            <th class="DarkBackground" colspan="2" align="left">Certificate Requestor Details</th>
-        </tr>
-        <tr>
-            <th class="LightBackground" align="right">Subject:</th>
-            <td class="LightBackground">
-                ${subject}
-            </td>
-        </tr>
-        <tr>
-            <th class="MediumBackground" align="right">Public Key:</th>
-            <td class="MediumBackground">
-                <pre>${publickey}</pre>
-            </td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-    </table>
-    <input type="submit" name="approve" value="Approve CSR"/>
-    <input type="submit" name="reject" value="Reject CSR">
-</form>
-
-<p><a href="<portlet:actionURL portletMode="view">
-              <portlet:param name="mode" value="index-before"/>
-            </portlet:actionURL>">Cancel</a></p>
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<b>Confirm Certificate Request</b>
+
+<p> This screen shows the details of the Certficate Signing Request (CSR) and allows you to approve the request.
+Once the request is approved, it will be considered for issue of a certificate.</p>
+
+<jsp:include page="_header.jsp" />
+
+<form name="<portlet:namespace/>confirmCertReqForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="confirmCertReq-after"/>
+    <input type="hidden" name="requestId" value="${requestId}"/>
+    <table border="0">
+        <tr>
+            <th class="DarkBackground" colspan="2" align="left">Certificate Requestor Details</th>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">Subject:</th>
+            <td class="LightBackground">
+                ${subject}
+            </td>
+        </tr>
+        <tr>
+            <th class="MediumBackground" align="right">Public Key:</th>
+            <td class="MediumBackground">
+                <pre>${publickey}</pre>
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+    </table>
+    <input type="submit" name="approve" value="Approve CSR"/>
+    <input type="submit" name="reject" value="Reject CSR">
+</form>
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="index-before"/>
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp Fri Nov 17 12:05:24 2006
@@ -1,85 +1,85 @@
-<%--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<portlet:defineObjects/>
-
-<b>Issue New Certificate</b> - Step 3: Confirm and Issue Certificate
-
-<p> This screen shows the CSR details and the certificate details entered in the previous screen.  Upon clicking
-the <i>Issue Certificate</i> button, a certificate will be issued and stored.  The next screen will show the
-details of the certificate issued.</p>
-
-<jsp:include page="_header.jsp" />
-
-<form name="<portlet:namespace/>confirmClientCertForm" action="<portlet:actionURL/>">
-    <input type="hidden" name="mode" value="confirmClientCert-after"/>
-    <input type="hidden" name="pkcs10certreq" value="${pkcs10certreq}"/>
-    <input type="hidden" name="requestId" value="${requestId}"/>
-    <table border="0">
-        <tr>
-            <th class="DarkBackground" colspan="2" align="left">Certificate Requestor Details</th>
-        </tr>
-        <tr>
-            <th class="LightBackground" align="right">Subject:</th>
-            <td class="LightBackground">
-                <input type="hidden" name="subject" value="${subject}" /> ${subject}
-            </td>
-        </tr>
-        <tr>
-            <th class="MediumBackground" align="right">Public Key:</th>
-            <td class="MediumBackground">
-                <input type="hidden" name="publickey" value="${publickey}" /><pre> ${publickey} </pre>
-            </td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-    </table>
-    <table border="0">
-        <tr>
-            <th class="DarkBackground" colspan="2" align="left">Details of the Certificate to be issued</th>
-        </tr>
-        <tr>
-            <th class="LightBackground" align="right">Certificate Serial Number:</th>
-            <td class="LightBackground">
-                <input type="hidden" name="sNo" value="${sNo}" /> ${sNo}
-            </td>
-        </tr>
-        <tr>
-            <th class="MediumBackground" align="right">Valid From Date (mm/dd/yyyy):</th>
-            <td class="MediumBackground">
-                <input type="hidden" name="validFrom" value="${validFrom}" /> ${validFrom}
-            </td>
-        </tr>
-        <tr>
-            <th class="LightBackground" align="right">Valid To Date (mm/dd/yyyy):</th>
-            <td class="LightBackground">
-                <input type="hidden" name="validTo" value="${validTo}" /> ${validTo}
-            </td>
-        </tr>
-        <tr>
-            <th class="MediumBackground" align="right">Signature Algorithm:</th>
-            <td class="MediumBackground">
-                <input type="hidden" name="algorithm" value="${algorithm}" /> ${algorithm}
-            </td>
-        </tr>
-    </table>
-    <input type="submit" value="Issue Certificate" />
-</form>
-
-<p><a href="<portlet:actionURL portletMode="view">
-              <portlet:param name="mode" value="index-before"/>
-            </portlet:actionURL>">Cancel</a></p>
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<b>Issue New Certificate</b> - Step 3: Confirm and Issue Certificate
+
+<p> This screen shows the CSR details and the certificate details entered in the previous screen.  Upon clicking
+the <i>Issue Certificate</i> button, a certificate will be issued and stored.  The next screen will show the
+details of the certificate issued.</p>
+
+<jsp:include page="_header.jsp" />
+
+<form name="<portlet:namespace/>confirmClientCertForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="confirmClientCert-after"/>
+    <input type="hidden" name="pkcs10certreq" value="${pkcs10certreq}"/>
+    <input type="hidden" name="requestId" value="${requestId}"/>
+    <table border="0">
+        <tr>
+            <th class="DarkBackground" colspan="2" align="left">Certificate Requestor Details</th>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">Subject:</th>
+            <td class="LightBackground">
+                <input type="hidden" name="subject" value="${subject}" /> ${subject}
+            </td>
+        </tr>
+        <tr>
+            <th class="MediumBackground" align="right">Public Key:</th>
+            <td class="MediumBackground">
+                <input type="hidden" name="publickey" value="${publickey}" /><pre> ${publickey} </pre>
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+    </table>
+    <table border="0">
+        <tr>
+            <th class="DarkBackground" colspan="2" align="left">Details of the Certificate to be issued</th>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">Certificate Serial Number:</th>
+            <td class="LightBackground">
+                <input type="hidden" name="sNo" value="${sNo}" /> ${sNo}
+            </td>
+        </tr>
+        <tr>
+            <th class="MediumBackground" align="right">Valid From Date (mm/dd/yyyy):</th>
+            <td class="MediumBackground">
+                <input type="hidden" name="validFrom" value="${validFrom}" /> ${validFrom}
+            </td>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">Valid To Date (mm/dd/yyyy):</th>
+            <td class="LightBackground">
+                <input type="hidden" name="validTo" value="${validTo}" /> ${validTo}
+            </td>
+        </tr>
+        <tr>
+            <th class="MediumBackground" align="right">Signature Algorithm:</th>
+            <td class="MediumBackground">
+                <input type="hidden" name="algorithm" value="${algorithm}" /> ${algorithm}
+            </td>
+        </tr>
+    </table>
+    <input type="submit" value="Issue Certificate" />
+</form>
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="index-before"/>
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/index.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/index.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/index.jsp Fri Nov 17 12:05:24 2006
@@ -1,74 +1,74 @@
-<%--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<portlet:defineObjects/>
-
-<p>This portlet allows you to setup a Certification Authority (CA) and issue certificates in reply to
-Certificate Signing Requests (CSRs).  <i>Setup Certification Authority</i> function allows to initialize
-the CA by providing CA Identity details, algorithm parameters for CA's key pair and self-signed certificate
-and a password to protect the CA's private key.  This password is to be used to unlock the CA to access CA
-functions.
-Once the CA is initialized, CSRs can be processed using <i>Issue New Certificate</i> function.  Previously
-issued certificates can be viewed using <i>View Issued Certificate</i> function.
-</p>
-
-<jsp:include page="_header.jsp" />
-
-<c:choose>
-  <c:when test="${caNotSetup}">
-    <!-- CA needs initialization -->
-    <p>CA is not running or the CA may not have been initialized.  Please initialize the CA using the link provided below.
-    <table border="0">
-      <tr>
-        <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="setupCA-before" /></portlet:actionURL>">Setup Certification Authority</a> </td>
-      </tr>
-    </table>
-  </c:when>
-  <c:otherwise>
-    <!-- CA is ready for use -->
-    <p>CA has been initialized.
-    <c:choose>
-      <c:when test="${caLocked}">
-        But, the CA is locked.  Please unlock the CA to access CA functions.
-        <table border="0">
-        <tr>
-          <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="unlockCA-before" /></portlet:actionURL>">Unlock CA</a> </td>
-        </tr>
-        </table>
-      </c:when>
-      <c:otherwise>
-        CA functions can be accessed using the links provided below.
-        <table border="0">
-        <tr>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /><portlet:param name="lock" value="lock" /></portlet:actionURL>">Lock CA</a> &nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="caDetails-before" /></portlet:actionURL>">View CA Details</a> &nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /><portlet:param name="publish" value="publish" /></portlet:actionURL>">Publish CA Certificate</a> &nbsp;</td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="listRequestsVerify-before" /></portlet:actionURL>">Requests to be verified</a>&nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="listRequestsIssue-before" /></portlet:actionURL>">Requests to be fulfilled</a>&nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="processCSR-before" /></portlet:actionURL>">Issue New Certificate</a> &nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="viewCert-before" /></portlet:actionURL>">View Issued Certificate</a> &nbsp;</td>
-        </tr>
-        </table>
-      </c:otherwise>
-    </c:choose>
-  </c:otherwise>
-</c:choose>
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p>This portlet allows you to setup a Certification Authority (CA) and issue certificates in reply to
+Certificate Signing Requests (CSRs).  <i>Setup Certification Authority</i> function allows to initialize
+the CA by providing CA Identity details, algorithm parameters for CA's key pair and self-signed certificate
+and a password to protect the CA's private key.  This password is to be used to unlock the CA to access CA
+functions.
+Once the CA is initialized, CSRs can be processed using <i>Issue New Certificate</i> function.  Previously
+issued certificates can be viewed using <i>View Issued Certificate</i> function.
+</p>
+
+<jsp:include page="_header.jsp" />
+
+<c:choose>
+  <c:when test="${caNotSetup}">
+    <!-- CA needs initialization -->
+    <p>CA is not running or the CA may not have been initialized.  Please initialize the CA using the link provided below.
+    <table border="0">
+      <tr>
+        <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="setupCA-before" /></portlet:actionURL>">Setup Certification Authority</a> </td>
+      </tr>
+    </table>
+  </c:when>
+  <c:otherwise>
+    <!-- CA is ready for use -->
+    <p>CA has been initialized.
+    <c:choose>
+      <c:when test="${caLocked}">
+        But, the CA is locked.  Please unlock the CA to access CA functions.
+        <table border="0">
+        <tr>
+          <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="unlockCA-before" /></portlet:actionURL>">Unlock CA</a> </td>
+        </tr>
+        </table>
+      </c:when>
+      <c:otherwise>
+        CA functions can be accessed using the links provided below.
+        <table border="0">
+        <tr>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /><portlet:param name="lock" value="lock" /></portlet:actionURL>">Lock CA</a> &nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="caDetails-before" /></portlet:actionURL>">View CA Details</a> &nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /><portlet:param name="publish" value="publish" /></portlet:actionURL>">Publish CA Certificate</a> &nbsp;</td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="listRequestsVerify-before" /></portlet:actionURL>">Requests to be verified</a>&nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="listRequestsIssue-before" /></portlet:actionURL>">Requests to be fulfilled</a>&nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="processCSR-before" /></portlet:actionURL>">Issue New Certificate</a> &nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="viewCert-before" /></portlet:actionURL>">View Issued Certificate</a> &nbsp;</td>
+        </tr>
+        </table>
+      </c:otherwise>
+    </c:choose>
+  </c:otherwise>
+</c:choose>

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/index.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp Fri Nov 17 12:05:24 2006
@@ -1,62 +1,62 @@
-<%--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<portlet:defineObjects/>
-
-<b>Certificate Requests awaiting fulfillment</b>
-
-<p> This screen shows the certificate requests waiting to be fulfilled.</p>
-
-<jsp:include page="_header.jsp" />
-
-<table border="0">
-    <tr>
-        <th class="DarkBackground" align="left">Certificate Requests</th>
-    </tr>
-  <c:choose>
-    <c:when test="${!empty(csrIds)}">
-      <c:set var="backgroundClass" value='MediumBackground'/>
-      <c:forEach items="${csrIds}" var="csrId">
-        <c:choose>
-            <c:when test="${backgroundClass == 'MediumBackground'}" >
-                <c:set var="backgroundClass" value='LightBackground'/>
-            </c:when>
-            <c:otherwise>
-                <c:set var="backgroundClass" value='MediumBackground'/>
-            </c:otherwise>
-        </c:choose>
-        <tr>
-          <td class="${backgroundClass}">
-            <a href="<portlet:actionURL portletMode="view">
-                       <portlet:param name="mode" value="listRequestsIssue-after"/>
-                       <portlet:param name="requestId" value="${csrId}"/>
-                     </portlet:actionURL>">${csrId}</a>
-          </td>
-        </tr>
-      </c:forEach>
-    </c:when>
-    <c:otherwise>
-        <tr>
-          <td>There are no requests.</td>
-        </tr>
-    </c:otherwise>
-  </c:choose>
-</table>
-<p><a href="<portlet:actionURL portletMode="view">
-              <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Back to CA home</a></p>
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<b>Certificate Requests awaiting fulfillment</b>
+
+<p> This screen shows the certificate requests waiting to be fulfilled.</p>
+
+<jsp:include page="_header.jsp" />
+
+<table border="0">
+    <tr>
+        <th class="DarkBackground" align="left">Certificate Requests</th>
+    </tr>
+  <c:choose>
+    <c:when test="${!empty(csrIds)}">
+      <c:set var="backgroundClass" value='MediumBackground'/>
+      <c:forEach items="${csrIds}" var="csrId">
+        <c:choose>
+            <c:when test="${backgroundClass == 'MediumBackground'}" >
+                <c:set var="backgroundClass" value='LightBackground'/>
+            </c:when>
+            <c:otherwise>
+                <c:set var="backgroundClass" value='MediumBackground'/>
+            </c:otherwise>
+        </c:choose>
+        <tr>
+          <td class="${backgroundClass}">
+            <a href="<portlet:actionURL portletMode="view">
+                       <portlet:param name="mode" value="listRequestsIssue-after"/>
+                       <portlet:param name="requestId" value="${csrId}"/>
+                     </portlet:actionURL>">${csrId}</a>
+          </td>
+        </tr>
+      </c:forEach>
+    </c:when>
+    <c:otherwise>
+        <tr>
+          <td>There are no requests.</td>
+        </tr>
+    </c:otherwise>
+  </c:choose>
+</table>
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="index-before" />
+            </portlet:actionURL>">Back to CA home</a></p>

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message