continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r463402 [2/2] - in /maven/continuum/trunk: ./ continuum-core/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/resources/META-INF/plexus/ continuum-core/src/test/resources/org/apache/maven/continuum/ continuu...
Date Thu, 12 Oct 2006 20:01:48 GMT
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp?view=diff&rev=463402&r1=463401&r2=463402
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
Thu Oct 12 13:01:45 2006
@@ -2,6 +2,8 @@
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
+<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
+
 <ww:i18n name="localization.Continuum">
 
   <h3>Projects</h3>
@@ -28,11 +30,12 @@
       <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="projectGroupName" title="summary.projectTable.group" width="13%"/>

       <ec:column property="buildNowAction" title="&nbsp;" width="1%">
         <jsp:include page="/components/buildNowCell.jsp"/>
       </ec:column>
       <ec:column property="buildHistoryAction" title="&nbsp;" width="1%">
+        <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
         <c:choose>
           <c:when test="${pageScope.project.latestBuildId > 0}">
             <ww:url id="buildResultsUrl" action="buildResults" namespace="/">
@@ -47,8 +50,14 @@
                  border="0">
           </c:otherwise>
         </c:choose>
+        </pss:ifAuthorized>
+        <pss:elseAuthorized>
+          <img src="<ww:url value='/images/buildhistory_disabled.gif'/>" alt="Build
History" title="Build History"
+                 border="0">
+        </pss:elseAuthorized>
       </ec:column>
       <ec:column property="workingCopyAction" title="&nbsp;" width="1%">
+        <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
         <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}">
             <ww:url id="workingCopyUrl" action="workingCopy" namespace="/">
@@ -62,8 +71,14 @@
                  border="0">
           </c:otherwise>
         </c:choose>
+        </pss:ifAuthorized>
+        <pss:elseAuthorized>
+          <img src="<ww:url value='/images/workingcopy_disabled.gif'/>" alt="Working
Copy" title="Working Copy"
+                 border="0">
+        </pss:elseAuthorized>
       </ec:column>
       <ec:column property="releaseAction" title="&nbsp;" width="1%" sortable="false">
+        <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
         <c:choose>
           <c:when test="${pageScope.project.state == 2}">
             <ww:url id="releaseProjectUrl" action="releasePromptGoal" namespace="/">
@@ -79,23 +94,32 @@
               title="Release Project" border="0"/>
           </c:otherwise>
         </c:choose>
+        </pss:ifAuthorized>
+        <pss:elseAuthorized>
+          <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
+        </pss:elseAuthorized>
       </ec:column>
-      <ec:column property="deleteAction" title="&nbsp;" width="1%">
-          <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}">
-              <ww:url id="deleteProjectUrl" value="deleteProject!default.action" namespace="/">
-                <ww:param name="projectId" value="${project.id}"/>
-                <ww:param name="projectName">${project.name}</ww:param>
-              </ww:url>
-              <ww:a href="%{deleteProjectUrl}">
-                <img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete"
border="0">
-              </ww:a>
-            </c:when>
-            <c:otherwise>
-              <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
-            </c:otherwise>
-          </c:choose>
+      <ec:column property="deleteAction" title="&nbsp;" width="1%" sortable="false">
+        <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
+        <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}">
+            <ww:url id="deleteProjectUrl" value="deleteProject!default.action" namespace="/">
+              <ww:param name="projectId" value="${project.id}"/>
+              <ww:param name="projectName" value="${project.name}"/>
+            </ww:url>
+            <ww:a href="%{deleteProjectUrl}">
+              <img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete"
border="0">
+            </ww:a>
+          </c:when>
+          <c:otherwise>
+            <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
+          </c:otherwise>
+        </c:choose>
+        </pss:ifAuthorized>
+        <pss:elseAuthorized>
+          <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
+        </pss:elseAuthorized>
       </ec:column>
     </ec:row>
   </ec:table>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp?view=diff&rev=463402&r1=463401&r2=463402
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp Thu Oct 12 13:01:45
2006
@@ -30,7 +30,7 @@
             <c1:data label="%{getText('configuration.companyUrl.label')}" name="companyUrl"/>
           </table>
           <div class="functnbar3">
-            <ww:form action="editConfiguration.action" method="post">
+            <ww:form action="configuration!input.action" method="post">
               <ww:submit value="%{getText('edit')}"/>
             </ww:form>
           </div>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp?view=diff&rev=463402&r1=463401&r2=463402
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp Thu Oct 12
13:01:45 2006
@@ -9,7 +9,8 @@
   <body>
   <div id="axial" class="h3">
     <h3><ww:text name="configuration.section.title"/></h3>
-    <ww:form action="configuration.action" method="post" validate="true">
+
+    <ww:form action="configuration!save" method="post">
 
       <ww:if test="hasActionErrors()">
         <h3>Action Error</h3>
@@ -17,30 +18,6 @@
       <p>
         <ww:actionerror/>
       </p>
-
-      <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
-
-          <ww:textfield label="%{getText('user.username.label')}" name="username" required="true">
-            <ww:param name="desc"><p><ww:text name="user.username.message"/></p></ww:param>
-          </ww:textfield>
-
-          <ww:textfield label="%{getText('user.fullName.label')}" name="fullName" required="true">
-            <ww:param name="desc"><p><ww:text name="user.fullName.message"/></p></ww:param>
-          </ww:textfield>
-
-          <ww:textfield label="%{getText('user.email.label')}" name="email">
-            <ww:param name="desc"><p><ww:text name="user.email.message"/></p></ww:param>
-          </ww:textfield>
-
-          <ww:password label="%{getText('user.password.label')}" name="password" required="true"/>
-
-          <ww:password label="%{getText('user.passwordTwo.label')}" name="passwordTwo"
required="true">
-            <ww:param name="desc"><p><ww:text name="user.passwordTwo.message"/></p></ww:param>
-          </ww:password>
-
-        </table>
-      </div>
 
       <div class="axial">
 

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp?view=diff&rev=463402&r1=463401&r2=463402
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp Thu Oct 12 13:01:45
2006
@@ -10,12 +10,15 @@
   <body>
   <div id="h3">
 
-    <h3>Project Groups</h3>
-
-    <p/>
-
-    <ww:if test="%{groups.isEmpty()}">
-      <b>No Project Groups Known.</b>
+    <ww:if test="${infoMessage != null}">
+       <p>${infoMessage}</p>
+    </ww:if>
+    <ww:else>
+       <h3>Project Groups</h3>
+    </ww:else>
+  
+    <ww:if test="${groups == null }">
+      No Project Groups Known.
     </ww:if>
 
     <div class="eXtremeTable" >

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp?view=diff&rev=463402&r1=463401&r2=463402
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp Thu
Oct 12 13:01:45 2006
@@ -1,4 +1,7 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
+
 <ww:i18n name="localization.Continuum">
 <div id="banner">
   <table border="1" cellpadding="8" cellspacing="0" width="100%">
@@ -20,22 +23,12 @@
 </div>
 
 <div id="breadcrumbs">
+
   <div style="float: right;">
     <a href="http://maven.apache.org/continuum">Continuum</a> |
     <a href="http://maven.apache.org/">Maven</a> |
     <a href="http://www.apache.org/">Apache</a>
   </div>
-
-  <div>
-    <ww:url id="loginUrl" action="login"/>
-    <ww:url id="logoutUrl" action="logout"/>
-    <ww:if test="${sessionScope.loggedIn != true}">
-      Welcome, <b>${sessionScope.user.username}</b> - <ww:a href="%{loginUrl}">Login</ww:a>
-    </ww:if>
-    <ww:else>
-      Welcome, <b>${sessionScope.user.username}</b> - <ww:a href="%{logoutUrl}">Logout</ww:a>
-    </ww:else>
-
-  </div>
+  <c:import url="/WEB-INF/jsp/pss/include/securityLinks.jsp"/>
 </div>
 </ww:i18n>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp?view=diff&rev=463402&r1=463401&r2=463402
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp Thu Oct 12
13:01:45 2006
@@ -1,6 +1,7 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
-<%@ taglib uri="continuum" prefix="c1" %>
+<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
+
 <ww:i18n name="localization.Continuum">
 <div id="navcolum">
   <div id="projectmenu" class="toolgroup">
@@ -15,7 +16,8 @@
     </div>
   </div>
 
-    <div id="projectmenu" class="toolgroup">
+  <pss:ifAuthorized permission="continuum-add-group">
+  <div id="projectmenu" class="toolgroup">
       <div class="label"><ww:text name="menu.addProject"/></div>
       <div>
         <div class="body">
@@ -30,35 +32,36 @@
         <div class="body">
           <a href="<ww:url value="/addProjectInput.action" includeParams="none"><ww:param
name="projectType">shell</ww:param></ww:url>"><ww:text name="menu.add.shellProject"/></a>
         </div>
-      </div>
     </div>
+  </pss:ifAuthorized>
 
-    <div id="projectmenu" class="toolgroup">
-      <div class="label"><ww:text name="menu.administration"/></div>
-      <div>
-      <c1:ifAuthorized permission="manageSchedule">
-          <div class="body">
-            <a href="<ww:url value="/schedules.action" includeParams="none"/>"><ww:text
name="menu.administration.schedules"/></a>
-          </div>
-      </c1:ifAuthorized>
-      <c1:ifAuthorized permission="manageConfiguration">
-          <div class="body">
-            <a href="<ww:url value="/editConfiguration.action" includeParams="none"/>"><ww:text
name="menu.administration.configuration"/></a>
-          </div>
-      </c1:ifAuthorized>
-      <c1:ifAuthorized permission="manageUsers">
+
+  <pss:ifAnyAuthorized permissions="continuum-manage-schedules,continuum-manage-configuration,continuum-manage-users">
+  <div id="projectmenu" class="toolgroup">
+    <div class="label"><ww:text name="menu.administration"/></div>
+    <div>
+      <pss:ifAuthorized permission="continuum-manage-schedules">
+        <ww:url id="scheduleUrl" action="schedules"/>
+        <div class="body">
+          <ww:a href="%{scheduleUrl}"><ww:text name="menu.administration.schedules"/></ww:a>
+        </div>
+      </pss:ifAuthorized>
+      <pss:ifAuthorized permission="continuum-manage-configuration">
+        <ww:url id="configurationUrl" action="configuration" method="default"/>
         <div class="body">
-          <ww:url id="userManagementUrl" action="users"/>
-          <ww:a href="%{userManagementUrl}">Users</ww:a>
+          <ww:a href="%{configurationUrl}"><ww:text name="menu.administration.configuration"/></ww:a>
         </div>
+      </pss:ifAuthorized>
+      <pss:ifAuthorized permission="continuum-manage-users">
+        <ww:url id="userListUrl" action="userlist" namespace="/security" includeParams="none"/>
         <div class="body">
-          <ww:url id="userGroupManagementUrl" action="userGroups"/>
-          <ww:a href="%{userGroupManagementUrl}">User Groups</ww:a>
+          <ww:a href="%{userListUrl}">Users</ww:a>
         </div>
-      </c1:ifAuthorized>
+      </pss:ifAuthorized>
       </div>
     </div>
 
+  </pss:ifAnyAuthorized>
   <div id="projectmenu" class="toolgroup">
     <div class="label">Legend</div>
     <div id="legend">

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp?view=diff&rev=463402&r1=463401&r2=463402
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
Thu Oct 12 13:01:45 2006
@@ -17,6 +17,7 @@
 
         <ww:action name="groupBuildDefinitionSummary" executeResult="true" namespace="component">
           <ww:param name="projectGroupId" value="%{projectGroupId}"/>
+          <ww:param name="projectGroupName" value="%{projectGroup.name}"/>
         </ww:action>
       </div>
     </body>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp?view=diff&rev=463402&r1=463401&r2=463402
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp Thu Oct
12 13:01:45 2006
@@ -2,6 +2,8 @@
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
+<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
+
 <html>
   <ww:i18n name="localization.Continuum">
     <head>
@@ -14,73 +16,79 @@
         <jsp:include page="/navigations/ProjectGroupMenu.jsp">
           <jsp:param name="tab" value="members"/>
         </jsp:include>
+        
+    <div class="axial">
+      <!--
+      Scan for new Projects?
+      -->
+    </div>
 
-<%--
-        <h3>Membership Actions</h3>
-
-        <div class="axial">
-          Scan for new Projects? 
-        </div>
---%>
-    
-        <h3>Member Projects</h3>
-    
-        <ec:table items="projectGroup.projects"
-                  var="project"
-                  showExports="false"
-                  showPagination="false"
-                  showStatusBar="false"
-                  sortable="false"
-                  filterable="false">
-          <ec:row highlightRow="true">
-            <ec:column property="name" title="summary.projectTable.name" width="48%">
-              <ww:url id="projectViewUrl" action="projectView">
-                <ww:param name="projectId" value="${pageScope.project.id}"/>
-              </ww:url>
-              <ww:a href="%{projectViewUrl}">${pageScope.project.name}</ww:a>
-            </ec:column>
-            <ec:column property="editAction" title="Edit" width="1%">
-              <center>
-                  <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}">
-                      <ww:url id="editProjectUrl" action="projectEdit">
-                        <ww:param name="projectId" value="${pageScope.project.id}"/>
-                        <ww:param name="projectName" value="${pageScope.project.name}"/>
-                      </ww:url>
-                      <ww:a href="%{editProjectUrl}">
-                        <img src="<ww:url value='/images/edit.gif'/>" alt="Edit"
title="Edit" border="0">
-                      </ww:a>
-                    </c:when>
-                    <c:otherwise>
-                      <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="Edit"
title="Edit" border="0">
-                    </c:otherwise>
-                  </c:choose>
-              </center>
-            </ec:column>
-            <ec:column property="deleteAction" title="Remove" width="1%">
-              <center>
-                  <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}">
-                      <ww:url id="removeProjectUrl" action="deleteProject">
-                        <ww:param name="projectId" value="${pageScope.project.id}"/>
-                        <ww:param name="projectName" value="${pageScope.project.name}"/>
-                      </ww:url>
-                      <ww:a href="%{removeProjectUrl}">
-                        <img src="<ww:url value='/images/delete.gif'/>" alt="Delete"
title="Delete" border="0">
-                      </ww:a>
-                    </c:when>
-                    <c:otherwise>
-                      <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
-                    </c:otherwise>
-                  </c:choose>
-              </center>
-            </ec:column>
-          </ec:row>
-        </ec:table>
-      </div>
-    </body>
-  </ww:i18n>
+    <h3>Member Projects</h3>
 
+    <ec:table items="projectGroup.projects"
+              var="project"
+              showExports="false"
+              showPagination="false"
+              showStatusBar="false"
+              filterable="false">
+      <ec:row highlightRow="true">
+        <ec:column property="name" title="summary.projectTable.name" width="48%">
+          <ww:url id="projectViewUrl" action="projectView">
+            <ww:param name="projectId" value="projectId"/>
+          </ww:url>
+          <ww:a href="%{projectViewUrl}">${pageScope.project.name}</ww:a>
+        </ec:column>
+        <ec:column property="editAction" title="Edit" width="1%" sortable="false">
+          <center>
+            <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
+            <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}">
+                <ww:url id="editProjectUrl" action="projectEdit">
+                  <ww:param name="projectId" value="${pageScope.project.id}"/>
+                  <ww:param name="projectName" value="${project.name}"/>
+                </ww:url>
+                <ww:a href="%{editProjectUrl}">
+                  <img src="<ww:url value='/images/edit.gif'/>" alt="Edit" title="Edit"
border="0">
+                </ww:a>
+              </c:when>
+              <c:otherwise>
+                <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="Edit"
title="Edit" border="0">
+              </c:otherwise>
+            </c:choose>
+            </pss:ifAuthorized>
+            <pss:elseAuthorized>
+                <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="Edit"
title="Edit" border="0">
+            </pss:elseAuthorized>
+          </center>
+        </ec:column>
+        <ec:column property="deleteAction" title="Remove" width="1%" sortable="false">
+          <center>
+            <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
+            <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}">
+                <ww:url id="removeProjectUrl" action="deleteProject">
+                  <ww:param name="projectId" value="${pageScope.project.id}"/>
+                  <ww:param name="projectName" value="${pageScope.project.name}"/>
+                </ww:url>
+                <ww:a href="%{removeProjectUrl">
+                  <img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete"
border="0">
+                </ww:a>
+              </c:when>
+              <c:otherwise>
+                <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
+              </c:otherwise>
+            </c:choose>
+            </pss:ifAuthorized>
+            <pss:elseAuthorized>
+                <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
+            </pss:elseAuthorized>
+          </center>
+        </ec:column>
+      </ec:row>
+    </ec:table>
+  </div>
+  </body>
+</ww:i18n>
 </html>

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=463402&r1=463401&r2=463402
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp Thu Oct
12 13:01:45 2006
@@ -1,15 +1,23 @@
 <%@ 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='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
+<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
+
 <html>
-  <ww:i18n name="localization.Continuum">
-    <head>
-      <title><ww:text name="projectView.page.title"/></title>
-    </head>
 
-    <body>
-      <div id="h3">
+<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="'Summary'"/>
+    </ww:action>
+
 
         <jsp:include page="/navigations/ProjectGroupMenu.jsp">
           <jsp:param name="tab" value="summary"/>
@@ -17,30 +25,48 @@
 
         <h3>Project Group Actions</h3>
 
-        <div class="functnbar3">
-            <table>
+    <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>
+
+    <pss:ifAnyAuthorized permissions="continuum-build-group,continuum-remove-group" resource="${projectGroup.name}">
+      <h3>Project Group Actions</h3>
+
+      <div class="functnbar3">
+                    <table>
                <tr>
                     <td>
+                      <pss:ifAuthorized permission="continuum-build-group" resource="${projectGroup.name}">
                         <form action="buildProjectGroup.action" method="post">
                             <input type="hidden" name="projectGroupId" value="<ww:property
value="projectGroupId"/>"/>
                             <input type="submit" name="build" value="<ww:text name="Build"/>"/>
-                        </form> 
+                        </form>
+                        </pss:ifAuthorized>
                     </td>
                     <td>
+                      <pss:ifAuthorized permission="continuum-remove-group" resource="${projectGroup.name}">
                         <form action="removeProjectGroup.action" method="post">
                             <input type="hidden" name="projectGroupId" value="<ww:property
value="projectGroupId"/>"/>
                             <input type="submit" name="remove" value="<ww:text name="Remove"/>"/>
-                        </form>                    
+                        </form>
+                      </pss:ifAuthorized>
                     </td>                    
                 </tr>
             </table>
         </div>
+    </pss:ifAnyAuthorized>
+
 
-        <ww:action name="projectSummary" executeResult="true" namespace="component">
-          <ww:param name="projectGroupId" value="%{projectGroupId}"/>
-        </ww:action>
-
-      </div>
-    </body>
-  </ww:i18n>
+    <h3>Projects</h3>
+    <ww:action name="projectSummary" executeResult="true" namespace="component">
+      <ww:param name="projectGroupId" value="%{projectGroupId}"/>
+      <ww:param name="projectGroupName" value="%{projectGroup.name}"/>
+    </ww:action>
+  </div>
+  </body>
+</ww:i18n>
 </html>

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=463402&r1=463401&r2=463402
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp Thu Oct 12 13:01:45
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" %>
+<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
 
 <html>
   <ww:i18n name="localization.Continuum">
@@ -27,9 +28,8 @@
             </ww:url>            
             <c1:data label="%{getText('projectView.project.group')}" name="project.projectGroup.name"
valueLink="%{'${projectGroupSummaryUrl}'}"/>
           </table>
-          <!--
-            TODO wrap this in security tag
-          -->
+
+          <pss:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
           <div class="functnbar3">
             <table>
               <tbody>
@@ -50,6 +50,7 @@
               </tbody>
             </table>
           </div>
+          </pss:ifAuthorized>
         </div>
 
         <h3><ww:text name="projectView.buildDefinitions"/></h3>
@@ -59,10 +60,12 @@
         </ww:action>
 
         <div class="functnbar3">
+           <pss:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
           <ww:form action="buildDefinition" method="post">
             <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
             <ww:submit value="%{getText('add')}"/>
           </ww:form>
+          </pss:ifAuthorized>
         </div>
 
         <h3><ww:text name="projectView.notifiers"/></h3>
@@ -80,6 +83,7 @@
             <ec:column property="events" title="projectView.notifier.events" cell="org.apache.maven.continuum.web.view.projectview.NotifierEventCell"/>
             <ec:column property="from" title="projectView.notifier.from" cell="org.apache.maven.continuum.web.view.projectview.NotifierFromCell"/>
             <ec:column property="actions" title="&nbsp;">
+               <pss:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
                 <c:if test="${!pageScope.notifier.fromProject}">
                     <a href='<ww:url value="${notifier.type}NotifierEdit!default.action">
                       <ww:param name="projectId" value="project.id"/>
@@ -96,14 +100,17 @@
                       <img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text
name='delete'/>" title="<ww:text name='delete'/>" border="0">
                     </a>
                 </c:if>
+              </pss:ifAuthorized>
             </ec:column>
           </ec:row>
         </ec:table>
         <div class="functnbar3">
+           <pss:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
           <ww:form action="addNotifier!default.action" method="post">
             <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
             <ww:submit value="%{getText('add')}"/>
           </ww:form>
+          </pss:ifAuthorized>
         </div>
 
         <h3><ww:text name="projectView.dependencies"/></h3>

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=463402&r1=463401&r2=463402
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp Thu Oct 12 13:01:45
2006
@@ -1,6 +1,8 @@
 <%@ 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="/plexusSecuritySystem" prefix="pss" %>
+
 <html>
 <ww:i18n name="localization.Continuum">
   <head>
@@ -32,6 +34,7 @@
           <jsp:include page="/components/buildNowCell.jsp"/>
         </ec:column>
         <ec:column property="buildHistoryAction" title="&nbsp;" width="1%">
+          <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
           <c:choose>
             <c:when test="${pageScope.project.latestBuildId > 0}">
               <a href='<ww:url action="buildResults">
@@ -44,8 +47,14 @@
                    border="0">
             </c:otherwise>
           </c:choose>
+           </pss:ifAuthorized>
+          <pss:elseAuthorized>
+            <img src="<ww:url value='/images/buildhistory_disabled.gif'/>" alt="Build
History" title="Build History"
+                   border="0">
+          </pss:elseAuthorized>
         </ec:column>
         <ec:column property="workingCopyAction" title="&nbsp;" width="1%">
+          <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
           <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}">
@@ -59,10 +68,15 @@
                    border="0">
             </c:otherwise>
           </c:choose>
+          </pss:ifAuthorized>
+          <pss:elseAuthorized>
+            <img src="<ww:url value='/images/workingcopy_disabled.gif'/>" alt="Working
Copy" title="Working Copy"
+                   border="0">
+          </pss:elseAuthorized>
         </ec:column>
       </ec:row>
     </ec:table>
-    <c1:ifAuthorized permission="buildProject">
+    <pss:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
       <div class="functnbar3">
         <ww:form action="buildProject.action" method="post">
           <ww:submit value="%{getText('summary.buildAll')}">
@@ -77,7 +91,7 @@
           </ww:submit>
         </ww:form>
       </div>
-    </c1:ifAuthorized>
+    </pss:ifAuthorized>
   </div>
   </body>
 </ww:i18n>

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=463402&r1=463401&r2=463402
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Thu Oct 12 13:01:45 2006
@@ -81,6 +81,7 @@
   </build>
   <modules>
     <module>continuum-api</module>
+    <module>continuum-security</module>
     <module>continuum-cc</module>
     <!-- module>continuum-core-it</module -->    <!-- TODO RE-ADD it when
continuum-plexus-application will be back -->
     <module>continuum-core</module>
@@ -294,6 +295,11 @@
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-release</artifactId>
+        <version>${pom.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.continuum</groupId>
+        <artifactId>continuum-security</artifactId>
         <version>${pom.version}</version>
       </dependency>
       <dependency>



Mime
View raw message