You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jm...@apache.org on 2007/05/09 23:26:03 UTC
svn commit: r536660 [1/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...
Author: jmcconnell
Date: Wed May 9 14:26:01 2007
New Revision: 536660
URL: http://svn.apache.org/viewvc?view=rev&rev=536660
Log:
redback integration, highlights include the removal of p-sec role creation over inheritence and kludgy role creation mechanism, consolidation of a number of annoying rbac related activities into a RoleManager component. redback.xml continuum application role descriptor, all continuum security goop in one xml file. switched to redback taglib (minor) and past that mostly a mess of import tweakage
Added:
maven/continuum/trunk/continuum-security/src/main/resources/META-INF/redback/
maven/continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml
Removed:
maven/continuum/trunk/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleProfileManager.java
maven/continuum/trunk/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumGroupAdministratorRoleProfile.java
maven/continuum/trunk/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumGuestRoleProfile.java
maven/continuum/trunk/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumSystemAdministratorRoleProfile.java
maven/continuum/trunk/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumUserAdministratorRoleProfile.java
maven/continuum/trunk/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupAdministratorDynamicRoleProfile.java
maven/continuum/trunk/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupDeveloperDynamicRoleProfile.java
maven/continuum/trunk/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupUserDynamicRoleProfile.java
maven/continuum/trunk/continuum-security/src/main/resources/META-INF/plexus/
Modified:
maven/continuum/trunk/continuum-core/pom.xml
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java
maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
maven/continuum/trunk/continuum-security/pom.xml
maven/continuum/trunk/continuum-webapp/pom.xml
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/bean/ProjectGroupUserBean.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultTop.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java
maven/continuum/trunk/pom.xml
Modified: maven/continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/pom.xml?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-core/pom.xml (original)
+++ maven/continuum/trunk/continuum-core/pom.xml Wed May 9 14:26:01 2007
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
+ <parent>
<artifactId>continuum-parent</artifactId>
<groupId>org.apache.maven.continuum</groupId>
<version>1.1-SNAPSHOT</version>
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-project</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -116,8 +116,8 @@
<artifactId>continuum-security</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus.security</groupId>
- <artifactId>plexus-security-rbac-profile</artifactId>
+ <groupId>org.codehaus.plexus.redback</groupId>
+ <artifactId>redback-rbac-role-manager</artifactId>
</dependency>
<!-- === Testing Dependencies === -->
<dependency>
@@ -173,13 +173,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus.security</groupId>
- <artifactId>plexus-security-ui-web-integration</artifactId>
+ <groupId>org.codehaus.plexus.redback</groupId>
+ <artifactId>redback-xwork-integration</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus.security</groupId>
- <artifactId>plexus-security-authorization-rbac-store-memory</artifactId>
+ <groupId>org.codehaus.plexus.redback</groupId>
+ <artifactId>redback-rbac-memory</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java Wed May 9 14:26:01 2007
@@ -23,9 +23,9 @@
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.codehaus.plexus.rbac.profile.RoleProfileException;
-import org.codehaus.plexus.rbac.profile.RoleProfileManager;
-import org.codehaus.plexus.security.rbac.Role;
+import org.codehaus.plexus.redback.role.RoleManager;
+import org.codehaus.plexus.redback.role.RoleManagerException;
+
import java.util.Map;
@@ -45,9 +45,9 @@
private ContinuumStore store;
/**
- * @plexus.requirement role-hint="continuum"
+ * @plexus.requirement role-hint="default"
*/
- private RoleProfileManager roleManager;
+ private RoleManager roleManager;
public void execute( Map context )
throws ContinuumException, ContinuumStoreException
@@ -60,16 +60,24 @@
try
{
- Role administrator = roleManager.getDynamicRole( "continuum-group-project-administrator", projectGroup.getName() );
-
- Role developer = roleManager.getDynamicRole( "continuum-group-developer", projectGroup.getName() );
-
- Role user = roleManager.getDynamicRole( "continuum-group-user", projectGroup.getName() );
+ if ( !roleManager.templatedRoleExists( "project-administrator", projectGroup.getName() ) )
+ {
+ roleManager.createTemplatedRole( "project-administrator", projectGroup.getName() );
+ }
+ if ( !roleManager.templatedRoleExists( "project-developer", projectGroup.getName() ) )
+ {
+ roleManager.createTemplatedRole( "project-developer", projectGroup.getName() );
+ }
+
+ if ( !roleManager.templatedRoleExists( "project-user", projectGroup.getName() ) )
+ {
+ roleManager.createTemplatedRole( "project-user", projectGroup.getName() );
+ }
}
- catch ( RoleProfileException rpe )
+ catch ( RoleManagerException e )
{
- rpe.printStackTrace();
- throw new ContinuumException( "error generating dynamic role for project " + projectGroup.getName(), rpe );
+ e.printStackTrace();
+ throw new ContinuumException( "error generating templated role for project " + projectGroup.getName(), e );
}
}
}
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java Wed May 9 14:26:01 2007
@@ -23,8 +23,9 @@
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.codehaus.plexus.rbac.profile.RoleProfileException;
-import org.codehaus.plexus.rbac.profile.RoleProfileManager;
+import org.codehaus.plexus.redback.role.RoleManager;
+import org.codehaus.plexus.redback.role.RoleManagerException;
+
import java.util.Map;
@@ -44,9 +45,9 @@
private ContinuumStore store;
/**
- * @plexus.requirement role-hint="continuum"
+ * @plexus.requirement role-hint="default"
*/
- private RoleProfileManager roleManager;
+ private RoleManager roleManager;
public void execute( Map context )
throws ContinuumException, ContinuumStoreException
@@ -57,16 +58,24 @@
try
{
- roleManager.deleteDynamicRole( "continuum-group-project-administrator", projectGroup.getName() );
-
- roleManager.deleteDynamicRole( "continuum-group-developer", projectGroup.getName() );
-
- roleManager.deleteDynamicRole( "continuum-group-user", projectGroup.getName() );
+ if ( !roleManager.templatedRoleExists( "project-administrator", projectGroup.getName() ) )
+ {
+ roleManager.removeTemplatedRole( "project-administrator", projectGroup.getName() );
+ }
+ if ( !roleManager.templatedRoleExists( "project-developer", projectGroup.getName() ) )
+ {
+ roleManager.removeTemplatedRole( "project-developer", projectGroup.getName() );
+ }
+
+ if ( !roleManager.templatedRoleExists( "project-user", projectGroup.getName() ) )
+ {
+ roleManager.removeTemplatedRole( "project-user", projectGroup.getName() );
+ }
}
- catch ( RoleProfileException rpe )
+ catch ( RoleManagerException e )
{
- rpe.printStackTrace();
- throw new ContinuumException( "error removing dynamic role for project " + projectGroup.getName(), rpe );
+ e.printStackTrace();
+ throw new ContinuumException( "error removing tempalted role for project " + projectGroup.getName(), e );
}
}
}
Modified: maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml (original)
+++ maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml Wed May 9 14:26:01 2007
@@ -49,170 +49,6 @@
<!--
|
- | dynamic role profiles for adding project group management and user roles, wired to memory RBACManager impls for
- | test
- |
- -->
- <component>
- <role>org.codehaus.plexus.rbac.profile.DynamicRoleProfile</role>
- <role-hint>continuum-group-project-administrator</role-hint>
- <implementation>org.apache.maven.continuum.security.profile.ProjectGroupAdministratorDynamicRoleProfile</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.security.rbac.RBACManager</role>
- <role-hint>memory</role-hint>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.codehaus.plexus.rbac.profile.DynamicRoleProfile</role>
- <role-hint>continuum-group-developer</role-hint>
- <implementation>org.apache.maven.continuum.security.profile.ProjectGroupDeveloperDynamicRoleProfile</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.security.rbac.RBACManager</role>
- <role-hint>memory</role-hint>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.codehaus.plexus.rbac.profile.DynamicRoleProfile</role>
- <role-hint>continuum-group-user</role-hint>
- <implementation>org.apache.maven.continuum.security.profile.ProjectGroupUserDynamicRoleProfile</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.security.rbac.RBACManager</role>
- <role-hint>memory</role-hint>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
- <role-hint>continuum-group-administrator</role-hint>
- <implementation>org.apache.maven.continuum.security.profile.ContinuumGroupAdministratorRoleProfile</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.security.rbac.RBACManager</role>
- <role-hint>memory</role-hint>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.PlexusContainer</role>
- <field-name>container</field-name>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
- <role-hint>continuum-guest</role-hint>
- <implementation>org.apache.maven.continuum.security.profile.ContinuumGuestRoleProfile</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.security.rbac.RBACManager</role>
- <role-hint>memory</role-hint>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.PlexusContainer</role>
- <field-name>container</field-name>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
- <role-hint>continuum-system-administrator</role-hint>
- <implementation>org.apache.maven.continuum.security.profile.ContinuumSystemAdministratorRoleProfile</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.security.rbac.RBACManager</role>
- <role-hint>memory</role-hint>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.PlexusContainer</role>
- <field-name>container</field-name>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
- <role-hint>continuum-user-administrator</role-hint>
- <implementation>org.apache.maven.continuum.security.profile.ContinuumUserAdministratorRoleProfile</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.security.rbac.RBACManager</role>
- <role-hint>memory</role-hint>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.PlexusContainer</role>
- <field-name>container</field-name>
- </requirement>
- </requirements>
- </component>
-
- <component>
- <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
- <role-hint>user-administrator</role-hint>
- <implementation>org.codehaus.plexus.security.ui.web.role.profile.UserAdministratorRoleProfile</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.security.rbac.RBACManager</role>
- <role-hint>memory</role-hint>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.PlexusContainer</role>
- <field-name>container</field-name>
- </requirement>
- </requirements>
- </component>
-
- <component>
- <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
- <role-hint>system-administrator</role-hint>
- <implementation>org.codehaus.plexus.security.ui.web.role.profile.SystemAdministratorRoleProfile</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.security.rbac.RBACManager</role>
- <role-hint>memory</role-hint>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.PlexusContainer</role>
- <field-name>container</field-name>
- </requirement>
- </requirements>
- </component>
-
- <component>
- <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
- <role-hint>registered-user</role-hint>
- <implementation>org.codehaus.plexus.security.ui.web.role.profile.RegisteredUserRoleProfile</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.security.rbac.RBACManager</role>
- <role-hint>memory</role-hint>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.PlexusContainer</role>
- <field-name>container</field-name>
- </requirement>
- </requirements>
- </component>
-
- <component>
- <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
- <role-hint>guest</role-hint>
- <implementation>org.codehaus.plexus.security.ui.web.role.profile.GuestRoleProfile</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.security.rbac.RBACManager</role>
- <role-hint>memory</role-hint>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.PlexusContainer</role>
- <field-name>container</field-name>
- </requirement>
- </requirements>
- </component>
-
- <!--
- |
| Validators
|
-->
Modified: maven/continuum/trunk/continuum-security/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-security/pom.xml?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-security/pom.xml (original)
+++ maven/continuum/trunk/continuum-security/pom.xml Wed May 9 14:26:01 2007
@@ -8,39 +8,4 @@
<artifactId>continuum-security</artifactId>
<name>Continuum Security</name>
<packaging>jar</packaging>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus.security</groupId>
- <artifactId>plexus-security-rbac-profile</artifactId>
- </dependency>
- </dependencies>
- <build>
- <!--
- TODO: fix cdc pulling requirements from other artifacts.
- This is disabled and done manually, due to the inability of
- plexus-cdc to generate a proper component descriptor when
- the component is extended off of another component.
-
- We have RoleProfile's based off of p-sec AbstractDynamicRoleProfile and
- a RoleProfileManager based off of p-sec DefaultRoleProfileManager.
-
- This arrangement will not work with the current version of plexus-cdc.
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3-SNAPSHOT</version>
- <executions>
- <execution>
- <id>generate</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- -->
- </build>
</project>
Added: maven/continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml?view=auto&rev=536660
==============================================================================
--- maven/continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml (added)
+++ maven/continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml Wed May 9 14:26:01 2007
@@ -0,0 +1,407 @@
+<redback-role-model>
+ <version>1.0.0</version>
+ <application>Continuum</application>
+ <operations>
+ <operation>
+ <id>continuum-manage-schedules</id>
+ <name>continuum-manage-schedules</name>
+ <description>Manage Continuum Scheduling</description>
+ </operation>
+ <operation>
+ <id>continuum-manage-configuration</id>
+ <name>continuum-manage-configuration</name>
+ <description>Manage Continuum Configuration</description>
+ </operation>
+ <operation>
+ <id>continuum-manage-users</id>
+ <name>continuum-manage-users</name>
+ <description>Manage Continuum Users</description>
+ </operation>
+ <operation>
+ <id>continuum-guest</id>
+ <name>continuum-guest</name>
+ <description>Continuum Guest Operations</description>
+ </operation>
+ <operation>
+ <id>continuum-view-group</id>
+ <name>continuum-view-group</name>
+ <description>Continuum View Groups</description>
+ </operation>
+ <operation>
+ <id>continuum-add-group</id>
+ <name>continuum-add-group</name>
+ <description>Continuum Add Group</description>
+ </operation>
+ <operation>
+ <id>continuum-remove-group</id>
+ <name>continuum-remove-group</name>
+ <description>Continuum Remove Group</description>
+ </operation>
+ <operation>
+ <id>continuum-build-group</id>
+ <name>continuum-build-group</name>
+ <description>Continuum Build Group</description>
+ </operation>
+ <operation>
+ <id>continuum-modify-group</id>
+ <name>continuum-modify-group</name>
+ <description>Continuum Modify Group</description>
+ </operation>
+ <operation>
+ <id>continuum-add-project-to-group</id>
+ <name>continuum-add-project-to-group</name>
+ <description>Continuum Add Project to Group</description>
+ </operation>
+ <operation>
+ <id>continuum-remove-project-from-group</id>
+ <name>continuum-remove-project-from-group</name>
+ <description>Continuum Remove Project from Group</description>
+ </operation>
+ <operation>
+ <id>continuum-modify-project-in-group</id>
+ <name>continuum-modify-project-in-group</name>
+ <description>Continuum Modify Project in Group</description>
+ </operation>
+ <operation>
+ <id>continuum-build-project-in-group</id>
+ <name>continuum-build-project-in-group</name>
+ <description>Continuum Build Project in Group</description>
+ </operation>
+ <operation>
+ <id>continuum-add-group-build-definition</id>
+ <name>continuum-add-group-build-definition</name>
+ <description>Continuum Add Group Build Definition</description>
+ </operation>
+ <operation>
+ <id>continuum-remove-group-build-definition</id>
+ <name>continuum-remove-group-build-definition</name>
+ <description>Continuum Remove Group Build Definition</description>
+ </operation>
+ <operation>
+ <id>continuum-modify-group-build-definition</id>
+ <name>continuum-modify-group-build-definition</name>
+ <description>Continuum Modify Group Build Definition</description>
+ </operation>
+ <operation>
+ <id>continuum-add-group-notifier</id>
+ <name>continuum-add-group-notifier</name>
+ <description>Continuum Add Group Notifier</description>
+ </operation>
+ <operation>
+ <id>continuum-remove-group-notifier</id>
+ <name>continuum-remove-group-notifier</name>
+ <description>Continuum Remove Group Notifier</description>
+ </operation>
+ <operation>
+ <id>continuum-modify-group-notifier</id>
+ <name>continuum-modify-group-notifier</name>
+ <description>Continuum Modify Group Notifier</description>
+ </operation>
+ <operation>
+ <id>continuum-add-project-build-definition</id>
+ <name>continuum-add-project-build-definition</name>
+ <description>Continuum Add Project Build Definition</description>
+ </operation>
+ <operation>
+ <id>continuum-remove-project-build-definition</id>
+ <name>continuum-remove-project-build-definition</name>
+ <description>Continuum Remove Project Build Definition</description>
+ </operation>
+ <operation>
+ <id>continuum-modify-project-build-definition</id>
+ <name>continuum-modify-project-build-definition</name>
+ <description>Continuum Modify Project Build Definition</description>
+ </operation>
+ <operation>
+ <id>continuum-add-project-notifier</id>
+ <name>continuum-add-project-notifier</name>
+ <description>Continuum Add Project Notifier</description>
+ </operation>
+ <operation>
+ <id>continuum-remove-project-notifier</id>
+ <name>continuum-remove-project-notifier</name>
+ <description>Continuum Remove Project Notifier</description>
+ </operation>
+ <operation>
+ <id>continuum-modify-project-notifier</id>
+ <name>continuum-modify-project-notifier</name>
+ <description>Continuum Modify Project Notifier</description>
+ </operation>
+ </operations>
+ <roles>
+ <role>
+ <id>continuum-system-administrator</id>
+ <name>Continuum System Administrator</name>
+ <assignable>false</assignable>
+ <permanent>true</permanent>
+ <permissions>
+ <permission>
+ <id>continuum-manage-configuration</id>
+ <name>Manage Continuum Configuration</name>
+ <permanent>true</permanent>
+ <operation>continuum-manage-configuration</operation>
+ <resource>global</resource>
+ </permission>
+ <permission>
+ <id>continuum-manage-schedules</id>
+ <name>Manage Continuum Schedules</name>
+ <permanent>true</permanent>
+ <operation>continuum-manage-schedules</operation>
+ <resource>global</resource>
+ </permission>
+ </permissions>
+ <parentRoles>
+ <parentRole>system-administrator</parentRole>
+ </parentRoles>
+ <childRoles>
+ <childRole>continuum-group-project-administrator</childRole>
+ </childRoles>
+ </role>
+ <role>
+ <id>continuum-user-administrator</id>
+ <name>Continuum User Administrator</name>
+ <assignable>false</assignable>
+ <permanent>true</permanent>
+ <permissions>
+ <permission>
+ <id>continuum-manage-users</id>
+ <name>Manage Continuum Users</name>
+ <permanent>true</permanent>
+ <operation>continuum-manage-users</operation>
+ <resource>global</resource>
+ </permission>
+ </permissions>
+ <parentRoles>
+ <parentRole>user-administrator</parentRole>
+ </parentRoles>
+ </role>
+ <role>
+ <id>continuum-group-project-administrator</id>
+ <name>Continuum Group Project Administrator</name>
+ <assignable>true</assignable>
+ <permanent>true</permanent>
+ <permissions>
+ <permission>
+ <id>continuum-add-group</id>
+ <name>Add Group to Continuum</name>
+ <permanent>true</permanent>
+ <operation>continuum-add-group</operation>
+ <resource>global</resource>
+ </permission>
+ <permission>
+ <id>continuum-manage-schedules</id>
+ <name>Manage Continuum Schedules</name>
+ <permanent>true</permanent>
+ <operation>continuum-manage-schedules</operation>
+ <resource>global</resource>
+ </permission>
+ </permissions>
+ </role>
+ <role>
+ <id>continuum-group-project-developer</id>
+ <name>Continuum Group Project Developer</name>
+ <assignable>true</assignable>
+ <permanent>true</permanent>
+ </role>
+ <role>
+ <id>continuum-group-project-user</id>
+ <name>Continuum Group Project User</name>
+ <assignable>true</assignable>
+ <permanent>true</permanent>
+ </role>
+ <role>
+ <id>continuum-guest</id>
+ <name>Continuum Guest</name>
+ <assignable>false</assignable>
+ <permanent>true</permanent>
+ <permissions>
+ <permission>
+ <id>continuum-guest</id>
+ <name>Continuum Guest Permissions</name>
+ <permanent>true</permanent>
+ <operation>continuum-guest</operation>
+ <resource>global</resource>
+ </permission>
+ </permissions>
+ <parentRoles>
+ <parentRole>guest</parentRole>
+ </parentRoles>
+ </role>
+ </roles>
+ <templates>
+ <template>
+ <id>project-administrator</id>
+ <namePrefix>Project Administrator</namePrefix>
+ <assignable>true</assignable>
+ <permissions>
+ <permission>
+ <id>continuum-manage-users</id>
+ <name>Continuum Manage Users</name>
+ <operation>continuum-manage-users</operation>
+ <resource>global</resource>
+ </permission>
+ <permission>
+ <id>continuum-manage-users-roles</id>
+ <name>Continuum Manage User Roles</name>
+ <operation>user-management-user-role</operation>
+ <resource>global</resource>
+ </permission>
+ <permission>
+ <id>continuum-group-role-grant</id>
+ <name>Continuum Grant Group Roles</name>
+ <operation>user-management-role-grant</operation>
+ <resource>${resource}</resource>
+ </permission>
+ </permissions>
+ <childTemplates>
+ <childTemplate>project-developer</childTemplate>
+ </childTemplates>
+ <parentRoles>
+ <parentRole>continuum-group-project-administrator</parentRole>
+ </parentRoles>
+ </template>
+ <template>
+ <id>project-developer</id>
+ <namePrefix>Project Developer</namePrefix>
+ <assignable>true</assignable>
+ <permissions>
+ <permission>
+ <id>continuum-build-group</id>
+ <name>Continuum Build Group</name>
+ <operation>continuum-build-group</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-remove-group</id>
+ <name>Continuum Remove Group</name>
+ <operation>continuum-remove-group</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-modify-group</id>
+ <name>Continuum Modify Group</name>
+ <operation>continuum-modify-group</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-add-group-build-definition</id>
+ <name>Continuum Add Group Build Definition</name>
+ <operation>continuum-add-group-build-definition</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-remove-group-build-definition</id>
+ <name>Continuum Remove Group Build Definition</name>
+ <operation>continuum-remove-group-build-definition</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-modify-group-build-definition</id>
+ <name>Continuum Modify Group Build Definition</name>
+ <operation>continuum-modify-group-build-definition</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-add-group-notifier</id>
+ <name>Continuum Add Group Notifier</name>
+ <operation>continuum-add-group-notifier</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-remove-group-notifier</id>
+ <name>Continuum Remove Group Notifier</name>
+ <operation>continuum-remove-group-notifier</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-modify-group-notifier</id>
+ <name>Continuum Modify Group Notifier</name>
+ <operation>continuum-modify-group-notifier</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-add-project-build-definition</id>
+ <name>Continuum Add Project Build Definition</name>
+ <operation>continuum-add-project-build-definition</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-remove-project-build-definition</id>
+ <name>Continuum Remove Project Build Definition</name>
+ <operation>continuum-remove-project-build-definition</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-modify-project-build-definition</id>
+ <name>Continuum Modify Project Build Definition</name>
+ <operation>continuum-modify-project-build-definition</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-add-project-notifier</id>
+ <name>Continuum Add Project Notifer</name>
+ <operation>continuum-add-project-notifier</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-remove-project-notifier</id>
+ <name>Continuum Remove Project Notifer</name>
+ <operation>continuum-remove-project-notifier</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-modify-project-notifier</id>
+ <name>Continuum Modify Project Notifer</name>
+ <operation>continuum-modify-project-notifier</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-build-project-in-group</id>
+ <name>Continuum Build Project in Group</name>
+ <operation>continuum-build-project-in-group</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-add-project-to-group</id>
+ <name>Continuum Add Project To Group</name>
+ <operation>continuum-add-project-to-group</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-remove-project-from-group</id>
+ <name>Continuum Remove Project from Group</name>
+ <operation>continuum-remove-project-from-group</operation>
+ <resource>${resource}</resource>
+ </permission>
+ <permission>
+ <id>continuum-modify-project-in-group</id>
+ <name>Continuum Modify Project in Group</name>
+ <operation>continuum-modify-project-in-group</operation>
+ <resource>${resource}</resource>
+ </permission>
+ </permissions>
+ <childTemplates>
+ <childTemplate>project-user</childTemplate>
+ </childTemplates>
+ <parentRoles>
+ <parentRole>continuum-group-project-developer</parentRole>
+ </parentRoles>
+ </template>
+ <template>
+ <id>project-user</id>
+ <namePrefix>Project User</namePrefix>
+ <assignable>true</assignable>
+ <permissions>
+ <permission>
+ <id>continuum-view-group</id>
+ <name>Continuum View Group</name>
+ <operation>continuum-view-group</operation>
+ <resource>${resource}</resource>
+ </permission>
+ </permissions>
+ <parentRoles>
+ <parentRole>continuum-group-project-user</parentRole>
+ </parentRoles>
+ </template>
+ </templates>
+</redback-role-model>
\ No newline at end of file
Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Wed May 9 14:26:01 2007
@@ -8,7 +8,7 @@
<artifactId>continuum-webapp</artifactId>
<name>Continuum Web APP</name>
<packaging>war</packaging>
- <build>
+ <build>
<resources>
<resource>
<filtering>true</filtering>
@@ -309,18 +309,12 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-log4j-logging</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
- -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
@@ -439,14 +433,18 @@
Plexus Security Dependencies
-->
<dependency>
- <groupId>org.codehaus.plexus.security</groupId>
- <artifactId>plexus-security-ui-web</artifactId>
+ <groupId>org.codehaus.plexus.redback</groupId>
+ <artifactId>redback-xwork-content</artifactId>
<type>war</type>
- <scope>runtime</scope>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus.redback</groupId>
+ <artifactId>redback-xwork-integration</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus.security</groupId>
- <artifactId>plexus-security-ui-web-taglib</artifactId>
+ <groupId>org.codehaus.plexus.redback</groupId>
+ <artifactId>redback-taglib</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -467,14 +465,7 @@
<artifactId>geronimo-spec-jta</artifactId>
<version>1.0.1B-rc2</version>
<scope>provided</scope>
- </dependency>
- <!--
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.0-312.jdbc3</version>
- </dependency>
- -->
+ </dependency>
<dependency>
<groupId>jpox</groupId>
<artifactId>jpox</artifactId>
@@ -514,4 +505,48 @@
<scope>provided</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>postgres</id>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-504.jdbc3</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <jettyEnvXml>src/jetty-env-postgres.xml</jettyEnvXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>mysql</id>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.0.4</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <jettyEnvXml>src/jetty-env-mysql.xml</jettyEnvXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java Wed May 9 14:26:01 2007
@@ -25,10 +25,10 @@
import org.apache.maven.continuum.security.ContinuumRoleConstants;
import org.apache.maven.continuum.web.exception.AuthenticationRequiredException;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
-import org.codehaus.plexus.security.authorization.AuthorizationException;
-import org.codehaus.plexus.security.system.SecuritySession;
-import org.codehaus.plexus.security.system.SecuritySystem;
-import org.codehaus.plexus.security.system.SecuritySystemConstants;
+import org.codehaus.plexus.redback.authorization.AuthorizationException;
+import org.codehaus.plexus.redback.system.SecuritySession;
+import org.codehaus.plexus.redback.system.SecuritySystem;
+import org.codehaus.plexus.redback.system.SecuritySystemConstants;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Wed May 9 14:26:01 2007
@@ -26,14 +26,14 @@
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.web.bean.ProjectGroupUserBean;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
-import org.codehaus.plexus.rbac.profile.RoleProfileException;
-import org.codehaus.plexus.rbac.profile.RoleProfileManager;
-import org.codehaus.plexus.security.rbac.RBACManager;
-import org.codehaus.plexus.security.rbac.RbacManagerException;
-import org.codehaus.plexus.security.rbac.RbacObjectNotFoundException;
-import org.codehaus.plexus.security.rbac.Role;
-import org.codehaus.plexus.security.user.User;
-import org.codehaus.plexus.security.user.UserManager;
+import org.codehaus.plexus.redback.rbac.RBACManager;
+import org.codehaus.plexus.redback.rbac.RbacManagerException;
+import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
+import org.codehaus.plexus.redback.rbac.Role;
+import org.codehaus.plexus.redback.role.RoleManager;
+import org.codehaus.plexus.redback.role.RoleManagerException;
+import org.codehaus.plexus.redback.users.User;
+import org.codehaus.plexus.redback.users.UserManager;
import org.codehaus.plexus.util.StringUtils;
import java.util.ArrayList;
@@ -74,9 +74,9 @@
private RBACManager rbac;
/**
- * @plexus.requirement role-hint="continuum"
+ * @plexus.requirement role-hint="default"
*/
- private RoleProfileManager roleManager;
+ private RoleManager roleManager;
private int projectGroupId;
@@ -259,13 +259,13 @@
{
try
{
- roleManager.renameDynamicRole( "continuum-group-project-administrator", projectGroup.getName(), name );
- roleManager.renameDynamicRole( "continuum-group-developer", projectGroup.getName(), name );
- roleManager.renameDynamicRole( "continuum-group-user", projectGroup.getName(), name );
+ roleManager.updateRole( "project-administrator", projectGroup.getName(), name );
+ roleManager.updateRole( "project-developer", projectGroup.getName(), name );
+ roleManager.updateRole( "project-user", projectGroup.getName(), name );
projectGroup.setName( name );
}
- catch ( RoleProfileException e )
+ catch ( RoleManagerException e )
{
throw new ContinuumException( "unable to rename the project group", e );
}
@@ -456,6 +456,7 @@
for ( Iterator j = effectiveRoles.iterator(); j.hasNext(); )
{
Role role = (Role) j.next();
+
if ( role.getName().indexOf( projectGroup.getName() ) > -1 )
{
pgUser.setRoles( effectiveRoles );
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java Wed May 9 14:26:01 2007
@@ -27,10 +27,10 @@
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.apache.maven.continuum.web.action.ContinuumActionSupport;
-import org.codehaus.plexus.security.rbac.Resource;
-import org.codehaus.plexus.security.ui.web.interceptor.SecureAction;
-import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
-import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException;
+import org.codehaus.plexus.redback.rbac.Resource;
+import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
+import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
import org.codehaus.plexus.util.StringUtils;
import javax.servlet.http.HttpServletRequest;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java Wed May 9 14:26:01 2007
@@ -30,12 +30,11 @@
import org.apache.maven.shared.app.company.CompanyPomHandler;
import org.apache.maven.shared.app.configuration.Configuration;
import org.apache.maven.shared.app.configuration.MavenAppConfiguration;
+import org.codehaus.plexus.redback.rbac.Resource;
+import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
+import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
import org.codehaus.plexus.registry.RegistryException;
-import org.codehaus.plexus.security.rbac.Resource;
-import org.codehaus.plexus.security.ui.web.interceptor.SecureAction;
-import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
-import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException;
-
import java.io.IOException;
/**
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java Wed May 9 14:26:01 2007
@@ -34,10 +34,10 @@
import org.apache.maven.shared.app.configuration.CompanyPom;
import org.apache.maven.shared.app.configuration.Configuration;
import org.apache.maven.shared.app.configuration.MavenAppConfiguration;
-import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
-import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException;
-import org.codehaus.plexus.security.ui.web.interceptor.SecureAction;
-import org.codehaus.plexus.security.rbac.Resource;
+import org.codehaus.plexus.redback.rbac.Resource;
+import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
+import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
import java.io.IOException;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/bean/ProjectGroupUserBean.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/bean/ProjectGroupUserBean.java?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/bean/ProjectGroupUserBean.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/bean/ProjectGroupUserBean.java Wed May 9 14:26:01 2007
@@ -20,8 +20,9 @@
*/
import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.codehaus.plexus.security.user.User;
-import org.codehaus.plexus.security.rbac.Role;
+import org.codehaus.plexus.redback.rbac.Role;
+import org.codehaus.plexus.redback.users.User;
+
import java.util.Collection;
import java.util.Iterator;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java Wed May 9 14:26:01 2007
@@ -19,10 +19,10 @@
* under the License.
*/
-import org.codehaus.plexus.security.system.check.EnvironmentCheck;
-import org.codehaus.plexus.rbac.profile.RoleProfileManager;
-import org.codehaus.plexus.rbac.profile.RoleProfileException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.redback.role.RoleManager;
+import org.codehaus.plexus.redback.role.RoleManagerException;
+import org.codehaus.plexus.redback.system.check.EnvironmentCheck;
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.Continuum;
@@ -45,9 +45,9 @@
implements EnvironmentCheck
{
/**
- * @plexus.requirement role-hint="continuum"
+ * @plexus.requirement role-hint="default"
*/
- private RoleProfileManager continuumRoleManager;
+ private RoleManager roleManager;
/**
* @plexus.requirement
@@ -58,11 +58,6 @@
{
try
{
- if ( !continuumRoleManager.isInitialized() )
- {
- continuumRoleManager.initialize();
- }
-
Collection projectGroups = continuum.getAllProjectGroups();
for ( Iterator i = projectGroups.iterator(); i.hasNext(); )
@@ -71,17 +66,26 @@
// gets the role, making it if it doesn't exist
//TODO: use continuum.executeAction( "add-assignable-roles", context ); or something like that to avoid code duplication
- continuumRoleManager.getDynamicRole( "continuum-group-project-administrator", group.getName() );
- continuumRoleManager.getDynamicRole( "continuum-group-user", group.getName() );
- continuumRoleManager.getDynamicRole( "continuum-group-developer", group.getName() );
-
+ if ( !roleManager.templatedRoleExists( "project-administrator", group.getName() ) )
+ {
+ roleManager.createTemplatedRole( "project-administrator", group.getName() );
+ }
+ if ( !roleManager.templatedRoleExists( "project-developer", group.getName() ) )
+ {
+ roleManager.createTemplatedRole( "project-developer", group.getName() );
+ }
+
+ if ( !roleManager.templatedRoleExists( "project-user", group.getName() ) )
+ {
+ roleManager.createTemplatedRole( "project-user", group.getName() );
+ }
}
}
- catch ( RoleProfileException rpe )
+ catch ( RoleManagerException rpe )
{
rpe.printStackTrace();
- list.add( "error inititalizing the continuum role manager" );
+ list.add( "error checking existence of roles for groups" );
}
}
}
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java Wed May 9 14:26:01 2007
@@ -25,10 +25,10 @@
import org.apache.maven.continuum.security.ContinuumRoleConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.security.authorization.AuthorizationException;
-import org.codehaus.plexus.security.system.SecuritySession;
-import org.codehaus.plexus.security.system.SecuritySystem;
-import org.codehaus.plexus.security.system.SecuritySystemConstants;
+import org.codehaus.plexus.redback.authorization.AuthorizationException;
+import org.codehaus.plexus.redback.system.SecuritySession;
+import org.codehaus.plexus.redback.system.SecuritySystem;
+import org.codehaus.plexus.redback.system.SecuritySystemConstants;
import org.codehaus.plexus.xwork.PlexusLifecycleListener;
import org.extremecomponents.table.bean.Column;
import org.extremecomponents.table.cell.DisplayCell;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java Wed May 9 14:26:01 2007
@@ -28,10 +28,10 @@
import org.apache.maven.continuum.security.ContinuumRoleConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.security.authorization.AuthorizationException;
-import org.codehaus.plexus.security.system.SecuritySession;
-import org.codehaus.plexus.security.system.SecuritySystem;
-import org.codehaus.plexus.security.system.SecuritySystemConstants;
+import org.codehaus.plexus.redback.authorization.AuthorizationException;
+import org.codehaus.plexus.redback.system.SecuritySession;
+import org.codehaus.plexus.redback.system.SecuritySystem;
+import org.codehaus.plexus.redback.system.SecuritySystemConstants;
import org.codehaus.plexus.xwork.PlexusLifecycleListener;
import org.extremecomponents.table.bean.Column;
import org.extremecomponents.table.cell.DisplayCell;
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Wed May 9 14:26:01 2007
@@ -31,20 +31,20 @@
<interceptors>
<interceptor name="exception-logging" class="exceptionLogging"/>
<interceptor name="continuumConfigurationCheck" class="forceContinuumConfigurationInterceptor"/>
- <interceptor name="pssForceAdminUser" class="pssForceAdminUserInterceptor"/>
- <interceptor name="pssSecureActions" class="pssSecureActionInterceptor"/>
- <interceptor name="pssAutoLogin" class="pssAutoLoginInterceptor"/>
- <interceptor name="pssPolicyEnforcement" class="pssPolicyEnforcementInterceptor"/>
- <interceptor name="pssEnvironmentChecker" class="pssEnvironmentCheckInterceptor"/>
+ <interceptor name="redbackForceAdminUser" class="redbackForceAdminUserInterceptor"/>
+ <interceptor name="redbackSecureActions" class="redbackSecureActionInterceptor"/>
+ <interceptor name="redbackAutoLogin" class="redbackAutoLoginInterceptor"/>
+ <interceptor name="redbackPolicyEnforcement" class="redbackPolicyEnforcementInterceptor"/>
+ <interceptor name="redbackEnvironmentChecker" class="redbackEnvironmentCheckInterceptor"/>
<interceptor-stack name="configuredContinuumStack">
- <interceptor-ref name="pssEnvironmentChecker"/>
- <interceptor-ref name="pssForceAdminUser"/>
- <interceptor-ref name="pssAutoLogin"/>
+ <interceptor-ref name="redbackEnvironmentChecker"/>
+ <interceptor-ref name="redbackForceAdminUser"/>
+ <interceptor-ref name="redbackAutoLogin"/>
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="exception-logging"/>
- <interceptor-ref name="pssSecureActions"/>
- <interceptor-ref name="pssPolicyEnforcement"/>
+ <interceptor-ref name="redbackSecureActions"/>
+ <interceptor-ref name="redbackPolicyEnforcement"/>
<interceptor-ref name="continuumConfigurationCheck"/>
<interceptor-ref name="validation">
<param name="excludeMethods">input,back,cancel,browse,edit</param>
@@ -55,13 +55,13 @@
</interceptor-stack>
<interceptor-stack name="unconfiguredContinuumStack">
- <interceptor-ref name="pssEnvironmentChecker"/>
- <interceptor-ref name="pssForceAdminUser"/>
- <interceptor-ref name="pssAutoLogin"/>
+ <interceptor-ref name="redbackEnvironmentChecker"/>
+ <interceptor-ref name="redbackForceAdminUser"/>
+ <interceptor-ref name="redbackAutoLogin"/>
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="exception-logging"/>
- <interceptor-ref name="pssPolicyEnforcement"/>
- <interceptor-ref name="pssSecureActions"/>
+ <interceptor-ref name="redbackPolicyEnforcement"/>
+ <interceptor-ref name="redbackSecureActions"/>
<interceptor-ref name="validation">
<param name="excludeMethods">input,back,cancel,browse,edit</param>
</interceptor-ref>
@@ -148,7 +148,7 @@
<!-- This is the redirection facility for plexus-security,
allowing plexus-security to call out from its own set of actions
into the application webapp, using global result names. -->
- <action name="pssRedirect" class="pss-redirect" method="redirect">
+ <action name="redbackRedirect" class="redback-redirect" method="redirect">
<result type="redirect-action">groupSummary</result>
</action>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.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">
@@ -40,33 +40,33 @@
<ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
<!-- ec:column property="profile" title="projectView.buildDefinition.profile"/ -->
<ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
- <pss:ifAuthorized permission="continuum-manage-schedules">
+ <redback:ifAuthorized permission="continuum-manage-schedules">
<ww:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
<ww:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</ww:param>
</ww:url>
<ww:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</ww:a>
- </pss:ifAuthorized>
- <pss:elseAuthorized>
+ </redback:ifAuthorized>
+ <redback:elseAuthorized>
${pageScope.buildDefinitionSummary.scheduleName}
- </pss:elseAuthorized>
+ </redback:elseAuthorized>
</ec:column>
<ec:column property="from" title="projectView.buildDefinition.from"/>
<ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
<ec:column property="isDefault" title="projectView.buildDefinition.default"/>
<ec:column property="buildAction" title=" " width="1%">
- <pss:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
+ <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
<ww:url id="buildUrl" action="buildProject" namespace="/">
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
</ww:url>
<ww:a href="%{buildUrl}"><img src="<ww:url value='/images/buildnow.gif'/>" alt="<ww:text name='build'/>" title="<ww:text name='build'/>" border="0"></ww:a>
- </pss:ifAuthorized>
- <pss:elseAuthorized>
+ </redback:ifAuthorized>
+ <redback:elseAuthorized>
<img src="<ww:url value='/images/buildnow_disabled.gif'/>" alt="<ww:text name='build'/>" title="<ww:text name='build'/>" border="0" />
- </pss:elseAuthorized>
+ </redback:elseAuthorized>
</ec:column>
<ec:column property="editActions" title=" " width="1%">
<center>
- <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
+ <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
<ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
<ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
@@ -74,15 +74,15 @@
<ww:a href="%{editUrl}">
<img src="<ww:url value='/images/edit.gif'/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0">
</ww:a>
- </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>
</center>
</ec:column>
<ec:column property="deleteActions" title=" " width="1%">
<center>
- <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
+ <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
<ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
<ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
@@ -91,23 +91,23 @@
<ww:a href="%{removeUrl}">
<img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0">
</ww:a>
- </pss:ifAuthorized>
- <pss:elseAuthorized>
+ </redback:ifAuthorized>
+ <redback:elseAuthorized>
<img src="<ww:url value='/images/delete_disabled.gif'/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0">
- </pss:elseAuthorized>
+ </redback:elseAuthorized>
</center>
</ec:column>
</ec:row>
</ec:table>
</ww:if>
- <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
+ <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
<div class="functnbar3">
<ww:form action="buildDefinition" method="post">
<input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupId"/>"/>
<ww:submit value="%{getText('add')}"/>
</ww:form>
</div>
- </pss:ifAuthorized>
+ </redback:ifAuthorized>
<ww:if test="${not empty projectBuildDefinitionSummaries}">
<h3>Project Build Definitions</h3>
@@ -131,20 +131,20 @@
<ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
<!-- ec:column property="profile" title="projectView.buildDefinition.profile"/ -->
<ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
- <pss:ifAuthorized permission="continuum-manage-schedules">
+ <redback:ifAuthorized permission="continuum-manage-schedules">
<ww:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
<ww:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</ww:param>
</ww:url>
<ww:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</ww:a>
- </pss:ifAuthorized>
- <pss:elseAuthorized>
+ </redback:ifAuthorized>
+ <redback:elseAuthorized>
${pageScope.buildDefinitionSummary.scheduleName}
- </pss:elseAuthorized>
+ </redback:elseAuthorized>
</ec:column>
<ec:column property="from" title="projectView.buildDefinition.from"/>
<ec:column property="isDefault" title="projectView.buildDefinition.default"/>
<ec:column property="buildNowAction" title=" " width="1%">
- <pss:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
+ <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
<ww:url id="buildProjectUrl" action="buildProject" namespace="/" includeParams="none">
<ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
@@ -152,13 +152,13 @@
<ww:a href="%{buildProjectUrl}">
<img src="<c:url value='/images/buildnow.gif'/>" alt="<ww:text name='build'/>" title="<ww:text name='build'/>" border="0">
</ww:a>
- </pss:ifAuthorized>
- <pss:elseAuthorized>
+ </redback:ifAuthorized>
+ <redback:elseAuthorized>
<img src="<ww:url value='/images/buildnow_disabled.gif'/>" alt="<ww:text name='build'/>" title="<ww:text name='build'/>" border="0" />
- </pss:elseAuthorized>
+ </redback:elseAuthorized>
</ec:column>
<ec:column property="editAction" title=" " width="1%">
- <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
+ <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
<ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
<ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
@@ -166,13 +166,13 @@
<ww:a href="%{editUrl}">
<img src="<ww:url value='/images/edit.gif'/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0">
</ww:a>
- </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="removeAction" title=" " width="1%">
- <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
+ <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
<ww:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
<ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
@@ -181,10 +181,10 @@
<ww:a href="%{removeUrl}">
<img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0">
</ww:a>
- </pss:ifAuthorized>
- <pss:elseAuthorized>
+ </redback:ifAuthorized>
+ <redback:elseAuthorized>
<img src="<ww:url value='/images/delete_disabled.gif'/>" alt="<ww:text name='delete'/>" title="<ww:text name='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/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.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">
<ec:table items="allBuildDefinitionSummaries"
@@ -37,77 +37,77 @@
<ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
<ec:column property="profile" title="projectView.buildDefinition.profile"/>
<ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
- <pss:ifAuthorized permission="continuum-manage-schedules">
+ <redback:ifAuthorized permission="continuum-manage-schedules">
<ww:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
<ww:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</ww:param>
</ww:url>
<ww:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</ww:a>
- </pss:ifAuthorized>
- <pss:elseAuthorized>
+ </redback:ifAuthorized>
+ <redback:elseAuthorized>
${pageScope.buildDefinitionSummary.scheduleName}
- </pss:elseAuthorized>
+ </redback:elseAuthorized>
</ec:column>
<ec:column property="from" title="projectView.buildDefinition.from"/>
<ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
<ec:column property="isDefault" title="projectView.buildDefinition.default"/>
<ec:column property="buildAction" title=" " width="1%">
- <pss:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
+ <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
<ww:url id="buildProjectUrl" action="buildProject" namespace="/">
<ww:param name="projectId">${projectId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
<ww:param name="fromProjectPage" value="true"/>
</ww:url>
<ww:a href="%{buildProjectUrl}"><img src="<ww:url value='/images/buildnow.gif'/>" alt="<ww:text name='build'/>" title="<ww:text name='build'/>" border="0"></ww:a>
- </pss:ifAuthorized>
- <pss:elseAuthorized>
+ </redback:ifAuthorized>
+ <redback:elseAuthorized>
<img src="<ww:url value='/images/buildnow_disabled.gif'/>" alt="<ww:text name='build'/>" title="<ww:text name='build'/>" border="0" />
- </pss:elseAuthorized>
+ </redback:elseAuthorized>
</ec:column>
<ec:column property="editAction" title=" " width="1%">
<%-- if the from is PROJECT then render the links differently --%>
<ww:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
- <pss:ifAuthorized permission="continuum-modify-project-build-definition" resource="${projectGroupName}">
+ <redback:ifAuthorized permission="continuum-modify-project-build-definition" resource="${projectGroupName}">
<ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
<ww:param name="projectId">${projectId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
</ww:url>
<ww:a href="%{editUrl}"><img src="<ww:url value='/images/edit.gif'/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0"></ww:a>
- </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>
</ww:if>
<ww:else>
- <pss:ifAuthorized permission="continuum-modify-group-build-definition" resource="${projectGroupName}">
+ <redback:ifAuthorized permission="continuum-modify-group-build-definition" resource="${projectGroupName}">
<ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
<ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
<ww:param name="groupBuildDefinition">true</ww:param>
</ww:url>
<ww:a href="%{editUrl}"><img src="<ww:url value='/images/edit.gif'/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0"></ww:a>
- </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>
</ww:else>
</ec:column>
<ec:column property="deleteAction" title=" " width="1%">
<%-- if the from is PROJECT then render the links differently --%>
<ww:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
- <pss:ifAuthorized permission="continuum-remove-project-build-definition" resource="${projectGroupName}">
+ <redback:ifAuthorized permission="continuum-remove-project-build-definition" resource="${projectGroupName}">
<ww:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
<ww:param name="projectId">${projectId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
<ww:param name="confirmed" value="false"/>
</ww:url>
<ww:a href="%{removeUrl}"><img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
- </pss:ifAuthorized>
- <pss:elseAuthorized>
+ </redback:ifAuthorized>
+ <redback:elseAuthorized>
<img src="<ww:url value='/images/delete_disabled.gif'/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0" />
- </pss:elseAuthorized>
+ </redback:elseAuthorized>
</ww:if>
<ww:else>
- <pss:ifAuthorized permission="continuum-remove-group-build-definition" resource="${projectGroupName}">
+ <redback:ifAuthorized permission="continuum-remove-group-build-definition" resource="${projectGroupName}">
<ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
<ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
@@ -115,10 +115,10 @@
<ww:param name="confirmed" value="false"/>
</ww:url>
<ww:a href="%{removeUrl}"><img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
- </pss:ifAuthorized>
- <pss:elseAuthorized>
+ </redback:ifAuthorized>
+ <redback:elseAuthorized>
<img src="<ww:url value='/images/delete_disabled.gif'/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0" />
- </pss:elseAuthorized>
+ </redback:elseAuthorized>
</ww:else>
</ec:column>
</ec:row>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?view=diff&rev=536660&r1=536659&r2=536660
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.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">
<h3>Project Group Notifiers of ${projectGroup.name} group</h3>
@@ -39,7 +39,7 @@
<ec:column property="events" title="projectView.notifier.events"/>
<!-- ec:column property="sender" title="projectView.notifier.sender"/ -->
<ec:column property="editActions" title=" " width="1%">
- <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
+ <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
<ww:url id="editUrl" action="editProjectGroupNotifier" namespace="/">
<ww:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</ww:param>
<ww:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</ww:param>
@@ -48,13 +48,13 @@
<ww:a href="%{editUrl}">
<img src="<ww:url value='/images/edit.gif'/>" alt="Edit" title="Edit" border="0">
</ww:a>
- </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>
</ec:column>
<ec:column property="deleteActions" title=" " width="1%">
- <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
+ <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
<ww:url id="removeUrl" action="deleteProjectGroupNotifier!default.action" namespace="/">
<ww:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</ww:param>
<ww:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</ww:param>
@@ -64,16 +64,16 @@
<ww:a href="%{removeUrl}">
<img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete" border="0">
</ww:a>
- </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>
</ww:if>
- <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
+ <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
<div class="functnbar3">
<ww:url id="addUrl" action="addProjectGroupNotifier" namespace="/" includeContext="false" includeParams="none" />
<ww:form action="%{addUrl}" method="post">
@@ -81,7 +81,7 @@
<ww:submit value="%{getText('add')}"/>
</ww:form>
</div>
- </pss:ifAuthorized>
+ </redback:ifAuthorized>
<ww:if test="${not empty projectNotifierSummaries}">
<h3>Project Notifiers</h3>
@@ -104,7 +104,7 @@
<ec:column property="events" title="projectView.notifier.events"/>
<!-- ec:column property="sender" title="projectView.notifier.sender"/ -->
<ec:column property="editActions" title=" " width="1%">
- <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
+ <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
<c:choose>
<c:when test="${!pageScope.projectNotifierSummary.fromProject}">
<ww:url id="editUrl" action="editProjectNotifier" namespace="/" includeParams="none">
@@ -122,13 +122,13 @@
<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>
</ec:column>
<ec:column property="deleteActions" title=" " width="1%">
- <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
+ <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
<c:choose>
<c:when test="${!pageScope.projectNotifierSummary.fromProject}">
<ww:url id="removeUrl" action="deleteProjectNotifier" namespace="/">
@@ -146,10 +146,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>