geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r476291 [1/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
Author: vamsic007
Date: Fri Nov 17 12:05:24 2006
New Revision: 476291

URL: http://svn.apache.org/viewvc?view=rev&rev=476291
Log:
modified svn properties

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/BaseCAHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CertificationAuthorityPortlet.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ConfirmCertReqHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/IntroHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/SetupCAHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/UnlockCAHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/_header.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/caDetails.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/index.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/processCSR.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/setupCA.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/LICENSE.txt   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/NOTICE.txt   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/CertificateRequestServlet.java   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/DownloadCertificateServlet.java   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/util/CAHelperUtils.java   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/confirmRequest.jsp   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/downloadCertificate.jsp   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/index.jsp   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/receivedCSR.jsp   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/requestCertificate.jsp   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/verifyCertificate.jsp   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-ca-helper/src/site/site.xml   (contents, props changed)
    geronimo/server/trunk/configs/ca-helper-jetty/LICENSE.txt   (contents, props changed)
    geronimo/server/trunk/configs/ca-helper-jetty/NOTICE.txt   (contents, props changed)
    geronimo/server/trunk/configs/ca-helper-jetty/pom.xml   (contents, props changed)
    geronimo/server/trunk/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml   (contents, props changed)
    geronimo/server/trunk/configs/ca-helper-jetty/src/plan/plan.xml   (contents, props changed)
    geronimo/server/trunk/configs/ca-helper-jetty/src/site/site.xml   (contents, props changed)
    geronimo/server/trunk/configs/ca-helper-tomcat/LICENSE.txt   (contents, props changed)
    geronimo/server/trunk/configs/ca-helper-tomcat/NOTICE.txt   (contents, props changed)
    geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml   (contents, props changed)
    geronimo/server/trunk/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml   (contents, props changed)
    geronimo/server/trunk/configs/ca-helper-tomcat/src/plan/plan.xml   (contents, props changed)
    geronimo/server/trunk/configs/ca-helper-tomcat/src/site/site.xml   (contents, props changed)
    geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/CertificateRequestStore.java   (contents, props changed)
    geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/CertificateStore.java   (contents, props changed)
    geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/CertificateStoreException.java   (contents, props changed)
    geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/CertificationAuthority.java   (contents, props changed)
    geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/CertificationAuthorityException.java   (contents, props changed)
    geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/KeyNotFoundException.java   (props changed)
    geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/KeystoreException.java   (props changed)
    geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateRequestStore.java   (contents, props changed)
    geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java   (contents, props changed)
    geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java   (contents, props changed)
    geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/CaUtils.java   (contents, props changed)

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/BaseCAHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/BaseCAHandler.java?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/BaseCAHandler.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/BaseCAHandler.java Fri Nov 17 12:05:24 2006
@@ -1,125 +1,125 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.console.ca;
-
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.console.MultiPageAbstractHandler;
-import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.management.geronimo.CertificateRequestStore;
-import org.apache.geronimo.management.geronimo.CertificateStore;
-import org.apache.geronimo.management.geronimo.CertificationAuthority;
-import org.apache.geronimo.management.geronimo.KeystoreException;
-import org.apache.geronimo.management.geronimo.KeystoreInstance;
-
-/**
- * The base class for all handlers for CA portlet
- *
- * @version $Rev$ $Date$
- */
-public abstract class BaseCAHandler extends MultiPageAbstractHandler {
-    private final static Log log = LogFactory.getLog(BaseCAHandler.class);
-
-    protected static final String INDEX_MODE = "index";
-    protected static final String SETUPCA_MODE = "setupCA";
-    protected static final String CONFIRM_CA_MODE = "confirmCA";
-    protected static final String CADETAILS_MODE = "caDetails";
-    protected static final String UNLOCKCA_MODE = "unlockCA";
-    protected static final String PROCESS_CSR_MODE = "processCSR";
-    protected static final String CERT_REQ_DETAILS_MODE = "certReqDetails";
-    protected static final String CONFIRM_CLIENT_CERT_MODE = "confirmClientCert";
-    protected static final String VIEW_CERT_MODE = "viewCert";
-    protected static final String LIST_REQUESTS_ISSUE_MODE = "listRequestsIssue";
-    protected static final String LIST_REQUESTS_VERIFY_MODE = "listRequestsVerify";
-    protected static final String CONFIRM_CERT_REQ_MODE = "confirmCertReq";
-    
-    // Key algorithm for CA's keypair
-    protected static final String defaultKeyAlgorithm = "RSA";
-    // CA's private key and self-signed certificate is stored under this keystore created using KeystoreManager
-    // Using FileKeystoreManager, the file willbe <server-base-dir>/var/security/keystores/<defaultCAKeystore>
-    protected static final String defaultCAKeystore = "ca-keystore";
-    // CA's certificate store directory
-    protected static final String defaultCAStoreDir = "var/security/ca/certs";
-    // Certificate request store directory
-    protected static final String defaultCSRStoreDir = "var/security/ca/requests";
-
-    // Name of the attribute for error message to be displayed in a page
-    protected static final String ERROR_MSG = "errorMsg";
-    // Name of the attribute for information message to be displayed in a page
-    protected static final String INFO_MSG = "infoMsg";
-
-    /**
-     * Constructor
-     */
-    protected BaseCAHandler(String mode, String viewName) {
-        super(mode, viewName);
-    }
-
-    public final static class CAModel implements MultiPageModel {
-        public CAModel(PortletRequest request) {
-        }
-
-        public void save(ActionResponse response, PortletSession session) {
-        }
-    }
-    
-    /**
-     * This method returns CertificationAuthority GBbean.
-     * @param request PortletRequest to execute retrieve GBean
-     * @return  null if a CA GBean is not running.
-     */
-    protected CertificationAuthority getCertificationAuthority(PortletRequest request) {
-        Object[] cas = PortletManager.getManagedBeans(request, CertificationAuthority.class);
-        return (CertificationAuthority)(cas != null && cas.length > 0 ? cas[0] : null);
-    }
-
-    /**
-     * This methods creates CA's keystore using KeystoreManager.
-     * @param request PortletRequest to get KeystoreManager
-     * @param password Password for newly created Keystore
-     * @throws KeystoreException 
-     */
-    protected KeystoreInstance createCAKeystoreInstance(PortletRequest request, String password) throws KeystoreException {
-        return PortletManager.getCurrentServer(request).getKeystoreManager().createKeystore(defaultCAKeystore, password.toCharArray());
-    }
-    
-    /**
-     * This method returns CertificateRequestStore GBean.
-     * @param request PortletRequest to execute retrieve GBean
-     * @return  null if a CertificateRequestStore GBean is not running.
-     */
-    protected CertificateRequestStore getCertificateRequestStore(PortletRequest request) {
-        Object[] crs = PortletManager.getManagedBeans(request, CertificateRequestStore.class);
-        return (CertificateRequestStore)(crs != null && crs.length > 0 ? crs[0] : null);
-    }
-
-    /**
-     * This method returns CertificateStore GBean.
-     * @param request PortletRequest to execute retrieve GBean
-     * @return  null if a CertificateStore GBean is not running.
-     */
-    protected CertificateStore getCertificateStore(PortletRequest request) {
-        Object[] cs = PortletManager.getManagedBeans(request, CertificateStore.class);
-        return (CertificateStore)(cs != null && cs.length > 0 ? cs[0] : null);
-    }
-}
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.ca;
+
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.MultiPageAbstractHandler;
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.management.geronimo.CertificateRequestStore;
+import org.apache.geronimo.management.geronimo.CertificateStore;
+import org.apache.geronimo.management.geronimo.CertificationAuthority;
+import org.apache.geronimo.management.geronimo.KeystoreException;
+import org.apache.geronimo.management.geronimo.KeystoreInstance;
+
+/**
+ * The base class for all handlers for CA portlet
+ *
+ * @version $Rev$ $Date$
+ */
+public abstract class BaseCAHandler extends MultiPageAbstractHandler {
+    private final static Log log = LogFactory.getLog(BaseCAHandler.class);
+
+    protected static final String INDEX_MODE = "index";
+    protected static final String SETUPCA_MODE = "setupCA";
+    protected static final String CONFIRM_CA_MODE = "confirmCA";
+    protected static final String CADETAILS_MODE = "caDetails";
+    protected static final String UNLOCKCA_MODE = "unlockCA";
+    protected static final String PROCESS_CSR_MODE = "processCSR";
+    protected static final String CERT_REQ_DETAILS_MODE = "certReqDetails";
+    protected static final String CONFIRM_CLIENT_CERT_MODE = "confirmClientCert";
+    protected static final String VIEW_CERT_MODE = "viewCert";
+    protected static final String LIST_REQUESTS_ISSUE_MODE = "listRequestsIssue";
+    protected static final String LIST_REQUESTS_VERIFY_MODE = "listRequestsVerify";
+    protected static final String CONFIRM_CERT_REQ_MODE = "confirmCertReq";
+    
+    // Key algorithm for CA's keypair
+    protected static final String defaultKeyAlgorithm = "RSA";
+    // CA's private key and self-signed certificate is stored under this keystore created using KeystoreManager
+    // Using FileKeystoreManager, the file willbe <server-base-dir>/var/security/keystores/<defaultCAKeystore>
+    protected static final String defaultCAKeystore = "ca-keystore";
+    // CA's certificate store directory
+    protected static final String defaultCAStoreDir = "var/security/ca/certs";
+    // Certificate request store directory
+    protected static final String defaultCSRStoreDir = "var/security/ca/requests";
+
+    // Name of the attribute for error message to be displayed in a page
+    protected static final String ERROR_MSG = "errorMsg";
+    // Name of the attribute for information message to be displayed in a page
+    protected static final String INFO_MSG = "infoMsg";
+
+    /**
+     * Constructor
+     */
+    protected BaseCAHandler(String mode, String viewName) {
+        super(mode, viewName);
+    }
+
+    public final static class CAModel implements MultiPageModel {
+        public CAModel(PortletRequest request) {
+        }
+
+        public void save(ActionResponse response, PortletSession session) {
+        }
+    }
+    
+    /**
+     * This method returns CertificationAuthority GBbean.
+     * @param request PortletRequest to execute retrieve GBean
+     * @return  null if a CA GBean is not running.
+     */
+    protected CertificationAuthority getCertificationAuthority(PortletRequest request) {
+        Object[] cas = PortletManager.getManagedBeans(request, CertificationAuthority.class);
+        return (CertificationAuthority)(cas != null && cas.length > 0 ? cas[0] : null);
+    }
+
+    /**
+     * This methods creates CA's keystore using KeystoreManager.
+     * @param request PortletRequest to get KeystoreManager
+     * @param password Password for newly created Keystore
+     * @throws KeystoreException 
+     */
+    protected KeystoreInstance createCAKeystoreInstance(PortletRequest request, String password) throws KeystoreException {
+        return PortletManager.getCurrentServer(request).getKeystoreManager().createKeystore(defaultCAKeystore, password.toCharArray());
+    }
+    
+    /**
+     * This method returns CertificateRequestStore GBean.
+     * @param request PortletRequest to execute retrieve GBean
+     * @return  null if a CertificateRequestStore GBean is not running.
+     */
+    protected CertificateRequestStore getCertificateRequestStore(PortletRequest request) {
+        Object[] crs = PortletManager.getManagedBeans(request, CertificateRequestStore.class);
+        return (CertificateRequestStore)(crs != null && crs.length > 0 ? crs[0] : null);
+    }
+
+    /**
+     * This method returns CertificateStore GBean.
+     * @param request PortletRequest to execute retrieve GBean
+     * @return  null if a CertificateStore GBean is not running.
+     */
+    protected CertificateStore getCertificateStore(PortletRequest request) {
+        Object[] cs = PortletManager.getManagedBeans(request, CertificateStore.class);
+        return (CertificateStore)(cs != null && cs.length > 0 ? cs[0] : null);
+    }
+}

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

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

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

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java Fri Nov 17 12:05:24 2006
@@ -1,100 +1,100 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.console.ca;
-
-import java.io.IOException;
-import java.security.PublicKey;
-import java.security.cert.Certificate;
-import java.security.interfaces.RSAPublicKey;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.management.geronimo.CertificationAuthority;
-import org.apache.geronimo.util.CaUtils;
-import org.apache.geronimo.util.CertificateUtil;
-
-/**
- * Handler for the CA details screen.
- *
- * @version $Rev$ $Date$
- */
-public class CADetailsHandler extends BaseCAHandler {
-    private final static Log log = LogFactory.getLog(CADetailsHandler.class);
-    public CADetailsHandler() {
-        super(CADETAILS_MODE, "/WEB-INF/view/ca/caDetails.jsp");
-    }
-
-    public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG};
-        for(int i = 0; i < params.length; ++i) {
-            String value = request.getParameter(params[i]);
-            if(value != null) response.setRenderParameter(params[i], value);
-        }
-        return getMode();
-    }
-
-    public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG};
-        for(int i = 0; i < params.length; ++i) {
-            String value = request.getParameter(params[i]);
-            if(value != null) request.setAttribute(params[i], value);
-        }
-        try {
-            CertificationAuthority ca = getCertificationAuthority(request);
-            if(ca == null) {
-                throw new Exception("CA is not running. CA may not have been initialized.");
-            }
-            if(ca.isLocked()) {
-                request.setAttribute("caLocked", Boolean.TRUE);
-                throw new Exception("CA is locked.  Unlock CA to view details.");
-            }
-            
-            // Get CA details
-            Certificate caCert = ca.getCertificate();
-            request.setAttribute("cert", caCert);
-            request.setAttribute("highestSerial", ca.getHighestSerialNumber());
-            request.setAttribute("certText", CaUtils.base64Certificate(caCert));
-            PublicKey publickey = caCert.getPublicKey();
-            String keySize = null;
-            if(publickey instanceof RSAPublicKey) {
-                keySize = ""+((RSAPublicKey)publickey).getModulus().bitLength();
-                request.setAttribute("keySize", keySize);
-            }
-            Map fingerPrints = new HashMap();
-            fingerPrints.put("MD5", CertificateUtil.generateFingerprint(caCert, "MD5"));
-            fingerPrints.put("SHA1", CertificateUtil.generateFingerprint(caCert, "SHA1"));
-            request.setAttribute("fingerPrints", fingerPrints);
-        } catch (Exception e) {
-            request.setAttribute(ERROR_MSG, e.toString());
-            log.error("Errors while trying to view CA Details.", e);
-        }
-    }
-
-    public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
-        return getMode()+BEFORE_ACTION;
-    }
-}
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.ca;
+
+import java.io.IOException;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
+import java.security.interfaces.RSAPublicKey;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.management.geronimo.CertificationAuthority;
+import org.apache.geronimo.util.CaUtils;
+import org.apache.geronimo.util.CertificateUtil;
+
+/**
+ * Handler for the CA details screen.
+ *
+ * @version $Rev$ $Date$
+ */
+public class CADetailsHandler extends BaseCAHandler {
+    private final static Log log = LogFactory.getLog(CADetailsHandler.class);
+    public CADetailsHandler() {
+        super(CADETAILS_MODE, "/WEB-INF/view/ca/caDetails.jsp");
+    }
+
+    public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        String[] params = {ERROR_MSG, INFO_MSG};
+        for(int i = 0; i < params.length; ++i) {
+            String value = request.getParameter(params[i]);
+            if(value != null) response.setRenderParameter(params[i], value);
+        }
+        return getMode();
+    }
+
+    public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
+        String[] params = {ERROR_MSG, INFO_MSG};
+        for(int i = 0; i < params.length; ++i) {
+            String value = request.getParameter(params[i]);
+            if(value != null) request.setAttribute(params[i], value);
+        }
+        try {
+            CertificationAuthority ca = getCertificationAuthority(request);
+            if(ca == null) {
+                throw new Exception("CA is not running. CA may not have been initialized.");
+            }
+            if(ca.isLocked()) {
+                request.setAttribute("caLocked", Boolean.TRUE);
+                throw new Exception("CA is locked.  Unlock CA to view details.");
+            }
+            
+            // Get CA details
+            Certificate caCert = ca.getCertificate();
+            request.setAttribute("cert", caCert);
+            request.setAttribute("highestSerial", ca.getHighestSerialNumber());
+            request.setAttribute("certText", CaUtils.base64Certificate(caCert));
+            PublicKey publickey = caCert.getPublicKey();
+            String keySize = null;
+            if(publickey instanceof RSAPublicKey) {
+                keySize = ""+((RSAPublicKey)publickey).getModulus().bitLength();
+                request.setAttribute("keySize", keySize);
+            }
+            Map fingerPrints = new HashMap();
+            fingerPrints.put("MD5", CertificateUtil.generateFingerprint(caCert, "MD5"));
+            fingerPrints.put("SHA1", CertificateUtil.generateFingerprint(caCert, "SHA1"));
+            request.setAttribute("fingerPrints", fingerPrints);
+        } catch (Exception e) {
+            request.setAttribute(ERROR_MSG, e.toString());
+            log.error("Errors while trying to view CA Details.", e);
+        }
+    }
+
+    public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        return getMode()+BEFORE_ACTION;
+    }
+}

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

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

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

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java Fri Nov 17 12:05:24 2006
@@ -1,125 +1,125 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.console.ca;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.management.geronimo.CertificationAuthority;
-
-/**
- * Handler for CSR details screen.
- *
- * @version $Rev$ $Date$
- */
-public class CertReqDetailsHandler extends BaseCAHandler {
-    private final static Log log = LogFactory.getLog(CertReqDetailsHandler.class);
-    public CertReqDetailsHandler() {
-        super(CERT_REQ_DETAILS_MODE, "/WEB-INF/view/ca/certReqDetails.jsp");
-    }
-
-    public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG, "algorithm", "sNo", "validFrom", "validTo", "pkcs10certreq", "subject", "publickey", "requestId"};
-        for(int i = 0; i < params.length; ++i) {
-            String value = request.getParameter(params[i]);
-            if(value != null) response.setRenderParameter(params[i], value);
-        }
-        String sNo = request.getParameter("sNo");
-        if(sNo == null) {
-            // Freshly loading the certificate request details screen
-            CertificationAuthority ca = getCertificationAuthority(request);
-            try {
-                sNo = ca.getNextSerialNumber().toString();
-                response.setRenderParameter("sNo", sNo);
-            } catch (Exception e) {
-                log.error("Unable to get next serial number from CA.", e);
-                response.setRenderParameter(ERROR_MSG, e.toString());
-            }
-        }
-        return getMode();
-    }
-
-    public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG, "subject", "publickey", "sNo", "validFrom", "validTo", "algorithm", "pkcs10certreq", "requestId"};
-        for(int i = 0; i < params.length; ++i) {
-            Object value = request.getParameter(params[i]);
-            if(value != null) request.setAttribute(params[i], value);
-        }
-    }
-
-    public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
-        String errorMsg = null;
-
-        try {
-            // Validate the Serial Number
-            String sNo = request.getParameter("sNo");
-            new BigInteger(sNo.trim());
-            
-            // Validate the from and to dates
-            String validFrom = request.getParameter("validFrom");
-            String validTo = request.getParameter("validTo");
-            DateFormat df = new SimpleDateFormat("MM/dd/yyyy");
-            // Check if the from date format is MM/DD/YYYY
-            Date validFromDate = df.parse(validFrom);
-            Calendar calendar = new GregorianCalendar();
-            calendar.setTime(validFromDate);
-            String mmddyyyy = (calendar.get(Calendar.MONTH) < 9 ? "0":"") + (calendar.get(Calendar.MONTH)+1);
-            mmddyyyy += "/"+(calendar.get(Calendar.DAY_OF_MONTH) < 10 ? "0":"") + (calendar.get(Calendar.DAY_OF_MONTH));
-            mmddyyyy += "/"+calendar.get(Calendar.YEAR);
-            if(!mmddyyyy.equals(validFrom)) {
-                throw new Exception("validFrom must be a date in MM/DD/YYYY format.");
-            }
-            // Check if the to date format is MM/DD/YYYY
-            Date validToDate = df.parse(validTo);
-            calendar.setTime(validToDate);
-            mmddyyyy = (calendar.get(Calendar.MONTH) < 9 ? "0":"") + (calendar.get(Calendar.MONTH)+1);
-            mmddyyyy += "/"+(calendar.get(Calendar.DAY_OF_MONTH) < 10 ? "0":"") + (calendar.get(Calendar.DAY_OF_MONTH));
-            mmddyyyy += "/"+calendar.get(Calendar.YEAR);
-            if(!mmddyyyy.equals(validTo)) {
-                throw new Exception("validTo must be a date in MM/DD/YYYY format.");
-            }
-            // Check if the from date is before the to date
-            if(validFromDate.after(validToDate)) {
-                throw new Exception("Validity: From date '"+validFrom+"' is before the To date '"+validTo+"'.");
-            }
-            
-            // Go to client certificate confirmation page
-            return CONFIRM_CLIENT_CERT_MODE+BEFORE_ACTION;
-        } catch(Exception e) {
-            errorMsg = e.toString();
-            log.error("Errors in user input while processing a CSR.", e);
-        }
-        
-        if(errorMsg != null) response.setRenderParameter(ERROR_MSG, errorMsg);
-        return getMode()+BEFORE_ACTION;
-    }
-}
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.ca;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.management.geronimo.CertificationAuthority;
+
+/**
+ * Handler for CSR details screen.
+ *
+ * @version $Rev$ $Date$
+ */
+public class CertReqDetailsHandler extends BaseCAHandler {
+    private final static Log log = LogFactory.getLog(CertReqDetailsHandler.class);
+    public CertReqDetailsHandler() {
+        super(CERT_REQ_DETAILS_MODE, "/WEB-INF/view/ca/certReqDetails.jsp");
+    }
+
+    public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        String[] params = {ERROR_MSG, INFO_MSG, "algorithm", "sNo", "validFrom", "validTo", "pkcs10certreq", "subject", "publickey", "requestId"};
+        for(int i = 0; i < params.length; ++i) {
+            String value = request.getParameter(params[i]);
+            if(value != null) response.setRenderParameter(params[i], value);
+        }
+        String sNo = request.getParameter("sNo");
+        if(sNo == null) {
+            // Freshly loading the certificate request details screen
+            CertificationAuthority ca = getCertificationAuthority(request);
+            try {
+                sNo = ca.getNextSerialNumber().toString();
+                response.setRenderParameter("sNo", sNo);
+            } catch (Exception e) {
+                log.error("Unable to get next serial number from CA.", e);
+                response.setRenderParameter(ERROR_MSG, e.toString());
+            }
+        }
+        return getMode();
+    }
+
+    public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
+        String[] params = {ERROR_MSG, INFO_MSG, "subject", "publickey", "sNo", "validFrom", "validTo", "algorithm", "pkcs10certreq", "requestId"};
+        for(int i = 0; i < params.length; ++i) {
+            Object value = request.getParameter(params[i]);
+            if(value != null) request.setAttribute(params[i], value);
+        }
+    }
+
+    public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        String errorMsg = null;
+
+        try {
+            // Validate the Serial Number
+            String sNo = request.getParameter("sNo");
+            new BigInteger(sNo.trim());
+            
+            // Validate the from and to dates
+            String validFrom = request.getParameter("validFrom");
+            String validTo = request.getParameter("validTo");
+            DateFormat df = new SimpleDateFormat("MM/dd/yyyy");
+            // Check if the from date format is MM/DD/YYYY
+            Date validFromDate = df.parse(validFrom);
+            Calendar calendar = new GregorianCalendar();
+            calendar.setTime(validFromDate);
+            String mmddyyyy = (calendar.get(Calendar.MONTH) < 9 ? "0":"") + (calendar.get(Calendar.MONTH)+1);
+            mmddyyyy += "/"+(calendar.get(Calendar.DAY_OF_MONTH) < 10 ? "0":"") + (calendar.get(Calendar.DAY_OF_MONTH));
+            mmddyyyy += "/"+calendar.get(Calendar.YEAR);
+            if(!mmddyyyy.equals(validFrom)) {
+                throw new Exception("validFrom must be a date in MM/DD/YYYY format.");
+            }
+            // Check if the to date format is MM/DD/YYYY
+            Date validToDate = df.parse(validTo);
+            calendar.setTime(validToDate);
+            mmddyyyy = (calendar.get(Calendar.MONTH) < 9 ? "0":"") + (calendar.get(Calendar.MONTH)+1);
+            mmddyyyy += "/"+(calendar.get(Calendar.DAY_OF_MONTH) < 10 ? "0":"") + (calendar.get(Calendar.DAY_OF_MONTH));
+            mmddyyyy += "/"+calendar.get(Calendar.YEAR);
+            if(!mmddyyyy.equals(validTo)) {
+                throw new Exception("validTo must be a date in MM/DD/YYYY format.");
+            }
+            // Check if the from date is before the to date
+            if(validFromDate.after(validToDate)) {
+                throw new Exception("Validity: From date '"+validFrom+"' is before the To date '"+validTo+"'.");
+            }
+            
+            // Go to client certificate confirmation page
+            return CONFIRM_CLIENT_CERT_MODE+BEFORE_ACTION;
+        } catch(Exception e) {
+            errorMsg = e.toString();
+            log.error("Errors in user input while processing a CSR.", e);
+        }
+        
+        if(errorMsg != null) response.setRenderParameter(ERROR_MSG, errorMsg);
+        return getMode()+BEFORE_ACTION;
+    }
+}

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

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

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

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CertificationAuthorityPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CertificationAuthorityPortlet.java?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CertificationAuthorityPortlet.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/CertificationAuthorityPortlet.java Fri Nov 17 12:05:24 2006
@@ -1,56 +1,56 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.console.ca;
-
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-
-import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.console.MultiPagePortlet;
-
-/**
- * A portlet for Certification Authority.
- *
- * @version $Rev$ $Date$
- */
-public class CertificationAuthorityPortlet extends MultiPagePortlet {
-    public void init(PortletConfig config) throws PortletException {
-        super.init(config);
-        addHelper(new IntroHandler(), config);
-        addHelper(new SetupCAHandler(), config);
-        addHelper(new ConfirmCAHandler(), config);
-        addHelper(new CADetailsHandler(), config);
-        addHelper(new UnlockCAHandler(), config);
-        addHelper(new ProcessCSRHandler(), config);
-        addHelper(new CertReqDetailsHandler(), config);
-        addHelper(new ConfirmClientCertHandler(), config);
-        addHelper(new ViewCertificateHandler(), config);
-        addHelper(new ListRequestsIssueHandler(), config);
-        addHelper(new ListRequestsVerifyHandler(), config);
-        addHelper(new ConfirmCertReqHandler(), config);
-    }
-
-    protected String getModelJSPVariableName() {
-        return "model";
-    }
-
-    protected MultiPageModel getModel(PortletRequest request) {
-        return new BaseCAHandler.CAModel(request);
-    }
-}
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.ca;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.console.MultiPagePortlet;
+
+/**
+ * A portlet for Certification Authority.
+ *
+ * @version $Rev$ $Date$
+ */
+public class CertificationAuthorityPortlet extends MultiPagePortlet {
+    public void init(PortletConfig config) throws PortletException {
+        super.init(config);
+        addHelper(new IntroHandler(), config);
+        addHelper(new SetupCAHandler(), config);
+        addHelper(new ConfirmCAHandler(), config);
+        addHelper(new CADetailsHandler(), config);
+        addHelper(new UnlockCAHandler(), config);
+        addHelper(new ProcessCSRHandler(), config);
+        addHelper(new CertReqDetailsHandler(), config);
+        addHelper(new ConfirmClientCertHandler(), config);
+        addHelper(new ViewCertificateHandler(), config);
+        addHelper(new ListRequestsIssueHandler(), config);
+        addHelper(new ListRequestsVerifyHandler(), config);
+        addHelper(new ConfirmCertReqHandler(), config);
+    }
+
+    protected String getModelJSPVariableName() {
+        return "model";
+    }
+
+    protected MultiPageModel getModel(PortletRequest request) {
+        return new BaseCAHandler.CAModel(request);
+    }
+}

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

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

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

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java Fri Nov 17 12:05:24 2006
@@ -1,183 +1,183 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.console.ca;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.net.URI;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.Naming;
-import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
-import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.management.geronimo.CertificationAuthority;
-import org.apache.geronimo.management.geronimo.KeystoreInstance;
-import org.apache.geronimo.security.ca.FileCertificateRequestStore;
-import org.apache.geronimo.security.ca.FileCertificateStore;
-import org.apache.geronimo.security.ca.GeronimoCertificationAuthority;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
-
-/**
- * Handler for the CA confirmation screen.
- *
- * @version $Rev$ $Date$
- */
-public class ConfirmCAHandler extends BaseCAHandler {
-    private final static Log log = LogFactory.getLog(ConfirmCAHandler.class);
-    public ConfirmCAHandler() {
-        super(CONFIRM_CA_MODE, "/WEB-INF/view/ca/confirmCA.jsp");
-    }
-
-    public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG, "caCN", "caOU", "caO", "caL", "caST", "caC", "alias", "keyAlgorithm", "keySize", "algorithm", "validFrom", "validTo", "sNo", "password"};
-        for(int i = 0; i < params.length; ++i) {
-            String value = request.getParameter(params[i]);
-            if(value != null) response.setRenderParameter(params[i], value);
-        }
-        return getMode();
-    }
-
-    public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG, "caCN", "caOU", "caO", "caL", "caST", "caC", "alias", "keyAlgorithm", "keySize", "algorithm", "validFrom", "validTo", "sNo", "password"};
-        for(int i = 0; i < params.length; ++i) {
-            String value = request.getParameter(params[i]);
-            if(value != null) request.setAttribute(params[i], value);
-        }
-    }
-
-    public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
-        String caCN = request.getParameter("caCN");
-        String caOU = request.getParameter("caOU");
-        String caO = request.getParameter("caO");
-        String caL = request.getParameter("caL");
-        String caST = request.getParameter("caST");
-        String caC = request.getParameter("caC");
-        String alias = request.getParameter("alias");
-        String password = request.getParameter("password");
-        String keyAlgorithm = request.getParameter("keyAlgorithm");
-        String keySize = request.getParameter("keySize");
-        String algorithm = request.getParameter("algorithm");
-        String validFrom = request.getParameter("validFrom");
-        String validTo = request.getParameter("validTo");
-        String sNo = request.getParameter("sNo");
-        String errorMsg = null;
-        
-        try {
-            // Generate keypair
-            // Check if the key algorithm is same as defaultKeyAlgorithm (which is "RSA")
-            if(!defaultKeyAlgorithm.equalsIgnoreCase(keyAlgorithm)) {
-                throw new Exception("Key Algorithm '"+keyAlgorithm+"' is not supported.");
-            }
-            // Create a KeystoreInstance and generate keypair
-            KeystoreInstance caKeystore = createCAKeystoreInstance(request, password);
-            caKeystore.unlockKeystore(password.toCharArray());
-            caKeystore.generateKeyPair(alias, password.toCharArray(), password.toCharArray(), keyAlgorithm, Integer.parseInt(keySize),
-                    algorithm, 365, caCN, caOU, caO, caL, caST, caC);
-            caKeystore.unlockPrivateKey(alias, password.toCharArray(), password.toCharArray());
-            
-            // Create CertificationAuthority, CertificateStore and CertificateRequestStore GBeans
-            createCARelatedGBeans(request, (GeronimoManagedBean)caKeystore, defaultCAStoreDir, defaultCSRStoreDir);
-
-            CertificationAuthority ca = getCertificationAuthority(request);
-            ca.unlock(password.toCharArray());
-
-            // Certificate validity and serial number.
-            // Validity of these have been checked before loading the confirmation page.
-            Date validFromDate = null, validToDate = null;
-            DateFormat df = new SimpleDateFormat("MM/dd/yyyy");
-            validFromDate = df.parse(validFrom);
-            validToDate = df.parse(validTo);
-            BigInteger serialNum = new BigInteger(sNo);
-            
-            // Instruct the CA to issue a self-signed certificate.
-            ca.issueOwnCertificate(serialNum, validFromDate, validToDate, algorithm);
-            // Publish the CA's certificate to CertificateStore.
-            getCertificateStore(request).storeCACertificate(ca.getCertificate());
-            
-            // CA Setup is succeessful.
-            // Load a page to show CA details.
-            response.setRenderParameter(INFO_MSG, "CA Setup is successful!");
-            log.info("CA Setup is successful.");
-            
-            return CADETAILS_MODE+BEFORE_ACTION;
-        } catch(Exception e) {
-            errorMsg = e.toString();
-            log.error("Errors in CA Setup process.", e);
-        }
-        
-        // An error occurred.  Go back to CA details entry page so that user can correct the errors.
-        if(errorMsg != null) response.setRenderParameter(ERROR_MSG, errorMsg);
-        return SETUPCA_MODE+BEFORE_ACTION;
-    }
-    
-    /**
-     * This method creates CerificationAuthority, CertificateStore and CertificateRequestStore GBeans.  The GBeans are
-     * created and added to the same configuration containing the caKeystore GBean.
-     * @param request PortletRequest to execute any kernel api's
-     * @param caKeystore Keystore to be used by the CA
-     * @param certStorePath Path for CertificateStore directory.  Note: This CA uses FileCertificateStore
-     * @param certReqStorePath Path for CertificateRequestStore directory: Note: This CA uses FileCertificateRequestStore
-     */
-    private void createCARelatedGBeans(PortletRequest request, GeronimoManagedBean caKeystore, String certStorePath, String certReqStorePath) {
-        // Get hold of configuration containing caKeystore GBean
-        AbstractName caKeystoreName = PortletManager.getNameFor(request, caKeystore);
-        Artifact configurationId =  PortletManager.getConfigurationFor(request, caKeystoreName);
-        ServerInfo serverInfo = PortletManager.getCurrentServer(request).getServerInfo();
-        AbstractName serverInfoName = PortletManager.getNameFor(request, serverInfo);
-        Naming naming = PortletManager.getManagementHelper(request).getNaming();
-        
-        // Add a CertificateStore GBean
-        AbstractName certStoreName = naming.createSiblingName(caKeystoreName, "geronimo-ca-cert-store", NameFactory.CERTIFICATE_STORE);
-        GBeanData certStore = new GBeanData(certStoreName, FileCertificateStore.GBEAN_INFO);
-        certStore.setAttribute("directoryPath", URI.create(certStorePath));
-        certStore.setReferencePattern("ServerInfo", serverInfoName);
-        PortletManager.addGBeanToConfiguration(request, configurationId, certStore, true);
-        
-        // Add a CertificateRequestStore GBean
-        AbstractName certReqStoreName = naming.createSiblingName(caKeystoreName, "geronimo-ca-cert-req-store", NameFactory.CERTIFICATE_REQUEST_STORE);
-        GBeanData certReqStore = new GBeanData(certReqStoreName, FileCertificateRequestStore.GBEAN_INFO);
-        certReqStore.setAttribute("directoryPath", URI.create(certReqStorePath));
-        certReqStore.setReferencePattern("ServerInfo", serverInfoName);
-        PortletManager.addGBeanToConfiguration(request, configurationId, certReqStore, true);
-        
-        // Add a CertificationAuthority GBean
-        AbstractName caName = naming.createSiblingName(caKeystoreName, "geronimo-ca", NameFactory.CERTIFICATION_AUTHORITY);
-        GBeanData ca = new GBeanData(caName, GeronimoCertificationAuthority.GBEAN_INFO);
-        ca.setReferencePattern("ServerInfo", serverInfoName);
-        ca.setReferencePattern("KeystoreInstance", caKeystoreName);
-        ca.setReferencePattern("CertificateStore", certStoreName);
-        ca.setReferencePattern("CertificateRequestStore", certReqStoreName);
-        PortletManager.addGBeanToConfiguration(request, configurationId, ca, true);
-    }
-}
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.ca;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.net.URI;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.Naming;
+import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.management.geronimo.CertificationAuthority;
+import org.apache.geronimo.management.geronimo.KeystoreInstance;
+import org.apache.geronimo.security.ca.FileCertificateRequestStore;
+import org.apache.geronimo.security.ca.FileCertificateStore;
+import org.apache.geronimo.security.ca.GeronimoCertificationAuthority;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+
+/**
+ * Handler for the CA confirmation screen.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ConfirmCAHandler extends BaseCAHandler {
+    private final static Log log = LogFactory.getLog(ConfirmCAHandler.class);
+    public ConfirmCAHandler() {
+        super(CONFIRM_CA_MODE, "/WEB-INF/view/ca/confirmCA.jsp");
+    }
+
+    public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        String[] params = {ERROR_MSG, INFO_MSG, "caCN", "caOU", "caO", "caL", "caST", "caC", "alias", "keyAlgorithm", "keySize", "algorithm", "validFrom", "validTo", "sNo", "password"};
+        for(int i = 0; i < params.length; ++i) {
+            String value = request.getParameter(params[i]);
+            if(value != null) response.setRenderParameter(params[i], value);
+        }
+        return getMode();
+    }
+
+    public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
+        String[] params = {ERROR_MSG, INFO_MSG, "caCN", "caOU", "caO", "caL", "caST", "caC", "alias", "keyAlgorithm", "keySize", "algorithm", "validFrom", "validTo", "sNo", "password"};
+        for(int i = 0; i < params.length; ++i) {
+            String value = request.getParameter(params[i]);
+            if(value != null) request.setAttribute(params[i], value);
+        }
+    }
+
+    public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        String caCN = request.getParameter("caCN");
+        String caOU = request.getParameter("caOU");
+        String caO = request.getParameter("caO");
+        String caL = request.getParameter("caL");
+        String caST = request.getParameter("caST");
+        String caC = request.getParameter("caC");
+        String alias = request.getParameter("alias");
+        String password = request.getParameter("password");
+        String keyAlgorithm = request.getParameter("keyAlgorithm");
+        String keySize = request.getParameter("keySize");
+        String algorithm = request.getParameter("algorithm");
+        String validFrom = request.getParameter("validFrom");
+        String validTo = request.getParameter("validTo");
+        String sNo = request.getParameter("sNo");
+        String errorMsg = null;
+        
+        try {
+            // Generate keypair
+            // Check if the key algorithm is same as defaultKeyAlgorithm (which is "RSA")
+            if(!defaultKeyAlgorithm.equalsIgnoreCase(keyAlgorithm)) {
+                throw new Exception("Key Algorithm '"+keyAlgorithm+"' is not supported.");
+            }
+            // Create a KeystoreInstance and generate keypair
+            KeystoreInstance caKeystore = createCAKeystoreInstance(request, password);
+            caKeystore.unlockKeystore(password.toCharArray());
+            caKeystore.generateKeyPair(alias, password.toCharArray(), password.toCharArray(), keyAlgorithm, Integer.parseInt(keySize),
+                    algorithm, 365, caCN, caOU, caO, caL, caST, caC);
+            caKeystore.unlockPrivateKey(alias, password.toCharArray(), password.toCharArray());
+            
+            // Create CertificationAuthority, CertificateStore and CertificateRequestStore GBeans
+            createCARelatedGBeans(request, (GeronimoManagedBean)caKeystore, defaultCAStoreDir, defaultCSRStoreDir);
+
+            CertificationAuthority ca = getCertificationAuthority(request);
+            ca.unlock(password.toCharArray());
+
+            // Certificate validity and serial number.
+            // Validity of these have been checked before loading the confirmation page.
+            Date validFromDate = null, validToDate = null;
+            DateFormat df = new SimpleDateFormat("MM/dd/yyyy");
+            validFromDate = df.parse(validFrom);
+            validToDate = df.parse(validTo);
+            BigInteger serialNum = new BigInteger(sNo);
+            
+            // Instruct the CA to issue a self-signed certificate.
+            ca.issueOwnCertificate(serialNum, validFromDate, validToDate, algorithm);
+            // Publish the CA's certificate to CertificateStore.
+            getCertificateStore(request).storeCACertificate(ca.getCertificate());
+            
+            // CA Setup is succeessful.
+            // Load a page to show CA details.
+            response.setRenderParameter(INFO_MSG, "CA Setup is successful!");
+            log.info("CA Setup is successful.");
+            
+            return CADETAILS_MODE+BEFORE_ACTION;
+        } catch(Exception e) {
+            errorMsg = e.toString();
+            log.error("Errors in CA Setup process.", e);
+        }
+        
+        // An error occurred.  Go back to CA details entry page so that user can correct the errors.
+        if(errorMsg != null) response.setRenderParameter(ERROR_MSG, errorMsg);
+        return SETUPCA_MODE+BEFORE_ACTION;
+    }
+    
+    /**
+     * This method creates CerificationAuthority, CertificateStore and CertificateRequestStore GBeans.  The GBeans are
+     * created and added to the same configuration containing the caKeystore GBean.
+     * @param request PortletRequest to execute any kernel api's
+     * @param caKeystore Keystore to be used by the CA
+     * @param certStorePath Path for CertificateStore directory.  Note: This CA uses FileCertificateStore
+     * @param certReqStorePath Path for CertificateRequestStore directory: Note: This CA uses FileCertificateRequestStore
+     */
+    private void createCARelatedGBeans(PortletRequest request, GeronimoManagedBean caKeystore, String certStorePath, String certReqStorePath) {
+        // Get hold of configuration containing caKeystore GBean
+        AbstractName caKeystoreName = PortletManager.getNameFor(request, caKeystore);
+        Artifact configurationId =  PortletManager.getConfigurationFor(request, caKeystoreName);
+        ServerInfo serverInfo = PortletManager.getCurrentServer(request).getServerInfo();
+        AbstractName serverInfoName = PortletManager.getNameFor(request, serverInfo);
+        Naming naming = PortletManager.getManagementHelper(request).getNaming();
+        
+        // Add a CertificateStore GBean
+        AbstractName certStoreName = naming.createSiblingName(caKeystoreName, "geronimo-ca-cert-store", NameFactory.CERTIFICATE_STORE);
+        GBeanData certStore = new GBeanData(certStoreName, FileCertificateStore.GBEAN_INFO);
+        certStore.setAttribute("directoryPath", URI.create(certStorePath));
+        certStore.setReferencePattern("ServerInfo", serverInfoName);
+        PortletManager.addGBeanToConfiguration(request, configurationId, certStore, true);
+        
+        // Add a CertificateRequestStore GBean
+        AbstractName certReqStoreName = naming.createSiblingName(caKeystoreName, "geronimo-ca-cert-req-store", NameFactory.CERTIFICATE_REQUEST_STORE);
+        GBeanData certReqStore = new GBeanData(certReqStoreName, FileCertificateRequestStore.GBEAN_INFO);
+        certReqStore.setAttribute("directoryPath", URI.create(certReqStorePath));
+        certReqStore.setReferencePattern("ServerInfo", serverInfoName);
+        PortletManager.addGBeanToConfiguration(request, configurationId, certReqStore, true);
+        
+        // Add a CertificationAuthority GBean
+        AbstractName caName = naming.createSiblingName(caKeystoreName, "geronimo-ca", NameFactory.CERTIFICATION_AUTHORITY);
+        GBeanData ca = new GBeanData(caName, GeronimoCertificationAuthority.GBEAN_INFO);
+        ca.setReferencePattern("ServerInfo", serverInfoName);
+        ca.setReferencePattern("KeystoreInstance", caKeystoreName);
+        ca.setReferencePattern("CertificateStore", certStoreName);
+        ca.setReferencePattern("CertificateRequestStore", certReqStoreName);
+        PortletManager.addGBeanToConfiguration(request, configurationId, ca, true);
+    }
+}

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

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

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

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ConfirmCertReqHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ConfirmCertReqHandler.java?view=diff&rev=476291&r1=476290&r2=476291
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ConfirmCertReqHandler.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ca/ConfirmCertReqHandler.java Fri Nov 17 12:05:24 2006
@@ -1,70 +1,70 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.console.ca;
-
-import java.io.IOException;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.apache.geronimo.console.MultiPageModel;
-
-/**
- * Handler for the Confirm Certificate Request screen.
- *
- * @version $Rev$ $Date$
- */
-public class ConfirmCertReqHandler extends BaseCAHandler {
-    public ConfirmCertReqHandler() {
-        super(CONFIRM_CERT_REQ_MODE, "/WEB-INF/view/ca/confirmCertReq.jsp");
-    }
-
-    public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG, "subject", "publickey", "requestId"};
-        for(int i = 0; i < params.length; ++i) {
-            String value = request.getParameter(params[i]);
-            if(value != null) response.setRenderParameter(params[i], value);
-        }
-        return getMode();
-    }
-
-    public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG, "subject", "publickey", "requestId"};
-        for(int i = 0; i < params.length; ++i) {
-            String value = request.getParameter(params[i]);
-            if(value != null) request.setAttribute(params[i], value);
-        }
-    }
-
-    public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
-        String requestId = request.getParameter("requestId");
-        String approve = request.getParameter("approve");
-        String reject = request.getParameter("reject");
-        if(approve != null) {
-            getCertificateRequestStore(request).setRequestVerified(requestId);
-            response.setRenderParameter(INFO_MSG, "Approved CSR. id = "+requestId);
-        } else if(reject != null) {
-            getCertificateRequestStore(request).deleteRequest(requestId);
-            response.setRenderParameter(INFO_MSG, "Rejected and deleted CSR. id = "+requestId);
-        }
-        return LIST_REQUESTS_VERIFY_MODE+BEFORE_ACTION;
-    }
-}
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.ca;
+
+import java.io.IOException;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.geronimo.console.MultiPageModel;
+
+/**
+ * Handler for the Confirm Certificate Request screen.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ConfirmCertReqHandler extends BaseCAHandler {
+    public ConfirmCertReqHandler() {
+        super(CONFIRM_CERT_REQ_MODE, "/WEB-INF/view/ca/confirmCertReq.jsp");
+    }
+
+    public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        String[] params = {ERROR_MSG, INFO_MSG, "subject", "publickey", "requestId"};
+        for(int i = 0; i < params.length; ++i) {
+            String value = request.getParameter(params[i]);
+            if(value != null) response.setRenderParameter(params[i], value);
+        }
+        return getMode();
+    }
+
+    public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
+        String[] params = {ERROR_MSG, INFO_MSG, "subject", "publickey", "requestId"};
+        for(int i = 0; i < params.length; ++i) {
+            String value = request.getParameter(params[i]);
+            if(value != null) request.setAttribute(params[i], value);
+        }
+    }
+
+    public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        String requestId = request.getParameter("requestId");
+        String approve = request.getParameter("approve");
+        String reject = request.getParameter("reject");
+        if(approve != null) {
+            getCertificateRequestStore(request).setRequestVerified(requestId);
+            response.setRenderParameter(INFO_MSG, "Approved CSR. id = "+requestId);
+        } else if(reject != null) {
+            getCertificateRequestStore(request).deleteRequest(requestId);
+            response.setRenderParameter(INFO_MSG, "Rejected and deleted CSR. id = "+requestId);
+        }
+        return LIST_REQUESTS_VERIFY_MODE+BEFORE_ACTION;
+    }
+}

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

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

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



Mime
View raw message