You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2006/12/05 13:29:08 UTC
svn commit: r482622 -
/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
Author: vamsic007
Date: Tue Dec 5 04:29:07 2006
New Revision: 482622
URL: http://svn.apache.org/viewvc?view=rev&rev=482622
Log:
Merging rev 482620 from branches\1.2
keystoreType and truststoreType have nothing to do with logLevel :o). Error existed ever since the file was added to svn.
Modified:
geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp?view=diff&rev=482622&r1=482621&r2=482622
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp Tue Dec 5 04:29:07 2006
@@ -225,7 +225,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>
@@ -276,7 +276,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>