continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1659100 [4/5] - in /continuum/trunk: ./ continuum-buildagent/continuum-buildagent-core/ continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ continuum-buildagent/continuum-buildagent-core/src/main/j...
Date Wed, 11 Feb 2015 21:38:16 GMT
Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/LegacyPathParser.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/LegacyPathParser.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/LegacyPathParser.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/LegacyPathParser.java Wed Feb 11 21:38:12 2015
@@ -25,12 +25,12 @@ import org.apache.maven.archiva.reposito
 import org.apache.maven.archiva.repository.content.ArtifactExtensionMapping;
 import org.apache.maven.archiva.repository.content.PathParser;
 import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * Codes were taken from Archiva's LegacyPathParser and made some few changes.
- *
- * @plexus.component role="org.apache.maven.archiva.repository.content.PathParser" role-hint="legacy-parser"
  */
+@Component( role = org.apache.maven.archiva.repository.content.PathParser.class, hint = "legacy-parser" )
 public class LegacyPathParser
     implements PathParser
 {
@@ -57,8 +57,8 @@ public class LegacyPathParser
         {
             // Illegal Path Parts Length.
             throw new LayoutException( INVALID_ARTIFACT_PATH +
-                                           "legacy paths should only have 3 parts [groupId]/[type]s/[artifactId]-[version].[type], found " +
-                                           pathParts.length + " instead." );
+                                           "legacy paths should only have 3 parts [groupId]/[type]s/[artifactId]-[version].[type], found "
+                                           + pathParts.length + " instead." );
         }
 
         // The Group ID.

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/task/PurgeTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/task/PurgeTaskExecutor.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/task/PurgeTaskExecutor.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/task/PurgeTaskExecutor.java Wed Feb 11 21:38:12 2015
@@ -30,6 +30,7 @@ import org.apache.continuum.purge.execut
 import org.apache.continuum.purge.repository.scanner.RepositoryScanner;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
@@ -44,14 +45,11 @@ import org.codehaus.plexus.taskqueue.exe
 public class PurgeTaskExecutor
     implements TaskExecutor, Contextualizable
 {
-    /**
-     * @plexus.requirement
-     */
+
+    @Requirement
     private PurgeConfigurationService purgeConfigurationService;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private RepositoryScanner scanner;
 
     private PlexusContainer container;

Modified: continuum/trunk/continuum-release/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/pom.xml?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-release/pom.xml (original)
+++ continuum/trunk/continuum-release/pom.xml Wed Feb 11 21:38:12 2015
@@ -108,6 +108,10 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-component-api</artifactId>
     </dependency>
     <dependency>

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java Wed Feb 11 21:38:12 2015
@@ -28,6 +28,7 @@ import org.apache.maven.shared.release.R
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 import org.apache.maven.shared.release.phase.AbstractRunGoalsPhase;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
@@ -40,14 +41,11 @@ import java.util.Map;
 public abstract class AbstractContinuumRunGoalsPhase
     extends AbstractRunGoalsPhase
 {
-    /**
-     * @plexus.requirement
-     */
+
+    @Requirement
     private ShellCommandHelper shellCommandHelper;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private InstallationService installationService;
 
     /**

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java Wed Feb 11 21:38:12 2015
@@ -25,6 +25,7 @@ import org.apache.maven.shared.release.R
 import org.apache.maven.shared.release.ReleaseResult;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
@@ -32,9 +33,8 @@ import java.util.List;
 
 /**
  * Run Release Perform Goals
- *
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase" role-hint="run-release-perform-goals"
  */
+@Component( role = org.apache.maven.shared.release.phase.ReleasePhase.class, hint = "run-release-perform-goals" )
 public class RunPerformGoalsPhase
     extends AbstractContinuumRunGoalsPhase
 {

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java Wed Feb 11 21:38:12 2015
@@ -24,15 +24,15 @@ import org.apache.maven.shared.release.R
 import org.apache.maven.shared.release.ReleaseResult;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
+import org.codehaus.plexus.component.annotations.Component;
 
 import java.io.File;
 import java.util.List;
 
 /**
  * Run Release Preparation Goals
- *
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase" role-hint="run-release-prepare-goals"
  */
+@Component( role = org.apache.maven.shared.release.phase.ReleasePhase.class, hint = "run-release-prepare-goals" )
 public class RunPrepareGoalsPhase
     extends AbstractContinuumRunGoalsPhase
 {

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java Wed Feb 11 21:38:12 2015
@@ -38,6 +38,7 @@ import org.apache.maven.shared.release.c
 import org.apache.maven.shared.release.config.ReleaseDescriptorStoreException;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
@@ -70,29 +71,19 @@ public class DefaultContinuumReleaseMana
 
     private static final String PLEXUS_KEY_ROLLBACK_RELEASE_TASKQUEUE_EXECUTOR = "rollback-release";
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ReleaseDescriptorStore releaseStore;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private TaskQueue prepareReleaseQueue;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private TaskQueue performReleaseQueue;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private TaskQueue rollbackReleaseQueue;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ScmManager scmManager;
 
     private PlexusContainer container;
@@ -435,7 +426,6 @@ public class DefaultContinuumReleaseMana
             getRollbackReleaseTaskQueueExecutor().getCurrentTask() != null;
     }
 
-
     public TaskQueueExecutor getPerformReleaseTaskQueueExecutor()
         throws TaskQueueManagerException
     {

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java Wed Feb 11 21:38:12 2015
@@ -26,6 +26,7 @@ import org.apache.maven.settings.MavenSe
 import org.apache.maven.settings.Settings;
 import org.apache.maven.shared.release.ReleaseManager;
 import org.apache.maven.shared.release.ReleaseResult;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -34,24 +35,17 @@ import java.io.IOException;
 
 /**
  * @author Edwin Punzalan
- * @version $Id$
  */
 public abstract class AbstractReleaseTaskExecutor
     implements ReleaseTaskExecutor
 {
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     protected ContinuumReleaseManager continuumReleaseManager;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     protected ReleaseManager releaseManager;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private MavenSettingsBuilder settingsBuilder;
 
     protected Settings settings;

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java Wed Feb 11 21:38:12 2015
@@ -41,6 +41,7 @@ import org.apache.maven.shared.release.c
 import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
@@ -55,15 +56,13 @@ import java.util.List;
 
 /**
  * @author Edwin Punzalan
- * @version $Id$
  */
 public class PerformReleaseTaskExecutor
     extends AbstractReleaseTaskExecutor
     implements Contextualizable
 {
-    /**
-     * @plexus.requirement
-     */
+
+    @Requirement
     private MavenProjectBuilder projectBuilder;
 
     private ProfileManager profileManager;
@@ -106,7 +105,7 @@ public class PerformReleaseTaskExecutor
                 MavenProject project = new MavenProject();
                 project.setFile( new File( descriptor.getCheckoutDirectory(), "pom.xml" ) );
                 reactorProjects = Collections.singletonList( project );
-//                reactorProjects = Collections.emptyList();
+                //                reactorProjects = Collections.emptyList();
             }
         }
         catch ( ContinuumReleaseException e )

Modified: continuum/trunk/continuum-store/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/pom.xml?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/pom.xml (original)
+++ continuum/trunk/continuum-store/pom.xml Wed Feb 11 21:38:12 2015
@@ -75,6 +75,10 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+      </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
@@ -107,11 +111,11 @@
       </plugin>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <executions>
           <execution>
             <goals>
-              <goal>descriptor</goal>
+              <goal>generate-metadata</goal>
             </goals>
           </execution>
         </executions>

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java Wed Feb 11 21:38:12 2015
@@ -21,6 +21,7 @@ package org.apache.continuum.dao;
 
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.jdo.PlexusJdoUtils;
 import org.codehaus.plexus.jdo.PlexusObjectNotFoundException;
 import org.codehaus.plexus.jdo.PlexusStoreException;
@@ -34,7 +35,6 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
  */
 public class AbstractDao
 {
@@ -58,10 +58,8 @@ public class AbstractDao
 
     protected static final String BUILD_TEMPLATE_BUILD_DEFINITIONS = "build-template-build-definitions";
 
-    /**
-     * @plexus.requirement
-     */
     @Resource
+    @Requirement
     private StoreUtilities storeUtilities;
 
     protected Object addObject( Object object )

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -25,6 +25,8 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,26 +45,21 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.BuildDefinitionDao"
  */
 @Repository( "buildDefinitionDao" )
+@Component( role = org.apache.continuum.dao.BuildDefinitionDao.class )
 public class BuildDefinitionDaoImpl
     extends AbstractDao
     implements BuildDefinitionDao
 {
     private static final Logger log = LoggerFactory.getLogger( BuildDefinitionDaoImpl.class );
 
-    /**
-     * @plexus.requirement role="org.apache.continuum.dao.ProjectDao"
-     */
     @Resource
+    @Requirement( role = org.apache.continuum.dao.ProjectDao.class )
     private ProjectDao projectDao;
 
-    /**
-     * @plexus.requirement role="org.apache.continuum.dao.ProjectGroupDao"
-     */
     @Resource
+    @Requirement( role = org.apache.continuum.dao.ProjectGroupDao.class )
     private ProjectGroupDao projectGroupDao;
 
     public BuildDefinition getBuildDefinition( int buildDefinitionId )
@@ -85,7 +82,6 @@ public class BuildDefinitionDaoImpl
         return buildDefinition;
     }
 
-
     public BuildDefinition addBuildDefinition( BuildDefinition buildDefinition )
         throws ContinuumStoreException
     {

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -21,6 +21,7 @@ package org.apache.continuum.dao;
 
 import org.apache.maven.continuum.model.project.BuildDefinitionTemplate;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
 import java.util.Collections;
@@ -32,10 +33,9 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.BuildDefinitionTemplateDao"
  */
 @Repository( "buildDefinitionTemplateDao" )
+@Component( role = org.apache.continuum.dao.BuildDefinitionTemplateDao.class )
 public class BuildDefinitionTemplateDaoImpl
     extends AbstractDao
     implements BuildDefinitionTemplateDao

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -21,6 +21,7 @@ package org.apache.continuum.dao;
 
 import org.apache.maven.continuum.model.project.BuildQueue;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
@@ -35,9 +36,9 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
- * @plexus.component role="org.apache.continuum.dao.BuildQueueDao"
  */
 @Repository( "buildQueueDao" )
+@Component( role = org.apache.continuum.dao.BuildQueueDao.class )
 public class BuildQueueDaoImpl
     extends AbstractDao
     implements BuildQueueDao

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -23,6 +23,7 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
 import java.util.Calendar;
@@ -38,10 +39,9 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.BuildResultDao"
  */
 @Repository( "buildResultDao" )
+@Component( role = org.apache.continuum.dao.BuildResultDao.class )
 public class BuildResultDaoImpl
     extends AbstractDao
     implements BuildResultDao

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -22,6 +22,7 @@ package org.apache.continuum.dao;
 import org.apache.continuum.model.release.ContinuumReleaseResult;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
 import java.util.Collection;
@@ -33,9 +34,9 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
- * @plexus.component role="org.apache.continuum.dao.ContinuumReleaseResultDao"
  */
 @Repository( "continuumReleaseResultDao" )
+@Component( role = org.apache.continuum.dao.ContinuumReleaseResultDao.class )
 public class ContinuumReleaseResultDaoImpl
     extends AbstractDao
     implements ContinuumReleaseResultDao

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java Wed Feb 11 21:38:12 2015
@@ -41,6 +41,8 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.model.system.Profile;
 import org.apache.maven.continuum.model.system.SystemConfiguration;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.jdo.PlexusJdoUtils;
 import org.springframework.stereotype.Repository;
 
@@ -59,18 +61,16 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.DaoUtils"
  */
 @Repository( "daoUtils" )
+@Component( role = org.apache.continuum.dao.DaoUtils.class )
 public class DaoUtilsImpl
     extends AbstractDao
     implements DaoUtils
 {
-    /**
-     * @plexus.requirement role="org.apache.continuum.dao.ProjectDao"
-     */
+
     @Resource
+    @Requirement( role = org.apache.continuum.dao.ProjectDao.class )
     private ProjectDao projectDao;
 
     public void closeStore()
@@ -149,7 +149,6 @@ public class DaoUtilsImpl
      * @param scheduleId
      * @return
      * @throws org.apache.maven.continuum.store.ContinuumStoreException
-     *
      * @todo Move to a better place
      */
     public Map<Integer, Object> getAggregatedProjectIdsAndBuildDefinitionIdsBySchedule( int scheduleId )

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -21,6 +21,7 @@ package org.apache.continuum.dao;
 
 import org.apache.continuum.model.repository.DirectoryPurgeConfiguration;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
 import java.util.Collections;
@@ -32,10 +33,9 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.DirectoryPurgeConfigurationDao"
  */
 @Repository( "directoryPurgeConfigurationDao" )
+@Component( role = org.apache.continuum.dao.DirectoryPurgeConfigurationDao.class )
 public class DirectoryPurgeConfigurationDaoImpl
     extends AbstractDao
     implements DirectoryPurgeConfigurationDao

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -21,6 +21,7 @@ package org.apache.continuum.dao;
 
 import org.apache.continuum.model.repository.DistributedDirectoryPurgeConfiguration;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
 import java.util.Collections;
@@ -30,12 +31,8 @@ import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 import javax.jdo.Transaction;
 
-/**
- * @author
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.DistributedDirectoryPurgeConfigurationDao"
- */
 @Repository( "distributedDirectoryPurgeConfigurationDao" )
+@Component( role = org.apache.continuum.dao.DistributedDirectoryPurgeConfigurationDao.class )
 public class DistributedDirectoryPurgeConfigurationDaoImpl
     extends AbstractDao
     implements DistributedDirectoryPurgeConfigurationDao

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -22,6 +22,7 @@ package org.apache.continuum.dao;
 import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.model.system.Profile;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 import org.springframework.stereotype.Repository;
 
@@ -35,10 +36,9 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.InstallationDao"
  */
 @Repository( "installationDao" )
+@Component( role = org.apache.continuum.dao.InstallationDao.class )
 public class InstallationDaoImpl
     extends AbstractDao
     implements InstallationDao

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -21,6 +21,7 @@ package org.apache.continuum.dao;
 
 import org.apache.continuum.model.repository.LocalRepository;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
 import java.util.Collection;
@@ -33,10 +34,9 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.LocalRepositoryDao"
  */
 @Repository( "localRepositoryDao" )
+@Component( role = org.apache.continuum.dao.LocalRepositoryDao.class )
 public class LocalRepositoryDaoImpl
     extends AbstractDao
     implements LocalRepositoryDao

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -21,6 +21,7 @@ package org.apache.continuum.dao;
 
 import org.apache.maven.continuum.model.system.Profile;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
 import java.util.Collection;
@@ -32,10 +33,9 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.ProfileDao"
  */
 @Repository( "profileDao" )
+@Component( role = org.apache.continuum.dao.ProfileDao.class )
 public class ProfileDaoImpl
     extends AbstractDao
     implements ProfileDao

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -25,6 +25,7 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
 import java.util.Collection;
@@ -38,10 +39,9 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.ProjectDao"
  */
 @Repository( "projectDao" )
+@Component( role = org.apache.continuum.dao.ProjectDao.class )
 public class ProjectDaoImpl
     extends AbstractDao
     implements ProjectDao
@@ -276,7 +276,6 @@ public class ProjectDaoImpl
         return getAllObjectsDetached( Project.class, "name ascending", null );
     }
 
-
     public List<Project> getAllProjectsByNameWithDependencies()
     {
         return getAllObjectsDetached( Project.class, "name ascending", PROJECT_DEPENDENCIES_FETCH_GROUP );

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -24,6 +24,8 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.jdo.PlexusJdoUtils;
 import org.springframework.stereotype.Repository;
 
@@ -41,18 +43,16 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.ProjectGroupDao"
  */
 @Repository( "projectGroupDao" )
+@Component( role = org.apache.continuum.dao.ProjectGroupDao.class )
 public class ProjectGroupDaoImpl
     extends AbstractDao
     implements ProjectGroupDao
 {
-    /**
-     * @plexus.requirement role=org.apache.continuum.dao.ProjectDao"
-     */
+
     @Resource
+    @Requirement( role = org.apache.continuum.dao.ProjectDao.class )
     private ProjectDao projectDao;
 
     public ProjectGroup addProjectGroup( ProjectGroup group )
@@ -191,9 +191,9 @@ public class ProjectGroupDaoImpl
     public List<ProjectGroup> getAllProjectGroupsWithTheLot()
     {
         List fetchGroups = Arrays.asList(
-            new String[]{PROJECT_WITH_BUILDS_FETCH_GROUP, PROJECTGROUP_PROJECTS_FETCH_GROUP,
+            new String[] { PROJECT_WITH_BUILDS_FETCH_GROUP, PROJECTGROUP_PROJECTS_FETCH_GROUP,
                 BUILD_RESULT_WITH_DETAILS_FETCH_GROUP, PROJECT_WITH_CHECKOUT_RESULT_FETCH_GROUP,
-                PROJECT_ALL_DETAILS_FETCH_GROUP, PROJECT_BUILD_DETAILS_FETCH_GROUP} );
+                PROJECT_ALL_DETAILS_FETCH_GROUP, PROJECT_BUILD_DETAILS_FETCH_GROUP } );
         return PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(), ProjectGroup.class, "name ascending",
                                                      fetchGroups );
     }

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -22,6 +22,7 @@ package org.apache.continuum.dao;
 import org.apache.continuum.model.project.ProjectScmRoot;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
 import java.util.Collection;
@@ -33,10 +34,9 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
- * @version $Id: $
- * @plexus.component role="org.apache.continuum.dao.ProjectScmRootDao"
  */
 @Repository( "projectScmRootDao" )
+@Component( role = org.apache.continuum.dao.ProjectScmRootDao.class )
 public class ProjectScmRootDaoImpl
     extends AbstractDao
     implements ProjectScmRootDao

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -21,6 +21,7 @@ package org.apache.continuum.dao;
 
 import org.apache.continuum.model.repository.RepositoryPurgeConfiguration;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
 import java.util.Collections;
@@ -32,10 +33,9 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.RepositoryPurgeConfigurationDao"
  */
 @Repository( "repositoryPurgeConfigurationDao" )
+@Component( role = org.apache.continuum.dao.RepositoryPurgeConfigurationDao.class )
 public class RepositoryPurgeConfigurationDaoImpl
     extends AbstractDao
     implements RepositoryPurgeConfigurationDao

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -21,6 +21,7 @@ package org.apache.continuum.dao;
 
 import org.apache.maven.continuum.model.project.Schedule;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
 import java.util.Collection;
@@ -32,10 +33,9 @@ import javax.jdo.Transaction;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.ScheduleDao"
  */
 @Repository( "scheduleDao" )
+@Component( role = org.apache.continuum.dao.ScheduleDao.class )
 public class ScheduleDaoImpl
     extends AbstractDao
     implements ScheduleDao

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java Wed Feb 11 21:38:12 2015
@@ -19,6 +19,8 @@ package org.apache.continuum.dao;
  * under the License.
  */
 
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.jdo.JdoFactory;
 import org.springframework.stereotype.Service;
 
@@ -27,16 +29,14 @@ import javax.jdo.PersistenceManagerFacto
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.continuum.dao.StoreUtilities"
  */
 @Service( "storeUtilities" )
+@Component( role = org.apache.continuum.dao.StoreUtilities.class )
 public class StoreUtilities
 {
-    /**
-     * @plexus.requirement role-hint="continuum"
-     */
+
     @Resource( name = "jdoFactory#continuum" )
+    @Requirement( hint = "continuum" )
     private JdoFactory continuumJdoFactory;
 
     private PersistenceManagerFactory continuumPersistenceManagerFactory;

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java Wed Feb 11 21:38:12 2015
@@ -21,16 +21,16 @@ package org.apache.continuum.dao;
 
 import org.apache.maven.continuum.model.system.SystemConfiguration;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
 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" )
+@Component( role = org.apache.continuum.dao.SystemConfigurationDao.class )
 public class SystemConfigurationDaoImpl
     extends AbstractDao
     implements SystemConfigurationDao

Modified: continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/pom.xml (original)
+++ continuum/trunk/continuum-webapp/pom.xml Wed Feb 11 21:38:12 2015
@@ -74,24 +74,12 @@
       </plugin>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
-        <configuration>
-          <roleDefaults>
-            <roleDefault>
-              <role>com.opensymphony.xwork2.Action</role>
-              <instantiation-strategy>per-lookup</instantiation-strategy>
-            </roleDefault>
-            <roleDefault>
-              <role>com.opensymphony.xwork2.validator.Validator</role>
-              <instantiation-strategy>per-lookup</instantiation-strategy>
-            </roleDefault>
-          </roleDefaults>
-        </configuration>
+        <artifactId>plexus-component-metadata</artifactId>
         <executions>
           <execution>
             <id>generate</id>
             <goals>
-              <goal>descriptor</goal>
+              <goal>generate-metadata</goal>
             </goals>
           </execution>
         </executions>
@@ -406,6 +394,10 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-component-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+    </dependency>
     <dependency> <!-- added since depMgt doesn't override imported dependencies -->
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java Wed Feb 11 21:38:12 2015
@@ -24,6 +24,7 @@ import org.apache.continuum.release.dist
 import org.apache.maven.continuum.security.ContinuumRoleConstants;
 import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 import org.apache.maven.continuum.web.model.DistributedReleaseSummary;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.redback.rbac.Resource;
 import org.codehaus.redback.integration.interceptor.SecureAction;
 import org.codehaus.redback.integration.interceptor.SecureActionBundle;
@@ -33,9 +34,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="distributedRelease"
- */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "distributedRelease", instantiationStrategy = "per-lookup" )
 public class DistributedReleasesAction
     extends ContinuumActionSupport
     implements SecureAction

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java Wed Feb 11 21:38:12 2015
@@ -27,6 +27,7 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.web.action.ContinuumConfirmAction;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.shared.release.ReleaseResult;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,8 +38,8 @@ 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"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "releaseResult", instantiationStrategy = "per-lookup" )
 public class ReleaseResultAction
     extends ContinuumConfirmAction
 {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java Wed Feb 11 21:38:12 2015
@@ -25,11 +25,12 @@ import org.apache.maven.continuum.web.ac
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.continuum.web.util.StateGenerator;
 import org.apache.struts2.ServletActionContext;
+import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="scmResult"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "scmResult", instantiationStrategy = "per-lookup" )
 public class ScmResultAction
     extends ContinuumActionSupport
 {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java Wed Feb 11 21:38:12 2015
@@ -29,6 +29,7 @@ import org.apache.maven.continuum.projec
 import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.continuum.web.model.ProjectBuildsSummary;
+import org.codehaus.plexus.component.annotations.Component;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -42,9 +43,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="projectBuildsReport"
- */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "projectBuildsReport", instantiationStrategy = "per-lookup" )
 public class ViewBuildsReportAction
     extends ContinuumActionSupport
 {
@@ -75,8 +74,8 @@ public class ViewBuildsReportAction
     public static final String SEND_FILE = "send-file";
 
     private static final String[] datePatterns =
-        new String[]{"MM/dd/yy", "MM/dd/yyyy", "MMMMM/dd/yyyy", "MMMMM/dd/yy", "dd MMMMM yyyy", "dd/MM/yy",
-            "dd/MM/yyyy", "yyyy/MM/dd", "yyyy-MM-dd", "yyyy-dd-MM", "MM-dd-yyyy", "MM-dd-yy"};
+        new String[] { "MM/dd/yy", "MM/dd/yyyy", "MMMMM/dd/yyyy", "MMMMM/dd/yy", "dd MMMMM yyyy", "dd/MM/yy",
+            "dd/MM/yyyy", "yyyy/MM/dd", "yyyy-MM-dd", "yyyy-dd-MM", "MM-dd-yyyy", "MM-dd-yy" };
 
     public void prepare()
         throws Exception

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java Wed Feb 11 21:38:12 2015
@@ -31,6 +31,7 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.security.ContinuumRoleConstants;
 import org.apache.maven.continuum.web.action.ContinuumConfirmAction;
 import org.apache.struts2.ServletActionContext;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.redback.rbac.Resource;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.redback.integration.interceptor.SecureAction;
@@ -45,8 +46,8 @@ import java.util.List;
 
 /**
  * @author Maria Catherine Tan
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildAgent"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "buildAgent", instantiationStrategy = "per-lookup" )
 public class BuildAgentAction
     extends ContinuumConfirmAction
     implements SecureAction
@@ -292,7 +293,7 @@ public class BuildAgentAction
         {
             if ( buildAgentGroup.getName().equals( profile.getBuildAgentGroup() ) )
             {
-                message = getText( "buildAgentGroup.error.remove.in.use", new String[]{ profile.getName() } );
+                message = getText( "buildAgentGroup.error.remove.in.use", new String[] { profile.getName() } );
                 return ERROR;
             }
         }

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction.java Wed Feb 11 21:38:12 2015
@@ -30,6 +30,8 @@ import org.apache.continuum.purge.PurgeC
 import org.apache.maven.continuum.model.project.Schedule;
 import org.apache.maven.continuum.security.ContinuumRoleConstants;
 import org.apache.maven.continuum.web.action.ContinuumConfirmAction;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.redback.rbac.Resource;
 import org.codehaus.redback.integration.interceptor.SecureAction;
 import org.codehaus.redback.integration.interceptor.SecureActionBundle;
@@ -44,11 +46,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="distributedPurgeConfiguration"
- */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "distributedPurgeConfiguration", instantiationStrategy = "per-lookup"  )
 public class DistributedPurgeConfigurationAction
     extends ContinuumConfirmAction
     implements Preparable, SecureAction
@@ -101,9 +99,7 @@ public class DistributedPurgeConfigurati
 
     private List<String> buildAgentUrls;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private PurgeConfigurationService purgeConfigService;
 
     @Override

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java Wed Feb 11 21:38:12 2015
@@ -31,6 +31,8 @@ import org.apache.continuum.web.util.Aud
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.security.ContinuumRoleConstants;
 import org.apache.maven.continuum.web.action.ContinuumConfirmAction;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.redback.rbac.Resource;
 import org.codehaus.redback.integration.interceptor.SecureAction;
 import org.codehaus.redback.integration.interceptor.SecureActionBundle;
@@ -43,10 +45,9 @@ import java.util.Map;
 
 /**
  * @author Maria Catherine Tan
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="localRepository"
  * @since 25 jul 07
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "localRepository", instantiationStrategy = "per-lookup"  )
 public class LocalRepositoryAction
     extends ContinuumConfirmAction
     implements Preparable, SecureAction
@@ -69,14 +70,10 @@ public class LocalRepositoryAction
 
     private Map<String, Boolean> defaultPurgeMap;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private RepositoryService repositoryService;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private PurgeConfigurationService purgeConfigService;
 
     public void prepare()

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeAction.java Wed Feb 11 21:38:12 2015
@@ -29,6 +29,8 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.security.ContinuumRoleConstants;
 import org.apache.maven.continuum.web.action.ContinuumConfirmAction;
 import org.apache.struts2.ServletActionContext;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.redback.rbac.Resource;
 import org.codehaus.redback.integration.interceptor.SecureAction;
 import org.codehaus.redback.integration.interceptor.SecureActionBundle;
@@ -41,11 +43,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="purge"
- */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "purge", instantiationStrategy = "per-lookup"  )
 public class PurgeAction
     extends ContinuumConfirmAction
     implements Preparable, SecureAction
@@ -76,14 +74,10 @@ public class PurgeAction
 
     private List<String> directoryTypes;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private PurgeConfigurationService purgeConfigService;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private RepositoryService repositoryService;
 
     private Schedule sched = null;

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java Wed Feb 11 21:38:12 2015
@@ -36,6 +36,8 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.security.ContinuumRoleConstants;
 import org.apache.maven.continuum.web.action.ContinuumConfirmAction;
 import org.apache.struts2.ServletActionContext;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.redback.rbac.Resource;
 import org.codehaus.redback.integration.interceptor.SecureAction;
 import org.codehaus.redback.integration.interceptor.SecureActionBundle;
@@ -51,10 +53,9 @@ import java.util.Map;
 
 /**
  * @author Maria Catherine Tan
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="purgeConfiguration"
  * @since 25 jul 07
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "purgeConfiguration", instantiationStrategy = "per-lookup" )
 public class PurgeConfigurationAction
     extends ContinuumConfirmAction
     implements Preparable, SecureAction
@@ -113,14 +114,10 @@ public class PurgeConfigurationAction
 
     private List<String> directoryTypes;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private PurgeConfigurationService purgeConfigService;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private RepositoryService repositoryService;
 
     @Override

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/error/HttpError.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/error/HttpError.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/error/HttpError.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/error/HttpError.java Wed Feb 11 21:38:12 2015
@@ -20,14 +20,14 @@ package org.apache.continuum.web.action.
  */
 
 import org.apache.maven.continuum.web.action.ContinuumActionSupport;
+import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * AboutAction:
  *
  * @author: Emmanuel Venisse <evenisse@apache.org>
- * @version: $Id:$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="httpError"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "httpError", instantiationStrategy = "per-lookup"  )
 public class HttpError
     extends ContinuumActionSupport
 {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java Wed Feb 11 21:38:12 2015
@@ -19,14 +19,14 @@ package org.apache.maven.continuum.web.a
  * under the License.
  */
 
+import org.codehaus.plexus.component.annotations.Component;
+
 /**
  * AboutAction:
  *
  * @author: Jesse McConnell <jmcconnell@apache.org>
- * @version: $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action"
- * role-hint="about"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "about", instantiationStrategy = "per-lookup" )
 public class AboutAction
     extends ContinuumActionSupport
 {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java Wed Feb 11 21:38:12 2015
@@ -23,6 +23,7 @@ import org.apache.continuum.web.util.Aud
 import org.apache.continuum.web.util.AuditLogConstants;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
+import org.codehaus.plexus.component.annotations.Component;
 
 import java.io.File;
 
@@ -31,9 +32,8 @@ import java.io.File;
  *
  * @author Nick Gonzalez
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addMavenOneProject"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "addMavenOneProject", instantiationStrategy = "per-lookup"  )
 public class AddMavenOneProjectAction
     extends AddMavenProjectAction
 {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Wed Feb 11 21:38:12 2015
@@ -25,6 +25,7 @@ import org.apache.maven.continuum.Contin
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -39,9 +40,8 @@ import java.util.List;
  *
  * @author Nick Gonzalez
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addMavenTwoProject"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "addMavenTwoProject", instantiationStrategy = "per-lookup" )
 public class AddMavenTwoProjectAction
     extends AddMavenProjectAction
 {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Wed Feb 11 21:38:12 2015
@@ -37,6 +37,8 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.profile.ProfileException;
 import org.apache.maven.continuum.profile.ProfileService;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,9 +49,8 @@ import java.util.List;
 
 /**
  * @author Nick Gonzalez
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addProject"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "addProject", instantiationStrategy = "per-lookup" )
 public class AddProjectAction
     extends ContinuumActionSupport
 {
@@ -83,9 +84,7 @@ public class AddProjectAction
 
     private List<Profile> profiles;
 
-    /**
-     * @plexus.requirement role-hint="default"
-     */
+    @Requirement( hint = "default" )
     private ProfileService profileService;
 
     private int projectGroupId;

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java Wed Feb 11 21:38:12 2015
@@ -27,6 +27,7 @@ import org.apache.continuum.web.util.Aud
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,8 +35,8 @@ import java.util.List;
 
 /**
  * @author Henry Isidro <hisidro@exist.com>
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addProjectGroup"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "addProjectGroup", instantiationStrategy = "per-lookup" )
 public class AddProjectGroupAction
     extends ContinuumActionSupport
 {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Wed Feb 11 21:38:12 2015
@@ -35,6 +35,8 @@ import org.apache.maven.continuum.profil
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.continuum.web.exception.ContinuumActionException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.util.ArrayList;
@@ -47,9 +49,8 @@ import java.util.Map;
  * BuildDefinitionAction:
  *
  * @author Jesse McConnell <jmcconnell@apache.org>
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildDefinition"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "buildDefinition", instantiationStrategy = "per-lookup" )
 public class BuildDefinitionAction
     extends ContinuumConfirmAction
 {
@@ -99,9 +100,7 @@ public class BuildDefinitionAction
 
     private Map<Integer, String> buildDefinitionUpdatePolicies;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BuildDefinitionService buildDefinitionService;
 
     @Override

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java Wed Feb 11 21:38:12 2015
@@ -28,13 +28,13 @@ import org.apache.maven.continuum.Contin
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildProject"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "buildProject", instantiationStrategy = "per-lookup"  )
 public class BuildProjectAction
     extends ContinuumActionSupport
 {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Wed Feb 11 21:38:12 2015
@@ -35,6 +35,8 @@ import org.apache.maven.continuum.projec
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.continuum.web.util.StateGenerator;
 import org.apache.struts2.ServletActionContext;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -44,18 +46,15 @@ import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildResult"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "buildResult", instantiationStrategy = "per-lookup"  )
 public class BuildResultAction
     extends AbstractBuildAction
 {
-    /**
-     * @plexus.requirement
-     */
+
+    @Requirement
     private DistributedBuildManager distributedBuildManager;
 
     private Project project;
@@ -196,7 +195,6 @@ public class BuildResultAction
         return CONFIRM;
     }
 
-
     public String buildLogAsText()
         throws ConfigurationException, IOException
     {
@@ -223,7 +221,6 @@ public class BuildResultAction
         return null;
     }
 
-
     public int getBuildId()
     {
         return buildId;

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java Wed Feb 11 21:38:12 2015
@@ -26,6 +26,7 @@ import org.apache.maven.continuum.Contin
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,9 +37,8 @@ import java.util.List;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildResults"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "buildResults", instantiationStrategy = "per-lookup"  )
 public class BuildResultsListAction
     extends AbstractBuildAction
 {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java Wed Feb 11 21:38:12 2015
@@ -29,6 +29,7 @@ import org.apache.continuum.web.util.Aud
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,9 +42,8 @@ import java.util.Set;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="cancelBuild"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "cancelBuild", instantiationStrategy = "per-lookup"  )
 public class CancelBuildAction
     extends ContinuumActionSupport
 {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java Wed Feb 11 21:38:12 2015
@@ -26,6 +26,7 @@ import org.apache.maven.continuum.execut
 import org.apache.maven.continuum.security.ContinuumRoleConstants;
 import org.apache.maven.continuum.web.exception.AuthenticationRequiredException;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.redback.authorization.AuthorizationException;
 import org.codehaus.plexus.redback.system.SecuritySession;
 import org.codehaus.plexus.redback.system.SecuritySystem;
@@ -41,7 +42,6 @@ import java.util.ResourceBundle;
  * ContinuumActionSupport
  *
  * @author Jesse McConnell <jesse@codehaus.org>
- * @version $Id$
  */
 public class ContinuumActionSupport
     extends PlexusActionSupport
@@ -49,9 +49,7 @@ public class ContinuumActionSupport
 {
     private SecuritySession securitySession;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private SecuritySystem securitySystem;
 
     protected static final String REQUIRES_AUTHENTICATION = "requires-authentication";
@@ -66,9 +64,7 @@ public class ContinuumActionSupport
     protected static final String ERROR_MSG_PROCESSING_AUTHORIZATION =
         "An error occurred while performing authorization.";
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private Continuum continuum;
 
     protected final SimpleDateFormat dateFormatter = new SimpleDateFormat( "MMM dd, yyyy hh:mm:ss aaa z" );
@@ -432,9 +428,8 @@ public class ContinuumActionSupport
     /**
      * Check if the current user is authorized to manage the application's configuration
      *
-     * @throws AuthenticationRequiredException
-     *                                        if the user isn't authorized if the user isn't authenticated
-     * @throws AuthorizationRequiredException if the user isn't authorized if the user isn't authorized
+     * @throws AuthenticationRequiredException if the user isn't authorized if the user isn't authenticated
+     * @throws AuthorizationRequiredException  if the user isn't authorized if the user isn't authorized
      */
     protected void checkManageConfigurationAuthorization()
         throws AuthenticationRequiredException, AuthorizationRequiredException
@@ -450,9 +445,8 @@ public class ContinuumActionSupport
     /**
      * Check if the current user is authorized to manage the project build schedules
      *
-     * @throws AuthenticationRequiredException
-     *                                        if the user isn't authorized if the user isn't authenticated
-     * @throws AuthorizationRequiredException if the user isn't authorized if the user isn't authorized
+     * @throws AuthenticationRequiredException if the user isn't authorized if the user isn't authenticated
+     * @throws AuthorizationRequiredException  if the user isn't authorized if the user isn't authorized
      */
     protected void checkManageSchedulesAuthorization()
         throws AuthenticationRequiredException, AuthorizationRequiredException
@@ -468,9 +462,8 @@ public class ContinuumActionSupport
     /**
      * Check if the current user is authorized to manage queues
      *
-     * @throws AuthenticationRequiredException
-     *                                        if the user isn't authenticated
-     * @throws AuthorizationRequiredException if the user isn't authorized
+     * @throws AuthenticationRequiredException if the user isn't authenticated
+     * @throws AuthorizationRequiredException  if the user isn't authorized
      */
     protected void checkManageQueuesAuthorization()
         throws AuthenticationRequiredException, AuthorizationRequiredException

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java Wed Feb 11 21:38:12 2015
@@ -25,14 +25,14 @@ import org.apache.maven.continuum.Contin
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteProject"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "deleteProject", instantiationStrategy = "per-lookup"  )
 public class DeleteProjectAction
     extends ContinuumActionSupport
 {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java Wed Feb 11 21:38:12 2015
@@ -24,6 +24,7 @@ import org.apache.maven.continuum.Contin
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.continuum.web.model.GroupSummary;
+import org.codehaus.plexus.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,9 +35,8 @@ import java.util.Map;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="groupSummary"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "groupSummary", instantiationStrategy = "per-lookup"  )
 public class GroupSummaryAction
     extends ContinuumActionSupport
 {
@@ -100,7 +100,6 @@ public class GroupSummaryAction
         return groups;
     }
 
-
     public String getInfoMessage()
     {
         return infoMessage;

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java Wed Feb 11 21:38:12 2015
@@ -24,12 +24,12 @@ import org.apache.continuum.web.util.Aud
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="projectEdit"
  */
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "projectEdit", instantiationStrategy = "per-lookup"  )
 public class ProjectEditAction
     extends ContinuumActionSupport
 {



Mime
View raw message