continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1489429 - in /continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp: ./ admin/ components/
Date Tue, 04 Jun 2013 13:12:43 GMT
Author: batkinson
Date: Tue Jun  4 13:12:43 2013
New Revision: 1489429

URL: http://svn.apache.org/r1489429
Log:
Fixed link encoding of tokens, naming changed since struts2 upgrade.

Modified:
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp?rev=1489429&r1=1489428&r2=1489429&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
Tue Jun  4 13:12:43 2013
@@ -65,8 +65,8 @@
               <s:token/>
               <s:url id="removeBuildAgentUrl" action="deleteBuildAgent">
                 <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:param name="struts.token.name">token</s:param>
+                <s:param name="token"><s:property value="token"/></s:param>
               </s:url>
               <s:a href="%{removeBuildAgentUrl}">
                 <img src="<s:url value='/images/delete.gif' includeParams="none"/>"
alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"/>
@@ -114,8 +114,8 @@
               <s:token/>
               <s:url id="removeBuildAgentGroupUrl" action="deleteBuildAgentGroup">
                 <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:param name="struts.token.name">token</s:param>
+                <s:param name="token"><s:property value="token"/></s:param>
               </s:url>
               <s:a href="%{removeBuildAgentGroupUrl}">
                 <img src="<s:url value='/images/delete.gif' includeParams="none"/>"
alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"/>
@@ -131,4 +131,4 @@
       </div>
     </body>
   </s:i18n>
-</html>
\ No newline at end of file
+</html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp?rev=1489429&r1=1489428&r2=1489429&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
Tue Jun  4 13:12:43 2013
@@ -61,8 +61,8 @@
               <s:url id="deleteUrl" action="deleteDefinitionTemplate" method="delete"
namespace="/">
                 <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:param name="struts.token.name">token</s:param>
+                <s:param name="token"><s:property value="token"/></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/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp?rev=1489429&r1=1489428&r2=1489429&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp
Tue Jun  4 13:12:43 2013
@@ -66,8 +66,8 @@
                 <s:url id="removePurgeConfigUrl" action="removeDistributedPurgeConfig">
                   <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:param name="struts.token.name">token</s:param>
+                  <s:param name="token"><s:property value="token"/></s:param>
                 </s:url>
                 <s:a href="%{removePurgeConfigUrl}"><img src="<s:url value='/images/delete.gif'
includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>"
border="0"></s:a>
             </ec:column>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp?rev=1489429&r1=1489428&r2=1489429&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
Tue Jun  4 13:12:43 2013
@@ -79,8 +79,8 @@
                 <s:token/>
                 <s:url id="removeRepositoryUrl" action="removeRepository">
                   <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:param name="struts.token.name">token</s:param>
+                  <s:param name="token"><s:property value="token"/></s:param>
                 </s:url>
                 <c:choose>
                   <c:when test="${repository.name == 'DEFAULT'}">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp?rev=1489429&r1=1489428&r2=1489429&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
Tue Jun  4 13:12:43 2013
@@ -52,8 +52,8 @@
             <s:url id="deleteBuildQueueUrl" action="deleteBuildQueue">
               <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:param name="struts.token.name">token</s:param>
+              <s:param name="token"><s:property value="token"/></s:param>
             </s:url>          
             <s:a href="%{deleteBuildQueueUrl}">
               <img src="<s:url value='/images/delete.gif' includeParams="none"/>"
alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp?rev=1489429&r1=1489428&r2=1489429&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
Tue Jun  4 13:12:43 2013
@@ -84,8 +84,8 @@
                 <s:url id="removePurgeConfigUrl" action="removePurgeConfig">
                   <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:param name="struts.token.name">token</s:param>
+                  <s:param name="token"><s:property value="token"/></s:param>
                 </s:url>
                 <s:a href="%{removePurgeConfigUrl}"><img src="<s:url value='/images/delete.gif'
includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>"
border="0"></s:a>
             </ec:column>
@@ -136,8 +136,8 @@
                 <s:url id="removePurgeConfigUrl" action="removePurgeConfig">
                   <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:param name="struts.token.name">token</s:param>
+                  <s:param name="token"><s:property value="token"/></s:param>
                 </s:url>
                 <s:a href="%{removePurgeConfigUrl}"><img src="<s:url value='/images/delete.gif'
includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>"
border="0"></s:a>
             </ec:column>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=1489429&r1=1489428&r2=1489429&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
Tue Jun  4 13:12:43 2013
@@ -104,8 +104,8 @@
               <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>

+              <s:param name="struts.token.name">token</s:param>
+              <s:param name="token"><s:property value="token"/></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">
@@ -211,8 +211,8 @@
             <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>
+            <s:param name="struts.token.name">token</s:param>
+            <s:param name="token"><s:property value="token"/></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">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=1489429&r1=1489428&r2=1489429&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Tue Jun  4 13:12:43 2013
@@ -106,8 +106,8 @@
                 <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>
+                <s:param name="struts.token.name">token</s:param>
+                <s:param name="token"><s:property value="token"/></s:param>
               </s:url>
               <s:set id="removeId">remove-build-definition-${pageScope.buildDefinitionSummary.id}</s:set>
               <s:a href="%{removeUrl}" id="%{removeId}"><img src="<s:url value='/images/delete.gif'
includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>"
border="0"></s:a>
@@ -129,8 +129,8 @@
                     <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>
-                    <s:param name="struts.token"><s:property value="struts.token"/></s:param>
+                    <s:param name="struts.token.name">token</s:param>
+                    <s:param name="token"><s:property value="token"/></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"></s:a>
                 </c:otherwise>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?rev=1489429&r1=1489428&r2=1489429&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
Tue Jun  4 13:12:43 2013
@@ -214,8 +214,8 @@
             <s:token/>
             <s:url id="deleteProjectUrl" value="deleteProject!default.action" namespace="/">
               <s:param name="projectId"><c:out value="${project.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:param name="struts.token.name">token</s:param>
+              <s:param name="token"><s:property value="token"/></s:param>
             </s:url>
             <s:a href="%{deleteProjectUrl}">
               <img src="<s:url value='/images/delete.gif' includeParams="none"/>"
alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp?rev=1489429&r1=1489428&r2=1489429&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp Tue
Jun  4 13:12:43 2013
@@ -92,8 +92,8 @@
                 <s:url id="removeProjectUrl" action="deleteProject!default.action">
                   <s:param name="projectId"><c:out value="${pageScope.project.id}"/></s:param>
                   <s:param name="projectName"><c:out value="${pageScope.project.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:param name="struts.token.name">token</s:param>
+                  <s:param name="token"><s:property value="token"/></s:param>
                 </s:url>
                 <s:a href="%{removeProjectUrl}">
                   <img src="<s:url value='/images/delete.gif' includeParams="none"/>"
alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp?rev=1489429&r1=1489428&r2=1489429&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp Tue Jun  4
13:12:43 2013
@@ -55,8 +55,8 @@
                 <s:url id="removeScheduleUrl" action="removeSchedule">
                   <s:param name="id"><c:out value="${pageScope.schedule.id}"/></s:param>
                   <s:param name="name"><c:out value="${pageScope.schedule.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:param name="struts.token.name">token</s:param>
+                  <s:param name="token"><s:property value="token"/></s:param>
                 </s:url>
                 <s:a href="%{removeScheduleUrl}"><img src="<s:url value='/images/delete.gif'
includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>"
border="0"></s:a>
             </ec:column>



Mime
View raw message