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 @@ + + + - 1.0.0 - - - Continuum - 1.0 - - - continuum-manage-queues - continuum-manage-queues - Manage Continuum Queues - - - continuum-view-queues - continuum-view-queues - Continuum View Queues - - - continuum-manage-build-templates - continuum-manage-build-templates - Manage Continuum Build Definition Templates - - - continuum-manage-schedules - continuum-manage-schedules - Manage Continuum Scheduling - - - continuum-manage-configuration - continuum-manage-configuration - Manage Continuum Configuration - - - continuum-manage-users - continuum-manage-users - Manage Continuum Users - - - continuum-guest - continuum-guest - Continuum Guest Operations - - - continuum-view-group - continuum-view-group - Continuum View Groups - - - continuum-add-group - continuum-add-group - Continuum Add Group - - - continuum-remove-group - continuum-remove-group - Continuum Remove Group - - - continuum-build-group - continuum-build-group - Continuum Build Group - - - continuum-modify-group - continuum-modify-group - Continuum Modify Group - - - continuum-add-project-to-group - continuum-add-project-to-group - Continuum Add Project to Group - - - continuum-remove-project-from-group - continuum-remove-project-from-group - Continuum Remove Project from Group - - - continuum-modify-project-in-group - continuum-modify-project-in-group - Continuum Modify Project in Group - - - continuum-build-project-in-group - continuum-build-project-in-group - Continuum Build Project in Group - - - continuum-add-group-build-definition - continuum-add-group-build-definition - Continuum Add Group Build Definition - - - continuum-remove-group-build-definition - continuum-remove-group-build-definition - Continuum Remove Group Build Definition - - - continuum-modify-group-build-definition - continuum-modify-group-build-definition - Continuum Modify Group Build Definition - - - continuum-add-group-notifier - continuum-add-group-notifier - Continuum Add Group Notifier - - - continuum-remove-group-notifier - continuum-remove-group-notifier - Continuum Remove Group Notifier - - - continuum-modify-group-notifier - continuum-modify-group-notifier - Continuum Modify Group Notifier - - - continuum-add-project-build-definition - continuum-add-project-build-definition - Continuum Add Project Build Definition - - - continuum-remove-project-build-definition - continuum-remove-project-build-definition - Continuum Remove Project Build Definition - - - continuum-modify-project-build-definition - continuum-modify-project-build-definition - Continuum Modify Project Build Definition - - - continuum-add-project-notifier - continuum-add-project-notifier - Continuum Add Project Notifier - - - continuum-remove-project-notifier - continuum-remove-project-notifier - Continuum Remove Project Notifier - - - continuum-modify-project-notifier - continuum-modify-project-notifier - Continuum Modify Project Notifier - - - continuum-manage-installations - continuum-manage-installations - Continuum Manage Installations - - - continuum-manage-profiles - continuum-manage-profiles - Continuum Manage Installations - - - continuum-manage-repositories - continuum-manage-repositories - Continuum Manage Repositories - - - continuum-manage-purging - continuum-manage-purging - Continuum Manage Purging - - - continuum-manage-distributed-builds - continuum-manage-distributed-builds - Continuum Manage Distributed Builds - - - - - continuum-system-administrator - Continuum System Administrator - false - true - - - continuum-manage-configuration - Manage Continuum Configuration - true - continuum-manage-configuration - global - - - continuum-manage-distributed-builds - Manage Distributed Builds - true - continuum-manage-distributed-builds - global - - - - system-administrator - - - continuum-group-project-administrator - continuum-manage-installations - continuum-manage-profiles - continuum-manage-schedules - continuum-manage-build-templates - continuum-manage-queues - continuum-manage-repositories - continuum-manage-purging - - - - continuum-user-administrator - Continuum User Administrator - false - true - - - continuum-manage-users - Manage Continuum Users - true - continuum-manage-users - global - - - - user-administrator - - - - continuum-group-project-administrator - Continuum Group Project Administrator - true - true - - - continuum-add-group - Add Group to Continuum - true - continuum-add-group - global - - - continuum-manage-schedules - Manage Continuum Schedules - true - continuum-manage-schedules - global - - - - continuum-group-project-developer - - - - continuum-group-project-developer - Continuum Group Project Developer - true - true - - continuum-group-project-user - - - - continuum-group-project-user - Continuum Group Project User - true - true - - - continuum-guest - Continuum Guest - false - true - - - continuum-guest - Continuum Guest Permissions - true - continuum-guest - global - - - - guest - - - - continuum-manage-installations - Continuum Manage Installations - true - true - - - continuum-manage-installations - Manage Continuum Installations - true - continuum-manage-installations - global - - - - - continuum-manage-profiles - Continuum Manage Build Environments - true - true - - - continuum-manage-profiles - Manage Continuum Build Environments - true - continuum-manage-profiles - global - - - - - continuum-manage-schedules - Continuum Manage Scheduling - true - true - - - continuum-manage-schedules - Continuum Manage Scheduling - true - continuum-manage-schedules - global - - - - - continuum-manage-build-templates - Continuum Manage Build Templates - true - true - - - continuum-manage-build-templates - Manage Continuum Build Definition Templates - true - continuum-manage-build-templates - global - - - - - continuum-manage-queues - Continuum Manage Queues - true - true - - - continuum-manage-queues - Manage Continuum Queues - true - continuum-manage-queues - global - - - continuum-view-queues - Continuum View Queues - true - continuum-view-queues - global - - - - - continuum-manage-repositories - continuum-manage-repositories - true - true - - - continuum-manage-repositories - Manage Continuum Local Repositories - true - continuum-manage-repositories - global - - - - - continuum-manage-purging - continuum-manage-purging - true - true - - - continuum-manage-purging - Manage Continuum Purging - true - continuum-manage-purging - global - - - - - - - - - - - + 1.0.0 + + + Continuum + 1.0 + + + continuum-manage-queues + continuum-manage-queues + Manage Continuum Queues + + + continuum-view-queues + continuum-view-queues + Continuum View Queues + + + continuum-manage-build-templates + continuum-manage-build-templates + Manage Continuum Build Definition Templates + + + continuum-manage-schedules + continuum-manage-schedules + Manage Continuum Scheduling + + + continuum-manage-configuration + continuum-manage-configuration + Manage Continuum Configuration + + + continuum-manage-users + continuum-manage-users + Manage Continuum Users + + + continuum-guest + continuum-guest + Continuum Guest Operations + + + continuum-view-group + continuum-view-group + Continuum View Groups + + + continuum-add-group + continuum-add-group + Continuum Add Group + + + continuum-remove-group + continuum-remove-group + Continuum Remove Group + + + continuum-build-group + continuum-build-group + Continuum Build Group + + + continuum-modify-group + continuum-modify-group + Continuum Modify Group + + + continuum-add-project-to-group + continuum-add-project-to-group + Continuum Add Project to Group + + + continuum-remove-project-from-group + continuum-remove-project-from-group + Continuum Remove Project from Group + + + continuum-modify-project-in-group + continuum-modify-project-in-group + Continuum Modify Project in Group + + + continuum-build-project-in-group + continuum-build-project-in-group + Continuum Build Project in Group + + + continuum-add-group-build-definition + continuum-add-group-build-definition + Continuum Add Group Build Definition + + + continuum-remove-group-build-definition + continuum-remove-group-build-definition + Continuum Remove Group Build Definition + + + continuum-modify-group-build-definition + continuum-modify-group-build-definition + Continuum Modify Group Build Definition + + + continuum-add-group-notifier + continuum-add-group-notifier + Continuum Add Group Notifier + + + continuum-remove-group-notifier + continuum-remove-group-notifier + Continuum Remove Group Notifier + + + continuum-modify-group-notifier + continuum-modify-group-notifier + Continuum Modify Group Notifier + + + continuum-add-project-build-definition + continuum-add-project-build-definition + Continuum Add Project Build Definition + + + continuum-remove-project-build-definition + continuum-remove-project-build-definition + Continuum Remove Project Build Definition + + + continuum-modify-project-build-definition + continuum-modify-project-build-definition + Continuum Modify Project Build Definition + + + continuum-add-project-notifier + continuum-add-project-notifier + Continuum Add Project Notifier + + + continuum-remove-project-notifier + continuum-remove-project-notifier + Continuum Remove Project Notifier + + + continuum-modify-project-notifier + continuum-modify-project-notifier + Continuum Modify Project Notifier + + + continuum-manage-installations + continuum-manage-installations + Continuum Manage Installations + + + continuum-manage-profiles + continuum-manage-profiles + Continuum Manage Installations + + + continuum-manage-repositories + continuum-manage-repositories + Continuum Manage Repositories + + + continuum-manage-purging + continuum-manage-purging + Continuum Manage Purging + + + continuum-manage-distributed-builds + continuum-manage-distributed-builds + Continuum Manage Distributed Builds + + + + + continuum-system-administrator + Continuum System Administrator + false + true + + + continuum-manage-configuration + Manage Continuum Configuration + true + continuum-manage-configuration + global + + + continuum-manage-distributed-builds + Manage Continuum Distributed Builds + true + continuum-manage-distributed-builds + global + + + + system-administrator + + + continuum-group-project-administrator + continuum-manage-installations + continuum-manage-profiles + continuum-manage-schedules + continuum-manage-build-templates + continuum-manage-queues + continuum-manage-repositories + continuum-manage-purging + + + + continuum-user-administrator + Continuum User Administrator + false + true + + + continuum-manage-users + Manage Continuum Users + true + continuum-manage-users + global + + + + user-administrator + + + + continuum-group-project-administrator + Continuum Group Project Administrator + true + true + + + continuum-add-group + Add Group to Continuum + true + continuum-add-group + global + + + continuum-manage-schedules + Manage Continuum Schedules + true + continuum-manage-schedules + global + + + + continuum-group-project-developer + + + + continuum-group-project-developer + Continuum Group Project Developer + true + true + + continuum-group-project-user + + + + continuum-group-project-user + Continuum Group Project User + true + true + + + continuum-guest + Continuum Guest + false + true + + + continuum-guest + Continuum Guest Permissions + true + continuum-guest + global + + + + guest + + + + continuum-manage-installations + Continuum Manage Installations + true + true + + + continuum-manage-installations + Manage Continuum Installations + true + continuum-manage-installations + global + + + + + continuum-manage-profiles + Continuum Manage Build Environments + true + true + + + continuum-manage-profiles + Manage Continuum Build Environments + true + continuum-manage-profiles + global + + + + + continuum-manage-schedules + Continuum Manage Scheduling + true + true + + + continuum-manage-schedules + Continuum Manage Scheduling + true + continuum-manage-schedules + global + + + + + continuum-manage-build-templates + Continuum Manage Build Templates + true + true + + + continuum-manage-build-templates + Manage Continuum Build Definition Templates + true + continuum-manage-build-templates + global + + + + + continuum-manage-queues + Continuum Manage Queues + true + true + + + continuum-manage-queues + Manage Continuum Queues + true + continuum-manage-queues + global + + + continuum-view-queues + Continuum View Queues + true + continuum-view-queues + global + + + + + continuum-manage-repositories + continuum-manage-repositories + true + true + + + continuum-manage-repositories + Manage Continuum Local Repositories + true + continuum-manage-repositories + global + + + + + continuum-manage-purging + continuum-manage-purging + true + true + + + continuum-manage-purging + Manage Continuum Purging + true + continuum-manage-purging + global + + + + + + + + + + + + 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 @@ Continuum :: Store + javax.annotation + jsr250-api + + org.codehaus.plexus plexus-jdo2 @@ -81,17 +85,6 @@ - - org.codehaus.plexus - plexus-maven-plugin - - - - descriptor - - - - 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 Emmanuel Venisse * @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 Emmanuel Venisse * @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 Emmanuel Venisse * @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 Maria Catherine Tan - * @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 Emmanuel Venisse * @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 Emmanuel Venisse * @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 Emmanuel Venisse * @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 Emmanuel Venisse * @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 Emmanuel Venisse * @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 Emmanuel Venisse * @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 Emmanuel Venisse * @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 Emmanuel Venisse * @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 Maria Catherine Tan - * @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 Emmanuel Venisse * @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 Emmanuel Venisse * @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 Emmanuel Venisse * @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 Emmanuel Venisse * @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 @@ + + + + + + + + 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 @@ + org.slf4j + slf4j-api + + + org.slf4j slf4j-log4j12 runtime 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 Maria Catherine Tan * @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