You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2011/05/11 00:46:25 UTC
svn commit: r1101669 [3/4] - in /continuum/branches/continuum-1.3.x: ./
continuum-webapp-test/src/test/resources/
continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/
continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/p...
Added: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction-saveBuildEnv-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction-saveBuildEnv-validation.xml?rev=1101669&view=auto
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction-saveBuildEnv-validation.xml (added)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction-saveBuildEnv-validation.xml Tue May 10 22:46:21 2011
@@ -0,0 +1,34 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+ <field name="profile.name">
+ <field-validator type="requiredstring">
+ <message key="profile.name.required"/>
+ </field-validator>
+ <field-validator type="regex">
+ <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+ <message key="profile.name.invalid"/>
+ </field-validator>
+ </field>
+</validators>
\ No newline at end of file
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction.properties Tue May 10 22:46:21 2011
@@ -18,3 +18,4 @@
#
profile.name.required = You must define a name.
+profile.name.invalid = Build environment name contains invalid characters.
\ No newline at end of file
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml Tue May 10 22:46:21 2011
@@ -26,6 +26,11 @@
<field-validator type="requiredstring">
<message key="ircNotifier.host.required"/>
</field-validator>
+ <field-validator type="regex">
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
+ <message key="ircNotifier.host.invalid" />
+ </field-validator>
</field>
<field name="port">
<field-validator type="int">
@@ -38,5 +43,10 @@
<field-validator type="requiredstring">
<message key="ircNotifier.channel.required"/>
</field-validator>
+ <field-validator type="regex">
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.#-]*]]></param>
+ <message key="ircNotifier.channel.invalid" />
+ </field-validator>
</field>
</validators>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.properties Tue May 10 22:46:21 2011
@@ -18,5 +18,7 @@
#
ircNotifier.host.required = Host is required
+ircNotifier.host.invalid = Host contains invalid character
ircNotifier.port.invalid = Port must be an integer from 0 to 65535
ircNotifier.channel.required = Channel is required
+ircNotifier.channel.invalid = Channel contains invalid character
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml Tue May 10 22:46:21 2011
@@ -26,6 +26,11 @@
<field-validator type="requiredstring">
<message key="ircNotifier.host.required"/>
</field-validator>
+ <field-validator type="regex">
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
+ <message key="ircNotifier.host.invalid" />
+ </field-validator>
</field>
<field name="port">
<field-validator type="int">
@@ -38,5 +43,10 @@
<field-validator type="requiredstring">
<message key="ircNotifier.channel.required"/>
</field-validator>
+ <field-validator type="regex">
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.#-]*]]></param>
+ <message key="ircNotifier.channel.invalid" />
+ </field-validator>
</field>
</validators>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.properties Tue May 10 22:46:21 2011
@@ -18,5 +18,7 @@
#
ircNotifier.host.required = Host is required
+ircNotifier.host.invalid = Host contains invalid character
ircNotifier.port.invalid = Port must be an integer from 0 to 65535
ircNotifier.channel.required = Channel is required
+ircNotifier.channel.invalid = Channel contains invalid character
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml Tue May 10 22:46:21 2011
@@ -26,6 +26,11 @@
<field-validator type="requiredstring">
<message key="jabberNotifier.host.required"/>
</field-validator>
+ <field-validator type="regex">
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
+ <message key="jabberNotifier.host.invalid"/>
+ </field-validator>
</field>
<field name="port">
<field-validator type="int">
@@ -44,6 +49,13 @@
<message key="jabberNotifier.password.required"/>
</field-validator>
</field>
+ <field name="domainName">
+ <field-validator type="regex">
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
+ <message key="jabberNotifier.domain.invalid" />
+ </field-validator>
+ </field>
<field name="address">
<field-validator type="requiredstring">
<message key="jabberNotifier.address.required"/>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.properties Tue May 10 22:46:21 2011
@@ -18,8 +18,10 @@
#
jabberNotifier.host.required = Host is required
+jabberNotifier.host.invalid = Host contains invalid character
jabberNotifier.port.invalid = Port must be an integer from 0 to 65535
jabberNotifier.login.required = Login is required
jabberNotifier.password.required = Password is required
+jabberNotifier.domain.invalid = Domain contains invalid character
jabberNotifier.address.required = Address is required
jabberNotifier.address.invalid = Address is invalid
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml Tue May 10 22:46:21 2011
@@ -26,6 +26,11 @@
<field-validator type="requiredstring">
<message key="jabberNotifier.host.required"/>
</field-validator>
+ <field-validator type="regex">
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
+ <message key="jabberNotifier.host.invalid"/>
+ </field-validator>
</field>
<field name="port">
<field-validator type="int">
@@ -44,6 +49,13 @@
<message key="jabberNotifier.password.required"/>
</field-validator>
</field>
+ <field name="domainName">
+ <field-validator type="regex">
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
+ <message key="jabberNotifier.domain.invalid" />
+ </field-validator>
+ </field>
<field name="address">
<field-validator type="requiredstring">
<message key="jabberNotifier.address.required"/>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties Tue May 10 22:46:21 2011
@@ -18,8 +18,10 @@
#
jabberNotifier.host.required = Host is required
+jabberNotifier.host.invalid = Host contains invalid characters
jabberNotifier.port.invalid = Port must be an integer from 0 to 65535
jabberNotifier.login.required = Login is required
jabberNotifier.password.required = Password is required
+jabberNotifier.domain.invalid = Domain contains invalid characters
jabberNotifier.address.required = Address is required
jabberNotifier.address.invalid = Address is invalid
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp Tue May 10 22:46:21 2011
@@ -37,7 +37,7 @@
<p><s:property/></p>
</s:iterator>
<c:forEach items="${errorMessages}" var="errorMessage">
- <p>${errorMessage}</p>
+ <p><c:out value="${errorMessage}"/></p>
</c:forEach>
</div>
</c:if>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp Tue May 10 22:46:21 2011
@@ -37,7 +37,7 @@
<p><s:property/></p>
</s:iterator>
<c:forEach items="${errorMessages}" var="errorMessage">
- <p>${errorMessage}</p>
+ <p><c:out value="${errorMessage}"/></p>
</c:forEach>
</div>
</c:if>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Tue May 10 22:46:21 2011
@@ -71,24 +71,29 @@
<table>
<tr>
<th><s:text name="appearance.companyPom.organizationName.label"/></th>
- <td>${companyModel.organization.name}</td>
+ <td><c:out value="${companyModel.organization.name}"/></td>
</tr>
<tr>
<th><s:text name="appearance.companyPom.organizationUrl.label"/></th>
- <td><a href="${companyModel.organization.url}" target="_blank">
- <code>${companyModel.organization.url}</code>
+ <c:set var="companyOrgUrl"><c:out value="${companyModel.organization.url}"/></c:set>
+ <td><a href="${companyOrgUrl}" target="_blank">
+ <code><c:out value="${companyModel.organization.url}"/></code>
</a></td>
</tr>
<tr>
<th><s:text name="appearance.companyPom.organizationLogoUrl.label"/></th>
<td>
- <code>${companyModel.properties['organization.logo']}</code>
+ <code><c:out value="${companyModel.properties['organization.logo']}"/></code>
</td>
</tr>
</table>
</c:when>
<c:otherwise>
- <s:text name="appearance.companyPomDoesNotExist"><s:param>${companyPom.groupId}:${companyPom.artifactId}</s:param></s:text>
+ <s:text name="appearance.companyPomDoesNotExist">
+ <s:param>
+ <c:out value="${companyPom.groupId}"/>:<c:out value="${companyPom.artifactId}"/>
+ </s:param>
+ </s:text>
<a href="<s:url action='editCompanyPom' />"><s:text name="appearance.createCompanyPom"/></a>
</c:otherwise>
</c:choose>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp Tue May 10 22:46:21 2011
@@ -47,15 +47,15 @@
<ec:row>
<ec:column property="url" title="buildAgents.table.url">
<s:url id="viewBuildAgentUrl" action="viewBuildAgent">
- <s:param name="buildAgent.url">${pageScope.buildAgent.url}</s:param>
+ <s:param name="buildAgent.url"><c:out value="${pageScope.buildAgent.url}"/></s:param>
</s:url>
- <s:a href="%{viewBuildAgentUrl}">${pageScope.buildAgent.url}</s:a>
+ <s:a href="%{viewBuildAgentUrl}"><c:out value="${pageScope.buildAgent.url}"/></s:a>
</ec:column>
<ec:column property="enabled" title="buildAgents.table.enabled"/>
<ec:column property="description" title="buildAgents.table.description"/>
<ec:column property="editActions" title=" " width="1%">
<s:url id="editBuildAgentUrl" action="editBuildAgent">
- <s:param name="buildAgent.url">${pageScope.buildAgent.url}</s:param>
+ <s:param name="buildAgent.url"><c:out value="${pageScope.buildAgent.url}"/></s:param>
</s:url>
<s:a href="%{editBuildAgentUrl}">
<img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0"/>
@@ -64,7 +64,7 @@
<ec:column property="deleteActions" title=" " width="1%">
<s:token/>
<s:url id="removeBuildAgentUrl" action="deleteBuildAgent">
- <s:param name="buildAgent.url">${pageScope.buildAgent.url}</s:param>
+ <s:param name="buildAgent.url"><c:out value="${pageScope.buildAgent.url}"/></s:param>
<s:param name="struts.token.name">struts.token</s:param>
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
@@ -104,7 +104,7 @@
</ec:column>
<ec:column property="editActions" title=" " width="1%">
<s:url id="editBuildAgentGroupUrl" action="editBuildAgentGroup">
- <s:param name="buildAgentGroup.name">${pageScope.buildAgentGroup.name}</s:param>
+ <s:param name="buildAgentGroup.name"><c:out value="${pageScope.buildAgentGroup.name}"/></s:param>
</s:url>
<s:a href="%{editBuildAgentGroupUrl}">
<img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0"/>
@@ -113,7 +113,7 @@
<ec:column property="deleteActions" title=" " width="1%">
<s:token/>
<s:url id="removeBuildAgentGroupUrl" action="deleteBuildAgentGroup">
- <s:param name="buildAgentGroup.name">${pageScope.buildAgentGroup.name}</s:param>
+ <s:param name="buildAgentGroup.name"><c:out value="${pageScope.buildAgentGroup.name}"/></s:param>
<s:param name="struts.token.name">struts.token</s:param>
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp Tue May 10 22:46:21 2011
@@ -46,7 +46,7 @@
<ec:column property="name" title="buildDefinition.template.name"/>
<ec:column property="editAction" title=" " width="1%">
<s:url id="editUrl" action="editBuildDefinitionTemplate" method="edit" namespace="/">
- <s:param name="buildDefinitionTemplate.id">${pageScope.template.id}</s:param>
+ <s:param name="buildDefinitionTemplate.id"><c:out value="${pageScope.template.id}"/></s:param>
</s:url>
<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>
@@ -59,8 +59,8 @@
<c:otherwise>
<s:token/>
<s:url id="deleteUrl" action="deleteDefinitionTemplate" method="delete" namespace="/">
- <s:param name="buildDefinitionTemplate.id">${pageScope.template.id}</s:param>
- <s:param name="buildDefinitionTemplate.name">${pageScope.template.name}</s:param>
+ <s:param name="buildDefinitionTemplate.id"><c:out value="${pageScope.template.id}"/></s:param>
+ <s:param name="buildDefinitionTemplate.name"><c:out value="${pageScope.template.name}"/></s:param>
<s:param name="struts.token.name">struts.token</s:param>
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
@@ -99,7 +99,7 @@
<ec:column property="type" title="buildDefinition.template.buildDefinition.type"/>
<ec:column property="editAction" title=" " width="1%">
<s:url id="editUrl" action="editBuildDefinitionAsTemplate" method="editBuildDefinition" namespace="/">
- <s:param name="buildDefinition.id">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="buildDefinition.id"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
</s:url>
<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>
@@ -110,8 +110,8 @@
</c:when>
<c:otherwise>
<s:url id="deleteUrl" action="deleteBuildDefinitionAsTemplate" method="deleteBuildDefinition" namespace="/">
- <s:param name="buildDefinition.id">${pageScope.buildDefinitionSummary.id}</s:param>
- <s:param name="buildDefinition.description">${pageScope.buildDefinitionSummary.description}</s:param>
+ <s:param name="buildDefinition.id"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
+ <s:param name="buildDefinition.description"><c:out value="${pageScope.buildDefinitionSummary.description}"/></s:param>
</s:url>
<s:a href="%{deleteUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
</c:otherwise>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp Tue May 10 22:46:21 2011
@@ -49,15 +49,15 @@
<ec:column property="name" title="buildQueue.currentTask.buildQueue" width="29%"/>
<ec:column property="projectUrl" title="buildQueue.currentTask.projectName" width="50%">
<s:url id="viewUrl" action="buildResults">
- <s:param name="projectId">${queue.task.projectId}</s:param>
+ <s:param name="projectId"><c:out value="${queue.task.projectId}"/></s:param>
</s:url>
- <s:a href="%{viewUrl}">${queue.task.projectName}</s:a>
+ <s:a href="%{viewUrl}"><c:out value="${queue.task.projectName}"/></s:a>
</ec:column>
<ec:column property="task.buildDefinitionLabel" title="buildQueue.currentTask.buildDefinition" width="19%"/>
<ec:column property="cancelAction" title=" " width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
<s:url id="cancelUrl" action="cancelCurrentBuildTask" method="cancelCurrent" namespace="/">
- <s:param name="projectId">${queue.task.projectId}</s:param>
+ <s:param name="projectId"><c:out value="${queue.task.projectId}"/></s:param>
</s:url>
<s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
</redback:ifAuthorized>
@@ -98,19 +98,19 @@
<ec:column property="name" title="buildQueue.currentTask.buildQueue" width="29%"/>
<ec:column property="projectUrl" title="buildQueue.currentTask.projectName" width="50%">
<s:url id="viewUrl" action="buildResults">
- <s:param name="projectId">${queue.task.projectId}</s:param>
+ <s:param name="projectId"><c:out value="${queue.task.projectId}"/></s:param>
</s:url>
- <s:a href="%{viewUrl}">${queue.task.projectName}</s:a>
+ <s:a href="%{viewUrl}"><c:out value="${queue.task.projectName}"/></s:a>
</ec:column>
<ec:column property="task.buildDefinitionLabel" title="buildQueue.currentTask.buildDefinition" width="19%"/>
<ec:column property="cancelAction" title=" " width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
<s:url id="cancelUrl" action="removeBuildQueueEntry" method="remove" namespace="/">
- <s:param name="projectId">${queue.task.projectId}</s:param>
- <s:param name="buildDefinitionId">${queue.task.buildDefinitionId}</s:param>
- <s:param name="trigger">${queue.task.trigger}</s:param>
- <s:param name="projectName">${queue.task.projectName}</s:param>
- <s:param name="projectGroupId">${queue.task.projectGroupId}</s:param>
+ <s:param name="projectId"><c:out value="${queue.task.projectId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${queue.task.buildDefinitionId}"/></s:param>
+ <s:param name="trigger"><c:out value="${queue.task.trigger}"/></s:param>
+ <s:param name="projectName"><c:out value="${queue.task.projectName}"/></s:param>
+ <s:param name="projectGroupId"><c:out value="${queue.task.projectGroupId}"/></s:param>
</s:url>
<s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
</redback:ifAuthorized>
@@ -160,14 +160,14 @@
<ec:column property="name" title="checkoutQueue.currentTask.buildQueue" width="29%"/>
<ec:column property="projectUrl" title="checkoutQueue.currentTask.projectName" width="69%">
<s:url id="viewUrl" action="projectView">
- <s:param name="projectId">${queue.task.projectId}</s:param>
+ <s:param name="projectId"><c:out value="${queue.task.projectId}"/></s:param>
</s:url>
- <s:a href="%{viewUrl}">${queue.task.projectName}</s:a>
+ <s:a href="%{viewUrl}"><c:out value="${queue.task.projectName}"/></s:a>
</ec:column>
<ec:column property="cancelAction" title=" " width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
<s:url id="cancelUrl" action="cancelCurrentQueueTask" method="cancelCurrentCheckout" namespace="/">
- <s:param name="projectId">${queue.task.projectId}</s:param>
+ <s:param name="projectId"><c:out value="${queue.task.projectId}"/></s:param>
</s:url>
<s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
</redback:ifAuthorized>
@@ -208,14 +208,14 @@
<ec:column property="name" title="checkoutQueue.currentTask.buildQueue" width="29%"/>
<ec:column property="projectUrl" title="checkoutQueue.currentTask.projectName" width="69%">
<s:url id="viewUrl" action="projectView">
- <s:param name="projectId">${queue.task.projectId}</s:param>
+ <s:param name="projectId"><c:out value="${queue.task.projectId}"/></s:param>
</s:url>
- <s:a href="%{viewUrl}">${queue.task.projectName}</s:a>
+ <s:a href="%{viewUrl}"><c:out value="${queue.task.projectName}"/></s:a>
</ec:column>
<ec:column property="cancelAction" title=" " width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
<s:url id="cancelUrl" action="removeCheckoutQueueEntry" method="removeCheckout" namespace="/">
- <s:param name="projectId">${queue.task.projectId}</s:param>
+ <s:param name="projectId"><c:out value="${queue.task.projectId}"/></s:param>
</s:url>
<s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
</redback:ifAuthorized>
@@ -263,9 +263,9 @@
<ec:row>
<ec:column property="projectGroupUrl" title="prepareBuildQueue.table.projectGroupName">
<s:url id="viewUrl" action="projectGroupSummary">
- <s:param name="projectGroupId">${pageScope.currentPrepareBuild.projectGroupId}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.currentPrepareBuild.projectGroupId}"/></s:param>
</s:url>
- <s:a href="%{viewUrl}">${pageScope.currentPrepareBuild.projectGroupName}</s:a>
+ <s:a href="%{viewUrl}"><c:out value="${pageScope.currentPrepareBuild.projectGroupName}"/></s:a>
</ec:column>
<ec:column property="scmRootAddress" title="prepareBuildQueue.table.scmRootAddress"/>
</ec:row>
@@ -300,16 +300,16 @@
</redback:ifAuthorized>
<ec:column property="projectGroupUrl" title="prepareBuildQueue.table.projectGroupName">
<s:url id="viewUrl" action="projectGroupSummary">
- <s:param name="projectGroupId">${pageScope.prepareBuildQueue.projectGroupId}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.prepareBuildQueue.projectGroupId}"/></s:param>
</s:url>
- <s:a href="%{viewUrl}">${pageScope.prepareBuildQueue.projectGroupName}</s:a>
+ <s:a href="%{viewUrl}"><c:out value="${pageScope.prepareBuildQueue.projectGroupName}"/></s:a>
</ec:column>
<ec:column property="scmRootAddress" title="prepareBuildQueue.table.scmRootAddress"/>
<ec:column property="cancelEntry" title=" " width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
<s:url id="cancelUrl" action="removePrepareBuildEntry" method="removePrepareBuildEntry" namespace="/">
- <s:param name="projectGroupId">${pageScope.prepareBuildQueue.projectGroupId}</s:param>
- <s:param name="scmRootId">${pageScope.prepareBuildQueue.scmRootId}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.prepareBuildQueue.projectGroupId}"/></s:param>
+ <s:param name="scmRootId"><c:out value="${pageScope.prepareBuildQueue.scmRootId}"/></s:param>
</s:url>
<s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
</redback:ifAuthorized>
@@ -340,4 +340,4 @@
</s:form>
</body>
</s:i18n>
-</html>
\ No newline at end of file
+</html>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp Tue May 10 22:46:21 2011
@@ -50,7 +50,7 @@
<ec:column property="layout" title="repositories.table.layout"/>
<ec:column property="editActions" title=" " width="1%">
<s:url id="editRepositoryUrl" action="editRepository">
- <s:param name="repository.id">${pageScope.repository.id}</s:param>
+ <s:param name="repository.id"><c:out value="${pageScope.repository.id}"/></s:param>
</s:url>
<c:choose>
<c:when test="${repository.name == 'DEFAULT'}">
@@ -66,7 +66,7 @@
<c:choose>
<c:when test="${defaultPurgeMap[repositoryName]}">
<s:url id="purgeRepositoryUrl" action="purgeRepository">
- <s:param name="repository.id">${pageScope.repository.id}</s:param>
+ <s:param name="repository.id"><c:out value="${pageScope.repository.id}"/></s:param>
</s:url>
<s:a href="%{purgeRepositoryUrl}"><img src="<s:url value='/images/purgenow.gif' includeParams="none"/>" alt="<s:text name='purge'/>" title="<s:text name='purge'/>" border="0" /></s:a>
</c:when>
@@ -78,7 +78,7 @@
<ec:column property="deleteActions" title=" " width="1%">
<s:token/>
<s:url id="removeRepositoryUrl" action="removeRepository">
- <s:param name="repository.id">${pageScope.repository.id}</s:param>
+ <s:param name="repository.id"><c:out value="${pageScope.repository.id}"/></s:param>
<s:param name="struts.token.name">struts.token</s:param>
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp Tue May 10 22:46:21 2011
@@ -50,8 +50,8 @@
<c:if test="${buildQueue.id != 1}">
<s:token/>
<s:url id="deleteBuildQueueUrl" action="deleteBuildQueue">
- <s:param name="buildQueue.id">${pageScope.buildQueue.id}</s:param>
- <s:param name="buildQueue.name">${pageScope.buildQueue.name}</s:param>
+ <s:param name="buildQueue.id"><c:out value="${pageScope.buildQueue.id}"/></s:param>
+ <s:param name="buildQueue.name"><c:out value="${pageScope.buildQueue.name}"/></s:param>
<s:param name="struts.token.name">struts.token</s:param>
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp Tue May 10 22:46:21 2011
@@ -51,12 +51,12 @@
<ec:column property="repository.name" title="purgeConfigs.table.repository">
<redback:ifAuthorized permission="continuum-manage-repositories">
<s:url id="editRepositoryUrl" action="editRepository" namespace="/admin" includeParams="none">
- <s:param name="repository.id">${pageScope.repoPurge.repository.id}</s:param>
+ <s:param name="repository.id"><c:out value="${pageScope.repoPurge.repository.id}"/></s:param>
</s:url>
- <s:a href="%{editRepositoryUrl}">${pageScope.repoPurge.repository.name}</s:a>
+ <s:a href="%{editRepositoryUrl}"><c:out value="${pageScope.repoPurge.repository.name}"/></s:a>
</redback:ifAuthorized>
<redback:elseAuthorized>
- ${pageScope.repoPurge.repository.name}
+ <c:out value="${pageScope.repoPurge.repository.name}"/>
</redback:elseAuthorized>
</ec:column>
<ec:column property="daysOlder" title="purgeConfigs.table.daysOlder"/>
@@ -69,21 +69,21 @@
<ec:column property="description" title="purgeConfigs.table.description"/>
<ec:column property="editActions" title=" " width="1%">
<s:url id="editPurgeConfigUrl" action="editPurgeConfig">
- <s:param name="purgeConfigId">${pageScope.repoPurge.id}</s:param>
+ <s:param name="purgeConfigId"><c:out value="${pageScope.repoPurge.id}"/></s:param>
</s:url>
<s:a href="%{editPurgeConfigUrl}"><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="purgeActions" title=" " width="1%">
<s:url id="purgeUrl" action="doPurge">
- <s:param name="purgeConfigId">${pageScope.repoPurge.id}</s:param>
+ <s:param name="purgeConfigId"><c:out value="${pageScope.repoPurge.id}"/></s:param>
</s:url>
<s:a href="%{purgeUrl}"><img src="<s:url value='/images/purgenow.gif' includeParams="none"/>" alt="<s:text name='purge'/>" title="<s:text name='purge'/>" border="0" /></s:a>
</ec:column>
<ec:column property="deleteActions" title=" " width="1%">
<s:token/>
<s:url id="removePurgeConfigUrl" action="removePurgeConfig">
- <s:param name="purgeConfigId">${pageScope.repoPurge.id}</s:param>
- <s:param name="description">${pageScope.repoPurge.description}</s:param>
+ <s:param name="purgeConfigId"><c:out value="${pageScope.repoPurge.id}"/></s:param>
+ <s:param name="description"><c:out value="${pageScope.repoPurge.description}"/></s:param>
<s:param name="struts.token.name">struts.token</s:param>
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
@@ -121,21 +121,21 @@
<ec:column property="description" title="purgeConfigs.table.description"/>
<ec:column property="editActions" title=" " width="1%">
<s:url id="editPurgeConfigUrl" action="editPurgeConfig">
- <s:param name="purgeConfigId">${pageScope.dirPurge.id}</s:param>
+ <s:param name="purgeConfigId"><c:out value="${pageScope.dirPurge.id}"/></s:param>
</s:url>
<s:a href="%{editPurgeConfigUrl}"><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="purgeActions" title=" " width="1%">
<s:url id="purgeUrl" action="doPurge">
- <s:param name="purgeConfigId">${pageScope.dirPurge.id}</s:param>
+ <s:param name="purgeConfigId"><c:out value="${pageScope.dirPurge.id}"/></s:param>
</s:url>
<s:a href="%{purgeUrl}"><img src="<s:url value='/images/purgenow.gif' includeParams="none"/>" alt="<s:text name='purge'/>" title="<s:text name='purge'/>" border="0" /></s:a>
</ec:column>
<ec:column property="deleteActions" title=" " width="1%">
<s:token/>
<s:url id="removePurgeConfigUrl" action="removePurgeConfig">
- <s:param name="purgeConfigId">${pageScope.dirPurge.id}</s:param>
- <s:param name="description">${pageScope.dirPurge.description}</s:param>
+ <s:param name="purgeConfigId"><c:out value="${pageScope.dirPurge.id}"/></s:param>
+ <s:param name="description"><c:out value="${pageScope.dirPurge.description}"/></s:param>
<s:param name="struts.token.name">struts.token</s:param>
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp Tue May 10 22:46:21 2011
@@ -53,16 +53,16 @@
<ec:row>
<ec:column property="projectUrl" title="distributedBuild.table.projectName">
<s:url id="viewUrl" action="buildResults">
- <s:param name="projectId">${pageScope.currentBuild.projectId}</s:param>
+ <s:param name="projectId"><c:out value="${pageScope.currentBuild.projectId}"/></s:param>
</s:url>
- <s:a href="%{viewUrl}">${pageScope.currentBuild.projectName}</s:a>
+ <s:a href="%{viewUrl}"><c:out value="${pageScope.currentBuild.projectName}"/></s:a>
</ec:column>
<ec:column property="buildDefinitionLabel" title="distributedBuild.table.buildDefinitionLabel"/>
<ec:column property="projectGroupName" title="distributedBuild.table.projectGroupName"/>
<ec:column property="buildAgentUrl" title="distributedBuild.table.agentUrl"/>
<ec:column property="cancelEntry" title=" " width="1%">
<s:url id="cancelUrl" action="cancelDistributedBuild" method="cancelDistributedBuild" namespace="/">
- <s:param name="buildAgentUrl">${pageScope.currentBuild.buildAgentUrl}</s:param>
+ <s:param name="buildAgentUrl"><c:out value="${pageScope.currentBuild.buildAgentUrl}"/></s:param>
</s:url>
<redback:ifAuthorized permission="continuum-manage-queues">
<s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
@@ -102,9 +102,9 @@
</redback:ifAuthorized>
<ec:column property="projectUrl" title="distributedBuild.table.projectName">
<s:url id="viewUrl" action="buildResults">
- <s:param name="projectId">${pageScope.buildQueue.projectId}</s:param>
+ <s:param name="projectId"><c:out value="${pageScope.buildQueue.projectId}"/></s:param>
</s:url>
- <s:a href="%{viewUrl}">${pageScope.buildQueue.projectName}</s:a>
+ <s:a href="%{viewUrl}"><c:out value="${pageScope.buildQueue.projectName}"/></s:a>
</ec:column>
<ec:column property="buildDefinitionLabel" title="distributedBuild.table.buildDefinitionLabel"/>
<ec:column property="projectGroupName" title="distributedBuild.table.projectGroupName"/>
@@ -112,9 +112,9 @@
<ec:column property="cancelEntry" title=" " width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
<s:url id="cancelUrl" action="removeDistributedBuildEntry" method="removeDistributedBuildEntry" namespace="/">
- <s:param name="projectId">${pageScope.buildQueue.projectId}</s:param>
- <s:param name="buildDefinitionId">${pageScope.buildQueue.buildDefinitionId}</s:param>
- <s:param name="buildAgentUrl">${pageScope.buildQueue.buildAgentUrl}</s:param>
+ <s:param name="projectId"><c:out value="${pageScope.buildQueue.projectId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${pageScope.buildQueue.buildDefinitionId}"/></s:param>
+ <s:param name="buildAgentUrl"><c:out value="${pageScope.buildQueue.buildAgentUrl}"/></s:param>
</s:url>
<s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
</redback:ifAuthorized>
@@ -159,9 +159,9 @@
<ec:row>
<ec:column property="projectGroupUrl" title="distributedPrepareBuild.table.projectGroupName">
<s:url id="viewUrl" action="projectGroupSummary">
- <s:param name="projectGroupId">${pageScope.currentPrepareBuild.projectGroupId}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.currentPrepareBuild.projectGroupId}"/></s:param>
</s:url>
- <s:a href="%{viewUrl}">${pageScope.currentPrepareBuild.projectGroupName}</s:a>
+ <s:a href="%{viewUrl}"><c:out value="${pageScope.currentPrepareBuild.projectGroupName}"/></s:a>
</ec:column>
<ec:column property="scmRootAddress" title="distributedPrepareBuild.table.scmRootAddress"/>
<ec:column property="buildAgentUrl" title="distributedPrepareBuild.table.agentUrl"/>
@@ -197,18 +197,18 @@
</redback:ifAuthorized>
<ec:column property="projectGroupUrl" title="distributedPrepareBuild.table.projectGroupName">
<s:url id="viewUrl" action="projectGroupSummary">
- <s:param name="projectGroupId">${pageScope.prepareBuildQueue.projectGroupId}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.prepareBuildQueue.projectGroupId}"/></s:param>
</s:url>
- <s:a href="%{viewUrl}">${pageScope.prepareBuildQueue.projectGroupName}</s:a>
+ <s:a href="%{viewUrl}"><c:out value="${pageScope.prepareBuildQueue.projectGroupName}"/></s:a>
</ec:column>
<ec:column property="scmRootAddress" title="distributedPrepareBuild.table.scmRootAddress"/>
<ec:column property="buildAgentUrl" title="distributedPrepareBuild.table.agentUrl"/>
<ec:column property="cancelEntry" title=" " width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
<s:url id="cancelUrl" action="removeDistributedPrepareBuildEntry" method="removeDistributedPrepareBuildEntry" namespace="/">
- <s:param name="projectGroupId">${pageScope.prepareBuildQueue.projectGroupId}</s:param>
- <s:param name="scmRootId">${pageScope.prepareBuildQueue.scmRootId}</s:param>
- <s:param name="buildAgentUrl">${pageScope.prepareBuildQueue.buildAgentUrl}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.prepareBuildQueue.projectGroupId}"/></s:param>
+ <s:param name="scmRootId"><c:out value="${pageScope.prepareBuildQueue.scmRootId}"/></s:param>
+ <s:param name="buildAgentUrl"><c:out value="${pageScope.prepareBuildQueue.buildAgentUrl}"/></s:param>
</s:url>
<s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
</redback:ifAuthorized>
@@ -240,4 +240,4 @@
</body>
</s:i18n>
-</html>
\ No newline at end of file
+</html>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Tue May 10 22:46:21 2011
@@ -22,6 +22,7 @@
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib prefix="c1" uri="continuum" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
+
<html>
<s:i18n name="localization.Continuum">
<head>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp Tue May 10 22:46:21 2011
@@ -21,6 +21,7 @@
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
+
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -77,10 +78,10 @@
<ec:column property="duration" title=" ">
<c:choose>
<c:when test="${buildResult.endTime gt 0}">
- <s:text name="buildResults.duration"/> : ${buildResult.durationTime}
+ <s:text name="buildResults.duration"/> : <c:out value="${buildResult.durationTime}"/>
</c:when>
<c:otherwise>
- <s:text name="buildResults.startedSince"/> : ${buildResult.elapsedTime}
+ <s:text name="buildResults.startedSince"/> : <c:out value="${buildResult.elapsedTime}"/>
</c:otherwise>
</c:choose>
</ec:column>
@@ -88,10 +89,10 @@
<ec:column property="buildDefinition.description" title="buildResults.buildDefinition.description" />
<ec:column property="actions" title=" ">
<s:url id="buildResultUrl" action="buildResult">
- <s:param name="projectId">${projectId}</s:param>
- <s:param name="projectName">${projectName}</s:param>
- <s:param name="buildId">${buildResult.id}</s:param>
- <s:param name="projectGroupId">${projectGroupId}</s:param>
+ <s:param name="projectId"><c:out value="${projectId}"/></s:param>
+ <s:param name="projectName"><c:out value="${projectName}"/></s:param>
+ <s:param name="buildId"><c:out value="${buildResult.id}"/></s:param>
+ <s:param name="projectGroupId"><c:out value="${projectGroupId}"/></s:param>
</s:url>
<s:a href="%{buildResultUrl}"><s:text name="buildResults.result"/></s:a>
</ec:column>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp Tue May 10 22:46:21 2011
@@ -25,7 +25,7 @@
<s:i18n name="localization.Continuum">
- <h3><s:text name="buildDefinitionSummary.projectGroup.section.title"><s:param>${projectGroup.name}</s:param></s:text></h3>
+ <h3><s:text name="buildDefinitionSummary.projectGroup.section.title"><s:param><c:out value="${projectGroup.name}"/></s:param></s:text></h3>
<c:if test="${not empty groupBuildDefinitionSummaries}">
<ec:table items="groupBuildDefinitionSummaries"
var="buildDefinitionSummary"
@@ -42,19 +42,19 @@
<ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
<redback:ifAuthorized permission="continuum-manage-schedules">
<s:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
- <s:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</s:param>
+ <s:param name="id"><c:out value="${pageScope.buildDefinitionSummary.scheduleId}"/></s:param>
</s:url>
- <s:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</s:a>
+ <s:a href="%{scheduleUrl}"><c:out value="${pageScope.buildDefinitionSummary.scheduleName}"/></s:a>
</redback:ifAuthorized>
<redback:elseAuthorized>
- ${pageScope.buildDefinitionSummary.scheduleName}
+ <c:out value="${pageScope.buildDefinitionSummary.scheduleName}"/>
</redback:elseAuthorized>
</ec:column>
<ec:column property="profileName" title="projectView.buildDefinition.profile">
<s:url id="profileUrl" action="editBuildEnv!edit.action" namespace="/" includeParams="none">
- <s:param name="profile.id">${pageScope.buildDefinitionSummary.profileId}</s:param>
+ <s:param name="profile.id"><c:out value="${pageScope.buildDefinitionSummary.profileId}"/></s:param>
</s:url>
- <s:a href="%{profileUrl}">${pageScope.buildDefinitionSummary.profileName}</s:a>
+ <s:a href="%{profileUrl}"><c:out value="${pageScope.buildDefinitionSummary.profileName}"/></s:a>
</ec:column>
<ec:column property="from" title="projectView.buildDefinition.from"/>
<ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
@@ -65,8 +65,8 @@
<ec:column property="buildAction" title=" " width="1%">
<redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
<s:url id="buildUrl" action="buildProject" namespace="/">
- <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
- <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.buildDefinitionSummary.projectGroupId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
<s:param name="fromGroupPage" value="true"/>
</s:url>
<s:a href="%{buildUrl}"><img src="<s:url value='/images/buildnow.gif' includeParams="none"/>" alt="<s:text name='build'/>" title="<s:text name='build'/>" border="0"></s:a>
@@ -79,8 +79,8 @@
<center>
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
<s:url id="editUrl" action="buildDefinition" method="input" namespace="/" includeParams="none">
- <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
- <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.buildDefinitionSummary.projectGroupId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
</s:url>
<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">
@@ -101,8 +101,8 @@
<c:otherwise>
<s:token/>
<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>
+ <s:param name="projectGroupId"><c:out value="${pageScope.buildDefinitionSummary.projectGroupId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
<s:param name="confirmed" value="false"/>
<s:param name="struts.token.name">struts.token</s:param>
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
@@ -144,9 +144,9 @@
<ec:row>
<ec:column property="projectName" title="buildDefinitionSummary.project">
<s:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
- <s:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</s:param>
+ <s:param name="projectId"><c:out value="${pageScope.buildDefinitionSummary.projectId}"/></s:param>
</s:url>
- <s:a href="%{projectUrl}">${pageScope.buildDefinitionSummary.projectName}</s:a>
+ <s:a href="%{projectUrl}"><c:out value="${pageScope.buildDefinitionSummary.projectName}"/></s:a>
</ec:column>
<ec:column property="goals" title="projectView.buildDefinition.goals"/>
<ec:column property="arguments" title="projectView.buildDefinition.arguments"/>
@@ -154,19 +154,19 @@
<ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
<redback:ifAuthorized permission="continuum-manage-schedules">
<s:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
- <s:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</s:param>
+ <s:param name="id"><c:out value="${pageScope.buildDefinitionSummary.scheduleId}"/></s:param>
</s:url>
- <s:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</s:a>
+ <s:a href="%{scheduleUrl}"><c:out value="${pageScope.buildDefinitionSummary.scheduleName}"/></s:a>
</redback:ifAuthorized>
<redback:elseAuthorized>
- ${pageScope.buildDefinitionSummary.scheduleName}
+ <c:out value="${pageScope.buildDefinitionSummary.scheduleName}"/>
</redback:elseAuthorized>
</ec:column>
<ec:column property="profileName" title="projectView.buildDefinition.profile">
<s:url id="profileUrl" action="editBuildEnv!edit.action" namespace="/" includeParams="none">
- <s:param name="profile.id">${pageScope.buildDefinitionSummary.profileId}</s:param>
+ <s:param name="profile.id"><c:out value="${pageScope.buildDefinitionSummary.profileId}"/></s:param>
</s:url>
- <s:a href="%{profileUrl}">${pageScope.buildDefinitionSummary.profileName}</s:a>
+ <s:a href="%{profileUrl}"><c:out value="${pageScope.buildDefinitionSummary.profileName}"/></s:a>
</ec:column>
<ec:column property="from" title="projectView.buildDefinition.from"/>
<ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
@@ -177,8 +177,8 @@
<ec:column property="buildNowAction" title=" " width="1%">
<redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
<s:url id="buildProjectUrl" action="buildProject" namespace="/" includeParams="none">
- <s:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</s:param>
- <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="projectId"><c:out value="${pageScope.buildDefinitionSummary.projectId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
</s:url>
<s:a href="%{buildProjectUrl}">
<img src="<s:url value='/images/buildnow.gif' includeParams="none"/>" alt="<s:text name='build'/>" title="<s:text name='build'/>" border="0">
@@ -191,8 +191,8 @@
<ec:column property="editAction" title=" " width="1%">
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
<s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
- <s:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</s:param>
- <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="projectId"><c:out value="${pageScope.buildDefinitionSummary.projectId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
<s:param name="groupBuildView" value="true"/>
</s:url>
<s:a href="%{editUrl}">
@@ -207,8 +207,8 @@
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
<s:token/>
<s:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
- <s:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</s:param>
- <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="projectId"><c:out value="${pageScope.buildDefinitionSummary.projectId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
<s:param name="confirmed" value="false"/>
<s:param name="struts.token.name">struts.token</s:param>
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Tue May 10 22:46:21 2011
@@ -39,12 +39,12 @@
<ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
<redback:ifAuthorized permission="continuum-manage-schedules">
<s:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
- <s:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</s:param>
+ <s:param name="id"><c:out value="${pageScope.buildDefinitionSummary.scheduleId}"/></s:param>
</s:url>
- <s:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</s:a>
+ <s:a href="%{scheduleUrl}"><c:out value="${pageScope.buildDefinitionSummary.scheduleName}"/></s:a>
</redback:ifAuthorized>
<redback:elseAuthorized>
- ${pageScope.buildDefinitionSummary.scheduleName}
+ <c:out value="${pageScope.buildDefinitionSummary.scheduleName}"/>
</redback:elseAuthorized>
</ec:column>
<ec:column property="profileName" title="projectView.buildDefinition.profile"/>
@@ -56,8 +56,8 @@
<ec:column property="buildAction" title=" " width="1%">
<redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
<s:url id="buildProjectUrl" action="buildProject" namespace="/">
- <s:param name="projectId">${projectId}</s:param>
- <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="projectId"><c:out value="${projectId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
<s:param name="fromProjectPage" value="true"/>
</s:url>
<s:a href="%{buildProjectUrl}"><img src="<s:url value='/images/buildnow.gif' includeParams="none"/>" alt="<s:text name='build'/>" title="<s:text name='build'/>" border="0"></s:a>
@@ -72,8 +72,8 @@
<c:when 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>
- <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="projectId"><c:out value="${projectId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
</s:url>
<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>
</redback:ifAuthorized>
@@ -84,8 +84,8 @@
<c:otherwise>
<redback:ifAuthorized permission="continuum-modify-group-build-definition" resource="${projectGroupName}">
<s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
- <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
- <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.buildDefinitionSummary.projectGroupId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
<s:param name="groupBuildDefinition">true</s:param>
</s:url>
<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>
@@ -103,8 +103,8 @@
<redback:ifAuthorized permission="continuum-remove-project-build-definition" resource="${projectGroupName}">
<s:token/>
<s:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
- <s:param name="projectId">${projectId}</s:param>
- <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="projectId"><c:out value="${projectId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
<s:param name="confirmed" value="false"/>
<s:param name="struts.token.name">struts.token</s:param>
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
@@ -124,8 +124,8 @@
<c:otherwise>
<s:token/>
<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>
+ <s:param name="projectGroupId"><c:out value="${pageScope.buildDefinitionSummary.projectGroupId}"/></s:param>
+ <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
<s:param name="groupBuildDefinition">true</s:param>
<s:param name="confirmed" value="false"/>
<s:param name="struts.token.name">struts.token</s:param>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp Tue May 10 22:46:21 2011
@@ -19,18 +19,20 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+
<s:set name="companyLogo" value="companyLogo"/>
<c:if test="${!empty (companyLogo)}">
- <s:set name="companyName" value="companyName"/>
- <s:set name="companyUrl" value="companyUrl"/>
+ <s:set name="companyName" value="companyName"/>"/>
+ <s:set name="companyUrl" value="companyUrl"/>"/>
<c:choose>
<c:when test="${!empty (companyUrl)}">
- <a href="${companyUrl}">
- <img src="${companyLogo}" title="${companyName}" border="0" alt="${companyName}"/>
+ <a href="${fn:escapeXml(companyUrl)}">
+ <img src="${fn:escapeXml(companyLogo)}" title="${fn:escapeXml(companyName)}" border="0" alt="${fn:escapeXml(companyName)}"/>
</a>
</c:when>
<c:otherwise>
- <img src="${companyLogo}" title="${companyName}" border="0" alt="${companyName}"/>
+ <img src="${fn:escapeXml(companyLogo)}" title="${fn:escapeXml(companyName)}" border="0" alt="${fn:escapeXml(companyName)}"/>
</c:otherwise>
</c:choose>
</c:if>
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp Tue May 10 22:46:21 2011
@@ -24,7 +24,7 @@
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<s:i18n name="localization.Continuum">
- <h3><s:text name="projectGroupNotifierSummaryComponent.groupNotifiers"><s:param>${projectGroup.name}</s:param></s:text></h3>
+ <h3><s:text name="projectGroupNotifierSummaryComponent.groupNotifiers"><s:param><c:out value="${projectGroup.name}"/></s:param></s:text></h3>
<c:if test="${not empty projectGroupNotifierSummaries}">
<ec:table items="projectGroupNotifierSummaries"
var="projectGroupNotifierSummary"
@@ -42,9 +42,9 @@
<ec:column property="editActions" title=" " width="1%">
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
<s:url id="editUrl" action="editProjectGroupNotifier" namespace="/">
- <s:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</s:param>
- <s:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</s:param>
- <s:param name="notifierType">${pageScope.projectGroupNotifierSummary.type}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.projectGroupNotifierSummary.projectGroupId}"/></s:param>
+ <s:param name="notifierId"><c:out value="${pageScope.projectGroupNotifierSummary.id}"/></s:param>
+ <s:param name="notifierType"><c:out value="${pageScope.projectGroupNotifierSummary.type}"/></s:param>
</s:url>
<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">
@@ -57,9 +57,9 @@
<ec:column property="deleteActions" title=" " width="1%">
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
<s:url id="removeUrl" action="deleteProjectGroupNotifier!default.action" namespace="/">
- <s:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</s:param>
- <s:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</s:param>
- <s:param name="notifierType">${pageScope.projectGroupNotifierSummary.type}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.projectGroupNotifierSummary.projectGroupId}"/></s:param>
+ <s:param name="notifierId"><c:out value="${pageScope.projectGroupNotifierSummary.id}"/></s:param>
+ <s:param name="notifierType"><c:out value="${pageScope.projectGroupNotifierSummary.type}"/></s:param>
</s:url>
<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">
@@ -96,9 +96,9 @@
<ec:row>
<ec:column property="projectName" title="projectView.project.name">
<s:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
- <s:param name="projectId">${pageScope.projectNotifierSummary.projectId}</s:param>
+ <s:param name="projectId"><c:out value="${pageScope.projectNotifierSummary.projectId}"/></s:param>
</s:url>
- <s:a href="%{projectUrl}">${pageScope.projectNotifierSummary.projectName}</s:a>
+ <s:a href="%{projectUrl}"><c:out value="${pageScope.projectNotifierSummary.projectName}"/></s:a>
</ec:column>
<ec:column property="type" title="projectView.notifier.type"/>
<ec:column property="recipient" title="projectView.notifier.recipient"/>
@@ -109,10 +109,10 @@
<c:choose>
<c:when test="${!pageScope.projectNotifierSummary.fromProject}">
<s:url id="editUrl" action="editProjectNotifier" namespace="/" includeParams="none">
- <s:param name="projectGroupId">${pageScope.projectNotifierSummary.projectGroupId}</s:param>
- <s:param name="projectId">${pageScope.projectNotifierSummary.projectId}</s:param>
- <s:param name="notifierId">${pageScope.projectNotifierSummary.id}</s:param>
- <s:param name="notifierType">${pageScope.projectNotifierSummary.type}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.projectNotifierSummary.projectGroupId}"/></s:param>
+ <s:param name="projectId"><c:out value="${pageScope.projectNotifierSummary.projectId}"/></s:param>
+ <s:param name="notifierId"><c:out value="${pageScope.projectNotifierSummary.id}"/></s:param>
+ <s:param name="notifierType"><c:out value="${pageScope.projectNotifierSummary.type}"/></s:param>
<s:param name="fromGroupPage" value="true"/>
</s:url>
<s:a href="%{editUrl}">
@@ -133,9 +133,9 @@
<c:choose>
<c:when test="${!pageScope.projectNotifierSummary.fromProject}">
<s:url id="removeUrl" action="deleteProjectNotifier!default.action" namespace="/">
- <s:param name="projectGroupId">${pageScope.projectNotifierSummary.projectGroupId}</s:param>
- <s:param name="projectId">${pageScope.projectNotifierSummary.projectId}</s:param>
- <s:param name="notifierId">${pageScope.projectNotifierSummary.id}</s:param>
+ <s:param name="projectGroupId"><c:out value="${pageScope.projectNotifierSummary.projectGroupId}"/></s:param>
+ <s:param name="projectId"><c:out value="${pageScope.projectNotifierSummary.projectId}"/></s:param>
+ <s:param name="notifierId"><c:out value="${pageScope.projectNotifierSummary.id}"/></s:param>
<s:param name="fromGroupPage" value="true"/>
</s:url>
<s:a href="%{removeUrl}">