continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r708024 - in /continuum/branches/continuum-struts2/continuum-webapp/src: main/webapp/WEB-INF/jsp/admin/editProfile.jsp test/resources/log4j.xml
Date Sun, 26 Oct 2008 19:12:17 GMT
Author: olamy
Date: Sun Oct 26 12:12:17 2008
New Revision: 708024

URL: http://svn.apache.org/viewvc?rev=708024&view=rev
Log:
fix build env edit page

Modified:
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/log4j.xml

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp?rev=708024&r1=708023&r2=708024&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
(original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
Sun Oct 26 12:12:17 2008
@@ -65,7 +65,7 @@
           </s:form>
           </td>
         </tr>
-        <c:if test="profile.id != 0">
+        <s:if test="profile.id != 0">
           <tr>
             <td>
               <div class="axial">
@@ -101,7 +101,7 @@
                     </tr>
                   </tbody>
                 </table>
-                <c:if test="${!empty allInstallations}">
+                <s:if test="allInstallations.size > 0">
                   <s:form action="addInstallationBuildEnv!addInstallation.action" method="get">
                     <s:hidden name="profile.id" />
                     <div class="functnbar3">
@@ -110,18 +110,18 @@
                       <s:submit value="%{getText('add')}"/>
                     </div>
                   </s:form>
-                </c:if>
+                </s:if>
                 <s:else>
                   <div class="warningmessage" style="color: red"><s:text name="profile.no.installations"
/></div>
                 </s:else>
               </div>              
             </td>
           </tr>
-        </c:if>
+        </s:if>
         <s:else>
           <tr>
             <td>
-              <c:if test="${empty allInstallations}">
+              <c:if test="allInstallations.size < 1">
                 <div class="warningmessage" style="color: red"><s:text name="profile.no.installations"
/></div>
               </c:if>
             </td>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/log4j.xml?rev=708024&r1=708023&r2=708024&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/log4j.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/log4j.xml Sun
Oct 26 12:12:17 2008
@@ -56,7 +56,11 @@
     <level value="info"/>
   </logger>
 
-  <logger name="com.opensymphony.xwork">
+  <logger name="com.opensymphony.xwork2">
+    <level value="info"/>
+  </logger>
+	
+  <logger name="org.apache.struts2">
     <level value="info"/>
   </logger>
 



Mime
View raw message