continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1659100 [3/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-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java Wed Feb 11 21:38:12 2015
@@ -41,6 +41,8 @@ import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.command.update.UpdateScmResult;
 import org.apache.maven.scm.manager.NoSuchScmProviderException;
 import org.apache.maven.scm.repository.ScmRepositoryException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 
 import java.io.File;
 import java.util.Date;
@@ -50,37 +52,26 @@ import java.util.Map;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id$
- * @plexus.component role="org.codehaus.plexus.action.Action" role-hint="update-working-directory-from-scm"
  */
+@Component( role = org.codehaus.plexus.action.Action.class, hint = "update-working-directory-from-scm" )
 public class UpdateWorkingDirectoryFromScmContinuumAction
     extends AbstractContinuumAction
 {
     private static final String KEY_UPDATE_SCM_RESULT = "update-result";
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ContinuumNotificationDispatcher notifier;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ContinuumScm scm;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private WorkingDirectoryService workingDirectoryService;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BuildResultDao buildResultDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectDao projectDao;
 
     public void execute( Map context )

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java Wed Feb 11 21:38:12 2015
@@ -23,6 +23,8 @@ import org.apache.continuum.dao.ProjectD
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
 import org.apache.maven.continuum.model.project.Project;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.util.List;
@@ -30,21 +32,16 @@ import java.util.Map;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id$
- * @plexus.component role="org.codehaus.plexus.action.Action"
- * role-hint="validate-project"
  */
+@Component( role = org.codehaus.plexus.action.Action.class, hint = "validate-project" )
 public class ValidateProject
     extends AbstractValidationContinuumAction
 {
-    /**
-     * @plexus.requirement
-     */
+
+    @Requirement
     private BuildExecutorManager buildExecutorManager;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectDao projectDao;
 
     public void execute( Map context )
@@ -81,20 +78,20 @@ public class ValidateProject
         }
         */
 
-//        if ( getProjectByScmUrl( scmUrl ) != null )
-//        {
-//            throw new ContinuumStoreException( "A project with the scm url '" + scmUrl + "' already exist." );
-//        }
+        //        if ( getProjectByScmUrl( scmUrl ) != null )
+        //        {
+        //            throw new ContinuumStoreException( "A project with the scm url '" + scmUrl + "' already exist." );
+        //        }
 
         // TODO: Enable
-//        assertStringNotEmpty( project.getPath(), "path" );
-//        assertStringNotEmpty( project.getGroupId(), "group id" );
-//        assertStringNotEmpty( project.getArtifactId(), "artifact id" );
-
-//        if ( project.getProjectGroup() == null )
-//        {
-//            throw new ContinuumException( "A project has to belong to a project group." );
-//        }
+        //        assertStringNotEmpty( project.getPath(), "path" );
+        //        assertStringNotEmpty( project.getGroupId(), "group id" );
+        //        assertStringNotEmpty( project.getArtifactId(), "artifact id" );
+
+        //        if ( project.getProjectGroup() == null )
+        //        {
+        //            throw new ContinuumException( "A project has to belong to a project group." );
+        //        }
 
         // TODO: validate that the SCM provider id
     }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java Wed Feb 11 21:38:12 2015
@@ -20,15 +20,14 @@ package org.apache.maven.continuum.core.
  */
 
 import org.apache.maven.continuum.model.project.ProjectGroup;
+import org.codehaus.plexus.component.annotations.Component;
 
 import java.util.Map;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id$
- * @plexus.component role="org.codehaus.plexus.action.Action"
- * role-hint="validate-project-group"
  */
+@Component( role = org.codehaus.plexus.action.Action.class, hint = "validate-project-group" )
 public class ValidateProjectGroup
     extends AbstractValidationContinuumAction
 {

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java Wed Feb 11 21:38:12 2015
@@ -34,6 +34,7 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.utils.WorkingDirectoryService;
 import org.codehaus.plexus.commandline.ExecutableResolver;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.util.StringUtils;
@@ -65,34 +66,22 @@ public abstract class AbstractBuildExecu
     //
     // ----------------------------------------------------------------------
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ShellCommandHelper shellCommandHelper;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ExecutableResolver executableResolver;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private WorkingDirectoryService workingDirectoryService;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private InstallationService installationService;
 
-    /**
-     * @plexus.configuration
-     */
+    @Requirement
     private File chrootJailDirectory;
 
-    /**
-     * @plexus.configuration
-     */
+    @Requirement
     private String defaultExecutable;
 
     // ----------------------------------------------------------------------

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java Wed Feb 11 21:38:12 2015
@@ -21,6 +21,8 @@ package org.apache.maven.continuum.execu
 
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,18 +32,14 @@ import java.util.Map;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.execution.manager.BuildExecutorManager"
- * role-hint"default"
  */
+@Component( role = org.apache.maven.continuum.execution.manager.BuildExecutorManager.class, hint = "default" )
 public class DefaultBuildExecutorManager
     implements BuildExecutorManager, Initializable
 {
     private static final Logger log = LoggerFactory.getLogger( DefaultBuildExecutorManager.class );
 
-    /**
-     * @plexus.requirement role="org.apache.maven.continuum.execution.ContinuumBuildExecutor"
-     */
+    @Requirement( role = org.apache.maven.continuum.execution.ContinuumBuildExecutor.class )
     private Map<String, ContinuumBuildExecutor> executors;
 
     // ----------------------------------------------------------------------

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.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.ProjectNotifier;
 import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
@@ -42,10 +43,8 @@ import java.util.Properties;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelper"
- * role-hint="default"
  */
+@Component( role = org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelper.class, hint = "default" )
 public class DefaultMavenOneMetadataHelper
     implements MavenOneMetadataHelper
 {
@@ -58,6 +57,7 @@ public class DefaultMavenOneMetadataHelp
     /**
      * @deprecated Use {@link #mapMetadata(ContinuumProjectBuildingResult, File, Project)} instead
      */
+    @Deprecated
     public void mapMetadata( File metadata, Project project )
         throws MavenOneMetadataHelperException
     {

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java Wed Feb 11 21:38:12 2015
@@ -32,6 +32,7 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.model.system.Profile;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
@@ -54,9 +55,7 @@ public class MavenOneBuildExecutor
 
     public final static String ID = ContinuumBuildExecutorConstants.MAVEN_ONE_BUILD_EXECUTOR;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private MavenOneMetadataHelper metadataHelper;
 
     // ----------------------------------------------------------------------

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Wed Feb 11 21:38:12 2015
@@ -55,6 +55,9 @@ import org.apache.maven.settings.Setting
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Configuration;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.context.Context;
@@ -77,37 +80,26 @@ import java.util.List;
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper" role-hint="default"
  */
+@Component( role = org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper.class, hint = "default" )
 public class DefaultMavenBuilderHelper
     implements MavenBuilderHelper, Contextualizable, Initializable
 {
     private static final Logger log = LoggerFactory.getLogger( DefaultMavenBuilderHelper.class );
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private MavenProjectBuilder projectBuilder;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ArtifactRepositoryFactory artifactRepositoryFactory;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ArtifactRepositoryLayout repositoryLayout;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private MavenSettingsBuilder mavenSettingsBuilder;
 
-    /**
-     * @plexus.configuration default-value="${plexus.home}/local-repository"
-     */
+    @Configuration( "${plexus.home}/local-repository" )
     private String localRepository;
 
     private PlexusContainer container;

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java Wed Feb 11 21:38:12 2015
@@ -41,6 +41,7 @@ import org.apache.maven.continuum.projec
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
 import org.apache.maven.project.artifact.ProjectArtifactMetadata;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
@@ -75,19 +76,13 @@ public class MavenTwoBuildExecutor
     //
     // ----------------------------------------------------------------------
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private MavenBuilderHelper builderHelper;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private MavenProjectHelper projectHelper;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ConfigurationService configurationService;
 
     // ----------------------------------------------------------------------
@@ -363,7 +358,7 @@ public class MavenTwoBuildExecutor
         DirectoryScanner scanner = new DirectoryScanner();
         scanner.setBasedir( workingDir );
         scanner.setIncludes(
-            new String[]{"**/target/surefire-reports/TEST-*.xml", "**/target/surefire-it-reports/TEST-*.xml"} );
+            new String[] { "**/target/surefire-reports/TEST-*.xml", "**/target/surefire-it-reports/TEST-*.xml" } );
         scanner.scan();
 
         String[] testResultFiles = scanner.getIncludedFiles();

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java Wed Feb 11 21:38:12 2015
@@ -34,6 +34,8 @@ import org.apache.maven.continuum.store.
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.apache.maven.settings.MavenSettingsBuilder;
 import org.apache.maven.settings.Settings;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.jpox.SchemaTool;
 import org.slf4j.Logger;
@@ -44,11 +46,9 @@ import java.util.Collection;
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id$
  * @todo use this, reintroduce default project group
- * @plexus.component role="org.apache.maven.continuum.initialization.ContinuumInitializer"
- * role-hint="default"
  */
+@Component( role = org.apache.maven.continuum.initialization.ContinuumInitializer.class, hint = "default" )
 public class DefaultContinuumInitializer
     implements ContinuumInitializer
 {
@@ -58,34 +58,22 @@ public class DefaultContinuumInitializer
     //  Requirements
     // ----------------------------------------------------------------------
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private LocalRepositoryDao localRepositoryDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private RepositoryPurgeConfigurationDao repositoryPurgeConfigurationDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectGroupDao projectGroupDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private SystemConfigurationDao systemConfigurationDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BuildDefinitionService buildDefinitionService;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private MavenSettingsBuilder mavenSettingsBuilder;
 
     // ----------------------------------------------------------------------
@@ -138,7 +126,6 @@ public class DefaultContinuumInitializer
         log.info( "Continuum initializer end running ..." );
     }
 
-
     private void createDefaultProjectGroup()
         throws ContinuumStoreException, BuildDefinitionServiceException
     {

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java Wed Feb 11 21:38:12 2015
@@ -29,6 +29,8 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.notification.manager.NotifierManager;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,28 +41,20 @@ import java.util.Map;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.notification.ContinuumNotificationDispatcher"
- * role-hint="default"
  */
+@Component( role = org.apache.maven.continuum.notification.ContinuumNotificationDispatcher.class, hint = "default" )
 public class DefaultContinuumNotificationDispatcher
     implements ContinuumNotificationDispatcher
 {
     private static final Logger log = LoggerFactory.getLogger( DefaultContinuumNotificationDispatcher.class );
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private NotifierManager notifierManager;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectDao projectDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectGroupDao projectGroupDao;
 
     // ----------------------------------------------------------------------

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java Wed Feb 11 21:38:12 2015
@@ -26,16 +26,15 @@ import org.apache.maven.continuum.notifi
 import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.notification.MessageContext;
 import org.apache.maven.continuum.notification.NotificationException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.notification.Notifier"
- * role-hint="console"
  */
+@Component( role = org.apache.maven.continuum.notification.Notifier.class, hint = "console" )
 public class ConsoleNotifier
     extends AbstractContinuumNotifier
 {

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java Wed Feb 11 21:38:12 2015
@@ -47,6 +47,8 @@ import org.apache.maven.continuum.report
 import org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.exception.ResourceNotFoundException;
+import org.codehaus.plexus.component.annotations.Configuration;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.velocity.VelocityComponent;
@@ -86,68 +88,44 @@ public class MailContinuumNotifier
     // Requirements
     // ----------------------------------------------------------------------
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private VelocityComponent velocity;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ConfigurationService configurationService;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private Continuum continuum;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private JavaMailSender javaMailSender;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ReportTestSuiteGenerator reportTestSuiteGenerator;
 
     // ----------------------------------------------------------------------
     // Configuration
     // ----------------------------------------------------------------------
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private String fromMailbox;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private String fromName;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private String toOverride;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private String timestampFormat;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private boolean includeBuildSummary = true;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private boolean includeTestSummary = true;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private boolean includeBuildOutput = false;
 
     /**
@@ -157,16 +135,14 @@ public class MailContinuumNotifier
      * "[continuum] BUILD ${state}: ${project.name} ${project.scmTag}" results in "[continuum] BUILD SUCCESSFUL: Hello World Branch001"
      * "[continuum] BUILD ${state}: ${project.name} ${build.durationTime}" results in "[continuum] BUILD SUCCESSFUL: Hello World 2 sec"
      * "[continuum] BUILD ${state}: ${project.name}, Build Def - ${build.buildDefinition.description}" results in "[continuum] BUILD SUCCESSFUL: Hello World, Build Def - Nightly Test Build"
-     *
-     * @plexus.configuration
      */
+    @Configuration( "" )
     private String buildSubjectFormat = "[continuum] BUILD ${state}: ${project.groupId} ${project.name}";
 
     /**
      * Customizable mail subject
-     *
-     * @plexus.configuration
      */
+    @Configuration( "" )
     private String prepareBuildSubjectFormat =
         "[continuum] PREPARE BUILD ${state]: ${projectScmRoot.projectGroup.name}";
 

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java Wed Feb 11 21:38:12 2015
@@ -20,21 +20,20 @@ package org.apache.maven.continuum.proje
  */
 
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 
 import java.util.Map;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager"
- * role-hint="default"
  */
+@Component( role = org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager.class, hint = "default" )
 public class DefaultContinuumProjectBuilderManager
     implements ContinuumProjectBuilderManager
 {
-    /**
-     * @plexus.requirement role="org.apache.maven.continuum.project.builder.ContinuumProjectBuilder"
-     */
+
+    @Requirement( role = org.apache.maven.continuum.project.builder.ContinuumProjectBuilder.class )
     private Map<String, ContinuumProjectBuilder> projectBuilders;
 
     // ----------------------------------------------------------------------

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java Wed Feb 11 21:38:12 2015
@@ -34,6 +34,8 @@ import org.apache.maven.continuum.projec
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuilderException;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 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 java.io.File;
@@ -42,29 +44,21 @@ import java.util.List;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.project.builder.ContinuumProjectBuilder"
- * role-hint="maven-one-builder"
  */
+@Component( role = org.apache.maven.continuum.project.builder.ContinuumProjectBuilder.class, hint = "maven-one-builder" )
 public class MavenOneContinuumProjectBuilder
     extends AbstractContinuumProjectBuilder
     implements ContinuumProjectBuilder
 {
     public static final String ID = "maven-one-builder";
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BuildDefinitionService buildDefinitionService;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private MavenOneMetadataHelper metadataHelper;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectGroupDao projectGroupDao;
 
     // ----------------------------------------------------------------------

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Wed Feb 11 21:38:12 2015
@@ -39,6 +39,9 @@ import org.apache.maven.continuum.projec
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Configuration;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
@@ -49,9 +52,8 @@ import java.util.List;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.project.builder.ContinuumProjectBuilder" role-hint="maven-two-builder"
  */
+@Component( role = org.apache.maven.continuum.project.builder.ContinuumProjectBuilder.class, hint = "maven-two-builder" )
 public class MavenTwoContinuumProjectBuilder
     extends AbstractContinuumProjectBuilder
     implements ContinuumProjectBuilder
@@ -60,36 +62,24 @@ public class MavenTwoContinuumProjectBui
 
     private static final String POM_PART = "/pom.xml";
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private LocalRepositoryDao localRepositoryDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private MavenBuilderHelper builderHelper;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ScheduleDao scheduleDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BuildDefinitionService buildDefinitionService;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private List<String> excludedPackagingTypes = new ArrayList<String>();
 
     private Project rootProject;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectGroupDao projectGroupDao;
 
     // ----------------------------------------------------------------------
@@ -124,7 +114,8 @@ public class MavenTwoContinuumProjectBui
                                                                      boolean checkoutInSingleDirectory )
         throws ContinuumProjectBuilderException
     {
-        return buildProjectsFromMetadata( url, username, password, loadRecursiveProjects, buildDefinitionTemplate, checkoutInSingleDirectory, -1 );
+        return buildProjectsFromMetadata( url, username, password, loadRecursiveProjects, buildDefinitionTemplate,
+                                          checkoutInSingleDirectory, -1 );
     }
 
     public ContinuumProjectBuildingResult buildProjectsFromMetadata( URL url, String username, String password,
@@ -148,7 +139,8 @@ public class MavenTwoContinuumProjectBui
                 projectGroup = projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId( projectGroupId );
             }
 
-            readModules( url, result, projectGroup, username, password, null, loadRecursiveProjects, buildDefinitionTemplate,
+            readModules( url, result, projectGroup, username, password, null, loadRecursiveProjects,
+                         buildDefinitionTemplate,
                          checkoutInSingleDirectory );
         }
         catch ( BuildDefinitionServiceException e )
@@ -166,7 +158,8 @@ public class MavenTwoContinuumProjectBui
     //
     // ----------------------------------------------------------------------
 
-    private void readModules( URL url, ContinuumProjectBuildingResult result, ProjectGroup projectGroup, String username,
+    private void readModules( URL url, ContinuumProjectBuildingResult result, ProjectGroup projectGroup,
+                              String username,
                               String password, String scmUrl, boolean loadRecursiveProjects,
                               BuildDefinitionTemplate buildDefinitionTemplate, boolean checkoutInSingleDirectory )
         throws ContinuumProjectBuilderException, BuildDefinitionServiceException
@@ -282,7 +275,8 @@ public class MavenTwoContinuumProjectBui
                     if ( buildDefinition.isDefaultForProject() )
                     {
                         // create a default build definition at the project level
-                        BuildDefinition projectBuildDef = buildDefinitionService.cloneBuildDefinition( buildDefinition );
+                        BuildDefinition projectBuildDef =
+                            buildDefinitionService.cloneBuildDefinition( buildDefinition );
                         projectBuildDef.setDefaultForProject( true );
 
                         String arguments = projectBuildDef.getArguments().replace( "--non-recursive", "" );
@@ -514,7 +508,6 @@ public class MavenTwoContinuumProjectBui
         return projectGroup;
     }
 
-
     public BuildDefinitionTemplate getDefaultBuildDefinitionTemplate()
         throws ContinuumProjectBuilderException
     {

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java Wed Feb 11 21:38:12 2015
@@ -26,6 +26,8 @@ import org.apache.maven.continuum.core.a
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.action.ActionManager;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
@@ -37,23 +39,18 @@ import java.util.Map;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id$
- * @plexus.component role="org.codehaus.plexus.taskqueue.execution.TaskExecutor"
- * role-hint="check-out-project" instantiation-strategy="per-lookup"
  */
+@Component( role = org.codehaus.plexus.taskqueue.execution.TaskExecutor.class, hint = "check-out-project",
+    instantiationStrategy = "per-lookup" )
 public class CheckOutTaskExecutor
     implements TaskExecutor
 {
     private static final Logger log = LoggerFactory.getLogger( CheckOutTaskExecutor.class );
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ActionManager actionManager;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectDao projectDao;
 
     // ----------------------------------------------------------------------

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java Wed Feb 11 21:38:12 2015
@@ -45,6 +45,8 @@ import org.apache.maven.continuum.store.
 import org.apache.maven.continuum.utils.WorkingDirectoryService;
 import org.codehaus.plexus.action.ActionManager;
 import org.codehaus.plexus.action.ActionNotFoundException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
@@ -61,53 +63,35 @@ import java.util.Set;
 
 /**
  * @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
- * @version $Id$
- * @plexus.component role="org.codehaus.plexus.taskqueue.execution.TaskExecutor"
- * role-hint="prepare-build-project"
  */
+@Component( role = org.codehaus.plexus.taskqueue.execution.TaskExecutor.class, hint = "prepare-build-project" )
 public class PrepareBuildProjectsTaskExecutor
     implements TaskExecutor
 {
     private static final Logger log = LoggerFactory.getLogger( PrepareBuildProjectsTaskExecutor.class );
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ActionManager actionManager;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectDao projectDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BuildDefinitionDao buildDefinitionDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectScmRootDao projectScmRootDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BuildResultDao buildResultDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private WorkingDirectoryService workingDirectoryService;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ContinuumNotificationDispatcher notifierDispatcher;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectGroupDao projectGroupDao;
 
     public void executeTask( Task task )

Modified: continuum/trunk/continuum-data-management/data-management-jdo/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-jdo/pom.xml?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-jdo/pom.xml (original)
+++ continuum/trunk/continuum-data-management/data-management-jdo/pom.xml Wed Feb 11 21:38:12 2015
@@ -43,6 +43,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>

Modified: continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/DefaultDatabaseFactoryConfigurator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/DefaultDatabaseFactoryConfigurator.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/DefaultDatabaseFactoryConfigurator.java (original)
+++ continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/DefaultDatabaseFactoryConfigurator.java Wed Feb 11 21:38:12 2015
@@ -19,21 +19,18 @@ package org.apache.maven.continuum.manag
  * under the License.
  */
 
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 
 import java.util.Iterator;
 import java.util.Properties;
 
-/**
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.management.DatabaseFactoryConfigurator" role-hint="continuum"
- */
+@Component( role = org.apache.maven.continuum.management.DatabaseFactoryConfigurator.class, hint = "continuum" )
 public class DefaultDatabaseFactoryConfigurator
     implements DatabaseFactoryConfigurator
 {
-    /**
-     * @plexus.requirement role="org.codehaus.plexus.jdo.JdoFactory" role-hint="continuum"
-     */
+    @Requirement( role = org.codehaus.plexus.jdo.JdoFactory.class, hint = "continuum" )
     protected DefaultConfigurableJdoFactory factory;
 
     public void configure( DatabaseParams params )

Modified: continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java (original)
+++ continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java Wed Feb 11 21:38:12 2015
@@ -51,6 +51,8 @@ import org.apache.maven.continuum.model.
 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.component.annotations.Requirement;
 import org.codehaus.plexus.jdo.ConfigurableJdoFactory;
 import org.codehaus.plexus.jdo.PlexusJdoUtils;
 import org.codehaus.plexus.util.IOUtil;
@@ -79,95 +81,61 @@ import javax.xml.stream.XMLStreamExcepti
 
 /**
  * JDO implementation the database management tool API.
- *
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.management.DataManagementTool" role-hint="continuum-jdo"
  */
+@Component( role = org.apache.maven.continuum.management.DataManagementTool.class, hint = "continuum-jdo" )
 public class JdoDataManagementTool
     implements DataManagementTool
 {
     private Logger log = LoggerFactory.getLogger( JdoDataManagementTool.class );
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private DaoUtils daoUtils;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private LocalRepositoryDao localRepositoryDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private DirectoryPurgeConfigurationDao directoryPurgeConfigurationDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private RepositoryPurgeConfigurationDao repositoryPurgeConfigurationDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private DistributedDirectoryPurgeConfigurationDao distributedDirectoryPurgeConfigurationDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private InstallationDao installationDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProfileDao profileDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectGroupDao projectGroupDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ScheduleDao scheduleDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private SystemConfigurationDao systemConfigurationDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ProjectScmRootDao projectScmRootDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BuildDefinitionTemplateDao buildDefinitionTemplateDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ContinuumReleaseResultDao releaseResultDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BuildQueueDao buildQueueDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BuildDefinitionDao buildDefinitionDao;
 
     protected static final String BUILDS_XML = "builds.xml";
 
-    /**
-     * @plexus.requirement role="org.codehaus.plexus.jdo.JdoFactory" role-hint="continuum"
-     */
+    @Requirement( role = org.codehaus.plexus.jdo.JdoFactory.class, hint = "continuum" )
     protected ConfigurableJdoFactory factory;
 
     public void backupDatabase( File backupDirectory )

Modified: continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java (original)
+++ continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java Wed Feb 11 21:38:12 2015
@@ -38,6 +38,8 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.model.scm.v1_0_9.TestResult;
 import org.apache.maven.continuum.model.system.v1_0_9.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.DefaultConfigurableJdoFactory;
 import org.codehaus.plexus.jdo.PlexusJdoUtils;
 import org.codehaus.plexus.util.IOUtil;
@@ -66,18 +68,14 @@ import javax.xml.stream.XMLStreamExcepti
 
 /**
  * JDO implementation the database management tool API.
- *
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.management.DataManagementTool" role-hint="legacy-continuum-jdo"
  */
+@Component( role = org.apache.maven.continuum.management.DataManagementTool.class, hint = "legacy-continuum-jdo" )
 public class LegacyJdoDataManagementTool
     implements DataManagementTool
 {
     protected static final String BUILDS_XML = "builds.xml";
-
-    /**
-     * @plexus.requirement role="org.codehaus.plexus.jdo.JdoFactory" role-hint="continuum"
-     */
+    
+    @Requirement( role = org.codehaus.plexus.jdo.JdoFactory.class, hint = "continuum" )
     protected DefaultConfigurableJdoFactory factory;
 
     public void backupDatabase( File backupDirectory )
@@ -158,7 +156,7 @@ public class LegacyJdoDataManagementTool
         return result;
     }
 
-    @SuppressWarnings( {"OverlyCoupledMethod"} )
+    @SuppressWarnings( { "OverlyCoupledMethod" } )
     public void eraseDatabase()
     {
         PersistenceManagerFactory pmf = getPersistenceManagerFactory( "jdo109" );

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

Modified: continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/DefaultDatabaseFactoryConfigurator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/DefaultDatabaseFactoryConfigurator.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/DefaultDatabaseFactoryConfigurator.java (original)
+++ continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/DefaultDatabaseFactoryConfigurator.java Wed Feb 11 21:38:12 2015
@@ -2,6 +2,8 @@ package org.apache.maven.continuum.manag
 
 import org.apache.maven.continuum.management.DatabaseFactoryConfigurator;
 import org.apache.maven.continuum.management.DatabaseParams;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 
 import java.util.Iterator;
@@ -26,16 +28,12 @@ import java.util.Properties;
  * under the License.
  */
 
-/**
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.management.DatabaseFactoryConfigurator" role-hint="redback"
- */
+@Component( role = org.apache.maven.continuum.management.DatabaseFactoryConfigurator.class, hint = "redback" )
 public class DefaultDatabaseFactoryConfigurator
     implements DatabaseFactoryConfigurator
 {
-    /**
-     * @plexus.requirement role="org.codehaus.plexus.jdo.JdoFactory" role-hint="users"
-     */
+
+    @Requirement( role = org.codehaus.plexus.jdo.JdoFactory.class, hint = "users" )
     protected DefaultConfigurableJdoFactory factory;
 
     public void configure( DatabaseParams params )

Modified: continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java (original)
+++ continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java Wed Feb 11 21:38:12 2015
@@ -21,6 +21,8 @@ package org.apache.maven.continuum.manag
 
 import org.apache.maven.continuum.management.DataManagementException;
 import org.apache.maven.continuum.management.DataManagementTool;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.redback.keys.KeyManager;
 import org.codehaus.plexus.redback.rbac.RBACManager;
 import org.codehaus.plexus.redback.rbac.RbacManagerException;
@@ -32,31 +34,22 @@ import javax.xml.stream.XMLStreamExcepti
 
 /**
  * JDO implementation the database management tool API.
- *
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.management.DataManagementTool" role-hint="redback-jdo"
  */
+@Component( role = org.apache.maven.continuum.management.DataManagementTool.class, hint = "redback-jdo" )
 public class JdoDataManagementTool
     implements DataManagementTool
 {
-    /**
-     * @plexus.requirement role-hint="jdo"
-     */
+
+    @Requirement( hint = "jdo" )
     private org.codehaus.plexus.redback.management.DataManagementTool toolDelegate;
 
-    /**
-     * @plexus.requirement role-hint="jdo"
-     */
+    @Requirement( hint = "jdo" )
     private RBACManager rbacManager;
 
-    /**
-     * @plexus.requirement role-hint="jdo"
-     */
+    @Requirement( hint = "jdo" )
     private UserManager userManager;
 
-    /**
-     * @plexus.requirement role-hint="jdo"
-     */
+    @Requirement( hint = "jdo" )
     private KeyManager keyManager;
 
     public void backupDatabase( File backupDirectory )

Modified: continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java (original)
+++ continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java Wed Feb 11 21:38:12 2015
@@ -21,6 +21,8 @@ package org.apache.maven.continuum.manag
 
 import org.apache.maven.continuum.management.DataManagementException;
 import org.apache.maven.continuum.management.DataManagementTool;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.jdo.JdoFactory;
 import org.codehaus.plexus.jdo.PlexusJdoUtils;
 import org.codehaus.plexus.jdo.PlexusStoreException;
@@ -65,10 +67,8 @@ import javax.xml.stream.XMLStreamExcepti
 
 /**
  * JDO implementation the database management tool API.
- *
- * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.management.DataManagementTool" role-hint="legacy-redback-jdo"
  */
+@Component( role = org.apache.maven.continuum.management.DataManagementTool.class, hint = "legacy-redback-jdo" )
 public class LegacyJdoDataManagementTool
     implements DataManagementTool
 {
@@ -78,9 +78,7 @@ public class LegacyJdoDataManagementTool
 
     private static final String RBAC_XML_NAME = "rbac.xml";
 
-    /**
-     * @plexus.requirement role-hint="users"
-     */
+    @Requirement( hint = "users" )
     private JdoFactory jdoFactory;
 
     public void backupDatabase( File backupDirectory )
@@ -297,7 +295,7 @@ public class LegacyJdoDataManagementTool
 
             RBACObjectAssertions.assertValid( role );
 
-            PlexusJdoUtils.saveObject( getPersistenceManager(), role, new String[]{null} );
+            PlexusJdoUtils.saveObject( getPersistenceManager(), role, new String[] { null } );
         }
 
         for ( Iterator i = database.getUserAssignments().iterator(); i.hasNext(); )
@@ -306,7 +304,7 @@ public class LegacyJdoDataManagementTool
 
             RBACObjectAssertions.assertValid( "Save User Assignment", userAssignment );
 
-            PlexusJdoUtils.saveObject( getPersistenceManager(), userAssignment, new String[]{null} );
+            PlexusJdoUtils.saveObject( getPersistenceManager(), userAssignment, new String[] { null } );
         }
     }
 

Modified: continuum/trunk/continuum-data-management/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/pom.xml?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/pom.xml (original)
+++ continuum/trunk/continuum-data-management/pom.xml Wed Feb 11 21:38:12 2015
@@ -46,11 +46,11 @@
       <!-- TODO: move up to continuum parent and use in all modules -->
       <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-notifiers/continuum-notifier-jabber/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml Wed Feb 11 21:38:12 2015
@@ -63,5 +63,9 @@
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-notifier-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+    </dependency>
   </dependencies>
 </project>

Modified: continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java Wed Feb 11 21:38:12 2015
@@ -29,6 +29,7 @@ import org.apache.maven.continuum.notifi
 import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.notification.MessageContext;
 import org.apache.maven.continuum.notification.NotificationException;
+import org.codehaus.plexus.component.annotations.Configuration;
 import org.codehaus.plexus.jabber.JabberClient;
 import org.codehaus.plexus.jabber.JabberClientException;
 import org.codehaus.plexus.util.StringUtils;
@@ -65,34 +66,22 @@ public class JabberContinuumNotifier
     // Configuration
     // ----------------------------------------------------------------------
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private String fromAddress;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private String fromPassword;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private String host;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private int port;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private String imDomainName;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private boolean sslConnection;
 
     // ----------------------------------------------------------------------

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

Modified: continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java Wed Feb 11 21:38:12 2015
@@ -29,6 +29,7 @@ import org.apache.maven.continuum.notifi
 import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.notification.MessageContext;
 import org.apache.maven.continuum.notification.NotificationException;
+import org.codehaus.plexus.component.annotations.Configuration;
 import org.codehaus.plexus.msn.MsnClient;
 import org.codehaus.plexus.msn.MsnException;
 import org.codehaus.plexus.util.StringUtils;
@@ -43,7 +44,6 @@ import javax.annotation.Resource;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
  */
 @Service( "notifier#msn" )
 public class MsnContinuumNotifier
@@ -65,14 +65,10 @@ public class MsnContinuumNotifier
     // Configuration
     // ----------------------------------------------------------------------
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private String fromAddress;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private String fromPassword;
 
     // ----------------------------------------------------------------------

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

Modified: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java Wed Feb 11 21:38:12 2015
@@ -60,6 +60,7 @@ import org.apache.maven.wagon.proxy.Prox
 import org.apache.maven.wagon.repository.Repository;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Configuration;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
@@ -100,9 +101,7 @@ public class WagonContinuumNotifier
     @Resource
     private MavenSettingsBuilder settingsBuilder;
 
-    /**
-     * @plexus.configuration
-     */
+    @Configuration( "" )
     private String localRepository;
 
     private Settings settings;
@@ -111,6 +110,10 @@ public class WagonContinuumNotifier
 
     private PlexusContainer container;
 
+    public WagonContinuumNotifier()
+    {
+    }
+
     public String getType()
     {
         return "wagon";

Modified: continuum/trunk/continuum-purge/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/pom.xml?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/pom.xml (original)
+++ continuum/trunk/continuum-purge/pom.xml Wed Feb 11 21:38:12 2015
@@ -90,6 +90,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>
@@ -139,18 +143,16 @@
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <executions>
           <execution>
             <id>generate</id>
-            <phase>generate-resources</phase>
             <goals>
-              <goal>descriptor</goal>
+              <goal>generate-metadata</goal>
             </goals>
           </execution>
           <execution>
             <id>merge</id>
-            <phase>process-resources</phase>
             <configuration>
               <descriptors>
                 <descriptor>${basedir}/src/main/resources/META-INF/plexus/components-fragment.xml</descriptor>
@@ -159,7 +161,7 @@
               <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output>
             </configuration>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>merge-metadata</goal>
             </goals>
           </execution>
         </executions>

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java Wed Feb 11 21:38:12 2015
@@ -33,6 +33,8 @@ import org.apache.maven.continuum.store.
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Component;
+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;
@@ -45,31 +47,23 @@ import java.util.List;
  * DefaultPurgeConfigurationService
  *
  * @author Maria Catherine Tan
- * @version $Id$
- * @plexus.component role="org.apache.continuum.purge.PurgeConfigurationService" role-hint="default"
  * @since 25 jul 07
  */
+@Component( role = org.apache.continuum.purge.PurgeConfigurationService.class, hint = "default" )
 public class DefaultPurgeConfigurationService
     implements PurgeConfigurationService, Contextualizable
 {
-    /**
-     * @plexus.requirement
-     */
+
+    @Requirement
     private DirectoryPurgeConfigurationDao directoryPurgeConfigurationDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private LocalRepositoryDao localRepositoryDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private RepositoryPurgeConfigurationDao repositoryPurgeConfigurationDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private DistributedDirectoryPurgeConfigurationDao distributedDirectoryPurgeConfigurationDao;
 
     private PlexusContainer container;

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java Wed Feb 11 21:38:12 2015
@@ -26,6 +26,7 @@ import org.apache.continuum.purge.execut
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
 import org.apache.continuum.purge.executor.DaysOldDirectoryPurgeExecutor;
 import org.apache.continuum.purge.executor.RetentionCountDirectoryPurgeExecutor;
+import org.codehaus.plexus.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,8 +34,8 @@ import org.slf4j.LoggerFactory;
  * DirectoryPurgeController
  *
  * @author Maria Catherine Tan
- * @plexus.component role="org.apache.continuum.purge.controller.PurgeController" role-hint="purge-directory"
  */
+@Component( role = org.apache.continuum.purge.controller.PurgeController.class, hint = "purge-directory" )
 public class DirectoryPurgeController
     implements PurgeController
 {

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DistributedDirectoryPurgeController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DistributedDirectoryPurgeController.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DistributedDirectoryPurgeController.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DistributedDirectoryPurgeController.java Wed Feb 11 21:38:12 2015
@@ -25,6 +25,8 @@ import org.apache.continuum.model.reposi
 import org.apache.continuum.model.repository.DistributedDirectoryPurgeConfiguration;
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
 import org.apache.maven.continuum.configuration.ConfigurationService;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,18 +34,14 @@ import java.net.URL;
 
 /**
  * DirectoryPurgeController
- *
- * @author
- * @plexus.component role="org.apache.continuum.purge.controller.PurgeController" role-hint="purge-distributed-directory"
  */
+@Component( role = org.apache.continuum.purge.controller.PurgeController.class, hint = "purge-distributed-directory" )
 public class DistributedDirectoryPurgeController
     implements PurgeController
 {
     private static final Logger log = LoggerFactory.getLogger( DistributedDirectoryPurgeController.class );
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private ConfigurationService configurationService;
 
     private SlaveBuildAgentTransportService transportClient;
@@ -62,10 +60,10 @@ public class DistributedDirectoryPurgeCo
 
             StringBuilder logMsg = new StringBuilder().append(
                 "Executing directory purge with the following settings[directoryType=" ).
-                append( dirPurge.getDirectoryType() ).append( ",daysOlder=" ).
-                append( dirPurge.getDaysOlder() ).append( ", retentionCount=" ).
-                append( dirPurge.getRetentionCount() ).append( ", deleteAll=" ).
-                append( dirPurge.isDeleteAll() ).append( "]" );
+                                                          append( dirPurge.getDirectoryType() ).append( ",daysOlder=" ).
+                                                          append( dirPurge.getDaysOlder() ).append( ", retentionCount=" ).
+                                                          append( dirPurge.getRetentionCount() ).append( ", deleteAll=" ).
+                                                          append( dirPurge.isDeleteAll() ).append( "]" );
 
             log.debug( logMsg.toString() );
 

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java Wed Feb 11 21:38:12 2015
@@ -31,6 +31,8 @@ import org.apache.continuum.purge.execut
 import org.apache.continuum.purge.executor.ReleasedSnapshotsRepositoryPurgeExecutor;
 import org.apache.continuum.purge.executor.RetentionCountRepositoryPurgeExecutor;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,8 +40,8 @@ import org.slf4j.LoggerFactory;
  * DefaultPurgeController
  *
  * @author Maria Catherine Tan
- * @plexus.component role="org.apache.continuum.purge.controller.PurgeController" role-hint="purge-repository"
  */
+@Component( role = org.apache.continuum.purge.controller.PurgeController.class, hint = "purge-repository" )
 public class RepositoryPurgeController
     implements PurgeController
 {
@@ -49,9 +51,7 @@ public class RepositoryPurgeController
 
     private ContinuumPurgeExecutor purgeReleasedSnapshotsExecutor;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private PurgeConfigurationService purgeConfigurationService;
 
     private boolean deleteReleasedSnapshots = false;

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedDefaultRepositoryContent.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedDefaultRepositoryContent.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedDefaultRepositoryContent.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedDefaultRepositoryContent.java Wed Feb 11 21:38:12 2015
@@ -33,6 +33,8 @@ import org.apache.maven.archiva.reposito
 import org.apache.maven.archiva.repository.content.DefaultPathParser;
 import org.apache.maven.archiva.repository.content.PathParser;
 import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,11 +43,9 @@ import java.util.Set;
 
 /**
  * Taken from Archiva's ManagedDefaultRepositoryContent and made some few changes.
- *
- * @plexus.component role="org.apache.continuum.purge.repository.content.RepositoryManagedContent"
- * role-hint="default"
- * instantiation-strategy="per-lookup"
  */
+@Component( role = org.apache.continuum.purge.repository.content.RepositoryManagedContent.class, hint = "default",
+    instantiationStrategy = "per-lookup" )
 public class ManagedDefaultRepositoryContent
     implements RepositoryManagedContent
 {
@@ -59,15 +59,14 @@ public class ManagedDefaultRepositoryCon
 
     private final PathParser defaultPathParser = new DefaultPathParser();
 
-    /**
-     * @plexus.requirement role-hint="file-types"
-     */
+    @Requirement( hint = "file-types" )
     private FileTypes filetypes;
 
     private LocalRepository repository;
 
     public void deleteVersion( VersionedReference reference )
         throws ContentNotFoundException
+
     {
         String path = toMetadataPath( reference );
         File projectPath = new File( getRepoRoot(), path );
@@ -264,7 +263,6 @@ public class ManagedDefaultRepositoryCon
         return foundVersions;
     }
 
-
     public String toMetadataPath( ProjectReference reference )
     {
         StringBuffer path = new StringBuffer();
@@ -336,7 +334,7 @@ public class ManagedDefaultRepositoryCon
      *
      * @param reference the reference to the versioned reference to search within
      * @return the ArtifactReference to the first artifact located within the versioned reference. or null if
-     *         no artifact was found within the versioned reference.
+     * no artifact was found within the versioned reference.
      * @throws IOException     if the versioned reference is invalid (example: doesn't exist, or isn't a directory)
      * @throws LayoutException if the path cannot be converted to an artifact reference.
      */

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedLegacyRepositoryContent.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedLegacyRepositoryContent.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedLegacyRepositoryContent.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedLegacyRepositoryContent.java Wed Feb 11 21:38:12 2015
@@ -30,6 +30,8 @@ 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;
+import org.codehaus.plexus.component.annotations.Requirement;
 
 import java.io.File;
 import java.util.HashMap;
@@ -39,11 +41,9 @@ import java.util.Set;
 
 /**
  * Taken from Archiva's ManagedLegacyRepositoryContent and made some few changes
- *
- * @plexus.component role="org.apache.continuum.purge.repository.content.RepositoryManagedContent"
- * role-hint="legacy"
- * instantiation-strategy="per-lookup"
  */
+@Component( role = org.apache.continuum.purge.repository.content.RepositoryManagedContent.class, hint = "legacy",
+    instantiationStrategy = "per-lookup" )
 public class ManagedLegacyRepositoryContent
     implements RepositoryManagedContent
 {
@@ -62,14 +62,10 @@ public class ManagedLegacyRepositoryCont
         typeToDirectoryMap.put( "javadoc", "javadoc.jar" );
     }
 
-    /**
-     * @plexus.requirement role-hint="legacy-parser"
-     */
+    @Requirement( hint = "legacy-parser" )
     private PathParser legacyPathParser;
-
-    /**
-     * @plexus.requirement role-hint="file-types"
-     */
+    
+    @Requirement( hint = "file-types" )
     private FileTypes filetypes;
 
     private LocalRepository repository;

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/DefaultRepositoryScanner.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/DefaultRepositoryScanner.java?rev=1659100&r1=1659099&r2=1659100&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/DefaultRepositoryScanner.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/DefaultRepositoryScanner.java Wed Feb 11 21:38:12 2015
@@ -24,6 +24,8 @@ import org.apache.continuum.model.reposi
 import org.apache.continuum.purge.controller.PurgeController;
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
 import org.apache.continuum.purge.repository.utils.FileTypes;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.DirectoryWalker;
 
 import java.io.File;
@@ -32,15 +34,13 @@ import java.util.List;
 
 /**
  * Codes were taken from Archiva and made some changes.
- *
- * @plexus.component role="org.apache.continuum.purge.repository.scanner.RepositoryScanner" role-hint="repository-scanner"
  */
+@Component( role = org.apache.continuum.purge.repository.scanner.RepositoryScanner.class, hint = "repository-scanner" )
 public class DefaultRepositoryScanner
     implements RepositoryScanner
 {
-    /**
-     * @plexus.requirement role-hint="file-types"
-     */
+
+    @Requirement( hint = "file-types" )
     private FileTypes filetypes;
 
     public void scan( LocalRepository repository, PurgeController purgeController )



Mime
View raw message