continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r474987 - in /maven/continuum/trunk/continuum-core: ./ src/main/java/org/apache/maven/continuum/ src/main/java/org/apache/maven/continuum/build/settings/ src/main/java/org/apache/maven/continuum/buildcontroller/ src/main/java/org/apache/mav...
Date Tue, 14 Nov 2006 21:22:01 GMT
Author: jmcconnell
Date: Tue Nov 14 13:21:59 2006
New Revision: 474987

URL: http://svn.apache.org/viewvc?view=rev&rev=474987
Log:
continuum-758 converted continuum-core over to use the plexus-maven-plugin where it can in generation of the components.xml and then a merge with the components can can't be totally configured that way.  This tore a lot of the meat out of the existing components.xml and should make working with the settings we need to manage with it a lot easier.  I commented where the components that are in continuum-core that couldn't be configured with the plugin in the components.xml file that we are merging in.

Added:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java   (contents, props changed)
      - copied, changed from r473392, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java
Removed:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/security/DefaultContinuumSecurityTest.java
Modified:
    maven/continuum/trunk/continuum-core/pom.xml
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddProjectToCheckOutQueueAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/DeployArtifactContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectGroupAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
    maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java

Modified: maven/continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/pom.xml?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/pom.xml (original)
+++ maven/continuum/trunk/continuum-core/pom.xml Tue Nov 14 13:21:59 2006
@@ -179,6 +179,36 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+       <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>merge</id>
+            <!--
+            <configuration>
+              <descriptors>
+                <descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
+                <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+              </descriptors>
+            </configuration>
+            -->
+            <goals>
+              <goal>merge-descriptors</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
   <profiles>
     <profile>
       <id>default</id>

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Tue Nov 14 13:21:59 2006
@@ -24,7 +24,7 @@
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.configuration.ConfigurationStoringException;
 import org.apache.maven.continuum.core.action.AbstractContinuumAction;
-import org.apache.maven.continuum.core.action.CreateProjectsFromMetadata;
+import org.apache.maven.continuum.core.action.CreateProjectsFromMetadataAction;
 import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
 import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
 import org.apache.maven.continuum.initialization.ContinuumInitializationException;
@@ -88,6 +88,10 @@
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l </a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.apache.maven.continuum.Continuum"
+ *   role-hint="default"
  */
 public class DefaultContinuum
     extends AbstractLogEnabled
@@ -119,7 +123,7 @@
     private SchedulesActivator schedulesActivator;
 
     /**
-     * @plexus.requirement
+     * @deprecated should removeorg.apache.maven.continuum.security.ContinuumSecurity.
      */
     private ContinuumSecurity security;
 
@@ -128,12 +132,12 @@
     // ----------------------------------------------------------------------
 
     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="build-project"
      */
     private TaskQueue buildQueue;
 
     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="check-out-project"
      */
     private TaskQueue checkoutQueue;
 
@@ -143,7 +147,7 @@
     private ContinuumReleaseManager releaseManager;
 
     /**
-     * @plexus.configuration
+     * @plexus.configuration default-value="${plexus.home}/temp"
      */
     private String workingDirectory;
 
@@ -960,9 +964,9 @@
     {
         Map context = new HashMap();
 
-        context.put( CreateProjectsFromMetadata.KEY_PROJECT_BUILDER_ID, projectBuilderId );
+        context.put( CreateProjectsFromMetadataAction.KEY_PROJECT_BUILDER_ID, projectBuilderId );
 
-        context.put( CreateProjectsFromMetadata.KEY_URL, metadataUrl );
+        context.put( CreateProjectsFromMetadataAction.KEY_URL, metadataUrl );
 
         context.put( AbstractContinuumAction.KEY_WORKING_DIRECTORY, getWorkingDirectory() );
 
@@ -973,7 +977,7 @@
         executeAction( "create-projects-from-metadata", context );
 
         ContinuumProjectBuildingResult result = (ContinuumProjectBuildingResult) context
-            .get( CreateProjectsFromMetadata.KEY_PROJECT_BUILDING_RESULT );
+            .get( CreateProjectsFromMetadataAction.KEY_PROJECT_BUILDING_RESULT );
 
         if ( getLogger().isInfoEnabled() )
         {

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java Tue Nov 14 13:21:59 2006
@@ -39,6 +39,10 @@
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.apache.maven.continuum.build.settings.SchedulesActivator"
+ *   role-hint="default"
  */
 public class DefaultSchedulesActivator
     extends AbstractLogEnabled

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Tue Nov 14 13:21:59 2006
@@ -46,6 +46,10 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.apache.maven.continuum.buildcontroller.BuildController"
+ *   role-hint="default"
  */
 public class DefaultBuildController
     extends AbstractLogEnabled

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java Tue Nov 14 13:21:59 2006
@@ -30,13 +30,16 @@
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.apache.maven.continuum.configuration.ConfigurationService"
  */
 public class DefaultConfigurationService
     extends AbstractLogEnabled
     implements ConfigurationService
 {
     /**
-     * @plexus.configuration
+     * @plexus.configuration default-value="${plexus.home}"
      */
     private File applicationHome;
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java Tue Nov 14 13:21:59 2006
@@ -38,8 +38,14 @@
 public class AddAssignableRolesAction
     extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private ContinuumStore store;
 
+    /**
+     * @plexus.requirement
+     */
     private RoleProfileManager roleManager;
 
     public void execute( Map context )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java Tue Nov 14 13:21:59 2006
@@ -27,6 +27,10 @@
  * @author Jesse McConnell <jmcconnell@apache.org>
  * @version $Id$
  *
+ * @plexus.component
+ *   role="org.codehaus.plexus.action.Action"
+ *   role-hint="add-build-definition-to-project"
+ *
  */
 public class AddBuildDefinitionToProjectAction
     extends AbstractBuildDefinitionContinuumAction

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddProjectToCheckOutQueueAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddProjectToCheckOutQueueAction.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddProjectToCheckOutQueueAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddProjectToCheckOutQueueAction.java Tue Nov 14 13:21:59 2006
@@ -27,6 +27,10 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.codehaus.plexus.action.Action"
+ *   role-hint="add-project-to-checkout-queue"
  */
 public class AddProjectToCheckOutQueueAction
     extends AbstractContinuumAction
@@ -36,8 +40,14 @@
      */
     private WorkingDirectoryService workingDirectoryService;
 
+    /**
+     * @plexus.requirement role-hint="check-out-project"
+     */
     private TaskQueue checkOutQueue;
 
+    /**
+     * @plexus.requirement
+     */
     private ContinuumStore store;
 
     public void execute( Map context )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java Tue Nov 14 13:21:59 2006
@@ -26,17 +26,21 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.codehaus.plexus.action.Action"
+ *   role-hint="check-working-directory"
  */
 public class CheckWorkingDirectoryAction
     extends AbstractContinuumAction
 {
     /**
-     * @plexus.requirement *
+     * @plexus.requirement
      */
     private WorkingDirectoryService workingDirectoryService;
 
     /**
-     * @plexus.requirement *
+     * @plexus.requirement
      */
     private ContinuumStore store;
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java Tue Nov 14 13:21:59 2006
@@ -31,12 +31,22 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.codehaus.plexus.action.Action"
+ *   role-hint="checkout-project"
  */
 public class CheckoutProjectContinuumAction
     extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private ContinuumScm scm;
 
+    /**
+     * @plexus.requirement
+     */
     private ContinuumStore store;
 
     public void execute( Map context )

Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java (from r473392, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java)
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java?view=diff&rev=474987&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java&r1=473392&p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java Tue Nov 14 13:21:59 2006
@@ -31,10 +31,17 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.codehaus.plexus.action.Action"
+ *   role-hint="create-projects-from-metadata"
  */
-public class CreateProjectsFromMetadata
+public class CreateProjectsFromMetadataAction
     extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private ContinuumProjectBuilderManager projectBuilderManager;
 
     public static final String KEY_URL = "url";

Propchange: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/DeployArtifactContinuumAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/DeployArtifactContinuumAction.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/DeployArtifactContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/DeployArtifactContinuumAction.java Tue Nov 14 13:21:59 2006
@@ -39,6 +39,10 @@
 /**
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.codehaus.plexus.action.Action"
+ *   role-hint="deploy-artifact"
  */
 public class DeployArtifactContinuumAction
     extends AbstractContinuumAction

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java Tue Nov 14 13:21:59 2006
@@ -37,6 +37,10 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.codehaus.plexus.action.Action"
+ *   role-hint="execute-builder"
  */
 public class ExecuteBuilderContinuumAction
     extends AbstractContinuumAction

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java Tue Nov 14 13:21:59 2006
@@ -27,10 +27,17 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.codehaus.plexus.action.Action"
+ *   role-hint="store-checkout-scm-result"
  */
 public class StoreCheckOutScmResultAction
     extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private ContinuumStore store;
 
     public void execute( Map context )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java Tue Nov 14 13:21:59 2006
@@ -27,10 +27,18 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.codehaus.plexus.action.Action"
+ *   role-hint="store-project"
  */
 public class StoreProjectAction
     extends AbstractContinuumAction
 {
+
+    /**
+     * @plexus.requirement
+     */
     private ContinuumStore store;
 
     public void execute( Map context )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectGroupAction.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectGroupAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectGroupAction.java Tue Nov 14 13:21:59 2006
@@ -10,10 +10,17 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.codehaus.plexus.action.Action"
+ *   role-hint="store-project-group"
  */
 public class StoreProjectGroupAction
     extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private ContinuumStore store;
 
     public void execute( Map context )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java Tue Nov 14 13:21:59 2006
@@ -26,8 +26,10 @@
  *
  * @author Jesse McConnell <jmcconnell@apache.org>
  * @version $Id$
- * @plexus.component role="org.codehaus.plexus.action.Action"
- * role-hint="update-build-definition-from-project"
+ *
+ * @plexus.component
+ *   role="org.codehaus.plexus.action.Action"
+ *   role-hint="update-build-definition-from-project"
  */
 public class UpdateBuildDefinitionFromProjectAction
     extends AbstractBuildDefinitionContinuumAction

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java Tue Nov 14 13:21:59 2006
@@ -31,6 +31,10 @@
 /**
  * @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-project-from-working-directory"
  */
 public class UpdateProjectFromWorkingDirectoryContinuumAction
     extends AbstractContinuumAction
@@ -40,8 +44,14 @@
      */
     private WorkingDirectoryService workingDirectoryService;
 
+    /**
+     * @plexus.requirement
+     */
     private BuildExecutorManager buildExecutorManager;
 
+    /**
+     * @plexus.requirement
+     */
     private ContinuumStore store;
 
     public void execute( Map context )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java Tue Nov 14 13:21:59 2006
@@ -26,12 +26,22 @@
 /**
  * @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"
  */
 public class ValidateProject
     extends AbstractValidationContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private BuildExecutorManager buildExecutorManager;
 
+    /**
+     * @plexus.requirement
+     */
     private ContinuumStore store;
 
     public void execute( Map context )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java Tue Nov 14 13:21:59 2006
@@ -10,6 +10,10 @@
 /**
  * @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"
  */
 public class ValidateProjectGroup
     extends AbstractValidationContinuumAction

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java Tue Nov 14 13:21:59 2006
@@ -28,11 +28,18 @@
 /**
  * @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"
  */
 public class DefaultBuildExecutorManager
     extends AbstractLogEnabled
     implements BuildExecutorManager, Initializable
 {
+    /**
+     * @plexus.requirement role="org.apache.maven.continuum.execution.ContinuumBuildExecutor"
+     */
     private Map executors;
 
     // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java Tue Nov 14 13:21:59 2006
@@ -40,6 +40,10 @@
 /**
  * @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"
  */
 public class DefaultMavenOneMetadataHelper
     extends AbstractLogEnabled

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Tue Nov 14 13:21:59 2006
@@ -76,6 +76,10 @@
  * @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"
  */
 public class DefaultMavenBuilderHelper
     extends AbstractLogEnabled
@@ -102,7 +106,7 @@
     private MavenSettingsBuilder mavenSettingsBuilder;
 
     /**
-     * @plexus.configuration
+     * @plexus.configuration default-value="${plexus.home}/local-repository"
      */
     private String localRepository;
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java Tue Nov 14 13:21:59 2006
@@ -16,9 +16,6 @@
  * limitations under the License.
  */
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.model.project.Schedule;
@@ -33,10 +30,17 @@
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.jpox.SchemaTool;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @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"
  */
 public class DefaultContinuumInitializer
     extends AbstractLogEnabled

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java Tue Nov 14 13:21:59 2006
@@ -38,6 +38,10 @@
 /**
  * @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"
  */
 public class DefaultContinuumNotificationDispatcher
     extends AbstractLogEnabled

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java Tue Nov 14 13:21:59 2006
@@ -30,6 +30,10 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.codehaus.plexus.notification.notifier.Notifier"
+ *   role-hint="console"
  */
 public class ConsoleNotifier
     extends AbstractNotifier

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java Tue Nov 14 13:21:59 2006
@@ -24,12 +24,18 @@
 /**
  * @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"
  */
 public class DefaultContinuumProjectBuilderManager
     extends AbstractLogEnabled
     implements ContinuumProjectBuilderManager
 {
-    /** @plexus.requirement */
+    /**
+     * @plexus.requirement role="org.apache.maven.continuum.project.builder.ContinuumProjectBuilder"
+     */
     private Map projectBuilders;
 
     // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java Tue Nov 14 13:21:59 2006
@@ -37,6 +37,10 @@
 /**
  * @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"
  */
 public class MavenOneContinuumProjectBuilder
     extends AbstractContinuumProjectBuilder

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Tue Nov 14 13:21:59 2006
@@ -47,6 +47,10 @@
 /**
  * @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"
  */
 public class MavenTwoContinuumProjectBuilder
     extends AbstractContinuumProjectBuilder
@@ -69,7 +73,7 @@
     /**
      * @plexus.configuration
      */
-    private List excludedPackagingTypes;
+    private List excludedPackagingTypes = new ArrayList();
 
     // ----------------------------------------------------------------------
     // AbstractContinuumProjectBuilder Implementation

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java Tue Nov 14 13:21:59 2006
@@ -32,6 +32,10 @@
 /**
  * @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"
  */
 public class CheckOutTaskExecutor
     extends AbstractLogEnabled

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java Tue Nov 14 13:21:59 2006
@@ -25,6 +25,10 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.apache.maven.continuum.utils.WorkingDirectoryService"
+ *   role-hint="default"
  */
 public class DefaultWorkingDirectoryService
     extends AbstractLogEnabled

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java Tue Nov 14 13:21:59 2006
@@ -29,6 +29,10 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="org.apache.maven.continuum.utils.shell.ShellCommandHelper"
+ *   role-hint="default"
  */
 public class DefaultShellCommandHelper
     extends AbstractLogEnabled

Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml Tue Nov 14 13:21:59 2006
@@ -1,160 +1,7 @@
 <component-set>
   <components>
-    <component>
-      <role>org.apache.maven.continuum.Continuum</role>
-      <implementation>org.apache.maven.continuum.DefaultContinuum</implementation>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.action.ActionManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.security.ContinuumSecurity</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.initialization.ContinuumInitializer</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.build.settings.SchedulesActivator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.release.ContinuumReleaseManager</role>
-        </requirement>
-        <!-- from core -->
-        <requirement>
-          <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
-          <role-hint>build-project</role-hint>
-          <field-name>buildQueue</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
-          <role-hint>check-out-project</role-hint>
-          <field-name>checkoutQueue</field-name>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.execution.manager.BuildExecutorManager</role>
-        </requirement>
-      </requirements>
-      <configuration>
-        <working-directory>${plexus.home}/temp</working-directory>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
-      <implementation>org.apache.maven.continuum.configuration.DefaultConfigurationService</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-      <configuration>
-        <application-home>${plexus.home}</application-home>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.security.ContinuumSecurity</role>
-      <implementation>org.apache.maven.continuum.security.DefaultContinuumSecurity</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.initialization.ContinuumInitializer</role>
-      <implementation>org.apache.maven.continuum.initialization.DefaultContinuumInitializer</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.build.settings.SchedulesActivator</role>
-      <implementation>org.apache.maven.continuum.build.settings.DefaultSchedulesActivator</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.scheduler.Scheduler</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.execution.manager.BuildExecutorManager</role>
-      <implementation>org.apache.maven.continuum.execution.manager.DefaultBuildExecutorManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
-          <field-name>executors</field-name>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager</role>
-      <implementation>
-        org.apache.maven.continuum.project.builder.manager.DefaultContinuumProjectBuilderManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.project.builder.ContinuumProjectBuilder</role>
-          <field-name>projectBuilders</field-name>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.buildcontroller.BuildController</role>
-      <implementation>org.apache.maven.continuum.buildcontroller.DefaultBuildController</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.notification.ContinuumNotificationDispatcher</role>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.action.ActionManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.notification.ContinuumNotificationDispatcher</role>
-      <implementation>org.apache.maven.continuum.notification.DefaultContinuumNotificationDispatcher</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.notification.notifier.manager.NotifierManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.notification.RecipientSource</role>
-        </requirement>
-      </requirements>
-    </component>
 
+    <!-- not using plexus-maven-plugin because of configuration complexity -->
     <component>
       <role>org.apache.maven.continuum.scm.ContinuumScm</role>
       <implementation>org.apache.maven.continuum.scm.DefaultContinuumScm</implementation>
@@ -177,17 +24,6 @@
           </property>
         </updateProperties>
       </configuration>
-
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
-      <implementation>org.apache.maven.continuum.utils.DefaultWorkingDirectoryService</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
-        </requirement>
-      </requirements>
     </component>
 
     <!-- ConnectionConsumer -->
@@ -213,18 +49,13 @@
       </requirements>
     </component>
 
-    <!-- Notifier -->
-
-    <component>
-      <role>org.codehaus.plexus.notification.notifier.Notifier</role>
-      <role-hint>console</role-hint>
-      <implementation>org.apache.maven.continuum.notification.console.ConsoleNotifier</implementation>
-    </component>
 
     <!--
      |
-     | Executorss
+     | Executors
      |
+     | not using plexus-maven-plugin because configuraton can't be configured with default-value
+     | todo refactor the defaultExecutable local maybe?
      |-->
     <component>
       <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
@@ -252,31 +83,6 @@
       </requirements>
     </component>
 
-    <component>
-      <role>org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper</role>
-      <implementation>org.apache.maven.continuum.execution.maven.m2.DefaultMavenBuilderHelper</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.project.MavenProjectBuilder</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
-          <role-hint>default</role-hint>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.settings.MavenSettingsBuilder</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.scm.manager.ScmManager</role>
-        </requirement>
-      </requirements>
-      <configuration>
-        <local-repository>${plexus.home}/local-repository</local-repository>
-      </configuration>
-    </component>
 
     <component>
       <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
@@ -301,15 +107,6 @@
       </requirements>
     </component>
 
-    <component>
-      <role>org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelper</role>
-      <implementation>org.apache.maven.continuum.execution.maven.m1.DefaultMavenOneMetadataHelper</implementation>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.utils.shell.ShellCommandHelper</role>
-      <implementation>org.apache.maven.continuum.utils.shell.DefaultShellCommandHelper</implementation>
-    </component>
 
     <component>
       <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
@@ -348,46 +145,6 @@
       </requirements>
     </component>
 
-    <!--
-     |
-     | Project Builders
-     |
-     |-->
-
-    <component>
-      <role>org.apache.maven.continuum.project.builder.ContinuumProjectBuilder</role>
-      <role-hint>maven-one-builder</role-hint>
-      <implementation>org.apache.maven.continuum.project.builder.maven.MavenOneContinuumProjectBuilder</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelper</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.project.builder.ContinuumProjectBuilder</role>
-      <role-hint>maven-two-builder</role-hint>
-      <implementation>org.apache.maven.continuum.project.builder.maven.MavenTwoContinuumProjectBuilder</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-      <configuration>
-        <excludedPackagingTypes>
-          <!--
-          <packaging>pom</packaging>
-          -->
-        </excludedPackagingTypes>
-      </configuration>
-    </component>
 
     <!--
      |
@@ -464,19 +221,7 @@
       <implementation>org.codehaus.plexus.taskqueue.DefaultTaskQueue</implementation>
       <lifecycle-handler>plexus-configurable</lifecycle-handler>
     </component>
-    <component>
-      <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
-      <role-hint>check-out-project</role-hint>
-      <implementation>org.apache.maven.continuum.scm.queue.CheckOutTaskExecutor</implementation>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.action.ActionManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
+
 
     <component>
       <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
@@ -498,356 +243,6 @@
       </configuration>
     </component>
 
-    <!--
-     |
-     | JDO
-     |
-     |-->
-    <!--
-        <component>
-          <role>org.codehaus.plexus.jdo.JdoFactory</role>
-          <implementation>org.codehaus.plexus.jdo.DefaultJdoFactory</implementation>
-          <configuration>
-            <properties>
-              <property>
-                <name>javax.jdo.PersistenceManagerFactoryClass</name>
-                <value>org.jpox.PersistenceManagerFactoryImpl</value>
-              </property>
-              <property>
-                <name>javax.jdo.option.ConnectionDriverName</name>
-                <value>org.hsqldb.jdbcDriver</value>
-              </property>
-              <property>
-                <name>javax.jdo.option.ConnectionURL</name>
-                <value>jdbc:hsqldb:faen</value>
-              </property>
-              <property>
-                <name>javax.jdo.option.ConnectionUserName</name>
-                <value>sa</value>
-              </property>
-              <property>
-                <name>javax.jdo.option.ConnectionPassword</name>
-                <value></value>
-              </property>
-              <property>
-                <name>org.jpox.transactionIsolation</name>
-                <value>READ_UNCOMMITTED</value>
-              </property>
-              <property>
-                <name>org.jpox.poid.transactionIsolation</name>
-                <value>READ_UNCOMMITTED</value>
-              </property>
-              <property>
-                <name>org.jpox.autoStartMechanism</name>
-                <value>SchemaTable</value>
-              </property>
-              <property>
-                <name>org.jpox.autoCreateSchema</name>
-                <value>true</value>
-              </property>
-              <property>
-                <name>org.jpox.autoStartMechanismMode</name>
-                <value>Quiet</value>
-              </property>
-              <!- - TODO: check if we need this on
-                        <property>
-                          <name>javax.jdo.option.Multithreaded</name>
-                          <value>true</value>
-                        </property>
-              - ->
-            </properties>
-          </configuration>
-        </component>
-    -->
-
-    <!--
-     |
-     | Actions
-     |
-     -->
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>add-assignable-roles</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.AddAssignableRolesAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.rbac.profile.RoleProfileManager</role>
-          <role-hint>continuum</role-hint>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>add-build-definition-to-project</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.AddBuildDefinitionToProjectAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>add-build-definition-to-project-group</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.AddBuildDefinitionToProjectGroupAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>add-project-to-checkout-queue</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.AddProjectToCheckOutQueueAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
-          <role-hint>check-out-project</role-hint>
-          <field-name>checkOutQueue</field-name>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>checkout-project</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.CheckoutProjectContinuumAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.scm.ContinuumScm</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>check-working-directory</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.CheckWorkingDirectoryAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>clean-working-directory</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.CleanWorkingDirectoryAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>create-projects-from-metadata</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.CreateProjectsFromMetadata</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>execute-builder</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.ExecuteBuilderContinuumAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.execution.manager.BuildExecutorManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.notification.ContinuumNotificationDispatcher</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>deploy-artifact</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.DeployArtifactContinuumAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.execution.manager.BuildExecutorManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.deployer.ArtifactDeployer</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>remove-build-definition-from-project</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.RemoveBuildDefinitionFromProjectAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>remove-build-definition-from-project-group</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.RemoveBuildDefinitionFromProjectGroupAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>store-checkout-scm-result</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.StoreCheckOutScmResultAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>store-project</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.StoreProjectAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>store-project-group</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.StoreProjectGroupAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
 
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>validate-project</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.ValidateProject</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.execution.manager.BuildExecutorManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>validate-project-group</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.ValidateProjectGroup</implementation>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>update-build-definition-from-project</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.UpdateBuildDefinitionFromProjectAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>update-build-definition-from-project-group</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.UpdateBuildDefinitionFromProjectGroupAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>update-working-directory-from-scm</role-hint>
-      <implementation>
-        org.apache.maven.continuum.core.action.UpdateWorkingDirectoryFromScmContinuumAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.notification.ContinuumNotificationDispatcher</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.scm.ContinuumScm</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>update-project-from-working-directory</role-hint>
-      <implementation>
-        org.apache.maven.continuum.core.action.UpdateProjectFromWorkingDirectoryContinuumAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.execution.manager.BuildExecutorManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>validate-project</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.ValidateProject</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.execution.manager.BuildExecutorManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
-        </requirement>
-      </requirements>
-    </component>
   </components>
 </component-set>

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java Tue Nov 14 13:21:59 2006
@@ -24,6 +24,7 @@
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 
 import java.io.File;
 import java.util.Collection;
@@ -42,7 +43,16 @@
     public void testContinuumConfiguration()
         throws Exception
     {
-        lookup( Continuum.ROLE );
+        try
+        {
+           lookup( Continuum.ROLE );
+        }
+        catch ( ComponentLookupException e )
+        {
+           e.printStackTrace();
+           throw e;
+        }
+
     }
 
     public void testLookups()

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java?view=diff&rev=474987&r1=474986&r2=474987
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java Tue Nov 14 13:21:59 2006
@@ -31,14 +31,14 @@
     extends MockObjectTestCase
 {
 
-    private CreateProjectsFromMetadata action;
+    private CreateProjectsFromMetadataAction action;
 
     private Mock projectBuilderManagerMock, projectBuilder;
 
     protected void setUp()
         throws Exception
     {
-        action = new CreateProjectsFromMetadata();
+        action = new CreateProjectsFromMetadataAction();
         action.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "" ) );
         projectBuilderManagerMock = mock( ContinuumProjectBuilderManager.class );
         action.setProjectBuilderManager( (ContinuumProjectBuilderManager) projectBuilderManagerMock.proxy() );
@@ -55,13 +55,13 @@
         throws Exception
     {
         Map context = new HashMap();
-        context.put( CreateProjectsFromMetadata.KEY_URL, "http://svn.apache.org/repos/asf/maven/continuum/trunk/pom.xml" );
-        context.put( CreateProjectsFromMetadata.KEY_PROJECT_BUILDER_ID, "id" );
+        context.put( CreateProjectsFromMetadataAction.KEY_URL, "http://svn.apache.org/repos/asf/maven/continuum/trunk/pom.xml" );
+        context.put( CreateProjectsFromMetadataAction.KEY_PROJECT_BUILDER_ID, "id" );
 
         action.execute( context );
 
         ContinuumProjectBuildingResult result = (ContinuumProjectBuildingResult) context
-            .get( CreateProjectsFromMetadata.KEY_PROJECT_BUILDING_RESULT );
+            .get( CreateProjectsFromMetadataAction.KEY_PROJECT_BUILDING_RESULT );
 
         assertFalse( "Should not have errors", result.hasErrors() );
     }



Mime
View raw message