continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r449533 [3/3] - in /maven/continuum/trunk: ./ 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/continuum/store/ cont...
Date Mon, 25 Sep 2006 00:40:27 GMT
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp Sun Sep
24 17:40:23 2006
@@ -3,29 +3,24 @@
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
-<ww:i18n name="localization.Continuum">
-  <head>
-    <title><ww:text name="projectView.page.title"/></title>
-  </head>
+  <ww:i18n name="localization.Continuum">
+    <head>
+      <title><ww:text name="projectView.page.title"/></title>
+    </head>
 
-  <body>
-  <div id="h3">
-    <ww:action name="projectGroupTab" executeResult="true">
-      <ww:param name="tabName" value="'Notifier'"/>
-    </ww:action>
+    <body>
+      <div id="h3">
 
-    <h3>PROJECT GROUP Notifiers<ww:text name="projectView.section.title"/></h3>
-
-    <div class="axial">
-      <table border="1" cellspacing="2" cellpadding="3" width="100%">
-        <c1:data label="%{getText('projectView.project.name')}" name="projectGroup.name"/>
-      </table>
-    </div>
-
-    <div class="axial">
-      UNDER CONSTRUCTION
-    </div>
-  </div>
-  </body>
-</ww:i18n>
+        <jsp:include page="/navigations/ProjectGroupMenu.jsp">
+          <jsp:param name="tab" value="notifier"/>
+        </jsp:include>
+    
+        <h3>PROJECT GROUP Notifiers<ww:text name="projectView.section.title"/></h3>
+    
+        <div class="axial">
+          UNDER CONSTRUCTION
+        </div>
+      </div>
+    </body>
+  </ww:i18n>
 </html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp Sun Sep
24 17:40:23 2006
@@ -5,35 +5,29 @@
 <html>
   <ww:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="projectView.page.title"/></title>
+      <title><ww:text name="projectView.page.title"/></title>
     </head>
-    <body>    
+
+    <body>
       <div id="h3">
-        <ww:action name="projectGroupTab" executeResult="true">
-            <ww:param name="tabName" value="'Summary'"/>
-        </ww:action>
-      
-        <h3>Project Group Information</h3>
-            
-        <div class="axial">
-          <table border="1" cellspacing="2" cellpadding="3" width="100%">
-            <c1:data label="%{getText('projectView.project.name')}" name="projectGroup.name"/>
-            <c1:data label="Group Id" name="projectGroup.groupId"/>
-            <c1:data label="Description" name="projectGroup.description"/>
-           </table>
-        </div>
+
+        <jsp:include page="/navigations/ProjectGroupMenu.jsp">
+          <jsp:param name="tab" value="summary"/>
+        </jsp:include>
 
         <h3>Project Group Actions</h3>
 
         <div class="functnbar3">
-          <ww:url id="buildProjectGroupUrl" action="buildProjectGroup">
-            <ww:param name="projectGroupId" value="projectGroupId"/>
-          </ww:url>
-          <ww:url id="removeProjectGroupUrl" action="removeProjectGroup">
-            <ww:param name="projectGroupId" value="projectGroupId"/>           
-            <ww:param name="confirmed" value="false"/>
-          </ww:url>
-          <ww:a href="%{buildProjectGroupUrl}">Build</ww:a>&nbsp;<ww:a
href="%{removeProjectGroupUrl}">Remove</ww:a>
+            <ww:url id="buildProjectGroupUrl" action="buildProjectGroup">
+              <ww:param name="projectGroupId" value="projectGroupId"/>
+            </ww:url>
+            <ww:a href="%{buildProjectGroupUrl}">Build</ww:a>
+          &nbsp;
+            <ww:url id="removeProjectGroupUrl" action="removeProjectGroup">
+              <ww:param name="projectGroupId" value="projectGroupId"/>           
+              <ww:param name="confirmed" value="false"/>
+            </ww:url>
+            <ww:a href="%{removeProjectGroupUrl}">Remove</ww:a>
         </div>
 
         <h3>Projects</h3>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp Sun Sep 24 17:40:23
2006
@@ -2,6 +2,7 @@
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
+
 <html>
   <ww:i18n name="localization.Continuum">
     <head>
@@ -9,13 +10,10 @@
     </head>
     <body>
       <div id="h3">
-        <div>
-          <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
-            <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><ww:text
name="info"/></b>
-            <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;
text-decoration: none;" href='<ww:url action="buildResults"/>'><ww:text name="builds"/></a>
-            <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;
text-decoration: none;" href='<ww:url action="workingCopy"/>'><ww:text name="workingCopy"/></a>
-          </p>
-        </div>
+
+        <jsp:include page="/navigations/ProjectMenu.jsp">
+          <jsp:param name="tab" value="view"/>
+        </jsp:include>
 
         <h3><ww:text name="projectView.section.title"/></h3>
 
@@ -30,7 +28,7 @@
             <c1:data label="%{getText('projectView.project.group')}" name="project.projectGroup.name"
valueLink="%{'${projectGroupSummaryUrl}'}"/>
           </table>
           <!--
-            wrap this in security tag
+            TODO wrap this in security tag
           -->
           <div class="functnbar3">
             <table>
@@ -83,10 +81,10 @@
             <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='<ww:url value="${notifier.type}NotifierEdit.action">
+                    <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>'>
+                      </ww:url>'>
                       <img src="<ww:url value='/images/edit.gif'/>" alt="<ww:text
name='edit'/>" title="<ww:text name='edit'/>" border="0" />
                     </a>
                     &nbsp;
@@ -94,7 +92,7 @@
                       <ww:param name="projectId" value="project.id"/>
                       <ww:param name="notifierId" value="${notifier.id}"/>
                       <ww:param name="notifierType" value="${notifier.type}"/>
-                    </ww:url>'>
+                      </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>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp Sun Sep 24 17:40:23
2006
@@ -15,6 +15,7 @@
                   showExports="false"
                   showPagination="false"
                   showStatusBar="false"
+                  sortable="false"
                   filterable="false">
          <ec:row>
             <ec:column property="name" title="schedules.table.name"/>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp Sun Sep 24 17:40:23
2006
@@ -1,7 +1,6 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <html>
 <ww:i18n name="localization.Continuum">
   <head>
@@ -17,6 +16,7 @@
               showExports="false"
               showPagination="false"
               showStatusBar="false"
+              sortable="false"
               filterable="false">
       <ec:row highlightRow="true">
         <ec:column property="state" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.StateCell"/>
@@ -28,9 +28,10 @@
         <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="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">
+        <ec:column property="buildNowAction" title="&nbsp;" width="1%">
+          <jsp:include page="/components/buildNowCell.jsp"/>
+        </ec:column>
+        <ec:column property="buildHistoryAction" title="&nbsp;" width="1%">
           <c:choose>
             <c:when test="${pageScope.project.latestBuildId > 0}">
               <a href='<ww:url action="buildResults">
@@ -44,7 +45,7 @@
             </c:otherwise>
           </c:choose>
         </ec:column>
-        <ec:column property="workingCopyAction" title="&nbsp;" width="1%" sortable="false">
+        <ec:column property="workingCopyAction" title="&nbsp;" width="1%">
           <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}">

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/surefireReport.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/surefireReport.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/surefireReport.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/surefireReport.jsp Sun Sep 24 17:40:23
2006
@@ -30,13 +30,14 @@
                   showExports="false"
                   showPagination="false"
                   showStatusBar="false"
+                  sortable="false"
                   filterable="false">
           <ec:row>
-            <ec:column property="tests" title="surefireReport.tests" sortable="false"/>
-            <ec:column property="errors" title="surefireReport.errors" sortable="false"/>
-            <ec:column property="failures" title="surefireReport.failures" sortable="false"/>
-            <ec:column property="successRate" title="surefireReport.successRate" sortable="false"/>
-            <ec:column property="elapsedTime" title="surefireReport.time" sortable="false"/>
+            <ec:column property="tests" title="surefireReport.tests"/>
+            <ec:column property="errors" title="surefireReport.errors"/>
+            <ec:column property="failures" title="surefireReport.failures"/>
+            <ec:column property="successRate" title="surefireReport.successRate"/>
+            <ec:column property="elapsedTime" title="surefireReport.time"/>
           </ec:row>
         </ec:table>
 
@@ -46,16 +47,17 @@
                   showExports="false"
                   showPagination="false"
                   showStatusBar="false"
+                  sortable="false"
                   filterable="false">
           <ec:row>
-            <ec:column property="name" title="surefireReport.package" sortable="false">
+            <ec:column property="name" title="surefireReport.package">
               <a href="#<c:out value="${pageScope.report.name}"/>"><c:out
value="${pageScope.report.name}"/></a>
             </ec:column>
-            <ec:column property="tests" title="surefireReport.tests" sortable="false"/>
-            <ec:column property="errors" title="surefireReport.errors" sortable="false"/>
-            <ec:column property="failures" title="surefireReport.failures" sortable="false"/>
-            <ec:column property="successRate" title="surefireReport.successRate" sortable="false"/>
-            <ec:column property="elapsedTime" title="surefireReport.time" sortable="false"/>
+            <ec:column property="tests" title="surefireReport.tests"/>
+            <ec:column property="errors" title="surefireReport.errors"/>
+            <ec:column property="failures" title="surefireReport.failures"/>
+            <ec:column property="successRate" title="surefireReport.successRate"/>
+            <ec:column property="elapsedTime" title="surefireReport.time"/>
           </ec:row>
         </ec:table>
 
@@ -66,6 +68,7 @@
                     showExports="false"
                     showPagination="false"
                     showStatusBar="false"
+                    sortable="false"
                     filterable="false">
             <ec:row>
               <!-- @todo there must be a better option than to use #attr -->
@@ -79,14 +82,14 @@
                   <img src="<ww:url value="/images/icon_success_sml.gif"/>" alt="<ww:text
name="message.success"/>" title="<ww:text name="message.success"/>"/>
                 </ec:column>
               </ww:else>
-              <ec:column property="name" title="surefireReport.class" sortable="false">
+              <ec:column property="name" title="surefireReport.class">
                 <a href="#<c:out value="${pageScope.report.id}"/>"><c:out
value="${pageScope.report.name}"/></a>
               </ec:column>
-              <ec:column property="tests" title="surefireReport.tests" sortable="false"/>
-              <ec:column property="errors" title="surefireReport.errors" sortable="false"/>
-              <ec:column property="failures" title="surefireReport.failures" sortable="false"/>
-              <ec:column property="successRate" title="surefireReport.successRate" sortable="false"/>
-              <ec:column property="elapsedTime" title="surefireReport.time" sortable="false"/>
+              <ec:column property="tests" title="surefireReport.tests"/>
+              <ec:column property="errors" title="surefireReport.errors"/>
+              <ec:column property="failures" title="surefireReport.failures"/>
+              <ec:column property="successRate" title="surefireReport.successRate"/>
+              <ec:column property="elapsedTime" title="surefireReport.time"/>
             </ec:row>
           </ec:table>
         </ww:iterator>
@@ -100,6 +103,7 @@
                       showExports="false"
                       showPagination="false"
                       showStatusBar="false"
+                      sortable="false"
                       filterable="false">
               <ec:row>
                 <!-- @todo there must be a better option than to use #attr -->
@@ -116,9 +120,9 @@
                   <ec:column property="icon" title="&nbsp;">
                     <img src="<ww:url value="/images/icon_success_sml.gif"/>" alt="<ww:text
name="message.success"/>" title="<ww:text name="message.success"/>"/>
                   </ec:column>
-                  <ec:column property="name" title="surefireReport.testCase" sortable="false"/>
+                  <ec:column property="name" title="surefireReport.testCase"/>
                 </ww:else>
-                <ec:column property="time" title="surefireReport.time" sortable="false"/>
+                <ec:column property="time" title="surefireReport.time"/>
               </ec:row>
             </ec:table>
           </ww:iterator>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/surefireReport.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp Sun Sep 24 17:40:23
2006
@@ -6,23 +6,10 @@
     </head>
     <body>
       <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 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>
+
+        <jsp:include page="/navigations/ProjectMenu.jsp">
+          <jsp:param name="tab" value="workingCopy"/>
+        </jsp:include>
 
         <h3>
             <ww:text name="workingCopy.section.title">

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Sun Sep 24 17:40:23 2006
@@ -71,6 +71,11 @@
           <version>1.3-SNAPSHOT</version>
           <extensions>true</extensions>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.modello</groupId>
+          <artifactId>modello-maven-plugin</artifactId>
+          <version>1.0-alpha-11-SNAPSHOT</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>



Mime
View raw message