continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r536660 [2/2] - in /maven/continuum/trunk: ./ continuum-core/ continuum-core/src/main/java/org/apache/maven/continuum/core/action/ continuum-core/src/test/resources/org/apache/maven/continuum/ continuum-security/ continuum-security/src/main...
Date Wed, 09 May 2007 21:26:03 GMT
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp
Wed May  9 14:26:01 2007
@@ -21,7 +21,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" %>
+<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 <ww:i18n name="localization.Continuum">
 
 

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
Wed May  9 14:26:01 2007
@@ -21,7 +21,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" %>
+<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
 <ww:i18n name="localization.Continuum">
 <ww:if test="${not empty projects}">
@@ -52,7 +52,7 @@
                  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%">
-        <pss:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
+        <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
           <c:choose>
             <c:when test="${!project.inBuildingQueue and !project.inCheckoutQueue and
( project.state gt 0 ) and ( project.state lt 5 )}">
               <ww:url id="buildProjectUrl" action="buildProject" namespace="/" includeParams="none">
@@ -68,13 +68,13 @@
               <img src="<ww:url value='/images/buildnow_disabled.gif'/>" alt="Build
Now" title="Build Now" border="0">
             </c:otherwise>
           </c:choose>
-        </pss:ifAuthorized>
-        <pss:elseAuthorized>
+        </redback:ifAuthorized>
+        <redback:elseAuthorized>
           <img src="<ww:url value='/images/buildnow_disabled.gif'/>" alt="Build
Now" title="Build Now" border="0">
-        </pss:elseAuthorized>
+        </redback:elseAuthorized>
       </ec:column>
       <ec:column property="buildHistoryAction" title="&nbsp;" width="1%">
-        <pss:ifAuthorized permission="continuum-view-group" resource="${projectGroupName}">
+        <redback:ifAuthorized permission="continuum-view-group" resource="${projectGroupName}">
         <c:choose>
           <c:when test="${pageScope.project.latestBuildId > 0}">
             <ww:url id="buildResultsUrl" action="buildResults" namespace="/">
@@ -89,14 +89,14 @@
                  border="0">
           </c:otherwise>
         </c:choose>
-        </pss:ifAuthorized>
-        <pss:elseAuthorized>
+        </redback:ifAuthorized>
+        <redback:elseAuthorized>
           <img src="<ww:url value='/images/buildhistory_disabled.gif'/>" alt="Build
History" title="Build History"
                  border="0">
-        </pss:elseAuthorized>
+        </redback:elseAuthorized>
       </ec:column>
       <ec:column property="workingCopyAction" title="&nbsp;" width="1%">
-        <pss:ifAuthorized permission="continuum-view-group" resource="${projectGroupName}">
+        <redback:ifAuthorized permission="continuum-view-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="/">
@@ -110,14 +110,14 @@
                  border="0">
           </c:otherwise>
         </c:choose>
-        </pss:ifAuthorized>
-        <pss:elseAuthorized>
+        </redback:ifAuthorized>
+        <redback:elseAuthorized>
           <img src="<ww:url value='/images/workingcopy_disabled.gif'/>" alt="Working
Copy" title="Working Copy"
                  border="0">
-        </pss:elseAuthorized>
+        </redback:elseAuthorized>
       </ec:column>
       <ec:column property="releaseAction" title="&nbsp;" width="1%" sortable="false">
-        <pss:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
+        <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
         <c:choose>
           <c:when test="${pageScope.project.state == 2}">
             <ww:url id="releaseProjectUrl" action="releasePromptGoal" namespace="/">
@@ -133,13 +133,13 @@
               title="Release Project" border="0"/>
           </c:otherwise>
         </c:choose>
-        </pss:ifAuthorized>
-        <pss:elseAuthorized>
+        </redback:ifAuthorized>
+        <redback:elseAuthorized>
           <img src="<ww:url value='/images/releaseproject_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
-        </pss:elseAuthorized>
+        </redback:elseAuthorized>
       </ec:column>
       <ec:column property="deleteAction" title="&nbsp;" width="1%" sortable="false">
-        <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
+        <redback: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}">
@@ -154,10 +154,10 @@
             <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
           </c:otherwise>
         </c:choose>
-        </pss:ifAuthorized>
-        <pss:elseAuthorized>
+        </redback:ifAuthorized>
+        <redback:elseAuthorized>
           <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
-        </pss:elseAuthorized>
+        </redback:elseAuthorized>
       </ec:column>
     </ec:row>
   </ec:table>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp Wed
May  9 14:26:01 2007
@@ -20,7 +20,7 @@
 <%@ 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" %>
+<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
 <html>
 <ww:i18n name="localization.Continuum">
@@ -61,7 +61,7 @@
       </ec:row>
     </ec:table>
     </ww:if>
-    <pss:ifAuthorized permission="continuum-add-group">
+    <redback:ifAuthorized permission="continuum-add-group">
       <div class="functnbar3">
         <table>
           <tr>
@@ -73,7 +73,7 @@
           </tr>
         </table>
       </div>
-    </pss:ifAuthorized>
+    </redback:ifAuthorized>
   </div>
   </body>
 </ww:i18n>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultTop.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultTop.jsp?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultTop.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultTop.jsp
Wed May  9 14:26:01 2007
@@ -19,7 +19,7 @@
 
 <%@ taglib uri="/webwork" prefix="ww" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
+<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
 <ww:i18n name="localization.Continuum">
   <div id="banner">
@@ -44,6 +44,6 @@
       <a href="http://maven.apache.org/">Maven</a> |
       <a href="http://www.apache.org/">Apache</a>
     </div>
-    <%@ include file="/WEB-INF/jsp/pss/include/securityLinks.jsp" %>
+    <%@ include file="/WEB-INF/jsp/redback/include/securityLinks.jsp" %>
   </div>
 </ww:i18n>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
Wed May  9 14:26:01 2007
@@ -19,7 +19,7 @@
 
 <%@ taglib uri="/webwork" prefix="ww" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
-<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
+<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
 <ww:i18n name="localization.Continuum">
 <div id="navcolumn">
@@ -41,7 +41,7 @@
     </div>
   </div>
 
-  <pss:ifAuthorized permission="continuum-add-group">
+  <redback:ifAuthorized permission="continuum-add-group">
     <div id="projectmenu" class="toolgroup">
       <div class="label">
         <ww:text name="menu.addProject"/>
@@ -79,24 +79,24 @@
         </div>
       </div>
     </div>
-  </pss:ifAuthorized>
+  </redback:ifAuthorized>
 
 
-  <pss:ifAnyAuthorized permissions="continuum-manage-schedules,continuum-manage-configuration,continuum-manage-users">
+  <redback: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">
+        <redback:ifAuthorized permission="continuum-manage-schedules">
           <ww:url id="scheduleUrl" namespace="/" action="schedules" includeParams="none"/>
           <div class="body">
             <ww:a href="%{scheduleUrl}">
               <ww:text name="menu.administration.schedules"/>
             </ww:a>
           </div>
-        </pss:ifAuthorized>
-        <pss:ifAuthorized permission="continuum-manage-configuration">
+        </redback:ifAuthorized>
+        <redback:ifAuthorized permission="continuum-manage-configuration">
           <ww:url id="configurationUrl" action="configuration" namespace="/admin" method="input"
includeParams="none"/>
           <div class="body">
             <ww:a href="%{configurationUrl}">
@@ -109,16 +109,16 @@
               <ww:text name="menu.administration.appearance"/>
             </ww:a>
           </div>
-        </pss:ifAuthorized>
-        <pss:ifAuthorized permission="continuum-manage-users">
+        </redback:ifAuthorized>
+        <redback:ifAuthorized permission="continuum-manage-users">
           <ww:url id="userListUrl" action="userlist" namespace="/security" includeParams="none"/>
           <div class="body">
             <ww:a href="%{userListUrl}">Users</ww:a>
           </div>
-        </pss:ifAuthorized>
+        </redback:ifAuthorized>
       </div>
     </div>
-  </pss:ifAnyAuthorized>
+  </redback:ifAnyAuthorized>
 
   <div id="projectmenu" class="toolgroup">
     <div class="label">Legend</div>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
Wed May  9 14:26:01 2007
@@ -21,7 +21,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" %>
+<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
 <html>
   <ww:i18n name="localization.Continuum">
@@ -59,7 +59,7 @@
         </ec:column>
         <ec:column property="editAction" title="&nbsp;" width="1%" sortable="false">
           <center>
-            <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
+            <redback: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}">
@@ -75,15 +75,15 @@
                 <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="Edit"
title="Edit" border="0">
               </c:otherwise>
             </c:choose>
-            </pss:ifAuthorized>
-            <pss:elseAuthorized>
+            </redback:ifAuthorized>
+            <redback:elseAuthorized>
                 <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="Edit"
title="Edit" border="0">
-            </pss:elseAuthorized>
+            </redback:elseAuthorized>
           </center>
         </ec:column>
         <ec:column property="deleteAction" title="&nbsp;" width="1%" sortable="false">
           <center>
-            <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
+            <redback: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}">
@@ -99,16 +99,16 @@
                 <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
               </c:otherwise>
             </c:choose>
-            </pss:ifAuthorized>
-            <pss:elseAuthorized>
+            </redback:ifAuthorized>
+            <redback:elseAuthorized>
                 <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
-            </pss:elseAuthorized>
+            </redback:elseAuthorized>
           </center>
         </ec:column>
       </ec:row>
     </ec:table>
     
-  <pss:ifAuthorized permission="continuum-manage-users">
+  <redback:ifAuthorized permission="continuum-manage-users">
   <h3>Users</h3>
     
   <ww:form action="projectGroupMembers" theme="xhtml" method="post">
@@ -193,7 +193,7 @@
       </ww:iterator>
     </tbody>
   </table>
-  </pss:ifAuthorized>
+  </redback:ifAuthorized>
   
   </div>
   </body>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
Wed May  9 14:26:01 2007
@@ -21,7 +21,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" %>
+<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
 <html>
 
@@ -78,7 +78,7 @@
       </table>
     </div>
 
-    <pss:ifAnyAuthorized permissions="continuum-build-group,continuum-remove-group" resource="${projectGroup.name}">
+    <redback:ifAnyAuthorized permissions="continuum-build-group,continuum-remove-group"
resource="${projectGroup.name}">
       <h3>Project Group Actions</h3>
 
       <c:if test="${!empty actionErrors}">
@@ -93,38 +93,38 @@
         <table>
           <tr>
             <td>
-              <pss:ifAuthorized permission="continuum-build-group" resource="${projectGroup.name}">
+              <redback: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>
-                </pss:ifAuthorized>
+                </redback:ifAuthorized>
             <td>
-                <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
+                <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
                 <form action="editProjectGroup.action" method="post">
                     <input type="hidden" name="projectGroupId" value="<ww:property
value="projectGroupId"/>"/>
                     <input type="submit" name="edit" value="<ww:text name="edit"/>"/>
                 </form>
-                </pss:ifAuthorized>
+                </redback:ifAuthorized>
             </td>
             <td>
-              <pss:ifAuthorized permission="continuum-remove-group" resource="${projectGroup.name}">
+              <redback: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="delete"/>"/>
                 </form>
-              </pss:ifAuthorized>
+              </redback:ifAuthorized>
             </td>
             <td>
-              <pss:ifAuthorized permission="continuum-build-group" resource="${projectGroup.name}">
+              <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroup.name}">
                 <form action="releaseProjectGroup.action" method="post">
                     <input type="hidden" name="projectGroupId" value="<ww:property
value="projectGroupId"/>"/>
                     <input type="submit" name="release" value="<ww:text name="release"/>"/>
                 </form>
-              </pss:ifAuthorized>
+              </redback:ifAuthorized>
             </td>
             <td>
-              <pss:ifAnyAuthorized permissions="continuum-add-project-to-group" resource="${projectGroup.name}">
+              <redback:ifAnyAuthorized permissions="continuum-add-project-to-group" resource="${projectGroup.name}">
                 <ww:form name="addNewProject">
                   <ww:hidden name="disableGroupSelection" value="true"/>
                   <ww:hidden name="selectedProjectGroup" value="${projectGroup.id}"/>
@@ -145,12 +145,12 @@
                 </select>
 
                 <input type="button" value="Add" onclick="goToAddProject()"/>
-              </pss:ifAnyAuthorized>
+              </redback:ifAnyAuthorized>
             </td>
           </tr>
         </table>
       </div>
-    </pss:ifAnyAuthorized>
+    </redback:ifAnyAuthorized>
 
     <ww:action name="projectSummary" executeResult="true" namespace="component">
       <ww:param name="projectGroupId" value="%{projectGroupId}"/>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Wed
May  9 14:26:01 2007
@@ -21,7 +21,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" %>
+<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
 <html>
   <ww:i18n name="localization.Continuum">
@@ -48,7 +48,7 @@
             <c1:data label="%{getText('projectView.project.group')}" name="project.projectGroup.name"
valueLink="%{'${projectGroupSummaryUrl}'}"/>
           </table>
 
-          <pss:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
+          <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
           <div class="functnbar3">
             <table>
               <tbody>
@@ -70,7 +70,7 @@
               </tbody>
             </table>
           </div>
-          </pss:ifAuthorized>
+          </redback:ifAuthorized>
         </div>
 
         <h3><ww:text name="projectView.buildDefinitions"/></h3>
@@ -81,13 +81,13 @@
         </ww:action>
 
         <div class="functnbar3">
-           <pss:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
+           <redback: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"/>"/>
             <input type="hidden" name="projectGroupId" value="<ww:property value="project.projectGroup.id"/>"/>
             <ww:submit value="%{getText('add')}"/>
           </ww:form>
-          </pss:ifAuthorized>
+          </redback:ifAuthorized>
         </div>
 
         <h3><ww:text name="projectView.notifiers"/></h3>
@@ -106,7 +106,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="editAction" title="&nbsp;" width="1%">
-                <pss:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
+                <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
                   <c:choose>
                     <c:when test="${!pageScope.notifier.fromProject}">
                       <a href='<ww:url value="${notifier.type}ProjectNotifierEdit.action">
@@ -121,13 +121,13 @@
                       <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="<ww:text
name='edit'/>" title="<ww:text name='edit'/>" border="0" />
                     </c:otherwise>
                 </c:choose>
-                </pss:ifAuthorized>
-                <pss:elseAuthorized>
+                </redback:ifAuthorized>
+                <redback:elseAuthorized>
                   <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="<ww:text
name='edit'/>" title="<ww:text name='edit'/>" border="0" />
-                </pss:elseAuthorized>
+                </redback:elseAuthorized>
               </ec:column>
               <ec:column property="deleteAction" title="&nbsp;" width="1%">
-                <pss:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
+                <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
                   <c:choose>
                     <c:when test="${!pageScope.notifier.fromProject}">
                       <a href='<ww:url value="/deleteProjectNotifier!default.action">
@@ -142,22 +142,22 @@
                       <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="<ww:text
name='edit'/>" title="<ww:text name='edit'/>" border="0" />
                     </c:otherwise>
                   </c:choose>
-                </pss:ifAuthorized>
-                <pss:elseAuthorized>
+                </redback:ifAuthorized>
+                <redback:elseAuthorized>
                   <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="<ww:text
name='edit'/>" title="<ww:text name='edit'/>" border="0" />
-                </pss:elseAuthorized>
+                </redback:elseAuthorized>
               </ec:column>
             </ec:row>
           </ec:table>
         </ww:if>
         <div class="functnbar3">
-           <pss:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
+           <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
           <ww:form action="addProjectNotifier!default.action" method="post">
             <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
             <input type="hidden" name="projectGroupId" value="<ww:property value="project.projectGroup.id"/>"/>
             <ww:submit value="%{getText('add')}"/>
           </ww:form>
-          </pss:ifAuthorized>
+          </redback:ifAuthorized>
         </div>
 
         <h3><ww:text name="projectView.dependencies"/></h3>

Modified: maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java
Wed May  9 14:26:01 2007
@@ -24,8 +24,6 @@
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
-import org.codehaus.plexus.security.system.SecuritySession;
-import org.codehaus.plexus.security.system.SecuritySystemConstants;
 
 import java.util.Map;
 import java.util.HashMap;

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Wed May  9 14:26:01 2007
@@ -487,88 +487,43 @@
         <version>1.0-alpha-3</version>
       </dependency>
       <!--
-        Plexus Security Dependencies
+        Plexus Redback Dependencies
         -->
       <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-rbac-profile</artifactId>
-        <version>${plexus-security.version}</version>
+        <groupId>org.codehaus.plexus.redback</groupId>
+        <artifactId>redback-rbac-role-manager</artifactId>
+        <version>${redback.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-ui-web-integration</artifactId>
-        <version>${plexus-security.version}</version>
+        <groupId>org.codehaus.plexus.redback</groupId>
+        <artifactId>redback-rbac-model</artifactId>
+        <version>${redback.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-authorization-rbac-model</artifactId>
-        <version>${plexus-security.version}</version>
+        <groupId>org.codehaus.plexus.redback</groupId>
+        <artifactId>redback-rbac-memory</artifactId>
+        <version>${redback.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-authorization-rbac-store-memory</artifactId>
-        <version>${plexus-security.version}</version>
+        <groupId>org.codehaus.plexus.redback</groupId>
+        <artifactId>redback-system</artifactId>
+        <version>${redback.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-system</artifactId>
-        <version>${plexus-security.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-ui-web</artifactId>
-        <version>${plexus-security.version}</version>
+        <groupId>org.codehaus.plexus.redback</groupId>
+        <artifactId>redback-xwork-content</artifactId>
+        <version>${redback.version}</version>
         <type>war</type>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-ui-web-taglib</artifactId>
-        <version>${plexus-security.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-authentication-provider-user-manager</artifactId>
-        <version>${plexus-security.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-user-management-api</artifactId>
-        <version>${plexus-security.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-user-management-provider-jdo</artifactId>
-        <version>${plexus-security.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-authorization-rbac-store-cached</artifactId>
-        <version>${plexus-security.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-authorization-rbac-store-jdo</artifactId>
-        <version>${plexus-security.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-keys-jdo</artifactId>
-        <version>${plexus-security.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-authentication-provider-keystore</artifactId>
-        <version>${plexus-security.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-authorization-api</artifactId>
-        <version>${plexus-security.version}</version>
+        <groupId>org.codehaus.plexus.redback</groupId>
+        <artifactId>redback-xwork-integration</artifactId>
+        <version>${redback.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.plexus.security</groupId>
-        <artifactId>plexus-security-authorization-rbac-authorizer</artifactId>
-        <version>${plexus-security.version}</version>
+        <groupId>org.codehaus.plexus.redback</groupId>
+        <artifactId>redback-taglib</artifactId>
+        <version>${redback.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -577,7 +532,7 @@
     <profile>
       <id>integration</id>
       <modules>
-        <module>continuum-webapp-test</module>
+        <module>continuum-webapp-test</module> 
       </modules>
     </profile>
   </profiles>
@@ -587,7 +542,7 @@
     <maven.version>2.0.5</maven.version>
     <wagon.version>1.0-beta-2</wagon.version>
     <maven-scm.version>1.0-SNAPSHOT</maven-scm.version>
-    <plexus-security.version>1.0-alpha-11</plexus-security.version>
+    <redback.version>1.0-alpha-1-SNAPSHOT</redback.version>
     <mail-sender.version>1.0-alpha-6</mail-sender.version>
   </properties>
 </project>



Mime
View raw message