Return-Path: 
 <continuum-commits-return-2031-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org
Received: (qmail 51954 invoked from network); 5 Sep 2006 03:18:45 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 5 Sep 2006 03:18:45 -0000
Received: (qmail 30826 invoked by uid 500); 5 Sep 2006 03:18:45 -0000
Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org
Received: (qmail 30800 invoked by uid 500); 5 Sep 2006 03:18:45 -0000
Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:continuum-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:continuum-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:continuum-commits@maven.apache.org>
List-Id: <continuum-commits.maven.apache.org>
Reply-To: continuum-dev@maven.apache.org
Delivered-To: mailing list continuum-commits@maven.apache.org
Received: (qmail 30789 invoked by uid 99); 5 Sep 2006 03:18:44 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Sep 2006 20:18:44 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Sep 2006 20:18:44 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id C91AA1A981F; Mon,  4 Sep 2006 20:18:23 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r440234 -
 /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
Date: Tue, 05 Sep 2006 03:18:23 -0000
To: continuum-commits@maven.apache.org
From: carlos@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20060905031823.C91AA1A981F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: carlos
Date: Mon Sep  4 20:18:23 2006
New Revision: 440234

URL: http://svn.apache.org/viewvc?view=rev&rev=440234
Log:
Add first ACL creation code

Modified:
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=440234&r1=440233&r2=440234
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Mon Sep  4 20:18:23 2006
@@ -488,7 +488,7 @@
           <field-name>sqlMojo</field-name>
         </requirement>
         <requirement>
-          <role>org.acegisecurity.acl.basic.BasicAclDao</role>
+          <role>org.acegisecurity.acl.basic.BasicAclExtendedDao</role>
           <field-name>dao</field-name>
         </requirement>
       </requirements>
@@ -522,7 +522,7 @@
     </component>
 
     <component>
-      <role>org.acegisecurity.acl.basic.BasicAclDao</role>
+      <role>org.acegisecurity.acl.basic.BasicAclExtendedDao</role>
       <implementation>org.acegisecurity.acl.basic.jdbc.JdbcExtendedDaoImpl</implementation>
       <component-composer>setter</component-composer>
       <requirements>
@@ -619,25 +619,124 @@
         <objectDefinitionSource implementation="org.acegisecurity.intercept.method.MethodDefinitionMap">
           <mappings>
             <methodDefinitionSourceMapping>
-              <methodName>org.apache.maven.continuum.Continuum.addProject</methodName>
+              <methodName>org.apache.maven.continuum.Continuum.getProjectGroup</methodName>
               <configAttributes>
-                <configAttribute>ROLE_admin</configAttribute>
-                <configAttribute>ROLE_addProject</configAttribute>
+                <configAttribute>ACL_PROJECTGROUP_READ</configAttribute>
               </configAttributes>
             </methodDefinitionSourceMapping>
             <methodDefinitionSourceMapping>
-              <methodName>org.apache.maven.continuum.Continuum.getProjectsInGroup</methodName>
+              <methodName>org.apache.maven.continuum.Continuum.getAllProjectGroupsWithProjects</methodName>
               <configAttributes>
                 <configAttribute>AFTER_ACL_COLLECTION_READ</configAttribute>
               </configAttributes>
             </methodDefinitionSourceMapping>
             <methodDefinitionSourceMapping>
-              <methodName>org.apache.maven.continuum.Continuum.getAllProjectGroupsWithProjects</methodName>
+              <methodName>org.apache.maven.continuum.Continuum.getProjectGroupByProjectId</methodName>
+              <configAttributes>
+                <configAttribute>ACL_PROJECTGROUP_READ</configAttribute>
+              </configAttributes>
+            </methodDefinitionSourceMapping>
+            <methodDefinitionSourceMapping>
+              <methodName>org.apache.maven.continuum.Continuum.getProjectsInGroup</methodName>
               <configAttributes>
                 <configAttribute>AFTER_ACL_COLLECTION_READ</configAttribute>
               </configAttributes>
             </methodDefinitionSourceMapping>
-            <!-- TODO add configuration for all the other methods that need to be secured -->
+            <methodDefinitionSourceMapping>
+              <methodName>org.apache.maven.continuum.Continuum.removeProjectGroup</methodName>
+              <configAttributes>
+                <configAttribute>ROLE_deleteProject</configAttribute>
+              </configAttributes>
+            </methodDefinitionSourceMapping>
+<!--
+removeProject( int projectId )
+checkoutProject( int projectId )
+getProject( int projectId )
+getAllProjectsWithAllDetails( int start, int end );
+getAllProjects( int start, int end )
+getProjects()
+getProjectsWithDependencies()
+getLatestBuildResultForProject( int projectId );
+getLatestBuildResults();
+getBuildResultsInSuccess();
+isInBuildingQueue( int projectId )
+isInBuildingQueue( int projectId, int buildDefinitionId )
+isInCheckoutQueue( int projectId )
+getProjectsInBuildOrder()
+buildProjects()
+buildProjects( int trigger )
+buildProjects( Schedule schedule )
+buildProject( int projectId )
+buildProject( int projectId, int trigger )
+buildProject( int projectId, int buildDefinitionId, int trigger )
+buildProjectGroup( int projectGroupId )
+getBuildResult( int buildId )
+getBuildResultByBuildNumber( int projectId, int buildNumber )
+getBuildOutput( int projectId, int buildId )
+getBuildResultsForProject( int projectId )
+getChangesSinceLastSuccess( int projectId, int buildResultId )
+-->
+            <methodDefinitionSourceMapping>
+              <methodName>org.apache.maven.continuum.Continuum.addProject</methodName>
+              <configAttributes>
+                <configAttribute>ROLE_admin</configAttribute>
+                <configAttribute>ROLE_addProject</configAttribute>
+              </configAttributes>
+            </methodDefinitionSourceMapping>
+<!--
+addMavenTwoProject( String metadataUrl )
+addMavenOneProject( String metadataUrl )
+updateProject( Project project )
+getNotifier( int projectId, int notifierId )
+updateNotifier( int projectId, int notifierId, Map configuration )
+updateNotifier( int projectId, ProjectNotifier notifier )
+addNotifier( int projectId, ProjectNotifier notifier )
+addNotifier( int projectId, String notifierType, Map configuration )
+removeNotifier( int projectId, int notifierId )
+getProjectWithCheckoutResult( int projectId )
+getProjectWithAllDetails( int projectId )
+getProjectWithBuilds( int projectId )
+getBuildDefinitions( int projectId )
+getBuildDefinition( int projectId, int buildDefinitionId )
+removeBuildDefinition( int projectId, int buildDefinitionId )
+getBuildDefinition( int buildDefinitionId )
+getDefaultBuildDefinition( int projectId )
+addBuildDefinitionToProject( int projectId, BuildDefinition buildDefinition )
+addBuildDefinitionToProjectGroup( int projectGroupId, BuildDefinition buildDefinition )
+getBuildDefinitionsForProject( int projectId )
+getBuildDefinitionsForProjectGroup( int projectGroupId )
+removeBuildDefinitionFromProject( int projectId, int buildDefinitionId )
+removeBuildDefinitionFromProjectGroup( int projectGroupId, int buildDefinitionId )
+updateBuildDefinitionForProject( int projectId, BuildDefinition buildDefinition )
+updateBuildDefinitionForProjectGroup( int projectGroupId, BuildDefinition buildDefinition )
+getSchedule( int id )
+getSchedules()
+addSchedule( Schedule schedule )
+updateSchedule( Schedule schedule )
+updateSchedule( int scheduleId, Map configuration )
+removeSchedule( int scheduleId )
+getWorkingDirectory( int projectId )
+getFileContent( int projectId, String directory, String filename )
+getFiles( int projectId, String currentDirectory )
+getConfiguration();
+updateConfiguration( Map parameters )
+reloadConfiguration()
+getSecurity();
+addUser( ContinuumUser user )
+addUser( Map configuration )
+updateUser( ContinuumUser user )
+updateUser( int userId, Map configuration )
+getUsers()
+getUser( int userId )
+removeUser( int userId )
+addUserGroup( UserGroup userGroup );
+addUserGroup( Map configuration )
+updateUserGroup( UserGroup userGroup )
+updateUserGroup( int userGroupId, Map configuration )
+getUserGroups()
+getUserGroup( int userGroupId )
+removeUserGroup( int userGroupId )
+-->
           </mappings>
         </objectDefinitionSource>
       </configuration>
@@ -648,7 +747,7 @@
       <implementation>org.acegisecurity.acl.basic.BasicAclProvider</implementation>
       <requirements>
         <requirement>
-          <role>org.acegisecurity.acl.basic.BasicAclDao</role>
+          <role>org.acegisecurity.acl.basic.BasicAclExtendedDao</role>
           <field-name>basicAclDao</field-name>
         </requirement>
       </requirements>
@@ -691,6 +790,26 @@
       </configuration>
     </component>
 
+    <component>
+      <role>org.acegisecurity.vote.AccessDecisionVoter</role>
+      <role-hint>aclProjectGroupRead</role-hint>
+      <implementation>org.acegisecurity.vote.BasicAclEntryVoter</implementation>
+      <requirements>
+        <requirement>
+          <role>org.acegisecurity.acl.AclManager</role>
+          <field-name>aclManager</field-name>
+        </requirement>
+      </requirements>
+      <configuration>
+        <processConfigAttribute>ACL_PROJECTGROUP_READ</processConfigAttribute>
+        <processDomainObjectClass>org.apache.maven.continuum.model.project.ProjectGroup</processDomainObjectClass>
+        <requirePermissionFromString>
+          <permission>ADMINISTRATION</permission>
+          <permission>READ</permission>
+        </requirePermissionFromString>
+      </configuration>
+    </component>
+
     <!-- An access decision manager used by the business objects -->
     <component>
       <role>org.acegisecurity.AccessDecisionManager</role>
@@ -840,12 +959,10 @@
             <hierarchy>org.extremecomponents</hierarchy>
             <level>INFO</level>
           </level>
-          <!-- this does not work, needs the log4j.xml or log4j.properties
           <level>
-            <hierarchy>org.acegisecurity</hierarchy>
+            <hierarchy>org.acegisecurity.acl.basic</hierarchy>
             <level>DEBUG</level>
           </level>
-          -->
         </levels>
       </configuration>
     </component>