continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r733441 [5/8] - in /continuum/branches/continuum-distributed-builds: ./ continuum-api/src/main/java/org/apache/continuum/configuration/ continuum-api/src/main/java/org/apache/continuum/dao/ continuum-api/src/main/java/org/apache/continuum/t...
Date Sun, 11 Jan 2009 09:52:35 GMT
Modified: continuum/branches/continuum-distributed-builds/continuum-security/src/main/resources/META-INF/redback/redback.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-security/src/main/resources/META-INF/redback/redback.xml?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-security/src/main/resources/META-INF/redback/redback.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-security/src/main/resources/META-INF/redback/redback.xml Sun Jan 11 01:52:08 2009
@@ -1,583 +1,604 @@
+<?xml version="1.0"?>
+
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <redback-role-model>
-    <modelVersion>1.0.0</modelVersion>
-    <applications>
-    	<application>
-    		<id>Continuum</id>
-    		<version>1.0</version>
-    		<operations>
-  		    <operation>
-  		      <id>continuum-manage-queues</id>
-  		      <name>continuum-manage-queues</name>
-  		      <description>Manage Continuum Queues</description>
-  		    </operation>    
-		    <operation>
-		      <id>continuum-view-queues</id>
-		      <name>continuum-view-queues</name>
-		      <description>Continuum View Queues</description>
-		    </operation>
-  		    <operation>
-  		      <id>continuum-manage-build-templates</id>
-  		      <name>continuum-manage-build-templates</name>
-  		      <description>Manage Continuum Build Definition Templates</description>
-  		    </operation>    
-  		    <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>
-  		    <operation>
-  		      <id>continuum-manage-installations</id>
-  		      <name>continuum-manage-installations</name>
-  		      <description>Continuum Manage Installations</description>
-  		    </operation>
-  		    <operation>
-  		      <id>continuum-manage-profiles</id>
-  		      <name>continuum-manage-profiles</name>
-  		      <description>Continuum Manage Installations</description>
-  		    </operation>        
-  		    <operation>
-  		      <id>continuum-manage-repositories</id>
-  		      <name>continuum-manage-repositories</name>
-  		      <description>Continuum Manage Repositories</description>
-  		    </operation>
-  		    <operation>
-  		      <id>continuum-manage-purging</id>
-  		      <name>continuum-manage-purging</name>
-  		      <description>Continuum Manage Purging</description>
-  		    </operation>
-  		    <operation>
-  		      <id>continuum-manage-distributed-builds</id>
-  		      <name>continuum-manage-distributed-builds</name>
-  		      <description>Continuum Manage Distributed Builds</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-distributed-builds</id>
-  		          <name>Manage Distributed Builds</name>
-  		          <permanent>true</permanent>
-  		          <operation>continuum-manage-distributed-builds</operation>
-  		          <resource>global</resource>
-  		        </permission>
-  		      </permissions>
-  		      <parentRoles>
-  		        <parentRole>system-administrator</parentRole>
-  		      </parentRoles>
-  		      <childRoles>
-  		        <childRole>continuum-group-project-administrator</childRole>
-  		        <childRole>continuum-manage-installations</childRole>
-  		        <childRole>continuum-manage-profiles</childRole>
-  		        <childRole>continuum-manage-schedules</childRole>
-  		        <childRole>continuum-manage-build-templates</childRole>
-  		        <childRole>continuum-manage-queues</childRole>
-  		        <childRole>continuum-manage-repositories</childRole>
-  		        <childRole>continuum-manage-purging</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>
-  		      <childRoles>
-  		        <childRole>continuum-group-project-developer</childRole>
-  		      </childRoles>
-  		    </role>
-  		    <role>
-  		      <id>continuum-group-project-developer</id>
-  		      <name>Continuum Group Project Developer</name>
-  		      <assignable>true</assignable>
-  		      <permanent>true</permanent>
-  		      <childRoles>
-  		        <childRole>continuum-group-project-user</childRole>
-  		      </childRoles>
-  		    </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>
-  		    <role>
-  		      <id>continuum-manage-installations</id>
-  		      <name>Continuum Manage Installations</name>
-  		      <assignable>true</assignable>
-  		      <permanent>true</permanent>
-  		      <permissions>
-  		        <permission>
-  		          <id>continuum-manage-installations</id>
-  		          <name>Manage Continuum Installations</name>
-  		          <permanent>true</permanent>
-  		          <operation>continuum-manage-installations</operation>
-  		          <resource>global</resource>
-  		        </permission>        
-  		      </permissions>
-  		    </role>
-  		    <role>
-  		      <id>continuum-manage-profiles</id>
-  		      <name>Continuum Manage Build Environments</name>
-  		      <assignable>true</assignable>
-  		      <permanent>true</permanent>
-  		      <permissions>
-  		        <permission>
-  		          <id>continuum-manage-profiles</id>
-  		          <name>Manage Continuum Build Environments</name>
-  		          <permanent>true</permanent>
-  		          <operation>continuum-manage-profiles</operation>
-  		          <resource>global</resource>
-  		        </permission>        
-  		      </permissions>
-  		    </role> 
-  			  <role>
-  		      <id>continuum-manage-schedules</id>
-  			    <name>Continuum Manage Scheduling</name>
-  		      <assignable>true</assignable>
-  		      <permanent>true</permanent>
-  		      <permissions>
-  		        <permission>
-  		          <id>continuum-manage-schedules</id>
-  		          <name>Continuum Manage Scheduling</name>  
-  		          <permanent>true</permanent>
-  		          <operation>continuum-manage-schedules</operation>
-  		          <resource>global</resource>
-  		        </permission>
-  		      </permissions>		
-  			  </role>
-  		    <role>
-  		      <id>continuum-manage-build-templates</id>
-  		      <name>Continuum Manage Build Templates</name>
-  		      <assignable>true</assignable>
-  		      <permanent>true</permanent>
-  		      <permissions>
-  		        <permission>
-  		          <id>continuum-manage-build-templates</id>
-  		          <name>Manage Continuum Build Definition Templates</name>
-  		          <permanent>true</permanent>
-  		          <operation>continuum-manage-build-templates</operation>
-  		          <resource>global</resource>
-  		        </permission>  
-  		      </permissions>
-  		    </role>    
-  		    <role>
-  		      <id>continuum-manage-queues</id>
-  		      <name>Continuum Manage Queues</name>
-  		      <assignable>true</assignable>
-  		      <permanent>true</permanent>
-  		      <permissions>
-  		        <permission>
-  		          <id>continuum-manage-queues</id>
-  		          <name>Manage Continuum Queues</name>
-  		          <permanent>true</permanent>
-  		          <operation>continuum-manage-queues</operation>
-  		          <resource>global</resource>
-  		        </permission>
-                        <permission>
-		          <id>continuum-view-queues</id>
-		          <name>Continuum View Queues</name>
-		          <permanent>true</permanent>
-		          <operation>continuum-view-queues</operation>
-		          <resource>global</resource>
-		        </permission>
-  		      </permissions>
-  		    </role>   
-  		    <role>
-  		      <id>continuum-manage-repositories</id>
-  		      <name>continuum-manage-repositories</name>
-  		      <assignable>true</assignable>
-  		      <permanent>true</permanent>
-  		      <permissions>
-  		        <permission>
-  		          <id>continuum-manage-repositories</id>
-  		          <name>Manage Continuum Local Repositories</name>
-  		          <permanent>true</permanent>
-  		          <operation>continuum-manage-repositories</operation>
-  		          <resource>global</resource>
-  		        </permission>
-  		      </permissions>
-  		    </role>
-  		    <role>
-  		      <id>continuum-manage-purging</id>
-  		      <name>continuum-manage-purging</name>
-  		      <assignable>true</assignable>
-  		      <permanent>true</permanent>
-  		      <permissions>
-  		        <permission>
-  		          <id>continuum-manage-purging</id>
-  		          <name>Manage Continuum Purging</name>
-  		          <permanent>true</permanent>
-  		          <operation>continuum-manage-purging</operation>
-  		          <resource>global</resource>
-  		        </permission>
-  		      </permissions>
-  		    </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-remove-group</id>
-  		          <name>Continuum Remove Group</name>
-  		          <operation>continuum-remove-group</operation>
-  		          <resource>${resource}</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-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>
-                            <permission>
-		              <id>continuum-view-queues</id>
-		              <name>Continuum View Queues</name>
-		              <operation>continuum-view-queues</operation>
-		              <resource>global</resource>
-		            </permission>
-  		  	  </permissions>  	  
-  		  	  <parentRoles>
-  		  	    <parentRole>continuum-group-project-user</parentRole>
-  		  	  </parentRoles>
-  		  	</template>
-  		  </templates>
-  	  </application>
-    </applications>
+  <modelVersion>1.0.0</modelVersion>
+  <applications>
+    <application>
+      <id>Continuum</id>
+      <version>1.0</version>
+      <operations>
+        <operation>
+          <id>continuum-manage-queues</id>
+          <name>continuum-manage-queues</name>
+          <description>Manage Continuum Queues</description>
+        </operation>    
+        <operation>
+          <id>continuum-view-queues</id>
+          <name>continuum-view-queues</name>
+          <description>Continuum View Queues</description>
+        </operation>
+        <operation>
+          <id>continuum-manage-build-templates</id>
+          <name>continuum-manage-build-templates</name>
+          <description>Manage Continuum Build Definition Templates</description>
+        </operation>    
+        <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>
+        <operation>
+          <id>continuum-manage-installations</id>
+          <name>continuum-manage-installations</name>
+          <description>Continuum Manage Installations</description>
+        </operation>
+        <operation>
+          <id>continuum-manage-profiles</id>
+          <name>continuum-manage-profiles</name>
+          <description>Continuum Manage Installations</description>
+        </operation>        
+        <operation>
+          <id>continuum-manage-repositories</id>
+          <name>continuum-manage-repositories</name>
+          <description>Continuum Manage Repositories</description>
+        </operation>
+        <operation>
+          <id>continuum-manage-purging</id>
+          <name>continuum-manage-purging</name>
+          <description>Continuum Manage Purging</description>
+        </operation>
+        <operation>
+          <id>continuum-manage-distributed-builds</id>
+          <name>continuum-manage-distributed-builds</name>
+          <description>Continuum Manage Distributed Builds</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-distributed-builds</id>
+              <name>Manage Continuum Distributed Builds</name>
+              <permanent>true</permanent>
+              <operation>continuum-manage-distributed-builds</operation>
+              <resource>global</resource>
+            </permission>
+          </permissions>
+          <parentRoles>
+            <parentRole>system-administrator</parentRole>
+          </parentRoles>
+          <childRoles>
+            <childRole>continuum-group-project-administrator</childRole>
+            <childRole>continuum-manage-installations</childRole>
+            <childRole>continuum-manage-profiles</childRole>
+            <childRole>continuum-manage-schedules</childRole>
+            <childRole>continuum-manage-build-templates</childRole>
+            <childRole>continuum-manage-queues</childRole>
+            <childRole>continuum-manage-repositories</childRole>
+            <childRole>continuum-manage-purging</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>
+          <childRoles>
+            <childRole>continuum-group-project-developer</childRole>
+          </childRoles>
+        </role>
+        <role>
+          <id>continuum-group-project-developer</id>
+          <name>Continuum Group Project Developer</name>
+          <assignable>true</assignable>
+          <permanent>true</permanent>
+          <childRoles>
+            <childRole>continuum-group-project-user</childRole>
+          </childRoles>
+        </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>
+        <role>
+          <id>continuum-manage-installations</id>
+          <name>Continuum Manage Installations</name>
+          <assignable>true</assignable>
+          <permanent>true</permanent>
+          <permissions>
+            <permission>
+              <id>continuum-manage-installations</id>
+              <name>Manage Continuum Installations</name>
+              <permanent>true</permanent>
+              <operation>continuum-manage-installations</operation>
+              <resource>global</resource>
+            </permission>        
+          </permissions>
+        </role>
+        <role>
+          <id>continuum-manage-profiles</id>
+          <name>Continuum Manage Build Environments</name>
+          <assignable>true</assignable>
+          <permanent>true</permanent>
+          <permissions>
+            <permission>
+              <id>continuum-manage-profiles</id>
+              <name>Manage Continuum Build Environments</name>
+              <permanent>true</permanent>
+              <operation>continuum-manage-profiles</operation>
+              <resource>global</resource>
+            </permission>        
+          </permissions>
+        </role> 
+        <role>
+          <id>continuum-manage-schedules</id>
+          <name>Continuum Manage Scheduling</name>
+          <assignable>true</assignable>
+          <permanent>true</permanent>
+          <permissions>
+            <permission>
+              <id>continuum-manage-schedules</id>
+              <name>Continuum Manage Scheduling</name>  
+              <permanent>true</permanent>
+              <operation>continuum-manage-schedules</operation>
+              <resource>global</resource>
+            </permission>
+          </permissions>		
+        </role>
+        <role>
+          <id>continuum-manage-build-templates</id>
+          <name>Continuum Manage Build Templates</name>
+          <assignable>true</assignable>
+          <permanent>true</permanent>
+          <permissions>
+            <permission>
+              <id>continuum-manage-build-templates</id>
+              <name>Manage Continuum Build Definition Templates</name>
+              <permanent>true</permanent>
+              <operation>continuum-manage-build-templates</operation>
+              <resource>global</resource>
+            </permission>  
+          </permissions>
+        </role>    
+        <role>
+          <id>continuum-manage-queues</id>
+          <name>Continuum Manage Queues</name>
+          <assignable>true</assignable>
+          <permanent>true</permanent>
+          <permissions>
+            <permission>
+              <id>continuum-manage-queues</id>
+              <name>Manage Continuum Queues</name>
+              <permanent>true</permanent>
+              <operation>continuum-manage-queues</operation>
+              <resource>global</resource>
+            </permission>
+            <permission>
+              <id>continuum-view-queues</id>
+              <name>Continuum View Queues</name>
+              <permanent>true</permanent>
+              <operation>continuum-view-queues</operation>
+              <resource>global</resource>
+            </permission>
+          </permissions>
+        </role>   
+        <role>
+          <id>continuum-manage-repositories</id>
+          <name>continuum-manage-repositories</name>
+          <assignable>true</assignable>
+          <permanent>true</permanent>
+          <permissions>
+            <permission>
+              <id>continuum-manage-repositories</id>
+              <name>Manage Continuum Local Repositories</name>
+              <permanent>true</permanent>
+              <operation>continuum-manage-repositories</operation>
+              <resource>global</resource>
+            </permission>
+          </permissions>
+        </role>
+        <role>
+          <id>continuum-manage-purging</id>
+          <name>continuum-manage-purging</name>
+          <assignable>true</assignable>
+          <permanent>true</permanent>
+          <permissions>
+            <permission>
+              <id>continuum-manage-purging</id>
+              <name>Manage Continuum Purging</name>
+              <permanent>true</permanent>
+              <operation>continuum-manage-purging</operation>
+              <resource>global</resource>
+            </permission>
+          </permissions>
+        </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-remove-group</id>
+              <name>Continuum Remove Group</name>
+              <operation>continuum-remove-group</operation>
+              <resource>${resource}</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-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>
+            <permission>
+              <id>continuum-view-queues</id>
+              <name>Continuum View Queues</name>
+              <operation>continuum-view-queues</operation>
+              <resource>global</resource>
+            </permission>
+          </permissions>  	  
+          <parentRoles>
+            <parentRole>continuum-group-project-user</parentRole>
+          </parentRoles>
+        </template>
+      </templates>
+    </application>
+  </applications>
 </redback-role-model>
+

Propchange: continuum/branches/continuum-distributed-builds/continuum-security/src/main/resources/META-INF/redback/redback.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-distributed-builds/continuum-security/src/main/resources/META-INF/redback/redback.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-distributed-builds/continuum-store/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/pom.xml?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/pom.xml Sun Jan 11 01:52:08 2009
@@ -28,6 +28,10 @@
   <name>Continuum :: Store</name>
   <dependencies>
     <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+    </dependency>    
+    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-jdo2</artifactId>
     </dependency>
@@ -81,17 +85,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>descriptor</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

Propchange: continuum/branches/continuum-distributed-builds/continuum-store/pom.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java Sun Jan 11 01:52:08 2009
@@ -25,6 +25,7 @@
 import org.codehaus.plexus.jdo.PlexusObjectNotFoundException;
 import org.codehaus.plexus.jdo.PlexusStoreException;
 
+import javax.annotation.Resource;
 import javax.jdo.FetchPlan;
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
@@ -59,9 +60,7 @@
 
     protected static final String PROJECT_WITH_SCM_DETAILS_FETCH_GROUP = "project-with-scm-details";
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private StoreUtilities storeUtilities;
 
     protected Object addObject( Object object )

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -28,7 +28,9 @@
 import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Repository;
 
+import javax.annotation.Resource;
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
@@ -42,22 +44,18 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.BuildDefinitionDao"
  */
+@Repository("buildDefinitionDao")
 public class BuildDefinitionDaoImpl
     extends AbstractDao
     implements BuildDefinitionDao
 {
-    private static Logger log = LoggerFactory.getLogger( BuildDefinitionDaoImpl.class );
+    private Logger log = LoggerFactory.getLogger( BuildDefinitionDaoImpl.class );
 
-    /**
-     * @plexus.requirement role="org.apache.continuum.dao.ProjectDao"
-     */
+    @Resource
     private ProjectDao projectDao;
 
-    /**
-     * @plexus.requirement role="org.apache.continuum.dao.ProjectGroupDao"
-     */
+    @Resource
     private ProjectGroupDao projectGroupDao;
 
     public BuildDefinition getBuildDefinition( int buildDefinitionId )

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -21,6 +21,7 @@
 
 import org.apache.maven.continuum.model.project.BuildDefinitionTemplate;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.springframework.stereotype.Repository;
 
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
@@ -32,8 +33,8 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.BuildDefinitionTemplateDao"
  */
+@Repository("buildDefinitionTemplateDao")
 public class BuildDefinitionTemplateDaoImpl
     extends AbstractDao
     implements BuildDefinitionTemplateDao

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -23,6 +23,7 @@
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.springframework.stereotype.Repository;
 
 import javax.jdo.Extent;
 import javax.jdo.JDOHelper;
@@ -37,8 +38,8 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.BuildResultDao"
  */
+@Repository("buildResultDao")
 public class BuildResultDaoImpl
     extends AbstractDao
     implements BuildResultDao

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -30,11 +30,12 @@
 import org.apache.continuum.model.release.ContinuumReleaseResult;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
- * @plexus.component role="org.apache.continuum.dao.ContinuumReleaseResultDao"
  */
+@Repository("continuumReleaseResultDao")
 public class ContinuumReleaseResultDaoImpl
     extends AbstractDao
     implements ContinuumReleaseResultDao

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java Sun Jan 11 01:52:08 2009
@@ -41,7 +41,9 @@
 import org.apache.maven.continuum.model.system.SystemConfiguration;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.jdo.PlexusJdoUtils;
+import org.springframework.stereotype.Repository;
 
+import javax.annotation.Resource;
 import javax.jdo.Extent;
 import javax.jdo.JDOUserException;
 import javax.jdo.PersistenceManager;
@@ -57,15 +59,13 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.DaoUtils"
  */
+@Repository("daoUtils")
 public class DaoUtilsImpl
     extends AbstractDao
     implements DaoUtils
 {
-    /**
-     * @plexus.requirement role="org.apache.continuum.dao.ProjectDao"
-     */
+    @Resource
     private ProjectDao projectDao;
 
     public void closeStore()

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -21,6 +21,7 @@
 
 import org.apache.continuum.model.repository.DirectoryPurgeConfiguration;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.springframework.stereotype.Repository;
 
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
@@ -32,8 +33,8 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.DirectoryPurgeConfigurationDao"
  */
+@Repository("directoryPurgeConfigurationDao")
 public class DirectoryPurgeConfigurationDaoImpl
     extends AbstractDao
     implements DirectoryPurgeConfigurationDao

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -23,6 +23,7 @@
 import org.apache.maven.continuum.model.system.Profile;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.util.StringUtils;
+import org.springframework.stereotype.Repository;
 
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
@@ -36,8 +37,8 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.InstallationDao"
  */
+@Repository("installationDao")
 public class InstallationDaoImpl
     extends AbstractDao
     implements InstallationDao

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -21,6 +21,7 @@
 
 import org.apache.continuum.model.repository.LocalRepository;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.springframework.stereotype.Repository;
 
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
@@ -33,8 +34,8 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.LocalRepositoryDao"
  */
+@Repository("localRepositoryDao")
 public class LocalRepositoryDaoImpl
     extends AbstractDao
     implements LocalRepositoryDao

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/NotifierDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/NotifierDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/NotifierDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/NotifierDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -21,12 +21,13 @@
 
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.NotifierDao"
  */
+@Repository("notifierDao")
 public class NotifierDaoImpl
     extends AbstractDao
     implements NotifierDao

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -21,6 +21,7 @@
 
 import org.apache.maven.continuum.model.system.Profile;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.springframework.stereotype.Repository;
 
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
@@ -32,8 +33,8 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.ProfileDao"
  */
+@Repository("profileDao")
 public class ProfileDaoImpl
     extends AbstractDao
     implements ProfileDao

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -23,6 +23,7 @@
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.springframework.stereotype.Repository;
 
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
@@ -35,8 +36,8 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.ProjectDao"
  */
+@Repository("projectDao")
 public class ProjectDaoImpl
     extends AbstractDao
     implements ProjectDao

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -24,7 +24,9 @@
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.jdo.PlexusJdoUtils;
+import org.springframework.stereotype.Repository;
 
+import javax.annotation.Resource;
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
@@ -37,15 +39,13 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.ProjectGroupDao"
  */
+@Repository("projectGroupDao")
 public class ProjectGroupDaoImpl
     extends AbstractDao
     implements ProjectGroupDao
 {
-    /**
-     * @plexus.requirement role=org.apache.continuum.dao.ProjectDao"
-     */
+    @Resource
     private ProjectDao projectDao;
 
     public ProjectGroup addProjectGroup( ProjectGroup group )

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -1,5 +1,24 @@
 package org.apache.continuum.dao;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import java.util.Collection;
 import java.util.List;
 
@@ -11,16 +30,17 @@
 import org.apache.continuum.model.project.ProjectScmRoot;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
- * @plexus.component role="org.apache.continuum.dao.ProjectScmRootDao"
+ * @version $Id: $
  */
+@Repository("projectScmRootDao")
 public class ProjectScmRootDaoImpl
     extends AbstractDao
     implements ProjectScmRootDao
 {
-
     public ProjectScmRoot addProjectScmRoot( ProjectScmRoot projectScmRoot )
         throws ContinuumStoreException
     {

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -21,6 +21,7 @@
 
 import org.apache.continuum.model.repository.RepositoryPurgeConfiguration;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.springframework.stereotype.Repository;
 
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
@@ -32,8 +33,8 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.RepositoryPurgeConfigurationDao"
  */
+@Repository("repositoryPurgeConfigurationDao")
 public class RepositoryPurgeConfigurationDaoImpl
     extends AbstractDao
     implements RepositoryPurgeConfigurationDao

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -21,6 +21,7 @@
 
 import org.apache.maven.continuum.model.project.Schedule;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.springframework.stereotype.Repository;
 
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
@@ -32,8 +33,8 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.ScheduleDao"
  */
+@Repository("scheduleDao")
 public class ScheduleDaoImpl
     extends AbstractDao
     implements ScheduleDao

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java Sun Jan 11 01:52:08 2009
@@ -20,19 +20,22 @@
  */
 
 import org.codehaus.plexus.jdo.JdoFactory;
+import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.jdo.PersistenceManagerFactory;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.StoreUtilities"
  */
+@Service("storeUtilities")
 public class StoreUtilities
 {
     /**
      * @plexus.requirement role-hint="continuum"
      */
+    @Resource(name="jdoFactory#continuum")
     private JdoFactory continuumJdoFactory;
 
     private PersistenceManagerFactory continuumPersistenceManagerFactory;

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java Sun Jan 11 01:52:08 2009
@@ -21,14 +21,15 @@
 
 import org.apache.maven.continuum.model.system.SystemConfiguration;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.SystemConfigurationDao"
  */
+@Repository("systemConfigurationDao")
 public class SystemConfigurationDaoImpl
     extends AbstractDao
     implements SystemConfigurationDao

Propchange: continuum/branches/continuum-distributed-builds/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-distributed-builds/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-distributed-builds/continuum-store/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-store/src/test/resources/log4j.xml?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-store/src/test/resources/log4j.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-store/src/test/resources/log4j.xml Sun Jan 11 01:52:08 2009
@@ -32,6 +32,14 @@
     </layout>
   </appender>
 
+  <!-- quiet spring loading :-) -->
+  <category name="org.springframework">
+    <priority value="ERROR"/>
+  </category>
+  <category name="org.codehaus.plexus">
+    <priority value="ERROR"/>
+  </category>
+
   <category name="JPOX">
     <priority value="ERROR"/>
     <appender-ref ref="default"/>

Propchange: continuum/branches/continuum-distributed-builds/continuum-store/src/test/resources/log4j.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: continuum/branches/continuum-distributed-builds/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-Id
+Author Date Id Revision

Propchange: continuum/branches/continuum-distributed-builds/continuum-test/src/main/java/org/apache/maven/continuum/configuration/ConfigurationServiceMock.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: continuum/branches/continuum-distributed-builds/continuum-test/src/main/java/org/apache/maven/continuum/jdo/MemoryJdoFactory.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: continuum/branches/continuum-distributed-builds/continuum-test/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-Id
+Author Date Id Revision

Modified: continuum/branches/continuum-distributed-builds/continuum-test/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-test/src/main/resources/META-INF/spring-context.xml?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-test/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-test/src/main/resources/META-INF/spring-context.xml Sun Jan 11 01:52:08 2009
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:p="http://www.springframework.org/schema/p"

Propchange: continuum/branches/continuum-distributed-builds/continuum-test/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: continuum/branches/continuum-distributed-builds/continuum-test/src/main/resources/jdo.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/pom.xml?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/pom.xml Sun Jan 11 01:52:08 2009
@@ -377,6 +377,10 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>    
+    <dependency>
+      <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <scope>runtime</scope>
     </dependency>

Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/appserver-base/conf/shared.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java Sun Jan 11 01:52:08 2009
@@ -19,6 +19,10 @@
  * under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.continuum.model.release.ContinuumReleaseResult;
 import org.apache.maven.continuum.ContinuumException;
@@ -29,12 +33,6 @@
 import org.apache.maven.shared.release.ReleaseResult;
 import org.codehaus.plexus.util.FileUtils;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.List;
-
 /**
  * @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
  * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="releaseResult"
@@ -108,7 +106,7 @@
                     catch ( ContinuumException e )
                     {
                         getLogger().error( "Error removing ContinuumReleaseResult with id=" + resultId );
-                        addActionError( "Unable to remove ContinuumReleaseResult with id=" + resultId );
+                        addActionError( getText( "Unable to remove ContinuumReleaseResult with id=" + resultId ) );
                     }
                 }
             }

Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java:713270-724659
+/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java:713270-724659,724671-733412



Mime
View raw message