continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r433720 [3/3] - in /maven/continuum/branches/continuum-acegi: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ continuum-api/src/main/java/org/apache/maven/conti...
Date Tue, 22 Aug 2006 18:37:46 GMT
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=433720&r1=433719&r2=433720&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
Tue Aug 22 11:37:42 2006
@@ -49,43 +49,13 @@
         </div>
 
         <h3><ww:text name="projectView.buildDefinitions"/></h3>
-        <ww:set name="buildDefinitions" value="project.buildDefinitions" scope="request"/>
-        <ec:table items="buildDefinitions"
-                  var="buildDefinition"
-                  showExports="false"
-                  showPagination="false"
-                  showStatusBar="false"
-                  filterable="false"
-                  sortable="false">
-          <ec:row>
-            <ec:column property="goals" title="projectView.buildDefinition.goals"/>
-            <ec:column property="arguments" title="projectView.buildDefinition.arguments"/>
-            <ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
-            <ec:column property="profile" title="projectView.buildDefinition.profile"/>
-            <ec:column property="schedule" title="schedule">
-                ${pageScope.buildDefinition.schedule.name}
-            </ec:column>
-            <ec:column property="from" title="projectView.buildDefinition.from">
-                PROJECT
-            </ec:column>
-            <ec:column property="actions" title="&nbsp;">
-                <!-- TODO: REPLACE THIS WITH A NEW CELL CLASS -->
-                <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;
-                <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>
+
+        <ww:action name="buildDefinitionSummary" id="summary" namespace="component" executeResult="true">
+          <ww:param name="projectId" value="%{project.id}" />
+        </ww:action>
+
         <div class="functnbar3">
-          <ww:form action="addBuildDefinition.action" method="post">
+          <ww:form action="buildDefinition" method="post">
             <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
             <ww:submit value="%{getText('add')}"/>
           </ww:form>
@@ -107,23 +77,19 @@
             <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}">
-                    <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 href='<ww:url value="${notifier.type}NotifierEdit!default.action">
+                      <ww:param name="projectId" value="project.id"/>
+                      <ww:param name="notifierId" value="${notifier.id}"/>
+                    </ww:url>'>
+                      <img src="<ww:url value='/images/edit.gif'/>" alt="<ww:text
name='edit'/>" title="<ww:text name='edit'/>" border="0" />
                     </a>
                     &nbsp;
-                    <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 href='<ww:url value="/deleteNotifier!default.action">
+                      <ww:param name="projectId" value="project.id"/>
+                      <ww:param name="notifierId" value="${notifier.id}"/>
+                      <ww:param name="notifierType" value="${notifier.type}"/>
+                    </ww:url>'>
+                      <img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text
name='delete'/>" title="<ww:text name='delete'/>" border="0">
                     </a>
                 </c:if>
             </ec:column>

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=433720&r1=433719&r2=433720&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
Tue Aug 22 11:37:42 2006
@@ -22,10 +22,10 @@
             <ec:column property="delay" title="schedules.table.delay"/>
             <ec:column property="cronExpression" title="schedules.table.cronExpression"/>
             <ec:column property="actions" title="&nbsp;">
-                <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>
+                <ww:url id="editUrl" action="schedule">
+                  <ww:param name="id" value="${pageScope.schedule.id}"/>
+                </ww:url>
+                <ww:a href="%{editUrl}">Edit</ww:a>
                 &nbsp;
                 <ww:text name="delete"/>
             </ec:column>
@@ -33,7 +33,7 @@
         </ec:table>
       </div>
       <div class="functnbar3">
-        <ww:form action="addSchedule!default.action" method="post">
+        <ww:form action="schedule" method="post">
           <ww:submit value="%{getText('add')}"/>
         </ww:form>
     </div>

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=433720&r1=433719&r2=433720&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
Tue Aug 22 11:37:42 2006
@@ -19,49 +19,34 @@
           <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%">
-                <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>
+                <a href="<ww:url action="projectView">
+                  <ww:param name="projectId" value="${project.id}"/>
+                </ww:url>">${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"/>
-            <ec:column property="projectGroupName" title="summary.projectTable.group"
width="13%"/>
             <ec:column property="buildNowAction" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.BuildNowCell"
sortable="false"/>
             <ec:column property="buildHistoryAction" title="&nbsp;" width="1%" sortable="false">
               <c:choose>
                 <c:when test="${pageScope.project.latestBuildId > 0}">
-                  <a href="<ww:url value="/buildResults.action?projectId="/>${pageScope.project.id}&projectName=${pageScope.project.name}"><img
src="<ww:url value="/images/buildhistory.gif"/>" alt="Build History" title="Build History"
border="0"></a>
+                  <a href='<ww:url action="buildResults">
+                      <ww:param name="projectId" value="${project.id}"/>
+                    </ww:url>'><img src="<ww:url value='/images/buildhistory.gif'/>"
alt="Build History" title="Build History" border="0"></a>
                 </c:when>
                 <c:otherwise>
-                  <img src="<ww:url value="/images/buildhistory_disabled.gif"/>"
alt="Build History" title="Build History" border="0">
+                  <img src="<ww:url value='/images/buildhistory_disabled.gif'/>"
alt="Build History" title="Build History" border="0">
                 </c:otherwise>
               </c:choose>
             </ec:column>
             <ec:column property="workingCopyAction" title="&nbsp;" width="1%" sortable="false">
               <c:choose>
                 <c:when test="${pageScope.project.state == 10 || pageScope.project.state
== 2 || pageScope.project.state == 3 || pageScope.project.state == 4 || pageScope.project.state
== 6}">
-                  <a href="<ww:url value="/workingCopy.action?projectId="/>${pageScope.project.id}&projectName=${pageScope.project.name}"><img
src="<ww:url value="/images/workingcopy.gif"/>" alt="Working Copy" title="Working Copy"
border="0"></a>
+                  <a href='<ww:url action="workingCopy">
+                      <ww:param name="projectId" value="${project.id}"/>
+                    </ww:url>'><img src="<ww:url value='/images/workingcopy.gif'/>"
alt="Working Copy" title="Working Copy" border="0"></a>
                 </c:when>
                 <c:otherwise>
-                  <img src="<ww:url value="/images/workingcopy_disabled.gif"/>"
alt="Working Copy" title="Working Copy" border="0">
-                </c:otherwise>
-              </c:choose>
-            </ec:column>
-            <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}">
-                  <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">
+                  <img src="<ww:url value='/images/workingcopy_disabled.gif'/>"
alt="Working Copy" title="Working Copy" border="0">
                 </c:otherwise>
               </c:choose>
             </ec:column>
@@ -71,9 +56,9 @@
           <ww:form action="buildProject.action" method="post">
             <ww:submit value="%{getText('summary.buildAll')}">
               <ww:param name="before">
-                <img src="<ww:url value="/images/icon_success_sml.gif"/>" alt="<ww:text
name="message.success"/>" title="<ww:text name="message.success"/>"/> <ww:property
value="nbSuccesses"/>
-                <img src="<ww:url value="/images/icon_warning_sml.gif"/>" alt="<ww:text
name="message.failed"/>" title="<ww:text name="message.failed"/>"/> <ww:property
value="nbFailures"/>
-                <img src="<ww:url value="/images/icon_error_sml.gif"/>" alt="<ww:text
name="message.error"/>" title="<ww:text name="message.error"/>"/> <ww:property
value="nbErrors"/>
+                <img src="<ww:url value='/images/icon_success_sml.gif'/>" alt="<ww:text
name='message.success'/>" title="<ww:text name='message.success'/>"/> <ww:property
value="nbSuccesses"/>
+                <img src="<ww:url value='/images/icon_warning_sml.gif'/>" alt="<ww:text
name='message.failed'/>" title="<ww:text name='message.failed'/>"/> <ww:property
value="nbFailures"/>
+                <img src="<ww:url value='/images/icon_error_sml.gif'/>" alt="<ww:text
name='message.error'/>" title="<ww:text name='message.error'/>"/> <ww:property
value="nbErrors"/>
               </ww:param>
             </ww:submit>
           </ww:form>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/workingCopy.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/workingCopy.jsp?rev=433720&r1=433719&r2=433720&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/workingCopy.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/workingCopy.jsp
Tue Aug 22 11:37:42 2006
@@ -8,8 +8,18 @@
       <div id="h3">
         <div>
           <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
-            <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;
text-decoration: none;" href="<ww:url value="/projectView.action?projectId="/><ww:property
value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text
name="info"/></a>
-            <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;
text-decoration: none;" href="<ww:url value="/buildResults.action?projectId="/><ww:property
value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text
name="builds"/></a>
+            <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;
text-decoration: none;"
+              href='<ww:url action="projectView">
+                  <ww:param name="projectId" value="projectId"/>
+                </ww:url>'>
+              <ww:text name="info"/>
+            </a>
+            <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;
text-decoration: none;"
+              href='<ww:url action="buildResults">
+                  <ww:param name="projectId" value="projectId"/>
+                </ww:url>'>
+              <ww:text name="builds"/>
+            </a>
             <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><ww:text
name="workingCopy"/></b>
           </p>
         </div>
@@ -20,7 +30,7 @@
             </ww:text>
         </h3>
 
-        <ww:property value="output"/>
+        <ww:property value="output" escape="false"/>
 
         <%
             if ( request.getParameter( "file" ) != null )



Mime
View raw message