geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r476291 [5/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/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/CertificateRequestServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/CertificateRequestServlet.java?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/CertificateRequestServlet.java (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/CertificateRequestServlet.java Fri Nov 17 12:05:24 2006
@@ -1,88 +1,88 @@
-/**
- *
- *  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.ca.helper;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.geronimo.ca.helper.util.CAHelperUtils;
-
-/**
- * Servlet implementation class for Servlet: CertificateRequestServlet
- *
- * @version $Rev$ $Date$
- */
- public class CertificateRequestServlet extends javax.servlet.http.HttpServlet implements javax.servlet.Servlet {
-    /* (non-Java-doc)
-     * @see javax.servlet.http.HttpServlet#HttpServlet()
-     */
-    public CertificateRequestServlet() {
-        super();
-    }       
-
-    /* (non-Java-doc)
-     * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-     */
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        doPost(request, response);
-    }      
-
-    /* (non-Java-doc)
-     * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
-     */
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        // Retrieve the values submitted by the user
-        String reqCN = request.getParameter("reqCN");
-        String reqOU = request.getParameter("reqOU");
-        String reqO = request.getParameter("reqO");
-        String reqL = request.getParameter("reqL");
-        String reqST = request.getParameter("reqST");
-        String reqC = request.getParameter("reqC");
-        String spkac = request.getParameter("spkac");
-
-        if(spkac == null || spkac.equals("")) {
-            // browser did not generate SignedPublicKeyAndChallenge
-            throw new ServletException("Browser did not generate SignedPublicKeyAndChallenge. Resubmit your certificate request.");
-        }
-        // Create a Properties object with user supplied values
-        Properties csrProps = new Properties();
-        csrProps.setProperty("CN", reqCN);
-        csrProps.setProperty("OU", reqOU);
-        csrProps.setProperty("O", reqO);
-        csrProps.setProperty("L", reqL);
-        csrProps.setProperty("ST", reqST);
-        csrProps.setProperty("C", reqC);
-        csrProps.setProperty("SPKAC", spkac);
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        csrProps.store(baos, "Request received through CA Helper Application");
-        baos.close();
-
-        // Store the CSR in the Certificate Request Store.
-        String csrId = CAHelperUtils.getCertificateRequestStore().storeRequest(null, baos.toString());
-
-        // Display the CSR Id to the user and confirm the receipt of CSR
-        request.setAttribute("id", csrId);
-        getServletContext().getRequestDispatcher("/receivedCSR.jsp").forward(request, response);
-    }    
-}
+/**
+ *
+ *  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.ca.helper;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.geronimo.ca.helper.util.CAHelperUtils;
+
+/**
+ * Servlet implementation class for Servlet: CertificateRequestServlet
+ *
+ * @version $Rev$ $Date$
+ */
+ public class CertificateRequestServlet extends javax.servlet.http.HttpServlet implements javax.servlet.Servlet {
+    /* (non-Java-doc)
+     * @see javax.servlet.http.HttpServlet#HttpServlet()
+     */
+    public CertificateRequestServlet() {
+        super();
+    }       
+
+    /* (non-Java-doc)
+     * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+     */
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doPost(request, response);
+    }      
+
+    /* (non-Java-doc)
+     * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+     */
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        // Retrieve the values submitted by the user
+        String reqCN = request.getParameter("reqCN");
+        String reqOU = request.getParameter("reqOU");
+        String reqO = request.getParameter("reqO");
+        String reqL = request.getParameter("reqL");
+        String reqST = request.getParameter("reqST");
+        String reqC = request.getParameter("reqC");
+        String spkac = request.getParameter("spkac");
+
+        if(spkac == null || spkac.equals("")) {
+            // browser did not generate SignedPublicKeyAndChallenge
+            throw new ServletException("Browser did not generate SignedPublicKeyAndChallenge. Resubmit your certificate request.");
+        }
+        // Create a Properties object with user supplied values
+        Properties csrProps = new Properties();
+        csrProps.setProperty("CN", reqCN);
+        csrProps.setProperty("OU", reqOU);
+        csrProps.setProperty("O", reqO);
+        csrProps.setProperty("L", reqL);
+        csrProps.setProperty("ST", reqST);
+        csrProps.setProperty("C", reqC);
+        csrProps.setProperty("SPKAC", spkac);
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        csrProps.store(baos, "Request received through CA Helper Application");
+        baos.close();
+
+        // Store the CSR in the Certificate Request Store.
+        String csrId = CAHelperUtils.getCertificateRequestStore().storeRequest(null, baos.toString());
+
+        // Display the CSR Id to the user and confirm the receipt of CSR
+        request.setAttribute("id", csrId);
+        getServletContext().getRequestDispatcher("/receivedCSR.jsp").forward(request, response);
+    }    
+}

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

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

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

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/DownloadCertificateServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/DownloadCertificateServlet.java?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/DownloadCertificateServlet.java (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/DownloadCertificateServlet.java Fri Nov 17 12:05:24 2006
@@ -1,122 +1,122 @@
-/**
- *
- *  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.ca.helper;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.security.cert.Certificate;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.geronimo.ca.helper.util.CAHelperUtils;
-import org.apache.geronimo.management.geronimo.CertificateRequestStore;
-import org.apache.geronimo.management.geronimo.CertificateStore;
-
-/**
- * Servlet implementation class for Servlet: DownloadCertificateServlet
- *
- * @version $Rev$ $Date$
- */
- public class DownloadCertificateServlet extends javax.servlet.http.HttpServlet implements javax.servlet.Servlet {
-    /* (non-Java-doc)
-     * @see javax.servlet.http.HttpServlet#HttpServlet()
-     */
-    public DownloadCertificateServlet() {
-        super();
-    }       
-
-    /* (non-Java-doc)
-     * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-     */
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        doPost(request, response);
-    }      
-
-    /* (non-Java-doc)
-     * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
-     */
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        String type = request.getParameter("type");
-        String csrId = request.getParameter("csrId");
-        try {
-            if(type != null && type.equals("ca")){
-                // Request is to download CA's certificate
-                // Retrieve CA's certificate from the CertificateStore
-                CertificateStore certStore = CAHelperUtils.getCertificateStore();
-                Certificate cert = certStore.getCACertificate();
-                byte[] data = cert.getEncoded();
-                // Upload the certificate with mime-header for CA certificates
-                response.setContentType("application/x-x509-ca-cert");
-                response.setContentLength(data.length);
-                response.getOutputStream().write(data);
-            } else if(csrId != null){
-                // Request is to download user's own certificate
-                // Get the serial number of the certificate based on the csrId
-                CertificateRequestStore certReqStore = CAHelperUtils.getCertificateRequestStore();
-                BigInteger sNo = certReqStore.getSerialNumberForRequest(csrId);
-                if(sNo == null) {
-                    // Either the CSR is yet to be fulfilled or the csrId is invalid.
-                    throw new Exception("Either the CSR is yet to be fulfilled or the csrId is invalid. csrId = "+csrId);
-                }
-                CertificateStore certStore = CAHelperUtils.getCertificateStore();
-                Certificate cert = certStore.getCertificate(sNo);
-                byte[] data = cert.getEncoded();
-                
-                // Create a link for "verify certificate" page.
-                String host = request.getServerName();
-                int port = CAHelperUtils.getHttpsClientAuthPort();
-                String contextPath = request.getContextPath();
-                String link = "https://"+host+":"+port+""+contextPath+"/verifyCertificate.jsp?csrId="+request.getParameter("csrId");
-
-                // Create a multi-part mime message with user's certificate and an information page.
-                response.setContentType("multipart/mixed; boundary=\"BOUNDARY\"");
-                OutputStream out = response.getOutputStream();
-                out.write("This is a multi-part message in MIME format.\n".getBytes());
-
-                // Upload the certificate with mime-header for user certificates.
-                out.write("--BOUNDARY\n".getBytes());
-                out.write(("Content-type: application/x-x509-user-cert\n\n").getBytes());
-                out.write(data);
-
-                // A web page showing "verify certificate" link if an HTTPS client-authentication connector is configured.
-                out.write("--BOUNDARY\n".getBytes());
-                out.write("Content-type: text/html\n\n".getBytes());
-                out.write("<html><body>".getBytes());
-                out.write("<p>Certificate is downloaded successfully. ".getBytes());
-                if(port != -1)
-                    out.write(("Access <a href="+link+">this link</a> to verify.</p>\n").getBytes());
-                else
-                    out.write("No HTTPS client-authentication port is configured to verify.</p>\n".getBytes());
-
-                out.write(("<a href=\""+contextPath+"\"> Back to CA Helper home</a>").getBytes());
-                out.write("</body></html>".getBytes());
-
-                out.write("--BOUNDARY--\n".getBytes());
-                out.flush();
-            } else {
-                // Request is for downloading neither CA's certificate nor user's certificate.
-                throw new Exception("Invalid certificate download request.");
-            }
-        } catch (Exception e) {
-            throw new ServletException("Exception while uploading certificate.", e);
-        }
-    }
-}
+/**
+ *
+ *  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.ca.helper;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.math.BigInteger;
+import java.security.cert.Certificate;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.geronimo.ca.helper.util.CAHelperUtils;
+import org.apache.geronimo.management.geronimo.CertificateRequestStore;
+import org.apache.geronimo.management.geronimo.CertificateStore;
+
+/**
+ * Servlet implementation class for Servlet: DownloadCertificateServlet
+ *
+ * @version $Rev$ $Date$
+ */
+ public class DownloadCertificateServlet extends javax.servlet.http.HttpServlet implements javax.servlet.Servlet {
+    /* (non-Java-doc)
+     * @see javax.servlet.http.HttpServlet#HttpServlet()
+     */
+    public DownloadCertificateServlet() {
+        super();
+    }       
+
+    /* (non-Java-doc)
+     * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+     */
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doPost(request, response);
+    }      
+
+    /* (non-Java-doc)
+     * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+     */
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        String type = request.getParameter("type");
+        String csrId = request.getParameter("csrId");
+        try {
+            if(type != null && type.equals("ca")){
+                // Request is to download CA's certificate
+                // Retrieve CA's certificate from the CertificateStore
+                CertificateStore certStore = CAHelperUtils.getCertificateStore();
+                Certificate cert = certStore.getCACertificate();
+                byte[] data = cert.getEncoded();
+                // Upload the certificate with mime-header for CA certificates
+                response.setContentType("application/x-x509-ca-cert");
+                response.setContentLength(data.length);
+                response.getOutputStream().write(data);
+            } else if(csrId != null){
+                // Request is to download user's own certificate
+                // Get the serial number of the certificate based on the csrId
+                CertificateRequestStore certReqStore = CAHelperUtils.getCertificateRequestStore();
+                BigInteger sNo = certReqStore.getSerialNumberForRequest(csrId);
+                if(sNo == null) {
+                    // Either the CSR is yet to be fulfilled or the csrId is invalid.
+                    throw new Exception("Either the CSR is yet to be fulfilled or the csrId is invalid. csrId = "+csrId);
+                }
+                CertificateStore certStore = CAHelperUtils.getCertificateStore();
+                Certificate cert = certStore.getCertificate(sNo);
+                byte[] data = cert.getEncoded();
+                
+                // Create a link for "verify certificate" page.
+                String host = request.getServerName();
+                int port = CAHelperUtils.getHttpsClientAuthPort();
+                String contextPath = request.getContextPath();
+                String link = "https://"+host+":"+port+""+contextPath+"/verifyCertificate.jsp?csrId="+request.getParameter("csrId");
+
+                // Create a multi-part mime message with user's certificate and an information page.
+                response.setContentType("multipart/mixed; boundary=\"BOUNDARY\"");
+                OutputStream out = response.getOutputStream();
+                out.write("This is a multi-part message in MIME format.\n".getBytes());
+
+                // Upload the certificate with mime-header for user certificates.
+                out.write("--BOUNDARY\n".getBytes());
+                out.write(("Content-type: application/x-x509-user-cert\n\n").getBytes());
+                out.write(data);
+
+                // A web page showing "verify certificate" link if an HTTPS client-authentication connector is configured.
+                out.write("--BOUNDARY\n".getBytes());
+                out.write("Content-type: text/html\n\n".getBytes());
+                out.write("<html><body>".getBytes());
+                out.write("<p>Certificate is downloaded successfully. ".getBytes());
+                if(port != -1)
+                    out.write(("Access <a href="+link+">this link</a> to verify.</p>\n").getBytes());
+                else
+                    out.write("No HTTPS client-authentication port is configured to verify.</p>\n".getBytes());
+
+                out.write(("<a href=\""+contextPath+"\"> Back to CA Helper home</a>").getBytes());
+                out.write("</body></html>".getBytes());
+
+                out.write("--BOUNDARY--\n".getBytes());
+                out.flush();
+            } else {
+                // Request is for downloading neither CA's certificate nor user's certificate.
+                throw new Exception("Invalid certificate download request.");
+            }
+        } catch (Exception e) {
+            throw new ServletException("Exception while uploading certificate.", e);
+        }
+    }
+}

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

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

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

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/util/CAHelperUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/util/CAHelperUtils.java?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/util/CAHelperUtils.java (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/util/CAHelperUtils.java Fri Nov 17 12:05:24 2006
@@ -1,103 +1,103 @@
-/**
- *
- *  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.ca.helper.util;
-
-import java.math.BigInteger;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelRegistry;
-import org.apache.geronimo.management.geronimo.CertificateRequestStore;
-import org.apache.geronimo.management.geronimo.CertificateStore;
-import org.apache.geronimo.management.geronimo.SecureConnector;
-
-/**
- * This class implements some methods used by the CA Helper Application.
- *
- * @version $Rev$ $Date$
- */
-public class CAHelperUtils {
-    /**
-     * This method removes a certificate request stored in the CertificateRequestStore.
-     * @param csrId Id of the CSR to be removed.
-     * @param sNo Serial number of the certificate issued in response to the CSR to be removed.
-     */
-    public static void removeRequest(String csrId, BigInteger sNo) {
-        getCertificateRequestStore().removeRequestStatus(csrId, sNo);
-    }
-    
-    /**
-     * This method returns the CertificateRequestStore.
-     */
-    public static CertificateRequestStore getCertificateRequestStore() {
-        Kernel kernel = KernelRegistry.getSingleKernel();
-        
-        AbstractNameQuery certReqStoreQuery = new AbstractNameQuery(org.apache.geronimo.management.geronimo.CertificateRequestStore.class.getName());
-        Set set = kernel.listGBeans(certReqStoreQuery);
-        try {
-            CertificateRequestStore certReqStore = (CertificateRequestStore)kernel.getGBean((AbstractName)set.iterator().next());
-            return certReqStore;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-    
-    /**
-     * This method returns the CertificateStore.
-     */
-    public static CertificateStore getCertificateStore() {
-        Kernel kernel = KernelRegistry.getSingleKernel();
-        
-        AbstractNameQuery certStoreQuery = new AbstractNameQuery(org.apache.geronimo.management.geronimo.CertificateStore.class.getName());
-        Set set = kernel.listGBeans(certStoreQuery);
-        try {
-            CertificateStore certStore = (CertificateStore)kernel.getGBean((AbstractName)set.iterator().next());
-            return certStore;
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * This method returns a port configured for HTTPS ClientAuthentication.
-     * 
-     * @return Port configured for HTTPS Client Authentication.
-     * @return -1 if no HTTPS Client Authentication Connector is configured.
-     */
-    public static int getHttpsClientAuthPort() {
-        Kernel kernel = KernelRegistry.getSingleKernel();
-        
-        AbstractNameQuery connectorQuery = new AbstractNameQuery(SecureConnector.class.getName());
-        Set set = kernel.listGBeans(connectorQuery);
-        for(Iterator itr = set.iterator(); itr.hasNext(); ){
-            try {
-                SecureConnector connector = (SecureConnector)kernel.getGBean((AbstractName)itr.next());
-                if(connector.isClientAuthRequired())
-                    return connector.getPort();
-            } catch(Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return -1;
-    }
-}
+/**
+ *
+ *  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.ca.helper.util;
+
+import java.math.BigInteger;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.management.geronimo.CertificateRequestStore;
+import org.apache.geronimo.management.geronimo.CertificateStore;
+import org.apache.geronimo.management.geronimo.SecureConnector;
+
+/**
+ * This class implements some methods used by the CA Helper Application.
+ *
+ * @version $Rev$ $Date$
+ */
+public class CAHelperUtils {
+    /**
+     * This method removes a certificate request stored in the CertificateRequestStore.
+     * @param csrId Id of the CSR to be removed.
+     * @param sNo Serial number of the certificate issued in response to the CSR to be removed.
+     */
+    public static void removeRequest(String csrId, BigInteger sNo) {
+        getCertificateRequestStore().removeRequestStatus(csrId, sNo);
+    }
+    
+    /**
+     * This method returns the CertificateRequestStore.
+     */
+    public static CertificateRequestStore getCertificateRequestStore() {
+        Kernel kernel = KernelRegistry.getSingleKernel();
+        
+        AbstractNameQuery certReqStoreQuery = new AbstractNameQuery(org.apache.geronimo.management.geronimo.CertificateRequestStore.class.getName());
+        Set set = kernel.listGBeans(certReqStoreQuery);
+        try {
+            CertificateRequestStore certReqStore = (CertificateRequestStore)kernel.getGBean((AbstractName)set.iterator().next());
+            return certReqStore;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+    
+    /**
+     * This method returns the CertificateStore.
+     */
+    public static CertificateStore getCertificateStore() {
+        Kernel kernel = KernelRegistry.getSingleKernel();
+        
+        AbstractNameQuery certStoreQuery = new AbstractNameQuery(org.apache.geronimo.management.geronimo.CertificateStore.class.getName());
+        Set set = kernel.listGBeans(certStoreQuery);
+        try {
+            CertificateStore certStore = (CertificateStore)kernel.getGBean((AbstractName)set.iterator().next());
+            return certStore;
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * This method returns a port configured for HTTPS ClientAuthentication.
+     * 
+     * @return Port configured for HTTPS Client Authentication.
+     * @return -1 if no HTTPS Client Authentication Connector is configured.
+     */
+    public static int getHttpsClientAuthPort() {
+        Kernel kernel = KernelRegistry.getSingleKernel();
+        
+        AbstractNameQuery connectorQuery = new AbstractNameQuery(SecureConnector.class.getName());
+        Set set = kernel.listGBeans(connectorQuery);
+        for(Iterator itr = set.iterator(); itr.hasNext(); ){
+            try {
+                SecureConnector connector = (SecureConnector)kernel.getGBean((AbstractName)itr.next());
+                if(connector.isClientAuthRequired())
+                    return connector.getPort();
+            } catch(Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return -1;
+    }
+}

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/util/CAHelperUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/util/CAHelperUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/util/CAHelperUtils.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml Fri Nov 17 12:05:24 2006
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="ca-helper-app" xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+<web-app id="ca-helper-app" xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
     version="2.4">
     <display-name>CAHelper</display-name>
-    <description>
-        CA Helper
-    </description>
-    <servlet>
-        <display-name>CertificateRequestServlet</display-name>
-        <servlet-name>CertificateRequestServlet</servlet-name>
-        <servlet-class>
-            org.apache.geronimo.ca.helper.CertificateRequestServlet
-        </servlet-class>
-    </servlet>
-    <servlet>
-        <display-name>DownloadCertificateServlet</display-name>
-        <servlet-name>DownloadCertificateServlet</servlet-name>
-        <servlet-class>
-            org.apache.geronimo.ca.helper.DownloadCertificateServlet
-        </servlet-class>
-    </servlet>
-    <!-- [INSERT FRAGMENT HERE] --> 
-    <servlet-mapping>
-        <servlet-name>CertificateRequestServlet</servlet-name>
-        <url-pattern>/CertificateRequestServlet</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>DownloadCertificateServlet</servlet-name>
-        <url-pattern>/DownloadCertificateServlet</url-pattern>
+    <description>
+        CA Helper
+    </description>
+    <servlet>
+        <display-name>CertificateRequestServlet</display-name>
+        <servlet-name>CertificateRequestServlet</servlet-name>
+        <servlet-class>
+            org.apache.geronimo.ca.helper.CertificateRequestServlet
+        </servlet-class>
+    </servlet>
+    <servlet>
+        <display-name>DownloadCertificateServlet</display-name>
+        <servlet-name>DownloadCertificateServlet</servlet-name>
+        <servlet-class>
+            org.apache.geronimo.ca.helper.DownloadCertificateServlet
+        </servlet-class>
+    </servlet>
+    <!-- [INSERT FRAGMENT HERE] --> 
+    <servlet-mapping>
+        <servlet-name>CertificateRequestServlet</servlet-name>
+        <url-pattern>/CertificateRequestServlet</url-pattern>
     </servlet-mapping>
-</web-app>
+    <servlet-mapping>
+        <servlet-name>DownloadCertificateServlet</servlet-name>
+        <url-pattern>/DownloadCertificateServlet</url-pattern>
+    </servlet-mapping>
+</web-app>
\ No newline at end of file

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/confirmRequest.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/confirmRequest.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/confirmRequest.jsp (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/confirmRequest.jsp Fri Nov 17 12:05:24 2006
@@ -1,97 +1,97 @@
-<%--
-   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.
---%>
+<%--
+   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.
+--%>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Request Certificate - Confirm Request</title>
-</head>
-<%
-    String reqCN = request.getParameter("reqCN");
-    String reqOU = request.getParameter("reqOU");
-    String reqO = request.getParameter("reqO");
-    String reqL = request.getParameter("reqL");
-    String reqST = request.getParameter("reqST");
-    String reqC = request.getParameter("reqC");
-    String challenge = request.getParameter("challenge");
-%>
-
-<body>
-<h2>Request Certificate: Confirm and Submit Request</h2>
-<p>This is step 2 of 2 in requesting your certificate.  Please review your name details and select the keysize for
-your keypair.  Upon clicking the <i>Submit Certificate Request</i> button, your certificate request will be generated
-and sent to the CA for further processing.</p>
-
-<form action="CertificateRequestServlet" method="post">
-    <table border="0">
-        <tr>
-            <th align="right">Common Name (CN):</th>
-            <td>
-                <input type="hidden" name="reqCN" value="<%=reqCN%>"/> <%=reqCN%>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">Division/Business Unit (OU):</th>
-            <td>
-                <input type="hidden" name="reqOU" value="<%=reqOU%>"/> <%=reqOU%>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">Company/Organization (O):</th>
-            <td>
-                <input type="hidden" name="reqO" value="<%=reqO%>"/> <%=reqO%>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">City/Locality (L):</th>
-            <td>
-                <input type="hidden" name="reqL" value="<%=reqL%>"/> <%=reqL%>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">State/Province (ST):</th>
-            <td>
-                <input type="hidden" name="reqST" value="<%=reqST%>"/> <%=reqST%>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">Country Code (2 char) (C):</th>
-            <td>
-                <input type="hidden" name="reqC" value="<%=reqC%>"/> <%=reqC%>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">Challenge Phrase:</th>
-            <td>
-                ********
-            </td>
-        </tr>
-        <tr>
-            <th align="right">Key Size:</th>
-            <td>
-                <keygen name="spkac" challenge="<%=challenge%>"/>
-            </td>
-        </tr>
-    </table>
-    <input type="submit" value="Submit Certificate Request"/>
-    <input type="reset" name="reset" value="Reset"/>
-</form>
-<a href="<%=request.getContextPath()%>">Cancel</a>
-</body>
-</html>
+<title>Request Certificate - Confirm Request</title>
+</head>
+<%
+    String reqCN = request.getParameter("reqCN");
+    String reqOU = request.getParameter("reqOU");
+    String reqO = request.getParameter("reqO");
+    String reqL = request.getParameter("reqL");
+    String reqST = request.getParameter("reqST");
+    String reqC = request.getParameter("reqC");
+    String challenge = request.getParameter("challenge");
+%>
+
+<body>
+<h2>Request Certificate: Confirm and Submit Request</h2>
+<p>This is step 2 of 2 in requesting your certificate.  Please review your name details and select the keysize for
+your keypair.  Upon clicking the <i>Submit Certificate Request</i> button, your certificate request will be generated
+and sent to the CA for further processing.</p>
+
+<form action="CertificateRequestServlet" method="post">
+    <table border="0">
+        <tr>
+            <th align="right">Common Name (CN):</th>
+            <td>
+                <input type="hidden" name="reqCN" value="<%=reqCN%>"/> <%=reqCN%>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">Division/Business Unit (OU):</th>
+            <td>
+                <input type="hidden" name="reqOU" value="<%=reqOU%>"/> <%=reqOU%>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">Company/Organization (O):</th>
+            <td>
+                <input type="hidden" name="reqO" value="<%=reqO%>"/> <%=reqO%>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">City/Locality (L):</th>
+            <td>
+                <input type="hidden" name="reqL" value="<%=reqL%>"/> <%=reqL%>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">State/Province (ST):</th>
+            <td>
+                <input type="hidden" name="reqST" value="<%=reqST%>"/> <%=reqST%>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">Country Code (2 char) (C):</th>
+            <td>
+                <input type="hidden" name="reqC" value="<%=reqC%>"/> <%=reqC%>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">Challenge Phrase:</th>
+            <td>
+                ********
+            </td>
+        </tr>
+        <tr>
+            <th align="right">Key Size:</th>
+            <td>
+                <keygen name="spkac" challenge="<%=challenge%>"/>
+            </td>
+        </tr>
+    </table>
+    <input type="submit" value="Submit Certificate Request"/>
+    <input type="reset" name="reset" value="Reset"/>
+</form>
+<a href="<%=request.getContextPath()%>">Cancel</a>
+</body>
+</html>

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/confirmRequest.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/confirmRequest.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/confirmRequest.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp Fri Nov 17 12:05:24 2006
@@ -1,81 +1,81 @@
-<%--
-   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.
---%>
+<%--
+   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.
+--%>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%>
-<%@ page import="java.security.cert.X509Certificate" %>
-<%@ page import="org.apache.geronimo.ca.helper.util.CAHelperUtils"%>
-<%
-    X509Certificate cert = (X509Certificate) CAHelperUtils.getCertificateStore().getCACertificate();
-    request.setAttribute("cert", cert);
-%>
+<%@ page import="java.security.cert.X509Certificate" %>
+<%@ page import="org.apache.geronimo.ca.helper.util.CAHelperUtils"%>
+<%
+    X509Certificate cert = (X509Certificate) CAHelperUtils.getCertificateStore().getCACertificate();
+    request.setAttribute("cert", cert);
+%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Download CA's Certificate</title>
 </head>
-<body>
+<body>
 <h2>Download CA's Certificate</h2>
-<p>This page enables you to download and install CA's certificate into your web browser. Click on the link below to
-download and install CA's certificate.</p>
-
-<a href="DownloadCertificateServlet?type=ca">Download CA's Certificate</a> &nbsp; <a href="<%=request.getContextPath()%>">Back to CA Helper home</a>
-
-    <table border="0">
-        <tr>
-            <th colspan="2" align="left">Certificate Details</th>
-        </tr>
-        <tr>
-            <th align="right">Version:</th>
-            <td>${cert.version}</td>
-        </tr>
-        <tr>
-            <th align="right">Subject:</th>
-            <td>${cert.subjectDN.name}</td>
-        </tr>
-        <tr>
-            <th align="right">Issuer:</th>
-            <td>${cert.issuerDN.name}</td>
-        </tr>
-        <tr>
-            <th align="right">Serial Number:</th>
-            <td>${cert.serialNumber}</td>
-        </tr>
-        <tr>
-            <th align="right">Valid From:</th>
-            <td>${cert.notBefore}</td>
-        </tr>
-        <tr>
-            <th align="right">Valid To:</th>
-            <td>${cert.notAfter}</td>
-        </tr>
-        <tr>
-            <th align="right">Signature Alg:</th>
-            <td>${cert.sigAlgName}</td>
-        </tr>
-        <tr>
-            <th align="right">Public Key Alg:</th>
-            <td>${cert.publicKey.algorithm}</td>
-        </tr>
-        <tr>
-            <th align="right" valign="top">cert.toString()</th>
-            <td><pre>${cert}</pre></td>
-        </tr>
-    </table>
-
+<p>This page enables you to download and install CA's certificate into your web browser. Click on the link below to
+download and install CA's certificate.</p>
+
+<a href="DownloadCertificateServlet?type=ca">Download CA's Certificate</a> &nbsp; <a href="<%=request.getContextPath()%>">Back to CA Helper home</a>
+
+    <table border="0">
+        <tr>
+            <th colspan="2" align="left">Certificate Details</th>
+        </tr>
+        <tr>
+            <th align="right">Version:</th>
+            <td>${cert.version}</td>
+        </tr>
+        <tr>
+            <th align="right">Subject:</th>
+            <td>${cert.subjectDN.name}</td>
+        </tr>
+        <tr>
+            <th align="right">Issuer:</th>
+            <td>${cert.issuerDN.name}</td>
+        </tr>
+        <tr>
+            <th align="right">Serial Number:</th>
+            <td>${cert.serialNumber}</td>
+        </tr>
+        <tr>
+            <th align="right">Valid From:</th>
+            <td>${cert.notBefore}</td>
+        </tr>
+        <tr>
+            <th align="right">Valid To:</th>
+            <td>${cert.notAfter}</td>
+        </tr>
+        <tr>
+            <th align="right">Signature Alg:</th>
+            <td>${cert.sigAlgName}</td>
+        </tr>
+        <tr>
+            <th align="right">Public Key Alg:</th>
+            <td>${cert.publicKey.algorithm}</td>
+        </tr>
+        <tr>
+            <th align="right" valign="top">cert.toString()</th>
+            <td><pre>${cert}</pre></td>
+        </tr>
+    </table>
+
 </body>
-</html>
+</html>

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCertificate.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCertificate.jsp (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCertificate.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.
---%>
+<%--
+   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.
+--%>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Download Certificate</title>
-<script language="JavaScript">
-    function validateForm() {
-        obj = document.forms[0].csrId;
-        if(obj.value == '') {
-            alert('csrId can not be empty');
-            obj.focus();
-            return false;
-        }
-        return true;
-    }
+<title>Download Certificate</title>
+<script language="JavaScript">
+    function validateForm() {
+        obj = document.forms[0].csrId;
+        if(obj.value == '') {
+            alert('csrId can not be empty');
+            obj.focus();
+            return false;
+        }
+        return true;
+    }
 </script>
 </head>
-<body>
-<h2>Download Certificate</h2>
-<p>This page enables you to download and install certificate issued to you by the CA.  Before installing your certificate,
-install the CA's certificate in your web browser by clicking on the <a href="DownloadCertificateServlet?type=ca"> this link</a>.</p>
-
-<form action="DownloadCertificateServlet" method="post">
-    <table border="0">
-        <tr>
-            <th align="right">CSR Id:</th>
-            <td>
-                <input type="text" name="csrId" size="20" maxlength="200"/>
-            </td>
-        </tr>
-    </table>
-    <input type="submit" value="Download Certificate" onClick="return validateForm();"/>
-    <input type="reset" name="reset" value="Reset"/>
-</form>
+<body>
+<h2>Download Certificate</h2>
+<p>This page enables you to download and install certificate issued to you by the CA.  Before installing your certificate,
+install the CA's certificate in your web browser by clicking on the <a href="DownloadCertificateServlet?type=ca"> this link</a>.</p>
+
+<form action="DownloadCertificateServlet" method="post">
+    <table border="0">
+        <tr>
+            <th align="right">CSR Id:</th>
+            <td>
+                <input type="text" name="csrId" size="20" maxlength="200"/>
+            </td>
+        </tr>
+    </table>
+    <input type="submit" value="Download Certificate" onClick="return validateForm();"/>
+    <input type="reset" name="reset" value="Reset"/>
+</form>
 <a href="<%=request.getContextPath()%>">Cancel</a>
 </body>
-</html>
+</html>

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCertificate.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCertificate.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCertificate.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/index.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/index.jsp (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/index.jsp Fri Nov 17 12:05:24 2006
@@ -1,63 +1,63 @@
-<%--
-   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.
---%>
+<%--
+   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.
+--%>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<%@page import="org.apache.geronimo.ca.helper.util.CAHelperUtils"%>
-<%
-    Object certReqStore = CAHelperUtils.getCertificateRequestStore();
-    Object certStore = CAHelperUtils.getCertificateStore();
-%>
+<%@page import="org.apache.geronimo.ca.helper.util.CAHelperUtils"%>
+<%
+    Object certReqStore = CAHelperUtils.getCertificateRequestStore();
+    Object certStore = CAHelperUtils.getCertificateStore();
+%>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>CA Helper Application</title>
 </head>
 <body>
-<h2>CA Helper Application</h2>
-<p>Welcome to CA Helper application. <p>
-
-<%if(certReqStore == null) {%>
-<p>A ceritificate request store is not available.  Application can not receive Certificate Signing Requests.</p>
-<%}%>
-<%if(certStore == null) {%>
-<p>A ceritificate store is not available.  Application can not upload certificates.</p>
-<%}%>
-<%if(certReqStore == null || certStore == null) {%>
-<p>Please contact the system administrator.</p>
-<%} else {%>
-<!-- The following is used to detect if the browser supports KEYGEN tag -->
-<div style="display:none"><form name='keygentest'><keygen name="test"/></form></div>
-<script>
-if(document.keygentest.elements.length == 0) {
-    document.write('Your browser does not support KEYGEN tag.  This application requires a browser that supports KEYGEN.');
-} else {
-    document.write('<p>This application allows you to submit certificate requests, download and install certificates issued by the CA.</p>');
-    document.write(
-    '<table border="0">'+
-      '<tr>'+
-        '<td>&nbsp;<a href="requestCertificate.jsp">Request Certificate</a>&nbsp;</td>'+
-        '<td>&nbsp;<a href="downloadCertificate.jsp">Download your Certificate</a>&nbsp;</td>'+
-        '<td>&nbsp;<a href="downloadCACertificate.jsp">Download CA Certificate</a>&nbsp;</td>'+
-      '</tr>'+
-    '</table>'
-    )
+<h2>CA Helper Application</h2>
+<p>Welcome to CA Helper application. <p>
+
+<%if(certReqStore == null) {%>
+<p>A ceritificate request store is not available.  Application can not receive Certificate Signing Requests.</p>
+<%}%>
+<%if(certStore == null) {%>
+<p>A ceritificate store is not available.  Application can not upload certificates.</p>
+<%}%>
+<%if(certReqStore == null || certStore == null) {%>
+<p>Please contact the system administrator.</p>
+<%} else {%>
+<!-- The following is used to detect if the browser supports KEYGEN tag -->
+<div style="display:none"><form name='keygentest'><keygen name="test"/></form></div>
+<script>
+if(document.keygentest.elements.length == 0) {
+    document.write('Your browser does not support KEYGEN tag.  This application requires a browser that supports KEYGEN.');
+} else {
+    document.write('<p>This application allows you to submit certificate requests, download and install certificates issued by the CA.</p>');
+    document.write(
+    '<table border="0">'+
+      '<tr>'+
+        '<td>&nbsp;<a href="requestCertificate.jsp">Request Certificate</a>&nbsp;</td>'+
+        '<td>&nbsp;<a href="downloadCertificate.jsp">Download your Certificate</a>&nbsp;</td>'+
+        '<td>&nbsp;<a href="downloadCACertificate.jsp">Download CA Certificate</a>&nbsp;</td>'+
+      '</tr>'+
+    '</table>'
+    )
 }
-</script>
-<%}%>
+</script>
+<%}%>
 </body>
-</html>
+</html>

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/receivedCSR.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/receivedCSR.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/receivedCSR.jsp (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/receivedCSR.jsp Fri Nov 17 12:05:24 2006
@@ -1,19 +1,19 @@
-<%--
-   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.
---%>
+<%--
+   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.
+--%>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
@@ -22,11 +22,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Confirm CSR</title>
 </head>
-<body>
-<h2>CSR Confirmation</h2>
-<p>Your Certificate Signing Request(CSR) is received by the CA. Your CSR Id is <b>${id}</b>. Please note down your
-CSR Id. It will be required later on to download your certificate.</p>
-
-<a href="<%=request.getContextPath()%>">Back to CA Helper home</a>
+<body>
+<h2>CSR Confirmation</h2>
+<p>Your Certificate Signing Request(CSR) is received by the CA. Your CSR Id is <b>${id}</b>. Please note down your
+CSR Id. It will be required later on to download your certificate.</p>
+
+<a href="<%=request.getContextPath()%>">Back to CA Helper home</a>
 </body>
-</html>
+</html>

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/receivedCSR.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/receivedCSR.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/receivedCSR.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/requestCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/requestCertificate.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/requestCertificate.jsp (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/requestCertificate.jsp Fri Nov 17 12:05:24 2006
@@ -1,128 +1,128 @@
-<%--
-   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.
---%>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<%--
+   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.
+--%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Request Certificate - Enter Name details</title>
-<script language="JavaScript">
-function textElementsNotEmpty(formName, elementNameArray){
-    var obj;
-    for(i in elementNameArray){
-        var elem = elementNameArray[i];
-        obj = eval("document.forms['" + formName + "'].elements['" + elem + "']"); 
-        if(isEmptyString(obj.value)){
-            alert(elem + " must not be empty.");
-            obj.focus(); 
-            return false;             
-        }
-    }
-    return true;
-}
-function isEmptyString(value){
-    return value.length < 1;
-}
-
-var formName = "CertReqForm";
-var requiredFields = new Array("reqCN", "reqOU", "reqO", "reqL", "reqST", "reqC");
-
-function validateForm(){
-    if(!textElementsNotEmpty(formName, requiredFields))
-        return false;
-    ch = eval("document." + formName + ".challenge"); 
-    cf = eval("document." + formName + ".confirm");
-    if(ch.value != cf.value) {
-        alert("Challenge phrase and confirm challenge do not match.");
-        ch.focus();
-        return false;
-    }
-    return true;
-}
-
-</script>
-</head>
-<body>
-<h2>Request Certificate: Enter Name Details</h2>
-<p>This is  step 1 of 2 in requesting your certificate.  Please enter your identity details below.
-The optional <i>Challenge Phrase</i> can be used later on if you ever need to revoke your certificate.
-The next screen will let you review these details before submitting the certificate request.</p>
-
-<form action="confirmRequest.jsp" method="post" name="CertReqForm">
-    <table border="0">
-        <tr>
-            <th colspan="2" align="left">Identity Details</th>
-        </tr>
-        <tr>
-            <th align="right">Common Name (CN):</th>
-            <td>
-                <input type="text" name="reqCN" size="20" maxlength="200"/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">Division/Business Unit (OU):</th>
-            <td>
-                <input type="text" name="reqOU" size="20" maxlength="200"/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">Company/Organization (O):</th>
-            <td>
-                <input type="text" name="reqO" size="20" maxlength="200"/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">City/Locality (L):</th>
-            <td>
-                <input type="text" name="reqL" size="20" maxlength="200"/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">State/Province (ST):</th>
-            <td>
-                <input type="text" name="reqST" size="20" maxlength="200"/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">Country Code (2 char) (C):</th>
-            <td>
-                <input type="text" name="reqC" size="3" maxlength="2"/>
-            </td>
-        </tr>
-        <tr>
-            <td>&nbsp;</td>
-        </tr>
-        <tr>
-            <th align="right">Challenge Phrase</th>
-            <td>
-                <input type="password" name="challenge" size="20" maxlength="200"/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">Confirm Challenge</th>
-            <td>
-                <input type="password" name="confirm" size="20" maxlength="200"/>
-            </td>
-        </tr>
-    </table>
-    <input type="submit" value="Review Name Details" onClick="return validateForm();"/>
-    <input type="reset" name="reset" value="Reset"/>
-</form>
-<a href="<%=request.getContextPath()%>">Cancel</a>
-</body>
-</html>
+<title>Request Certificate - Enter Name details</title>
+<script language="JavaScript">
+function textElementsNotEmpty(formName, elementNameArray){
+    var obj;
+    for(i in elementNameArray){
+        var elem = elementNameArray[i];
+        obj = eval("document.forms['" + formName + "'].elements['" + elem + "']"); 
+        if(isEmptyString(obj.value)){
+            alert(elem + " must not be empty.");
+            obj.focus(); 
+            return false;             
+        }
+    }
+    return true;
+}
+function isEmptyString(value){
+    return value.length < 1;
+}
+
+var formName = "CertReqForm";
+var requiredFields = new Array("reqCN", "reqOU", "reqO", "reqL", "reqST", "reqC");
+
+function validateForm(){
+    if(!textElementsNotEmpty(formName, requiredFields))
+        return false;
+    ch = eval("document." + formName + ".challenge"); 
+    cf = eval("document." + formName + ".confirm");
+    if(ch.value != cf.value) {
+        alert("Challenge phrase and confirm challenge do not match.");
+        ch.focus();
+        return false;
+    }
+    return true;
+}
+
+</script>
+</head>
+<body>
+<h2>Request Certificate: Enter Name Details</h2>
+<p>This is  step 1 of 2 in requesting your certificate.  Please enter your identity details below.
+The optional <i>Challenge Phrase</i> can be used later on if you ever need to revoke your certificate.
+The next screen will let you review these details before submitting the certificate request.</p>
+
+<form action="confirmRequest.jsp" method="post" name="CertReqForm">
+    <table border="0">
+        <tr>
+            <th colspan="2" align="left">Identity Details</th>
+        </tr>
+        <tr>
+            <th align="right">Common Name (CN):</th>
+            <td>
+                <input type="text" name="reqCN" size="20" maxlength="200"/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">Division/Business Unit (OU):</th>
+            <td>
+                <input type="text" name="reqOU" size="20" maxlength="200"/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">Company/Organization (O):</th>
+            <td>
+                <input type="text" name="reqO" size="20" maxlength="200"/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">City/Locality (L):</th>
+            <td>
+                <input type="text" name="reqL" size="20" maxlength="200"/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">State/Province (ST):</th>
+            <td>
+                <input type="text" name="reqST" size="20" maxlength="200"/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">Country Code (2 char) (C):</th>
+            <td>
+                <input type="text" name="reqC" size="3" maxlength="2"/>
+            </td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+        </tr>
+        <tr>
+            <th align="right">Challenge Phrase</th>
+            <td>
+                <input type="password" name="challenge" size="20" maxlength="200"/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">Confirm Challenge</th>
+            <td>
+                <input type="password" name="confirm" size="20" maxlength="200"/>
+            </td>
+        </tr>
+    </table>
+    <input type="submit" value="Review Name Details" onClick="return validateForm();"/>
+    <input type="reset" name="reset" value="Reset"/>
+</form>
+<a href="<%=request.getContextPath()%>">Cancel</a>
+</body>
+</html>

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/requestCertificate.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/requestCertificate.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/requestCertificate.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/verifyCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/verifyCertificate.jsp?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/verifyCertificate.jsp (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/verifyCertificate.jsp Fri Nov 17 12:05:24 2006
@@ -1,83 +1,83 @@
-<%--
-   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.
---%>
+<%--
+   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.
+--%>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%>
-<%@ page import="java.security.cert.Certificate" %>
-<%@ page import="java.security.cert.X509Certificate" %>
-<%@ page import="org.apache.geronimo.ca.helper.util.CAHelperUtils"%>
-
-<%
-    X509Certificate cert = (X509Certificate)((Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate"))[0];
-    request.setAttribute("cert", cert);
-    CAHelperUtils.removeRequest(request.getParameter("csrId"), cert.getSerialNumber());
-%>
-
+<%@ page import="java.security.cert.Certificate" %>
+<%@ page import="java.security.cert.X509Certificate" %>
+<%@ page import="org.apache.geronimo.ca.helper.util.CAHelperUtils"%>
+
+<%
+    X509Certificate cert = (X509Certificate)((Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate"))[0];
+    request.setAttribute("cert", cert);
+    CAHelperUtils.removeRequest(request.getParameter("csrId"), cert.getSerialNumber());
+%>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Verify Certificate Download</title>
 </head>
-<body>
-<h2>Verify Certificate Download</h2>
-<p>If you are seeing this page, it means you have successfully downloaded and installed your certificate into your
-web browser. The details of the certificate you used to authenticate with the web server are given below.</p>
-
-    <table border="0">
-        <tr>
-            <th colspan="2" align="left">Certificate Details</th>
-        </tr>
-        <tr>
-            <th align="right">Version:</th>
-            <td>${cert.version}</td>
-        </tr>
-        <tr>
-            <th align="right">Subject:</th>
-            <td>${cert.subjectDN.name}</td>
-        </tr>
-        <tr>
-            <th align="right">Issuer:</th>
-            <td>${cert.issuerDN.name}</td>
-        </tr>
-        <tr>
-            <th align="right">Serial Number:</th>
-            <td>${cert.serialNumber}</td>
-        </tr>
-        <tr>
-            <th align="right">Valid From:</th>
-            <td>${cert.notBefore}</td>
-        </tr>
-        <tr>
-            <th align="right">Valid To:</th>
-            <td>${cert.notAfter}</td>
-        </tr>
-        <tr>
-            <th align="right">Signature Alg:</th>
-            <td>${cert.sigAlgName}</td>
-        </tr>
-        <tr>
-            <th align="right">Public Key Alg:</th>
-            <td>${cert.publicKey.algorithm}</td>
-        </tr>
-        <tr>
-            <th align="right" valign="top">cert.toString()</th>
-            <td><pre>${cert}</pre></td>
-        </tr>
+<body>
+<h2>Verify Certificate Download</h2>
+<p>If you are seeing this page, it means you have successfully downloaded and installed your certificate into your
+web browser. The details of the certificate you used to authenticate with the web server are given below.</p>
+
+    <table border="0">
+        <tr>
+            <th colspan="2" align="left">Certificate Details</th>
+        </tr>
+        <tr>
+            <th align="right">Version:</th>
+            <td>${cert.version}</td>
+        </tr>
+        <tr>
+            <th align="right">Subject:</th>
+            <td>${cert.subjectDN.name}</td>
+        </tr>
+        <tr>
+            <th align="right">Issuer:</th>
+            <td>${cert.issuerDN.name}</td>
+        </tr>
+        <tr>
+            <th align="right">Serial Number:</th>
+            <td>${cert.serialNumber}</td>
+        </tr>
+        <tr>
+            <th align="right">Valid From:</th>
+            <td>${cert.notBefore}</td>
+        </tr>
+        <tr>
+            <th align="right">Valid To:</th>
+            <td>${cert.notAfter}</td>
+        </tr>
+        <tr>
+            <th align="right">Signature Alg:</th>
+            <td>${cert.sigAlgName}</td>
+        </tr>
+        <tr>
+            <th align="right">Public Key Alg:</th>
+            <td>${cert.publicKey.algorithm}</td>
+        </tr>
+        <tr>
+            <th align="right" valign="top">cert.toString()</th>
+            <td><pre>${cert}</pre></td>
+        </tr>
     </table>
-<a href="<%=request.getContextPath()%>">Back to CA Helper home</a>
+<a href="<%=request.getContextPath()%>">Back to CA Helper home</a>
 </body>
-</html>
+</html>

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/verifyCertificate.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/verifyCertificate.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/verifyCertificate.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/site/site.xml?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/site/site.xml (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/site/site.xml Fri Nov 17 12:05:24 2006
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="${project.name}">
-    
-    <body>
-        
-        ${parentProject}
-        
-        ${modules}
-        
-        ${reports}
-        
-    </body>
-
-</project>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project name="${project.name}">
+    
+    <body>
+        
+        ${parentProject}
+        
+        ${modules}
+        
+        ${reports}
+        
+    </body>
+
+</project>
+
+

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/geronimo-ca-helper/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message