geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r476229 [3/5] - in /geronimo/server/trunk: applications/ applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/ applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/ applications/c...
Date Fri, 17 Nov 2006 17:48:06 GMT
Added: geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml?view=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml Fri Nov 17 09:48:02 2006
@@ -0,0 +1,90 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.applications</groupId>
+        <artifactId>applications</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-ca-helper</artifactId>
+    <name>Geronimo Applications :: CA Helper Application</name>
+    <packaging>war</packaging>
+
+    <description>
+        This is a helper application for CA to enable receiving CSR's through
+        and uploading certificates to web browsers.
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.0_spec</artifactId>
+        </dependency>
+
+        <!-- Required for JSPC compilation -->
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: 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=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/CertificateRequestServlet.java (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/CertificateRequestServlet.java Fri Nov 17 09:48:02 2006
@@ -0,0 +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);
+    }    
+}

Added: 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=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/DownloadCertificateServlet.java (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/DownloadCertificateServlet.java Fri Nov 17 09:48:02 2006
@@ -0,0 +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);
+        }
+    }
+}

Added: 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=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/util/CAHelperUtils.java (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/util/CAHelperUtils.java Fri Nov 17 09:48:02 2006
@@ -0,0 +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;
+    }
+}

Added: 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=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml Fri Nov 17 09:48:02 2006
@@ -0,0 +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"
+    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>
+    </servlet-mapping>
+</web-app>

Added: 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=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/confirmRequest.jsp (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/confirmRequest.jsp Fri Nov 17 09:48:02 2006
@@ -0,0 +1,81 @@
+<%@ 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>

Added: 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=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp Fri Nov 17 09:48:02 2006
@@ -0,0 +1,65 @@
+<%@ 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);
+%>
+<!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>
+<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>
+
+</body>
+</html>

Added: 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=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCertificate.jsp (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCertificate.jsp Fri Nov 17 09:48:02 2006
@@ -0,0 +1,39 @@
+<%@ 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;
+    }
+</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>
+<a href="<%=request.getContextPath()%>">Cancel</a>
+</body>
+</html>

Added: 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=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/index.jsp (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/index.jsp Fri Nov 17 09:48:02 2006
@@ -0,0 +1,47 @@
+<%@ 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();
+%>
+<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>'
+    )
+}
+</script>
+<%}%>
+</body>
+</html>

Added: 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=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/receivedCSR.jsp (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/receivedCSR.jsp Fri Nov 17 09:48:02 2006
@@ -0,0 +1,16 @@
+<%@ 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>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>
+</html>

Added: 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=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/requestCertificate.jsp (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/requestCertificate.jsp Fri Nov 17 09:48:02 2006
@@ -0,0 +1,112 @@
+<%@ 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>

Added: 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=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/verifyCertificate.jsp (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/verifyCertificate.jsp Fri Nov 17 09:48:02 2006
@@ -0,0 +1,67 @@
+<%@ 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());
+%>
+
+<!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>
+    </table>
+<a href="<%=request.getContextPath()%>">Back to CA Helper home</a>
+</body>
+</html>

Added: 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=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/site/site.xml (added)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/site/site.xml Fri Nov 17 09:48:02 2006
@@ -0,0 +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>
+
+

Modified: geronimo/server/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/pom.xml?view=diff&rev=476229&r1=476228&r2=476229
==============================================================================
--- geronimo/server/trunk/applications/pom.xml (original)
+++ geronimo/server/trunk/applications/pom.xml Fri Nov 17 09:48:02 2006
@@ -45,6 +45,7 @@
         <module>geronimo-ldap-demo</module>
         <module>magicGball</module>
         <module>demo</module>
+        <module>geronimo-ca-helper</module>
     </modules>
     
 </project>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml?view=diff&rev=476229&r1=476228&r2=476229
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml Fri Nov 17 09:48:02 2006
@@ -272,6 +272,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>ca-helper-jetty</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>shutdown</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?view=diff&rev=476229&r1=476228&r2=476229
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Fri Nov 17 09:48:02 2006
@@ -195,4 +195,6 @@
 
     <module name="org.apache.geronimo.configs/hot-deployer/${version}/car"/>
 
+    <module name="org.apache.geronimo.configs/ca-helper-jetty/${version}/car" load="false"/>
+
 </attributes>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml?view=diff&rev=476229&r1=476228&r2=476229
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml Fri Nov 17 09:48:02 2006
@@ -265,6 +265,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>ca-helper-tomcat</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>shutdown</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?view=diff&rev=476229&r1=476228&r2=476229
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml Fri Nov 17 09:48:02 2006
@@ -165,4 +165,6 @@
 
     <module name="org.apache.geronimo.configs/hot-deployer/${version}/car"/>
 
+    <module name="org.apache.geronimo.configs/ca-helper-tomcat/${version}/car" load="false"/>
+
 </attributes>

Added: geronimo/server/trunk/configs/ca-helper-jetty/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-jetty/LICENSE.txt?view=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-jetty/LICENSE.txt (added)
+++ geronimo/server/trunk/configs/ca-helper-jetty/LICENSE.txt Fri Nov 17 09:48:02 2006
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

Added: geronimo/server/trunk/configs/ca-helper-jetty/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-jetty/NOTICE.txt?view=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-jetty/NOTICE.txt (added)
+++ geronimo/server/trunk/configs/ca-helper-jetty/NOTICE.txt Fri Nov 17 09:48:02 2006
@@ -0,0 +1,6 @@
+Apache Geronimo
+Copyright 2006-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/server/trunk/configs/ca-helper-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-jetty/pom.xml?view=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-jetty/pom.xml (added)
+++ geronimo/server/trunk/configs/ca-helper-jetty/pom.xml Fri Nov 17 09:48:02 2006
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="ISO-8859-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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>ca-helper-jetty</artifactId>
+    <name>Geronimo Configs :: CA Helper app - Jetty</name>
+    <packaging>car</packaging>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-ca-helper</artifactId>
+            <version>${pom.version}</version>
+            <type>war</type>
+        </dependency>
+        
+    </dependencies>
+    
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.applications</groupId>
+                        <artifactId>geronimo-ca-helper</artifactId>
+                        <version>${pom.version}</version>
+                        <type>war</type>
+                    </module>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

Added: geronimo/server/trunk/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml (added)
+++ geronimo/server/trunk/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml Fri Nov 17 09:48:02 2006
@@ -0,0 +1,46 @@
+<?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$ -->
+
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+    <name>Geronimo CA Helper Web App (Jetty)</name>
+    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <category>Core Geronimo</category>
+    <description>
+        This is a helper application for CA to enable receiving CSR's through
+        and uploading certificates to web browsers.
+    </description>
+    <url>http://geronimo.apache.org/</url>
+    <author>The Apache Geronimo development community</author>
+    <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <prerequisite>
+        <id>org.apache.geronimo.configs/jetty//car</id>
+        <resource-type>Web Container</resource-type>
+        <description>
+            This version of the CA Helper application works with the Geronimo/Jetty distribution.
+            It is not intended to run in the Geronimo/Tomcat distribution.  There is a separate version of the
+            CA Helper application that works with Tomcat.  Please install the version appropriate to your Geronimo
+            distribution.
+        </description>
+    </prerequisite>
+    <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+    <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
+    <source-repository>http://www.ibiblio.org/maven2/</source-repository>
+</geronimo-plugin>

Added: geronimo/server/trunk/configs/ca-helper-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-jetty/src/plan/plan.xml?view=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-jetty/src/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/ca-helper-jetty/src/plan/plan.xml Fri Nov 17 09:48:02 2006
@@ -0,0 +1,23 @@
+<?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$ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+    <context-root>/CAHelper</context-root>
+</web-app>

Added: geronimo/server/trunk/configs/ca-helper-jetty/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-jetty/src/site/site.xml?view=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-jetty/src/site/site.xml (added)
+++ geronimo/server/trunk/configs/ca-helper-jetty/src/site/site.xml Fri Nov 17 09:48:02 2006
@@ -0,0 +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>
+
+

Added: geronimo/server/trunk/configs/ca-helper-tomcat/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-tomcat/LICENSE.txt?view=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-tomcat/LICENSE.txt (added)
+++ geronimo/server/trunk/configs/ca-helper-tomcat/LICENSE.txt Fri Nov 17 09:48:02 2006
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

Added: geronimo/server/trunk/configs/ca-helper-tomcat/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-tomcat/NOTICE.txt?view=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-tomcat/NOTICE.txt (added)
+++ geronimo/server/trunk/configs/ca-helper-tomcat/NOTICE.txt Fri Nov 17 09:48:02 2006
@@ -0,0 +1,6 @@
+Apache Geronimo
+Copyright 2006-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml?view=auto&rev=476229
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml (added)
+++ geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml Fri Nov 17 09:48:02 2006
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="ISO-8859-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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>ca-helper-tomcat</artifactId>
+    <name>Geronimo Configs :: CA Helper app - Tomcat</name>
+    <packaging>car</packaging>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-ca-helper</artifactId>
+            <version>${pom.version}</version>
+            <type>war</type>
+        </dependency>
+        
+    </dependencies>
+    
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.applications</groupId>
+                        <artifactId>geronimo-ca-helper</artifactId>
+                        <version>${pom.version}</version>
+                        <type>war</type>
+                    </module>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>



Mime
View raw message