You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2006/07/27 22:07:11 UTC
svn commit: r426222 - in /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp: buildResults.jsp projectView.jsp schedules.jsp summary.jsp

Author: carlos
Date: Thu Jul 27 13:07:10 2006
New Revision: 426222

URL: http://svn.apache.org/viewvc?rev=426222&view=rev
Log:
Merged rev# 426218 from trunk

Modified:
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResults.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResults.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResults.jsp?rev=426222&r1=426221&r2=426222&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResults.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResults.jsp Thu Jul 27 13:07:10 2006
@@ -39,7 +39,12 @@
             <ec:column property="endTime" title="buildResults.endTime" cell="date"/>
             <ec:column property="state" title="buildResults.state" cell="org.apache.maven.continuum.web.view.buildresults.StateCell"/>
             <ec:column property="actions" title="&nbsp;">
-              <a href="${pageContext.request.contextPath}/buildResult.action?projectId=<ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>&buildId=${pageScope.buildResult.id}">Result</a>
+              <c:url var="buildResultUrl" value="/buildResult.action">
+                <c:param name="projectId" value="projectId"/>
+                <c:param name="projectName" value="projectName"/>
+                <c:param name="buildId" value="${buildResult.id}"/>
+              </c:url>
+              <a href="<c:out value='${buildResultUrl}'/>">Result</a>
             </ec:column>
           </ec:row>
         </ec:table>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp?rev=426222&r1=426221&r2=426222&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp Thu Jul 27 13:07:10 2006
@@ -70,9 +70,17 @@
             </ec:column>
             <ec:column property="actions" title="&nbsp;">
                 <!-- TODO: REPLACE THIS WITH A NEW CELL CLASS -->
-                <a href="${pageContext.request.contextPath}/buildDefinitionEdit!default.action?projectId=<ww:property value="project.id"/>&buildDefinitionId=${pageScope.buildDefinition.id}"><ww:text name="edit"/></a>
+                <c:url var="buildDefinitionEditUrl" value="/buildDefinitionEdit!default.action">
+                  <c:param name="projectId" value="project.id"/>
+                  <c:param name="buildDefinitionId" value="${buildDefinition.id}"/>
+                </c:url>
+                <a href="<c:out value='${buildDefinitionEditUrl}'/>"><ww:text name="edit"/></a>
                 &nbsp;
-                <a href="${pageContext.request.contextPath}/deleteBuildDefinition!default.action?projectId=<ww:property value="project.id"/>&buildDefinitionId=${pageScope.buildDefinition.id}"><ww:text name="delete"/></a>
+                <c:url var="deleteBuildDefinitionUrl" value="/deleteBuildDefinition!default.action">
+                  <c:param name="projectId" value="project.id"/>
+                  <c:param name="buildDefinitionId" value="${buildDefinition.id}"/>
+                </c:url>
+                <a href="<c:out value='${deleteBuildDefinitionUrl}'/>"><ww:text name="delete"/></a>
             </ec:column>
           </ec:row>
         </ec:table>
@@ -99,9 +107,24 @@
             <ec:column property="from" title="projectView.notifier.from" cell="org.apache.maven.continuum.web.view.projectview.NotifierFromCell"/>
             <ec:column property="actions" title="&nbsp;">
                 <c:if test="${!pageScope.notifier.fromProject}">
-                    <a href="${pageContext.request.contextPath}/${pageScope.notifier.type}NotifierEdit!default.action?projectId=<ww:property value="project.id"/>&notifierId=${pageScope.notifier.id}"><img src="${pageContext.request.contextPath}/images/edit.gif" alt="<ww:text name="edit"/>" title="<ww:text name="edit"/>" border="0"></a>
+                    <c:url var="notifierEditUrl" value="${notifier.type}NotifierEdit!default.action">
+                      <c:param name="projectId" value="project.id"/>
+                      <c:param name="notifierId" value="${notifier.id}"/>
+                    </c:url>
+                    <c:url var="imgEditUrl" value="/images/edit.gif" />
+                    <a href="<c:out value='${notifierEditUrl}'/>">
+                      <img src="<c:out value='${imgEditUrl}'/>" alt="<ww:text name="edit"/>" title="<ww:text name="edit"/>" border="0">
+                    </a>
                     &nbsp;
-                    <a href="${pageContext.request.contextPath}/deleteNotifier!default.action?projectId=<ww:property value="project.id"/>&notifierId=${pageScope.notifier.id}&notifierType=${pageScope.notifier.type}"><img src="${pageContext.request.contextPath}/images/delete.gif" alt="<ww:text name="delete"/>" title="<ww:text name="delete"/>" border="0"></a>
+                    <c:url var="notifierDeleteUrl" value="/deleteNotifier!default.action">
+                      <c:param name="projectId" value="project.id"/>
+                      <c:param name="notifierId" value="${notifier.id}"/>
+                      <c:param name="notifierType" value="${notifier.type}"/>
+                    </c:url>
+                    <c:url var="imgDeleteUrl" value="/images/delete.gif" />
+                    <a href="<c:out value='${notifierDeleteUrl}'/>">
+                      <img src="<c:out value='${imgDeleteUrl}'/>" alt="<ww:text name="delete"/>" title="<ww:text name="delete"/>" border="0">
+                    </a>
                 </c:if>
             </ec:column>
           </ec:row>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp?rev=426222&r1=426221&r2=426222&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp Thu Jul 27 13:07:10 2006
@@ -21,7 +21,10 @@
             <ec:column property="delay" title="schedules.table.delay"/>
             <ec:column property="cronExpression" title="schedules.table.cronExpression"/>
             <ec:column property="actions" title="&nbsp;">
-                <a href="${pageContext.request.contextPath}/editSchedule!edit.action?id=${pageScope.schedule.id}"><ww:text name="edit"/></a>
+                <c:url var="editScheduleUrl" value="/editSchedule!edit.action">
+                  <c:param name="id" value="${schedule.id}"/>
+                </c:url>
+                <a href="<c:out value='${editScheduleUrl}'/>"><ww:text name="edit"/></a>
                 &nbsp;
                 <ww:text name="delete"/>
             </ec:column>
@@ -35,4 +38,4 @@
     </div>
     </body>
   </ww:i18n>
-</html>
\ No newline at end of file
+</html>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp?rev=426222&r1=426221&r2=426222&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp Thu Jul 27 13:07:10 2006
@@ -19,7 +19,10 @@
           <ec:row highlightRow="true">
             <ec:column property="state" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.StateCell"/>
             <ec:column property="name" title="summary.projectTable.name" width="48%">
-                <a href="${pageContext.request.contextPath}/projectView.action?projectId=${pageScope.project.id}">${pageScope.project.name}</a>
+                <c:url var="projectViewUrl" value="/projectView.action">
+                  <c:param name="projectId" value="${project.id}"/>
+                </c:url>
+                <a href="<c:out value='${projectViewUrl}'/>">${project.name}</a>
             </ec:column>
             <ec:column property="version" title="summary.projectTable.version" width="13%"/>
             <ec:column property="buildNumber" title="summary.projectTable.build" width="5%" cell="org.apache.maven.continuum.web.view.BuildCell"/>
@@ -48,7 +51,14 @@
             <ec:column property="deleteAction" title="&nbsp;" width="1%" sortable="false">
               <c:choose>
                 <c:when test="${pageScope.project.state == 1 || pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4}">
-                  <a href="${pageContext.request.contextPath}/deleteProject!default.action?projectId=${pageScope.project.id}&projectName=${pageScope.project.name}"><img src="<ww:url value="/images/delete.gif"/>" alt="Delete" title="Delete" border="0"></a>
+                  <c:url var="deleteProjectUrl" value="/deleteProject!default.action">
+                    <c:param name="projectId" value="${project.id}"/>
+                    <c:param name="projectName" value="${project.name}"/>
+                  </c:url>
+                  <c:url var="imgDeleteUrl" value="/images/delete.gif" />
+                  <a href="<c:out value='${deleteProjectUrl}'/>">
+                    <img src="<c:out value='${imgDeleteUrl}'/>" alt="Delete" title="Delete" border="0">
+                  </a>
                 </c:when>
                 <c:otherwise>
                   <img src="<ww:url value="/images/delete_disabled.gif"/>" alt="Delete" title="Delete" border="0">
@@ -71,4 +81,4 @@
       </div>
     </body>
   </ww:i18n>
-</html>
\ No newline at end of file
+</html>