svn commit: r482626 - /geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp

[va...@apache.org]

Author: vamsic007
Date: Tue Dec  5 04:37:47 2006
New Revision: 482626

URL: http://svn.apache.org/viewvc?view=rev&rev=482626
Log:
keystoreType and truststoreType have nothing to do with logLevel :o).  Error existed ever since the file was added to svn.

Modified:
    geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp

Modified: geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp?view=diff&rev=482626&r1=482625&r2=482626
==============================================================================
--- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp (original)
+++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp Tue Dec  5 04:37:47 2006
@@ -1,3 +1,22 @@
+<%--
+   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$ --%>
+
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
 <portlet:defineObjects/>
@@ -162,7 +181,7 @@
         <td><div align="right">Keystore Type: </div></td>
         <td>
           <select name="keystoreType">
-            <option<c:if test="${keystoreType eq 'JKS' || logLevel eq ''}"> selected</c:if>>JKS</option>
+            <option<c:if test="${keystoreType eq 'JKS' || keystoreType eq '' || empty(keystoreType)}"> selected</c:if>>JKS</option>
             <option<c:if test="${keystoreType eq 'PKCS12'}"> selected</c:if>>PKCS12</option>
           </select>
         </td>
@@ -204,7 +223,7 @@
     <td><div align="right">Truststore Type: </div></td>
     <td>
       <select name="truststoreType">
-        <option<c:if test="${truststoreType eq 'JKS' || logLevel eq ''}"> selected</c:if>>JKS</option>
+        <option<c:if test="${truststoreType eq 'JKS' || truststoreType eq '' || empty(truststoreType)}"> selected</c:if>>JKS</option>
         <option<c:if test="${truststoreType eq 'PKCS12'}"> selected</c:if>>PKCS12</option>
       </select>
     </td>