You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2008/10/29 07:05:53 UTC
svn commit: r708798 - in
/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp:
./ admin/ components/ notifier/
Author: evenisse
Date: Tue Oct 28 23:05:52 2008
New Revision: 708798
URL: http://svn.apache.org/viewvc?rev=708798&view=rev
Log:
More fix
Modified:
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp Tue Oct 28 23:05:52 2008
@@ -51,9 +51,9 @@
</ec:column>
<!-- TODO list attached buildDefs -->
<ec:column property="deleteAction" title=" " width="1%">
- <c:if test="${template.continuumDefault == true}">
+ <s:if test="template.continuumDefault == true">
<img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='disabled'/>" title="<s:text name='disabled'/>" border="0" />
- </c:if>
+ </s:if>
<s:else>
<s:url id="deleteUrl" action="deleteDefinitionTemplate" method="delete" namespace="/">
<s:param name="buildDefinitionTemplate.id">${pageScope.template.id}</s:param>
@@ -96,9 +96,9 @@
<s:a href="%{editUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0"></s:a>
</ec:column>
<ec:column property="deleteAction" title=" " width="1%">
- <c:if test="${buildDefinitionSummary.isDefault == true}">
+ <s:if test="buildDefinitionSummary.isDefault == true">
<img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='disabled'/>" title="<s:text name='disabled'/>" border="0" />
- </c:if>
+ </s:if>
<s:else>
<s:url id="deleteUrl" action="deleteBuildDefinitionAsTemplate" method="deleteBuildDefinition" namespace="/">
<s:param name="buildDefinition.id">${pageScope.buildDefinitionSummary.id}</s:param>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp Tue Oct 28 23:05:52 2008
@@ -36,7 +36,7 @@
<s:text name="buildQueue.currentTask.section.title"/>
</h3>
<table width="100%">
- <c:if test="currentBuildProjectTask != null">
+ <s:if test="%{currentBuildProjectTask != null}">
<tbody>
<tr>
<th><s:text name="buildQueue.currentTask.projectName"/></th>
@@ -59,7 +59,7 @@
</td>
</tr>
</tbody>
- </c:if>
+ </s:if>
<s:else>
<s:text name="buildQueue.no.currentTaks" />
</s:else>
@@ -69,7 +69,7 @@
<h3>
<s:text name="buildQueue.section.title"/>
</h3>
- <c:if test="${not empty buildProjectTasks}">
+ <s:if test="%{not empty buildProjectTasks}">
<ec:table items="buildProjectTasks"
var="buildProjectTask"
showExports="false"
@@ -101,7 +101,7 @@
</ec:column>
</ec:row>
</ec:table>
- </c:if>
+ </s:if>
<s:else>
<s:text name="buildQueue.empty"/>
</s:else>
@@ -128,7 +128,7 @@
<s:text name="checkoutQueue.currentTask.section.title"/>
</h3>
<table width="100%">
- <c:if test="currentCheckOutTask != null">
+ <s:if test="%{currentCheckOutTask != null}">
<tbody>
<tr>
<th><s:text name="checkoutQueue.currentTask.projectName"/></th>
@@ -149,7 +149,7 @@
</td>
</tr>
</tbody>
- </c:if>
+ </s:if>
<s:else>
<s:text name="checkoutQueue.no.currentTaks" />
</s:else>
@@ -159,7 +159,7 @@
<h3>
<s:text name="checkoutQueue.section.title"/>
</h3>
- <c:if test="${not empty currentCheckOutTasks}">
+ <s:if test="%{!empty currentCheckOutTasks}">
<ec:table items="currentCheckOutTasks"
var="currentCheckOutTask"
showExports="false"
@@ -187,7 +187,7 @@
</ec:column>
</ec:row>
</ec:table>
- </c:if>
+ </s:if>
<s:else>
<s:text name="checkoutQueue.empty"/>
</s:else>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp Tue Oct 28 23:05:52 2008
@@ -45,9 +45,9 @@
<c:when test="${empty actionErrors}">
<table>
<tbody>
- <c:if test="buildDefinition.type == 'ant'">
+ <s:if test="buildDefinition.type == 'ant'">
<s:textfield label="%{getText('buildDefinition.buildFile.ant.label')}" name="buildDefinition.buildFile" required="true"/>
- </c:if>
+ </s:if>
<s:elseif test="buildDefinition.type == 'shell'">
<s:textfield label="%{getText('buildDefinition.buildFile.shell.label')}" name="buildDefinition.buildFile" required="true"/>
</s:elseif>
@@ -55,9 +55,9 @@
<s:textfield label="%{getText('buildDefinition.buildFile.maven.label')}" name="buildDefinition.buildFile" required="true"/>
</s:else>
- <c:if test="buildDefinition.type == 'ant'">
+ <s:if test="buildDefinition.type == 'ant'">
<s:textfield label="%{getText('buildDefinition.goals.ant.label')}" name="buildDefinition.goals"/>
- </c:if>
+ </s:if>
<s:elseif test="buildDefinition.type == 'shell'">
</s:elseif>
<s:else>
@@ -70,10 +70,10 @@
<s:checkbox label="%{getText('buildDefinition.defaultForProject.label')}" name="buildDefinition.defaultForProject" />
<s:select label="%{getText('buildDefinition.schedule.label')}" name="buildDefinition.schedule.id" list="schedules" listValue="name"
listKey="id"/>
- <c:if test="buildDefinition.profile == null">
+ <s:if test="buildDefinition.profile == null">
<s:select label="%{getText('buildDefinition.profile.label')}" name="buildDefinition.profile.id" list="profiles" listValue="name"
value="-1" listKey="id" headerKey="-1" headerValue=""/>
- </c:if>
+ </s:if>
<s:else>
<s:select label="%{getText('buildDefinition.profile.label')}" name="buildDefinition.profile.id" list="profiles" listValue="name"
listKey="id" headerKey="-1" headerValue=""/>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp Tue Oct 28 23:05:52 2008
@@ -65,9 +65,9 @@
</s:else>
<s:textfield label="%{getText('installation.value.label')}" name="installation.varValue"
required="true"/>
- <c:if test="(automaticProfileDisplayable && installation == null) || (installation.installationId == 0)">
+ <s:if test="%{(automaticProfileDisplayable && installation == null) || (installation.installationId == 0)}">
<s:checkbox label="%{getText('installation.automaticProfile.label')}" name="automaticProfile" />
- </c:if>
+ </s:if>
</tbody>
</table>
<div class="functnbar3">
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp Tue Oct 28 23:05:52 2008
@@ -46,11 +46,11 @@
<s:select label="%{getText('repository.layout.label')}" name="repository.layout" list="layouts" disabled="%{defaultRepo}"/>
</table>
<s:hidden name="repository.id"/>
- <c:if test="${defaultRepo}">
+ <s:if test="defaultRepo">
<s:hidden name="repository.name"/>
<s:hidden name="repository.location"/>
<s:hidden name="repository.layout"/>
- </c:if>
+ </s:if>
<div class="functnbar3">
<c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
</div>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp Tue Oct 28 23:05:52 2008
@@ -53,9 +53,9 @@
<s:textfield label="%{getText('purgeConfig.daysOlder.label')}" name="daysOlder"/>
<s:textfield label="%{getText('purgeConfig.retentionCount.label')}" name="retentionCount"/>
<s:checkbox label="%{getText('purgeConfig.deleteAll.label')}" name="deleteAll"/>
- <c:if test="${purgeType == 'repository'}">
+ <s:if test="purgeType == 'repository'">
<s:checkbox label="%{getText('purgeConfig.deleteReleasedSnapshots.label')}" name="deleteReleasedSnapshots"/>
- </c:if>
+ </s:if>
<c:choose>
<c:when test="${defaultPurgeConfiguration == true}">
<s:hidden name="defaultPurgeConfiguration"/>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp Tue Oct 28 23:05:52 2008
@@ -53,17 +53,17 @@
<ec:column property="name" title="Name" style="white-space: nowrap" />
<ec:column property="Installations" title="Installations" style="white-space: nowrap">
<ul>
- <c:if test='${profile.jdk != null}'>
+ <s:if test='profile.jdk != null'>
<li><c:out value="${profile.jdk.name}"/> (<c:out value="${profile.jdk.type}"/>)</li>
- </c:if>
- <c:if test='${profile.builder != null}'>
+ </s:if>
+ <s:if test='profile.builder != null'>
<li><c:out value="${profile.builder.name}"/> (<c:out value="${profile.builder.type}"/>)</li>
- </c:if>
- <c:if test='${profile.environmentVariables != null}'>
+ </s:if>
+ <s:if test='profile.environmentVariables != null'>
<c:forEach var="envVar" items="${profile.environmentVariables}">
<li><c:out value="${envVar.name}" /></li>
</c:forEach>
- </c:if>
+ </s:if>
<ul>
</ec:column>
<ec:column property="id" title=" " width="1%">
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Tue Oct 28 23:05:52 2008
@@ -48,7 +48,7 @@
</c1:data>
<c1:data label="%{getText('buildResult.duration')}">
<s:param name="after">
- <c:if test="${buildResult.endTime == 0}"><s:text name="buildResult.startedSince"/></c:if> <s:property value="buildResult.durationTime"/></s:param>
+ <s:if test="buildResult.endTime == 0"><s:text name="buildResult.startedSince"/></s:if> <s:property value="buildResult.durationTime"/></s:param>
</c1:data>
<c1:data label="%{getText('buildResult.trigger')}">
<s:param name="after"><s:text name="buildResult.trigger.%{buildResult.trigger}"/></s:param>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp Tue Oct 28 23:05:52 2008
@@ -57,9 +57,9 @@
</ec:column>
</redback:ifAuthorized>
<ec:column property="buildNumberIfNotZero" title="buildResults.buildNumber">
- <c:if test="${pageScope.buildResult.state == 2}">
+ <s:if test="pageScope.buildResult.state == 2">
<c:out value="${pageScope.buildResult.buildNumber}"/>
- </c:if>
+ </s:if>
</ec:column>
<ec:column property="startTime" title="buildResults.startTime" cell="date"/>
<ec:column property="endTime" title="buildResults.endTime" cell="date"/>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp Tue Oct 28 23:05:52 2008
@@ -92,10 +92,11 @@
<ec:column property="deleteActions" title=" " width="1%">
<center>
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
- <c:if test="${pageScope.buildDefinitionSummary.isDefault == true}">
+ <c:choose>
+ <c:when test="${pageScope.buildDefinitionSummary.isDefault == true}">
<img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0">
- </c:if>
- <s:else>
+ </c:when>
+ <c:otherwise>${pageScope.buildDefinitionSummary.isDefault}
<s:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
<s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
<s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
@@ -104,7 +105,8 @@
<s:a href="%{removeUrl}">
<img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0">
</s:a>
- </s:else>
+ </c:otherwise>
+ </c:choose>
</redback:ifAuthorized>
<redback:elseAuthorized>
<img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0">
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Tue Oct 28 23:05:52 2008
@@ -67,7 +67,7 @@
</ec:column>
<ec:column property="editAction" title=" " width="1%">
<%-- if the from is PROJECT then render the links differently --%>
- <c:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
+ <s:if test="pageScope.buildDefinitionSummary.from == 'PROJECT'">
<redback:ifAuthorized permission="continuum-modify-project-build-definition" resource="${projectGroupName}">
<s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
<s:param name="projectId">${projectId}</s:param>
@@ -78,7 +78,7 @@
<redback:elseAuthorized>
<img src="<s:url value='/images/edit_disabled.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" />
</redback:elseAuthorized>
- </c:if>
+ </s:if>
<s:else>
<redback:ifAuthorized permission="continuum-modify-group-build-definition" resource="${projectGroupName}">
<s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
@@ -95,7 +95,7 @@
</ec:column>
<ec:column property="deleteAction" title=" " width="1%">
<%-- if the from is PROJECT then render the links differently --%>
- <c:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
+ <s:if test="pageScope.buildDefinitionSummary.from == 'PROJECT'">
<redback:ifAuthorized permission="continuum-remove-project-build-definition" resource="${projectGroupName}">
<s:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
<s:param name="projectId">${projectId}</s:param>
@@ -107,7 +107,7 @@
<redback:elseAuthorized>
<img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
</redback:elseAuthorized>
- </c:if>
+ </s:if>
<s:else>
<redback:ifAuthorized permission="continuum-remove-group-build-definition" resource="${projectGroupName}">
<s:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp Tue Oct 28 23:05:52 2008
@@ -32,9 +32,9 @@
<body>
<div id="h3">
- <c:if test="${infoMessage != null}">
+ <s:if test="infoMessage != null">
<p>${infoMessage}</p>
- </c:if>
+ </s:if>
<s:else>
<h3><s:text name="groups.page.section.title"/></h3>
</s:else>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp Tue Oct 28 23:05:52 2008
@@ -39,21 +39,23 @@
</p>
</div>
<div class="functnbar3">
- <c:if test="${projectId == -1}">
+ <c:choose>
+ <c:when test="${projectId == -1}">
<s:form action="deleteProjectGroupNotifier.action" method="post">
<s:hidden name="notifierId"/>
<s:hidden name="projectGroupId" />
<c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
</s:form>
- </c:if>
- <s:else>
+ </c:when>
+ <c:otherwise>
<s:form action="deleteProjectNotifier.action" method="post">
<s:hidden name="notifierId"/>
<s:hidden name="projectId"/>
<s:hidden name="projectGroupId" />
<c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
</s:form>
- </s:else>
+ </c:otherwise>
+ </c:choose>
</div>
</div>
</body>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp Tue Oct 28 23:05:52 2008
@@ -30,9 +30,9 @@
</head>
<body>
<div id="axial" class="h3">
- <c:if test="${projectId > 0}">
+ <s:if test="projectId > 0">
<s:url id="actionUrl" action="ircProjectNotifierSave" includeContext="false" includeParams="none" />
- </c:if>
+ </s:if>
<s:else>
<s:url id="actionUrl" action="ircProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
</s:else>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp Tue Oct 28 23:05:52 2008
@@ -30,9 +30,9 @@
</head>
<body>
<div id="axial" class="h3">
- <c:if test="${projectId > 0}">
+ <s:if test="projectId > 0">
<s:url id="actionUrl" action="jabberProjectNotifierSave" includeContext="false" includeParams="none" />
- </c:if>
+ </s:if>
<s:else>
<s:url id="actionUrl" action="jabberProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
</s:else>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp Tue Oct 28 23:05:52 2008
@@ -30,9 +30,9 @@
</head>
<body>
<div id="axial" class="h3">
- <c:if test="${projectId > 0}">
+ <s:if test="projectId > 0">
<s:url id="actionUrl" action="mailProjectNotifierSave" includeContext="false" includeParams="none" />
- </c:if>
+ </s:if>
<s:else>
<s:url id="actionUrl" action="mailProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
</s:else>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp Tue Oct 28 23:05:52 2008
@@ -30,9 +30,9 @@
</head>
<body>
<div id="axial" class="h3">
- <c:if test="${projectId > 0}">
+ <s:if test="projectId > 0">
<s:url id="actionUrl" action="msnProjectNotifierSave" includeContext="false" includeParams="none" />
- </c:if>
+ </s:if>
<s:else>
<s:url id="actionUrl" action="msnProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
</s:else>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp Tue Oct 28 23:05:52 2008
@@ -27,9 +27,9 @@
<body>
<div id="axial" class="h3">
- <c:if test="${projectId > 0}">
+ <s:if test="projectId > 0">
<s:url id="actionUrl" value="addProjectNotifier!execute" includeParams="none" />
- </c:if>
+ </s:if>
<s:else>
<s:url id="actionUrl" value="addProjectGroupNotifier!execute" includeParams="none" />
</s:else>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp Tue Oct 28 23:05:52 2008
@@ -30,9 +30,9 @@
</head>
<body>
<div id="axial" class="h3">
- <c:if test="${projectId > 0}">
+ <s:if test="projectId > 0">
<s:url id="actionUrl" action="wagonProjectNotifierSave" includeContext="false" includeParams="none" />
- </c:if>
+ </s:if>
<s:else>
<s:url id="actionUrl" action="wagonProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
</s:else>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp Tue Oct 28 23:05:52 2008
@@ -32,11 +32,11 @@
<div class="axial">
<s:form action="saveProjectGroup" method="post" validate="true">
- <c:if test="${projectInCOQueue}">
+ <s:if test="projectInCOQueue">
<div class="label">
<p><s:text name="%{getText('project.in.checkout.queue.error')}"/></p>
</div >
- </c:if>
+ </s:if>
<c:if test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp Tue Oct 28 23:05:52 2008
@@ -143,9 +143,9 @@
<tr>
<th nowrap="true">
<s:form id="sortlist" name="sortlist" action="projectGroupMembers" theme="xhtml" method="post">
- <c:if test="${ascending}">
+ <s:if test="ascending">
<s:a href="javascript:document.forms['sortlist'].submit()"><img src="<s:url value='/images/icon_sortdown.gif' includeParams="none"/>" title="<s:text name='sort.descending'/>" border="0"></s:a> <s:text name="user.username.label"/>
- </c:if>
+ </s:if>
<s:else>
<s:a href="javascript:document.forms['sortlist'].submit()"><img src="<s:url value='/images/icon_sortup.gif' includeParams="none"/>" title="<s:text name='sort.ascending'/>" border="0"></s:a> <s:text name="user.username.label"/>
</s:else>
@@ -175,19 +175,19 @@
<s:property value="userEmail"/>
</td>
<td>
- <c:if test="${administrator}">
+ <s:if test="administrator">
<img src="<s:url value='/images/icon_success_sml.gif' includeParams="none"/>" border="0">
- </c:if>
+ </s:if>
</td>
<td>
- <c:if test="${developer}">
+ <s:if test="developer">
<img src="<s:url value='/images/icon_success_sml.gif' includeParams="none"/>" border="0">
- </c:if>
+ </s:if>
</td>
<td>
- <c:if test="${user}">
+ <s:if test="user">
<img src="<s:url value='/images/icon_success_sml.gif' includeParams="none"/>" border="0">
- </c:if>
+ </s:if>
</td>
</tr>
</s:iterator>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp Tue Oct 28 23:05:52 2008
@@ -59,9 +59,9 @@
<ec:column property="startTime" title="releaseResults.startTime" cell="date"/>
<ec:column property="endTime" title="releaseResults.endTime" cell="date"/>
<ec:column property="resultCode" title="releaseResults.state">
- <c:if test="${pageScope.result.resultCode == 0}">
+ <s:if test="pageScope.result.resultCode == 0">
<s:text name="releaseViewResult.success"/>
- </c:if>
+ </s:if>
<s:else>
<s:text name="releaseViewResult.error"/>
</s:else>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=708798&r1=708797&r2=708798&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp Tue Oct 28 23:05:52 2008
@@ -89,10 +89,10 @@
<c1:data label="%{getText('projectGroup.groupId.label')}" name="projectGroup.groupId"/>
<c1:data label="%{getText('projectGroup.description.label')}" name="projectGroup.description"/>
<c1:data label="%{getText('projectGroup.repository.label')}" name="projectGroup.localRepository.name"/>
- <c:if test="${url != null}">
+ <s:if test="url != null">
<s:url id="projectHomepageUrl" value="%{#url}" includeContext="false" includeParams="none"/>
<c1:data label="%{getText('projectGroup.url.label')}" name="url" valueLink="%{'${projectHomepageUrl}'}"/>
- </c:if>
+ </s:if>
</table>
</div>