geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r686819 [1/3] - in /geronimo/server/branches/2.1: ./ plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/ plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/ plugins/act...
Date Mon, 18 Aug 2008 16:54:02 GMT
Author: dwoods
Date: Mon Aug 18 09:53:56 2008
New Revision: 686819

URL: http://svn.apache.org/viewvc?rev=686819&view=rev
Log:
GERONIMO-4245 Upgrade to Tomcat 6.0.18 to pickup latest security fixes.  Updated Jasper code required changes to some JSPs for 1) escaping quotes in values strings, 2) placing blank spaces around empty operators

Added:
    geronimo/server/branches/2.1/repository/org/apache/tomcat/6.0.18-G678601.README.TXT   (with props)
    geronimo/server/branches/2.1/repository/org/apache/tomcat/TOMCAT_6_0_18-G678601.patch
    geronimo/server/branches/2.1/repository/org/apache/tomcat/catalina/6.0.18-G678601/
    geronimo/server/branches/2.1/repository/org/apache/tomcat/catalina/6.0.18-G678601/catalina-6.0.18-G678601.jar   (with props)
    geronimo/server/branches/2.1/repository/org/apache/tomcat/catalina/6.0.18-G678601/catalina-6.0.18-G678601.jar.md5
    geronimo/server/branches/2.1/repository/org/apache/tomcat/jasper/6.0.18-G678601/
    geronimo/server/branches/2.1/repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.jar   (with props)
    geronimo/server/branches/2.1/repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.jar.md5
Removed:
    geronimo/server/branches/2.1/repository/org/apache/tomcat/6.0.16-G652117.README.TXT
    geronimo/server/branches/2.1/repository/org/apache/tomcat/TOMCAT_6_0_16-G652117.patch
    geronimo/server/branches/2.1/repository/org/apache/tomcat/catalina/6.0.16-G652117/
    geronimo/server/branches/2.1/repository/org/apache/tomcat/jasper/6.0.16-G652117/
Modified:
    geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp
    geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
    geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp
    geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp
    geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp
    geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factoryType.jsp
    geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
    geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp
    geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp Mon Aug 18 09:53:56 2008
@@ -23,8 +23,8 @@
 <p><fmt:message key="jmsmanager.server.connector.normal.title" />:</p>
 
 <!-- Show existing connectors -->
-<c:if test="${empty(connectors)}"><fmt:message key="jmsmanager.server.connector.normal.noJMSNetworkConnectors" /></c:if>
-<c:if test="${!empty(connectors)}">
+<c:if test="${empty (connectors)}"><fmt:message key="jmsmanager.server.connector.normal.noJMSNetworkConnectors" /></c:if>
+<c:if test="${! empty (connectors)}">
 <table width="100%">
   <tr>
     <td style="padding: 0 20px">

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp Mon Aug 18 09:53:56 2008
@@ -23,8 +23,8 @@
 <p><fmt:message key="jmsmanager.server.normal.title" />:</p>
 
 <!-- Show existing connectors -->
-<c:if test="${empty(brokers)}"><fmt:message key="jmsmanager.server.normal.noJMSBrokers"/></c:if>
-<c:if test="${!empty(brokers)}">
+<c:if test="${empty (brokers)}"><fmt:message key="jmsmanager.server.normal.noJMSBrokers"/></c:if>
+<c:if test="${! empty (brokers)}">
 <table width="50%">
   <tr><td style="padding: 0 20px"></td></tr>
           <tr>

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp Mon Aug 18 09:53:56 2008
@@ -72,7 +72,7 @@
       </tr>
 
     <!-- ENTRY FIELD: Config Properties -->
-<c:if test="${!empty(provider.adminObjectDefinitions[data.destinationType].configProperties)}">
+<c:if test="${! empty (provider.adminObjectDefinitions[data.destinationType].configProperties)}">
       <tr>
         <th colspan="2"><fmt:message key="jmswizard.destination.destinationConfSettings" /></th>
       </tr>
@@ -111,7 +111,7 @@
               <c:forEach var="factory" items="${data.connectionFactories}">
                   <li>
                       <c:choose>
-                          <c:when test="${empty(factory.instanceName)}">
+                          <c:when test="${empty (factory.instanceName)}">
                               <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>
@@ -129,7 +129,7 @@
               <c:forEach var="dest" items="${data.adminObjects}">
                   <li>
                       <c:choose>
-                          <c:when test="${empty(dest.name)}">
+                          <c:when test="${empty (dest.name)}">
                               <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp Mon Aug 18 09:53:56 2008
@@ -94,7 +94,7 @@
               <c:forEach var="factory" items="${data.connectionFactories}">
                   <li>
                       <c:choose>
-                          <c:when test="${empty(factory.instanceName)}">
+                          <c:when test="${empty (factory.instanceName)}">
                               <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>
@@ -112,7 +112,7 @@
               <c:forEach var="dest" items="${data.adminObjects}">
                   <li>
                       <c:choose>
-                          <c:when test="${empty(dest.name)}">
+                          <c:when test="${empty (dest.name)}">
                               <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp Mon Aug 18 09:53:56 2008
@@ -128,7 +128,7 @@
     </tr>
 
     <!-- ENTRY FIELD: Config Properties -->
-<c:if test="${!empty(provider.connectionDefinitions[data.factoryType].configProperties)}">
+<c:if test="${! empty (provider.connectionDefinitions[data.factoryType].configProperties)}">
       <tr>
         <th colspan="2"><fmt:message key="jmswizard.common.connectionFactoryConfigurationSettings" /></th>
       </tr>
@@ -167,7 +167,7 @@
               <c:forEach var="factory" items="${data.connectionFactories}">
                   <li>
                       <c:choose>
-                          <c:when test="${empty(factory.instanceName)}">
+                          <c:when test="${empty (factory.instanceName)}">
                               <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>
@@ -185,7 +185,7 @@
               <c:forEach var="dest" items="${data.adminObjects}">
                   <li>
                       <c:choose>
-                          <c:when test="${empty(dest.name)}">
+                          <c:when test="${empty (dest.name)}">
                               <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factoryType.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factoryType.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factoryType.jsp (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factoryType.jsp Mon Aug 18 09:53:56 2008
@@ -94,7 +94,7 @@
               <c:forEach var="factory" items="${data.connectionFactories}">
                   <li>
                       <c:choose>
-                          <c:when test="${empty(factory.instanceName)}">
+                          <c:when test="${empty (factory.instanceName)}">
                               <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>
@@ -112,7 +112,7 @@
               <c:forEach var="dest" items="${data.adminObjects}">
                   <li>
                       <c:choose>
-                          <c:when test="${empty(dest.name)}">
+                          <c:when test="${empty (dest.name)}">
                               <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp Mon Aug 18 09:53:56 2008
@@ -23,7 +23,7 @@
 <p><fmt:message key="jmswizard.list.title" /></p>
 
 <c:choose>
-  <c:when test="${empty(resources)}"><p><i><fmt:message key="jmswizard.list.noJMSResourceGroups" /></i></p></c:when>
+  <c:when test="${empty (resources)}"><p><i><fmt:message key="jmswizard.list.noJMSResourceGroups" /></i></p></c:when>
   <c:otherwise>
 <!--
 <p>For each resource listed, you can click the <b>usage</b> link to see examples of how

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp Mon Aug 18 09:53:56 2008
@@ -16,10 +16,10 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<c:if test="${!empty(infoMsg)}">
+<c:if test="${! empty (infoMsg)}">
 <p><font color="blue"><b>${infoMsg}</b></font></p>
 </c:if>
 
-<c:if test="${!empty(errorMsg)}">
+<c:if test="${! empty (errorMsg)}">
 <p><font color="red"><b>Error: ${errorMsg}</b></font></p>
 </c:if>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp Mon Aug 18 09:53:56 2008
@@ -25,7 +25,7 @@
 </p>
 <jsp:include page="_header.jsp" />
 
-<c:if test="${empty(caLocked) || !caLocked}">
+<c:if test="${empty (caLocked) || !caLocked}">
   <table border="0">
     <tr>
         <th colspan="2" align="left" class="DarkBackground"><fmt:message key="ca.common.certificateDetails"/>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp Mon Aug 18 09:53:56 2008
@@ -95,7 +95,7 @@
             <td>
                 <select name="algorithm">
                     <option <c:if test="${algorithm eq 'MD2withRSA'}">selected</c:if> >MD2withRSA</option>
-                    <option <c:if test="${algorithm eq 'MD5withRSA' || algorithm eq '' || empty(algorithm)}">selected</c:if> >MD5withRSA</option>
+                    <option <c:if test="${algorithm eq 'MD5withRSA' || algorithm eq '' || empty (algorithm)}">selected</c:if> >MD5withRSA</option>
                     <option <c:if test="${algorithm eq 'SHA1withRSA'}">selected</c:if> >SHA1withRSA</option>
                 </select>
             </td>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp Mon Aug 18 09:53:56 2008
@@ -33,7 +33,7 @@
         <th class="DarkBackground" align="left"><fmt:message key="ca.common.certRequests"/></th>
     </tr>
   <c:choose>
-    <c:when test="${!empty(csrIds)}">
+    <c:when test="${! empty (csrIds)}">
       <c:set var="backgroundClass" value='MediumBackground'/>
       <c:forEach items="${csrIds}" var="csrId">
         <c:choose>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp Mon Aug 18 09:53:56 2008
@@ -32,7 +32,7 @@
         <th class="DarkBackground" align="left"><fmt:message key="ca.common.certRequests"/></th>
     </tr>
   <c:choose>
-    <c:when test="${!empty(csrIds)}">
+    <c:when test="${! empty (csrIds)}">
       <c:set var="backgroundClass" value='MediumBackground'/>
       <c:forEach items="${csrIds}" var="csrId">
         <c:choose>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp Mon Aug 18 09:53:56 2008
@@ -120,7 +120,7 @@
             <th align="right"><fmt:message key="ca.common.keyAlgorithm"/>:</th>
             <td>
                 <select name="keyAlgorithm">
-                    <option <c:if test="${keyAlgorithm eq 'RSA' || keyAlgorithm eq '' || empty(keyAlgorithm)}">selected</c:if> >RSA</option>
+                    <option <c:if test="${keyAlgorithm eq 'RSA' || keyAlgorithm eq '' || empty (keyAlgorithm)}">selected</c:if> >RSA</option>
                 </select>
             </td>
         </tr>
@@ -129,7 +129,7 @@
             <td>
                 <select name="keySize">
                     <option <c:if test="${keySize eq '512'}">selected</c:if> >512</option>
-                    <option <c:if test="${keySize eq '1024' || keySize eq '' || empty(keySize)}">selected</c:if> >1024</option>
+                    <option <c:if test="${keySize eq '1024' || keySize eq '' || empty (keySize)}">selected</c:if> >1024</option>
                     <option <c:if test="${keySize eq '2048'}">selected</c:if> >2048</option>
                 </select>
             </td>
@@ -173,7 +173,7 @@
             <td>
                 <select name="algorithm">
                     <option <c:if test="${algorithm eq 'MD2withRSA'}">selected</c:if> >MD2withRSA</option>
-                    <option <c:if test="${algorithm eq 'MD5withRSA' || algorithm eq '' || empty(algorithm)}">selected</c:if> >MD5withRSA</option>
+                    <option <c:if test="${algorithm eq 'MD5withRSA' || algorithm eq '' || empty (algorithm)}">selected</c:if> >MD5withRSA</option>
                     <option <c:if test="${algorithm eq 'SHA1withRSA'}">selected</c:if> >SHA1withRSA</option>
                 </select>
             </td>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp Mon Aug 18 09:53:56 2008
@@ -38,7 +38,7 @@
 <jsp:include page="_header.jsp" />
 
 <c:choose>
-  <c:when test="${empty(sNo)}">
+  <c:when test="${empty (sNo)}">
     <!-- No serial number was received to show a certificate -->
     <p>
     <fmt:message key="ca.viewCertificate.enterSerialNumber"/>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp Mon Aug 18 09:53:56 2008
@@ -19,10 +19,10 @@
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<c:if test="${!empty(infoMsg)}">
+<c:if test="${! empty (infoMsg)}">
 <p><font color="blue"><b>${infoMsg}</b></font></p>
 </c:if>
 
-<c:if test="${!empty(errorMsg)}">
+<c:if test="${! empty (errorMsg)}">
 <p><font color="red"><b>Error: ${errorMsg}</b></font></p>
 </c:if>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp Mon Aug 18 09:53:56 2008
@@ -41,7 +41,7 @@
 </script>
 
 <c:choose>
-    <c:when test="${!empty(alias)}">
+    <c:when test="${! empty (alias)}">
         <b><fmt:message key="keystore.changePassword.changePwdForPriKey"/>&nbsp;${alias}</b><br/>
     </c:when>
     <c:otherwise>
@@ -77,7 +77,7 @@
 </form>
 
 <c:choose>
-    <c:when test="${!empty(alias)}">
+    <c:when test="${! empty (alias)}">
         <p><a href="<portlet:actionURL portletMode="view">
                         <portlet:param name="mode" value="certificateDetails-before" />
                         <portlet:param name="id" value="${keystore}" />

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp Mon Aug 18 09:53:56 2008
@@ -28,7 +28,7 @@
 <jsp:include page="_header.jsp" />
 
 <c:choose>
-  <c:when test="${empty(keystores)}"><p><i><fmt:message key="keystore.index.noKeystores"/></i></p></c:when>
+  <c:when test="${empty (keystores)}"><p><i><fmt:message key="keystore.index.noKeystores"/></i></p></c:when>
   <c:otherwise>
 <p><fmt:message key="keystore.index.explanation"/></p>
 

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp Mon Aug 18 09:53:56 2008
@@ -24,12 +24,12 @@
 
 <!-- Show existing connectors -->
 <c:choose>
-  <c:when test="${empty(containers)}">There are no Web Containers defined</c:when>
+  <c:when test="${empty (containers)}">There are no Web Containers defined</c:when>
   <c:otherwise>
     <c:forEach var="container" items="${containers}">
       <c:if test="${fn:length(containers) > 1}"><p><b>Connectors for ${container.name}:</b></p></c:if>
         <c:choose>
-          <c:when test="${empty(container.connectors)}"><p>There are no connectors defined for ${container.name}</p></c:when>
+          <c:when test="${empty (container.connectors)}"><p>There are no connectors defined for ${container.name}</p></c:when>
           <c:otherwise>
 <table width="100%">
           <tr>

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp Mon Aug 18 09:53:56 2008
@@ -23,7 +23,7 @@
 <p><fmt:message key="realmwizard.list.title" /></p>
 
 <c:choose>
-  <c:when test="${empty(realms)}"><p><i><fmt:message key="realmwizard.list.noSecurityRealms" /></i></p></c:when>
+  <c:when test="${empty (realms)}"><p><i><fmt:message key="realmwizard.list.noSecurityRealms" /></i></p></c:when>
   <c:otherwise>
 <p><fmt:message key="realmwizard.list.seeExamples" /></p>
 

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp Mon Aug 18 09:53:56 2008
@@ -130,8 +130,8 @@
             <td align="left" width="5%"><input type="checkbox" name="graph_ids" value="<%=rs.getString("graph_id")%>"></td>
             <td align="left"><a href="javascript: void(0)" onClick="openNewWindow('/monitoring/monitoringPopUpGraph.jsp?graph_id=<%=rs.getString("graph_id")%>','graph','width=800,height=300','title=<%=rs.getString("name") %>')"><%=rs.getString("name") %></a></td>
             <td align="left"><%=rs.getString("timeframe")%> min.</td>
-            <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=rs.getString("server_id")%>" /></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
-            <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>
+            <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value='<%=rs.getString("server_id")%>' /></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
+            <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value='<%=rs.getString("graph_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>
             </tr>
       <%
 

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp Mon Aug 18 09:53:56 2008
@@ -165,8 +165,8 @@
             <td align="left" width="5%"><input type="checkbox" name="graph_ids" value="<%=rs.getString("graph_id")%>" <%if (graphsList.contains(rs.getInt("graph_id"))){%> checked<%}%>></td>
             <td align="left"><a href="javascript: void(0)" onClick="openNewWindow('/monitoring/monitoringPopUpGraph.jsp?graph_id=<%=rs.getString("graph_id")%>','graph','width=800,height=300','title=<%=rs.getString("name") %>')"><%=rs.getString("name")%></a></td>
             <td align="left"><%=rs.getString("timeframe")%> min.</td>
-            <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=rs.getString("server_id")%>" /></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
-            <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>
+            <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value='<%=rs.getString("server_id")%>' /></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
+            <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value='<%=rs.getString("graph_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>
             </tr>
       <%
 

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp Mon Aug 18 09:53:56 2008
@@ -71,11 +71,11 @@
       </c:otherwise>
   </c:choose>
  <tr>
-  <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value="<%=rs.getString("view_id")%>" /></portlet:actionURL>"><%=rs.getString("name")%></a></td>
+  <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><%=rs.getString("name")%></a></td>
   <td class="${backgroundClass}" width="10%" align="center"><%=rs.getString("graph_count")%></td>
   <td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>
   <td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>
-  <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value="<%=rs.getString("view_id")%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
+  <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
  </tr>
  <%
  }

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp Mon Aug 18 09:53:56 2008
@@ -309,7 +309,7 @@
                         <%
                         } else if (collecting == 0){
                         %>
-                            <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServerViewQuery" /><portlet:param name="server_id" value="<%=server_id%>" /><portlet:param name="snapshotDuration" value="<%= "" + (snapshotDuration * 1000 * 60) %>" /></portlet:actionURL>">Enable Query</a></li>
+                            <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServerViewQuery" /><portlet:param name="server_id" value="<%=server_id%>" /><portlet:param name="snapshotDuration" value='<%= "" + (snapshotDuration * 1000 * 60) %>' /></portlet:actionURL>">Enable Query</a></li>
                         <%
                         }
                         else if (collecting == -1){

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp Mon Aug 18 09:53:56 2008
@@ -68,11 +68,11 @@
       </c:otherwise>
   </c:choose>
  <tr>
-  <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value="<%=rs.getString("view_id")%>" /></portlet:actionURL>"><%=rs.getString("name")%></a></td>
+  <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><%=rs.getString("name")%></a></td>
   <td class="${backgroundClass}" width="10%" align="center"><%=rs.getString("graph_count")%></td>
   <td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>
   <td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>
-  <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value="<%=rs.getString("view_id")%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
+  <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
  </tr>
  <%
  }

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp Mon Aug 18 09:53:56 2008
@@ -144,7 +144,7 @@
 <input type="hidden" name="mode" value="references-after" />
 
 <!-- ENTRY FIELD: EJB References -->
-<c:if test="${!empty(data.ejbRefs)}">
+<c:if test="${! empty (data.ejbRefs)}">
   <p><b>EJB References:</b></p>
   <table border="0" width="100%">
     <tr>
@@ -179,7 +179,7 @@
 </c:if>
 
 <!-- ENTRY FIELD: EJB Local References -->
-<c:if test="${!empty(data.ejbLocalRefs)}">
+<c:if test="${! empty (data.ejbLocalRefs)}">
   <p><b>EJB Local References:</b></p>
   <table border="0" width="100%">
     <tr>
@@ -214,7 +214,7 @@
 </c:if>
 
 <!-- ENTRY FIELD: JDBC Connection Pool References -->
-<c:if test="${!empty(data.jdbcPoolRefs)}">
+<c:if test="${! empty (data.jdbcPoolRefs)}">
   <p><b>JDBC Pool References:</b></p>
   <table border="0" width="100%">
     <tr>
@@ -249,7 +249,7 @@
 </c:if>
 
 <!-- ENTRY FIELD: JMS Connection Factory References -->
-<c:if test="${!empty(data.jmsConnectionFactoryRefs)}">
+<c:if test="${! empty (data.jmsConnectionFactoryRefs)}">
   <p><b>JMS Connection Factory References:</b></p>
   <table border="0" width="100%">
     <tr>
@@ -284,7 +284,7 @@
 </c:if>
 
 <!-- ENTRY FIELD: JMS Destination References -->
-<c:if test="${!empty(data.jmsDestinationRefs) || !empty(data.messageDestinations)}">
+<c:if test="${(! empty (data.jmsDestinationRefs)) || (! empty (data.messageDestinations))}">
   <p><b>JMS Destination References:</b></p>
   <table border="0" width="100%">
     <tr>
@@ -346,7 +346,7 @@
 </c:if>
 
 <!-- ENTRY FIELD: JavaMail Session References -->
-<c:if test="${!empty(data.javaMailSessionRefs)}">
+<c:if test="${! empty (data.javaMailSessionRefs)}">
   <p><b>JavaMail Session References:</b></p>
   <table border="0" width="100%">
     <tr>
@@ -381,7 +381,7 @@
 </c:if>
 
 <!-- ENTRY FIELD: Web Service References -->
-<c:if test="${!empty(data.webServiceRefs)}">
+<c:if test="${! empty (data.webServiceRefs)}">
   <p><b>Web Service References:</b></p>
   <p>Service references declared in your application are shown below to the left. If the WSDL doesn't contain 
   the port information to contact the service or if that information is ambiguous, then resolve the service-ref

Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp Mon Aug 18 09:53:56 2008
@@ -25,7 +25,7 @@
 <p><fmt:message key="dbwizard.importStatus.summary"/></p>
 
 <c:choose>
-  <c:when test="${empty(status.pools)}"><p><i><fmt:message key="dbwizard.importStatus.importFailed"/></i></p></c:when>
+  <c:when test="${empty (status.pools)}"><p><i><fmt:message key="dbwizard.importStatus.importFailed"/></i></p></c:when>
   <c:otherwise>
 <table width="100%">
   <tr>

Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp Mon Aug 18 09:53:56 2008
@@ -23,7 +23,7 @@
 <p><fmt:message key="dbwizard.list.summary"/></p>
 
 <c:choose>
-  <c:when test="${empty(pools)}"><p><i><fmt:message key="dbwizard.list.noDatabasePools"/></i></p></c:when>
+  <c:when test="${empty (pools)}"><p><i><fmt:message key="dbwizard.list.noDatabasePools"/></i></p></c:when>
   <c:otherwise>
 <p><fmt:message key="dbwizard.list.hasDatabasePools"/></p>
 

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=686819&r1=686818&r2=686819&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Mon Aug 18 09:53:56 2008
@@ -72,7 +72,7 @@
         -->
         <openejbVersion>3.0</openejbVersion>
         <derbyVersion>10.2.2.0</derbyVersion>
-        <tomcatVersion>6.0.16</tomcatVersion>
+        <tomcatVersion>6.0.18</tomcatVersion>
         <tranqlVendorsVersion>1.4</tranqlVendorsVersion>
         <dojoVersion>1.0.2</dojoVersion>
         <dojoLegacyVersion>0.4.3</dojoLegacyVersion>
@@ -1001,7 +1001,7 @@
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>jasper</artifactId>
-                <version>6.0.16-G652117</version>
+                <version>6.0.18-G678601</version>
             </dependency>
 
             <dependency>
@@ -1031,7 +1031,7 @@
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>catalina</artifactId>
-                <version>6.0.16-G652117</version>
+                <version>6.0.18-G678601</version>
             </dependency>
 
             <dependency>
@@ -1993,7 +1993,7 @@
                         <dependency>
                             <groupId>org.apache.tomcat</groupId>
                             <artifactId>jasper</artifactId>
-                            <version>6.0.16-G652117</version>
+                            <version>6.0.18-G678601</version>
                         </dependency>
                     </dependencies>
                 </plugin>

Added: geronimo/server/branches/2.1/repository/org/apache/tomcat/6.0.18-G678601.README.TXT
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/tomcat/6.0.18-G678601.README.TXT?rev=686819&view=auto
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/tomcat/6.0.18-G678601.README.TXT (added)
+++ geronimo/server/branches/2.1/repository/org/apache/tomcat/6.0.18-G678601.README.TXT Mon Aug 18 09:53:56 2008
@@ -0,0 +1,70 @@
+Private Build of Tomcat for Geronimo.   
+
+How to build Tomcat 6_0_18 with modifications for Geronimo:
+
+Checkout tomcat 6.0.18
+  svn co  https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_18  tomcat_6_0_18
+  
+svn info for Tomcat image:
+Path: TOMCAT_6_0_18
+URL: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_18
+Repository Root: https://svn.apache.org/repos/asf
+Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
+Revision: 686112
+Node Kind: directory
+Last Changed Author: remm
+Last Changed Rev: 678601
+Last Changed Date: 2008-07-21 20:07:28 -0400 (Mon, 21 Jul 2008)
+
+
+Apply the patch
+
+cd tomcat_6_0_18
+patch -p0 -u < TOMCAT_6_0_18-G678601.patch
+Answer 'y' to any prompts of "Reversed (or previously applied) patch detected!  Assume -R? [n]"
+
+Force delete these three files
+  svn delete java/org/apache/jasper/runtime/AnnotationHelper.java --force
+  svn delete java/org/apache/AnnotationProcessor.java --force
+  svn delete java/org/apache/catalina/util/DefaultAnnotationProcessor.java --force
+  
+Add the following files
+  java/org/apache/InstanceManager.java
+  java/org/apache/jasper/runtime/InstanceManagerFactory.java
+  java/org/apache/catalina/core/DefaultInstanceManager.java
+  java/org/apache/catalina/core/RestrictedListeners.properties
+  java/org/apache/catalina/deploy/Injectable.java
+  java/org/apache/catalina/deploy/InjectionTarget.java
+ 
+Build tomcat
+  cd tomcat_6_0_18
+  Per tomcat build instructions install ant-1.6.5 or later and set ANT_HOME as well as add ant/bin to PATH
+  You must run as the super user for the first build that downloads more ant & eclipse artifacts
+  ant download   - to setup build for tomcat
+  Exit super user
+  ant - to build tomcat artifacts
+  
+Copy to appropriate jars and rename into geronimo/repository
+  cd tomcat_6_0_18
+  cp output/build/lib/catalina.jar <geronimo-root>/repository/org/apache/tomcat/catalina/6.0.18-G678601/catalina-6.0.18-G678601.jar
+  cp output/build/lib/jasper.jar   <geronimo-root>/repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.jar
+  
+How the patch was created (tomcat_6_0_18-G678601.patch):
+
+Checkout tomcat 6.0.18
+  svn co  https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_18  tomcat_6_0_18
+
+
+Apply patch from prior Tomcat release (6.0.16)
+  patch -p0 -u < TOMCAT_6_0_16-G652117.patch
+
+Original way to apply the individual patches
+  Apply annotations patch 
+    patch -p0 -u < TOMCAT_6_0_14-G604245.patch
+    fix patch conflicts
+  Apply the Webdav security fix patch
+    patch -p0 -u < TOMCAT_6_0_14-G614585.patch
+
+Create the patch:
+  svn diff > TOMCAT_6_0_18-G678601.patch
+

Propchange: geronimo/server/branches/2.1/repository/org/apache/tomcat/6.0.18-G678601.README.TXT
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message