continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tryg...@apache.org
Subject svn commit: r193136 - in /maven/continuum/trunk: ./ continuum-api/src/main/java/org/apache/maven/continuum/ continuum-cc/ continuum-core-it/src/ continuum-core-it/src/main/ continuum-core-it/src/main/assembly/ continuum-core-it/src/main/java/ continuum...
Date Thu, 23 Jun 2005 13:02:18 GMT
Author: trygvis
Date: Thu Jun 23 06:02:15 2005
New Revision: 193136

URL: http://svn.apache.org/viewcvs?rev=193136&view=rev
Log:
o Cleanup.
o Moving more code to the actions, using the actions in DefaultContinuum.

Added:
    maven/continuum/trunk/continuum-core-it/src/
    maven/continuum/trunk/continuum-core-it/src/main/
    maven/continuum/trunk/continuum-core-it/src/main/assembly/
    maven/continuum/trunk/continuum-core-it/src/main/assembly/dep.xml   (with props)
    maven/continuum/trunk/continuum-core-it/src/main/java/
    maven/continuum/trunk/continuum-core-it/src/main/java/org/
    maven/continuum/trunk/continuum-core-it/src/main/java/org/apache/
    maven/continuum/trunk/continuum-core-it/src/main/java/org/apache/maven/
    maven/continuum/trunk/continuum-core-it/src/main/java/org/apache/maven/continuum/
    maven/continuum/trunk/continuum-core-it/src/main/java/org/apache/maven/continuum/it/
    maven/continuum/trunk/continuum-core-it/src/main/java/org/apache/maven/continuum/it/ContinuumIt.java   (with props)
    maven/continuum/trunk/continuum-core-it/src/main/resources/
    maven/continuum/trunk/continuum-core-it/src/main/resources/server.xml   (with props)
    maven/continuum/trunk/continuum-core-it/src/test/
    maven/continuum/trunk/continuum-core-it/src/test/java/
    maven/continuum/trunk/continuum-core-it/src/test/resources/
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java
      - copied, changed from r191649, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectMetadataContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java
      - copied, changed from r191649, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromScmContinuumAction.java
Removed:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromScmContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectMetadataContinuumAction.java
Modified:
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
    maven/continuum/trunk/continuum-cc/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/buildcontroller/BuildProjectTaskExecutor.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/core/ContinuumCore.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.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/CheckOutProjectContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.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/StoreProjectAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/registration/socket/UrlSocketRegistrar.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.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/project/ContinuumJPoxStoreTest.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java
    maven/continuum/trunk/continuum-model/pom.xml
    maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
    maven/continuum/trunk/continuum-plexus-application/build.sh
    maven/continuum/trunk/continuum-plexus-application/pom.xml
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/FormicaValve.java
    maven/continuum/trunk/continuum-xmlrpc/pom.xml
    maven/continuum/trunk/pom.xml

Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Thu Jun 23 06:02:15 2005
@@ -39,9 +39,6 @@
     void removeProject( String projectId )
         throws ContinuumException;
 
-    void updateProjectFromScm( String projectId )
-        throws ContinuumException;
-
     ContinuumProject getProject( String projectId )
         throws ContinuumException;
 

Modified: maven/continuum/trunk/continuum-cc/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-cc/pom.xml?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-cc/pom.xml (original)
+++ maven/continuum/trunk/continuum-cc/pom.xml Thu Jun 23 06:02:15 2005
@@ -21,6 +21,7 @@
         <version>1.1-alpha-3-SNAPSHOT</version>
         <executions>
           <execution>
+            <id>foo</id>
             <goals>
               <goal>descriptor</goal>
             </goals>

Added: maven/continuum/trunk/continuum-core-it/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/main/assembly/dep.xml?rev=193136&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/main/assembly/dep.xml (added)
+++ maven/continuum/trunk/continuum-core-it/src/main/assembly/dep.xml Thu Jun 23 06:02:15 2005
@@ -0,0 +1,41 @@
+<assembly>
+  <id>dep</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <!-- TODO: use expressions instead: ${project.build.directory}, ${project.build.finalName}, or have a <build /> tag to include the built artifact -->
+      <directory>target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+<!--
+      <unpack>false</unpack>
+-->
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+      <excludes>
+        <exclude>ant:ant</exclude>
+        <exclude>junit:junit</exclude>
+        <exclude>bcel:bcel</exclude>
+        <exclude>commons-cli:commons-cli</exclude>
+        <exclude>jasper-compiler:jasper-compiler</exclude>
+        <exclude>jasper-runtime:jasper-runtime</exclude>
+        <exclude>jdbc:jdbc</exclude>
+        <exclude>jdbc:jdbc-stdext</exclude>
+        <exclude>jline:jline</exclude>
+        <exclude>jpox:jpox-enhancer</exclude>
+        <exclude>jpox:jpox-enhancer</exclude>
+        <exclude>ojdbc:ojdbc</exclude>
+        <exclude>servlet:servletapi</exclude>
+        <exclude>xml-apis:xml-apis</exclude>
+        <exclude>xerces:xerces</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Propchange: maven/continuum/trunk/continuum-core-it/src/main/assembly/dep.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-core-it/src/main/assembly/dep.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: maven/continuum/trunk/continuum-core-it/src/main/java/org/apache/maven/continuum/it/ContinuumIt.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/main/java/org/apache/maven/continuum/it/ContinuumIt.java?rev=193136&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/main/java/org/apache/maven/continuum/it/ContinuumIt.java (added)
+++ maven/continuum/trunk/continuum-core-it/src/main/java/org/apache/maven/continuum/it/ContinuumIt.java Thu Jun 23 06:02:15 2005
@@ -0,0 +1,72 @@
+package org.apache.maven.continuum.it;
+
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+
+import org.codehaus.plexus.application.PlexusApplicationHost;
+import org.codehaus.plexus.application.ApplicationServer;
+import org.codehaus.plexus.application.profile.ApplicationRuntimeProfile;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.classworlds.ClassWorld;
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
+ * @version $Id$
+ */
+public class ContinuumIt
+{
+    public static void main( String[] args )
+        throws Exception
+    {
+        // ----------------------------------------------------------------------
+        // Set up the enviroment
+        // ----------------------------------------------------------------------
+
+        File basedir = new File( new File( "" ).getAbsolutePath() );
+
+        File plexusHome = new File( basedir, "../continuum-plexus-application/target/plexus-test-runtime" );
+
+        System.setProperty( "plexus.home", plexusHome.getAbsolutePath() );
+
+        // ----------------------------------------------------------------------
+        // Start the application host
+        // ----------------------------------------------------------------------
+
+        PlexusApplicationHost applicationHost = new PlexusApplicationHost();
+
+        ClassWorld classWorld = new ClassWorld();
+
+//        String configurationResource = new File( basedir, "../continuum-plexus-application/src/conf/application.xml" ).getAbsolutePath();
+
+        String configurationResource = new File( basedir, "src/main/resources/server.xml" ).getAbsolutePath();
+
+        applicationHost.start( classWorld, configurationResource );
+
+        ApplicationServer server = applicationHost.getApplicationServer();
+
+        ApplicationRuntimeProfile profile = server.getApplicationRuntimeProfile( "continuum" );
+
+        PlexusContainer container = profile.getContainer();
+
+        applicationHost.shutdown();
+    }
+
+    private static void doTests()
+    {
+    }
+}

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

Propchange: maven/continuum/trunk/continuum-core-it/src/main/java/org/apache/maven/continuum/it/ContinuumIt.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: maven/continuum/trunk/continuum-core-it/src/main/resources/server.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/main/resources/server.xml?rev=193136&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/main/resources/server.xml (added)
+++ maven/continuum/trunk/continuum-core-it/src/main/resources/server.xml Thu Jun 23 06:02:15 2005
@@ -0,0 +1,4 @@
+<plexus>
+  <components>
+  </components>
+</plexus>

Propchange: maven/continuum/trunk/continuum-core-it/src/main/resources/server.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-core-it/src/main/resources/server.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- 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 Thu Jun 23 06:02:15 2005
@@ -30,10 +30,10 @@
 import org.apache.maven.continuum.project.AntProject;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.project.MavenOneProject;
 import org.apache.maven.continuum.project.MavenTwoProject;
 import org.apache.maven.continuum.project.ShellProject;
+import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.apache.maven.continuum.project.builder.maven.MavenOneContinuumProjectBuilder;
 import org.apache.maven.continuum.project.builder.maven.MavenTwoContinuumProjectBuilder;
@@ -45,7 +45,6 @@
 
 import org.codehaus.plexus.action.ActionManager;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.workflow.WorkflowEngine;
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -56,10 +55,10 @@
     extends AbstractLogEnabled
     implements Continuum
 {
+    /** @plexus.requirement */
     private ContinuumCore core;
 
-    private WorkflowEngine workflowEngine;
-
+    /** @plexus.requirement */
     private ActionManager actionManager;
 
     // ----------------------------------------------------------------------
@@ -84,11 +83,12 @@
         {
             ContinuumProject p = (ContinuumProject) i.next();
 
-// TODO: FIX
-//            if ( p.getState() == ContinuumProjectState.FAILED )
-//            {
-//                list.add( p );
-//            }
+            ContinuumBuild build = core.getLatestBuildForProject( p.getId() );
+
+            if ( build.getState() == ContinuumProjectState.FAILED )
+            {
+                list.add( p );
+            }
         }
 
         return list;
@@ -103,11 +103,12 @@
         {
             ContinuumProject p = (ContinuumProject) i.next();
 
-// TODO: FIX
-//            if ( p.getState() == ContinuumProjectState.ERROR )
-//            {
-//                list.add( p );
-//            }
+            ContinuumBuild build = core.getLatestBuildForProject( p.getId() );
+
+            if ( build.getState() == ContinuumProjectState.ERROR )
+            {
+                list.add( p );
+            }
         }
 
         return list;
@@ -123,12 +124,6 @@
     //
     // ----------------------------------------------------------------------
 
-    public void updateProjectFromScm( String projectId )
-        throws ContinuumException
-    {
-        core.updateProjectFromScm( projectId );
-    }
-
     public void removeProject( String projectId )
         throws ContinuumException
     {
@@ -223,9 +218,7 @@
     {
         project.setExecutorId( AntBuildExecutor.ID );
 
-        String projectId = core.addProjectFromScm( project );
-
-        return projectId;
+        return executeAddProjectFromScmActivity( project );
     }
 
     public AntProject getAntProject( String projectId )
@@ -237,7 +230,7 @@
     public void updateAntProject( AntProject project )
         throws ContinuumException
     {
-        updateProject( project );
+        executeUpdateProjectActivity( project );
     }
 
     // ----------------------------------------------------------------------
@@ -340,7 +333,7 @@
     public void updateMavenOneProject( MavenOneProject project )
         throws ContinuumException
     {
-        updateProject( project );
+        executeUpdateProjectActivity( project );
     }
 
     // ----------------------------------------------------------------------
@@ -408,7 +401,6 @@
             throw new ContinuumException( "Error adding Maven 2 project.", e );
         }
 
-        System.err.println();
         return result;
     }
 
@@ -452,7 +444,7 @@
     public void updateMavenTwoProject( MavenTwoProject project )
         throws ContinuumException
     {
-        updateProject( project );
+        executeUpdateProjectActivity( project );
     }
 
     public String addShellProject( ShellProject project )
@@ -460,9 +452,14 @@
     {
         project.setExecutorId( ShellBuildExecutor.ID );
 
-        String projectId = core.addProjectFromScm( project );
-
-        return projectId;
+        try
+        {
+            return executeAddProjectFromScmActivity( project );
+        }
+        catch ( Exception e )
+        {
+            throw new ContinuumException( "Error adding Shell project.", e );
+        }
     }
 
     public ShellProject getShellProject( String projectId )
@@ -474,22 +471,43 @@
     public void updateShellProject( ShellProject project )
         throws ContinuumException
     {
-        updateProject( project );
+        executeUpdateProjectActivity( project );
     }
 
     // ----------------------------------------------------------------------
-    //
+    // Activities. These should end up as workflows in werkflow
     // ----------------------------------------------------------------------
 
-    private void updateProject( ContinuumProject project )
+    private void executeUpdateProjectActivity( ContinuumProject project )
         throws ContinuumException
     {
         core.updateProject( project );
-//        core.updateProject( project.getId(),
-//                            project.getName(),
-//                            project.getScmUrl(),
-//                            project.getNotifiers(),
-//                            project.getVersion(),
-//                            project.getCommandLineArguments() );
+    }
+
+    private String executeAddProjectFromScmActivity( ContinuumProject project )
+        throws ContinuumException
+    {
+        try
+        {
+            Map context = new HashMap();
+
+            // ----------------------------------------------------------------------
+            //
+            // ----------------------------------------------------------------------
+
+            context.put( AbstractContinuumAction.KEY_UNVALIDATED_PROJECT, project );
+
+            actionManager.lookup( "validate-project" ).execute( context );
+
+            actionManager.lookup( "store-project" ).execute( context );
+
+            actionManager.lookup( "add-project-to-checkout-queue" ).execute( context );
+
+            return (String) context.get( StoreProjectAction.KEY_PROJECT_ID );
+        }
+        catch ( Exception e )
+        {
+            throw new ContinuumException( "Error adding project.", e );
+        }
     }
 }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java Thu Jun 23 06:02:15 2005
@@ -26,16 +26,16 @@
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id:$
+ * @version $Id$
  */
 public class BuildProjectTaskExecutor
     extends AbstractLogEnabled
     implements TaskExecutor
 {
-    /** @requirement */
+    /** @plexus.requirement */
     private BuildController controller;
 
-    /** @requirement */
+    /** @plexus.requirement */
     private ContinuumStore store;
 
     // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- 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 Thu Jun 23 06:02:15 2005
@@ -16,26 +16,25 @@
  * limitations under the License.
  */
 
-import java.util.Collection;
-import java.util.Date;
-import java.io.StringWriter;
 import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.maven.continuum.Continuum;
-import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
-import org.apache.maven.continuum.execution.ContinuumBuildExecutionResult;
+import org.apache.maven.continuum.core.action.AbstractContinuumAction;
 import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
 import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.scm.ContinuumScm;
-import org.apache.maven.continuum.scm.ContinuumScmException;
 import org.apache.maven.continuum.scm.UpdateScmResult;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 
+import org.codehaus.plexus.action.ActionManager;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 /**
@@ -47,42 +46,13 @@
     implements BuildController
 {
     /** @plexus.requirement */
-    private BuildExecutorManager buildExecutorManager;
-
-    /** @plexus.requirement */
     private ContinuumStore store;
 
     /** @plexus.requirement */
     private ContinuumNotificationDispatcher notifier;
 
     /** @plexus.requirement */
-    private Continuum continuum;
-
-    /** @plexus.requirement */
-    private ContinuumScm scm;
-
-    // ----------------------------------------------------------------------
-    //
-    // ----------------------------------------------------------------------
-
-    private static class BuildContext
-    {
-        ContinuumProject project;
-
-        ContinuumBuildExecutor builder;
-
-        boolean forced;
-
-        UpdateScmResult scmResult;
-
-        ContinuumBuildExecutionResult result;
-
-        int state;
-
-        Throwable cause;
-
-        ContinuumBuild build;
-    }
+    private ActionManager actionManager;
 
     // ----------------------------------------------------------------------
     // BuildController Implementation
@@ -90,9 +60,7 @@
 
     public void build( String projectId, boolean forced )
     {
-        BuildContext context = new BuildContext();
-
-        context.forced = forced;
+        long startTime = System.currentTimeMillis();
 
         // ----------------------------------------------------------------------
         // Initialize the context
@@ -101,25 +69,17 @@
         // if these calls fail we're screwed anyway
         // and it will only be logged through the logger.
 
-        try
-        {
-            context.project = store.getProject( projectId );
-        }
-        catch ( ContinuumStoreException ex )
-        {
-            getLogger().error( "Internal error while building the project.", ex );
+        ContinuumProject project;
 
-            return;
-        }
+        String buildId = null;
 
         try
         {
-            context.builder = buildExecutorManager.getBuildExecutor( context.project.getExecutorId() );
+            project = store.getProject( projectId );
         }
-        catch ( ContinuumException e )
+        catch ( ContinuumStoreException ex )
         {
-            getLogger().fatalError( "Error while getting builder '" + context.project.getExecutorId() + "'. " +
-                                    "Project Id: '" + projectId + "'.", e );
+            getLogger().error( "Internal error while building the project.", ex );
 
             return;
         }
@@ -130,8 +90,39 @@
 
         try
         {
-            notifier.buildStarted( context.project );
+            notifier.buildStarted( project );
+
+            Map actionContext = new HashMap();
+
+            actionContext.put( AbstractContinuumAction.KEY_PROJECT_ID, projectId );
+
+            actionContext.put( AbstractContinuumAction.KEY_FORCED, Boolean.valueOf( forced ) );
+
+            UpdateScmResult scmResult = null;
+
+            try
+            {
+                actionManager.lookup( "update-working-directory-from-scm" ).execute( actionContext );
+
+                scmResult = (UpdateScmResult) actionContext.get( AbstractContinuumAction.KEY_UPDATE_SCM_RESULT );
 
+                actionManager.lookup( "update-project-from-working-directory" ).execute( actionContext );
+
+                actionManager.lookup( "execute-builder" ).execute( actionContext );
+
+                buildId = (String) actionContext.get( AbstractContinuumAction.KEY_BUILD_ID );
+            }
+            catch ( Throwable e )
+            {
+                buildId = makeAndSetErrorBuildResult( store.getProject( projectId ),
+                                                      scmResult,
+                                                      startTime,
+                                                      forced, e );
+            }
+
+/////////////////////// This section should delegate to UpdateWorkingDirectoryFromScmContinuumAction
+/*
+/////////////////////// START SECTION
             // ----------------------------------------------------------------------
             // Update the project
             //
@@ -139,22 +130,23 @@
             // build status to error.
             // ----------------------------------------------------------------------
 
-/////////////////////// This section should delegate to UpdateProjectFromScmContinuumAction
-/////////////////////// START SECTION
+
             if ( !update( context ) )
             {
                 return;
             }
 /////////////////////// END SECTION
-
-/////////////////////// This section should delegate to UpdateProjectMetadataContinuumAction
+*/
+/*
+/////////////////////// This section should delegate to UpdateProjectFromWorkingDirectoryContinuumAction
 /////////////////////// START SECTION
             if ( !updateProjectMetadata( context ) )
             {
                 return;
             }
 /////////////////////// END SECTION
-
+*/
+/*
 /////////////////////// This section should delegate to ExecuteBuilderContinuumAction
 /////////////////////// START SECTION
 
@@ -179,8 +171,9 @@
             buildProject( context );
 
 /////////////////////// END SECTION
+*/
         }
-        catch ( ContinuumStoreException ex )
+        catch ( Exception ex )
         {
             if ( !Thread.interrupted() )
             {
@@ -189,14 +182,28 @@
         }
         finally
         {
-            notifier.buildComplete( context.project, context.build );
+            ContinuumBuild build = null;
+
+            if ( buildId != null )
+            {
+                try
+                {
+                    build = store.getBuild( buildId );
+                }
+                catch ( ContinuumStoreException e )
+                {
+                    // ignore
+                }
+            }
+
+            notifier.buildComplete( project, build );
         }
     }
 
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------
-
+/*
     private boolean update( BuildContext context )
         throws ContinuumStoreException
     {
@@ -227,7 +234,8 @@
             notifier.checkoutComplete( context.project, context.scmResult );
         }
     }
-
+*/
+/*
     private boolean updateProjectMetadata( BuildContext context )
         throws ContinuumStoreException
     {
@@ -252,7 +260,8 @@
 
         return true;
     }
-
+*/
+/*
     private void buildProject( BuildContext context )
         throws ContinuumStoreException
     {
@@ -288,81 +297,41 @@
             notifier.goalsCompleted( context.project, context.build );
         }
     }
-
+*/
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------
 
-    private void makeAndSetErrorBuildResult( BuildContext context, Throwable e )
+    private String makeAndSetErrorBuildResult( ContinuumProject project,
+                                             UpdateScmResult scmResult,
+                                             long startTime,
+                                             boolean forced,
+                                             Throwable e )
         throws ContinuumStoreException
     {
-        makeBuild( context );
-
-        context.result = new ContinuumBuildExecutionResult( false, null, null, 0 );
+        getLogger().error( "Error while building project.", e );
 
-        context.state = ContinuumProjectState.ERROR;
-
-        setBuildResult( context.build.getId(),
-                        context.state,
-                        context.result,
-                        context.scmResult,
-                        e );
-    }
+        ContinuumBuild build = new ContinuumBuild();
 
-    private void setBuildResult( String buildId,
-                                 int state,
-                                 ContinuumBuildExecutionResult result,
-                                 UpdateScmResult scmResult,
-                                 Throwable error )
-        throws ContinuumStoreException
-    {
-        getLogger().info( "Setting the build id '" + buildId + "' state to " + state );
+        build.setState( ContinuumProjectState.ERROR );
 
-//        store.setBuildResult( buildId, state, result, scmResult, e );
+        build.setForced( forced );
 
-        ContinuumBuild build = store.getBuild( buildId );
+        build.setStartTime( startTime );
 
-        build.setState( state );
+        build.setEndTime( System.currentTimeMillis() );
 
-        build.setEndTime( new Date().getTime() );
+        build.setError( throwableToString( e ) );
 
-        build.setError( throwableToString( error ) );
+        build.setSuccess( false );
 
         build.setUpdateScmResult( scmResult );
 
-        // ----------------------------------------------------------------------
-        // Copy over the build result
-        // ----------------------------------------------------------------------
-
-        build.setSuccess( result.isSuccess() );
-
-        build.setStandardOutput( result.getStandardOutput() );
-
-        build.setStandardError( result.getStandardError() );
-
-        build.setExitCode( result.getExitCode() );
-
-        store.updateBuild( build );
-    }
-
-    private void makeBuild( BuildContext context )
-        throws ContinuumStoreException
-    {
-//        String buildId = store.createBuild( context.project.getId(), context.forced );
-
-        ContinuumBuild build = new ContinuumBuild();
-
-        build.setStartTime( System.currentTimeMillis() );
-        build.setState( ContinuumProjectState.BUILDING );
-        build.setForced( context.forced );
-
-        String buildId = store.addBuild( context.project.getId(), build );
+        String buildId = store.addBuild( project.getId(), build );
 
         getLogger().info( "Build id: '" + buildId + "'." );
 
-        context.build = store.getBuild( buildId );
-
-        context.build.setUpdateScmResult( context.scmResult );
+        return buildId;
     }
 
     // Check to see if there is only a single build in the builds list.

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java Thu Jun 23 06:02:15 2005
@@ -16,9 +16,7 @@
  * limitations under the License.
  */
 
-import java.net.URL;
 import java.util.Collection;
-import java.util.List;
 
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
@@ -41,20 +39,20 @@
 {
     String ROLE = ContinuumCore.class.getName();
 
-    Collection addProjectsFromUrl( String url, String projectBuilderId )
-        throws ContinuumException;
-
-    Collection addProjectsFromUrl( URL url, String projectBuilderId )
-        throws ContinuumException;
-
-    String addProjectFromScm( ContinuumProject project )
-        throws ContinuumException;
+//    Collection addProjectsFromUrl( String url, String projectBuilderId )
+//        throws ContinuumException;
+//
+//    Collection addProjectsFromUrl( URL url, String projectBuilderId )
+//        throws ContinuumException;
+//
+//    String addProjectFromScm( ContinuumProject project )
+//        throws ContinuumException;
 
     void removeProject( String projectId )
         throws ContinuumException;
 
-    void updateProjectFromScm( String projectId )
-        throws ContinuumException;
+//    void updateProjectFromScm( String projectId )
+//        throws ContinuumException;
 
     void updateProject( ContinuumProject project )
         throws ContinuumException;

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java Thu Jun 23 06:02:15 2005
@@ -17,31 +17,18 @@
  */
 
 import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.List;
 
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.buildqueue.BuildProjectTask;
 import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
-import org.apache.maven.continuum.execution.ContinuumBuildExecutorException;
 import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
-import org.apache.maven.continuum.project.builder.ContinuumProjectBuilderException;
-import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager;
-import org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManagerException;
 import org.apache.maven.continuum.scm.CheckOutScmResult;
 import org.apache.maven.continuum.scm.ContinuumScm;
-import org.apache.maven.continuum.scm.ContinuumScmException;
-import org.apache.maven.continuum.scm.queue.CheckOutTask;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 
@@ -52,7 +39,6 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
-import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
@@ -151,7 +137,7 @@
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------
-
+/*
     public Collection addProjectsFromUrl( String url, String executorId )
         throws ContinuumException
     {
@@ -233,7 +219,7 @@
 
         return project.getId();
     }
-
+*/
     public void removeProject( String projectId )
         throws ContinuumException
     {
@@ -246,7 +232,7 @@
             throw logAndCreateException( "Error while removing project.", ex );
         }
     }
-
+/*
     public void updateProjectFromScm( String projectId )
         throws ContinuumException
     {
@@ -289,7 +275,7 @@
 
         updateProjectFromCheckOut( project );
     }
-
+*/
     public void updateProject( ContinuumProject project )
         throws ContinuumException
     {
@@ -301,7 +287,6 @@
         {
             throw logAndCreateException( "Error while removing project.", ex );
         }
-
     }
 
 //    public void updateProject( String projectId,
@@ -462,7 +447,7 @@
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------
-
+/*
     private ContinuumProjectBuilder getProjectBuilder( String projectBuilderId )
         throws ContinuumException
     {
@@ -475,7 +460,8 @@
             throw logAndCreateException( "Error while getting project builder '" + projectBuilderId + "'.", e );
         }
     }
-
+*/
+/*
     private void validateProject( ContinuumProject project )
         throws ContinuumException
     {
@@ -489,7 +475,6 @@
             throw logAndCreateException( "No such executor with id '" + project.getExecutorId() + "'." );
         }
 
-        // TODO: Reenable
         try
         {
             if ( store.getProjectByName( project.getName() ) != null )
@@ -513,7 +498,8 @@
 
         project.setCommandLineArguments( StringUtils.clean( project.getCommandLineArguments() ) );
     }
-
+*/
+/*
     private ContinuumProject addProjectAndCheckOutSources( ContinuumProject project  )
         throws ContinuumException
     {
@@ -570,7 +556,8 @@
 
         return getProject( projectId );
     }
-
+*/
+/*
     private void doTempCheckOut( ContinuumProject project )
         throws ContinuumException
     {
@@ -608,7 +595,8 @@
             throw logAndCreateException( "Error while checking out the project.", e );
         }
     }
-
+*/
+/*
     private void updateProjectFromCheckOut( ContinuumProject project )
         throws ContinuumException
     {
@@ -635,13 +623,6 @@
 
         try
         {
-//            store.updateProject( id,
-//                                 project.getName(),
-//                                 project.getScmUrl(),
-//                                 project.getNotifiers(),
-//                                 project.getVersion(),
-//                                 project.getCommandLineArguments() );
-
             store.updateProject( project );
         }
         catch ( ContinuumStoreException e )
@@ -649,7 +630,7 @@
             throw logAndCreateException( "Error while storing the updated project.", e );
         }
     }
-
+*/
     // ----------------------------------------------------------------------
     // Lifecylce Management
     // ----------------------------------------------------------------------
@@ -762,14 +743,14 @@
 
         getLogger().info( "Continuum stopped." );
     }
-
+/*
     private ContinuumException logAndCreateException( String message )
     {
         getLogger().error( message );
 
         return new ContinuumException( message );
     }
-
+*/
     private ContinuumException logAndCreateException( String message, Throwable cause )
     {
         getLogger().error( message, cause );

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java Thu Jun 23 06:02:15 2005
@@ -48,8 +48,6 @@
 
     public final static String KEY_PROJECT_ID = "projectId";
 
-    public final static String KEY_PROJECT = "project";
-
     public final static String KEY_UNVALIDATED_PROJECT = "unvalidatedProject";
 
     public final static String KEY_BUILD_ID = "buildId";
@@ -58,9 +56,9 @@
 
     public static final String KEY_CHECKOUT_SCM_RESULT = "checkOutResult";
 
-    protected static final String KEY_UPDATE_SCM_RESULT = "updateResult";
+    public static final String KEY_UPDATE_SCM_RESULT = "updateResult";
 
-    private static final String KEY_FORCED = "forced";
+    public static final String KEY_FORCED = "forced";
 
     // ----------------------------------------------------------------------
     // Requirements
@@ -72,7 +70,7 @@
     private ContinuumCore core;
 
     /**
-     * @requirement
+     * @plexus.requirement
      */
     private ContinuumNotificationDispatcher notificationDispatcher;
 
@@ -125,14 +123,12 @@
     //
     // ----------------------------------------------------------------------
 
-    protected String getProjectId( Map context )
-        throws ContinuumStoreException
+    public String getProjectId( Map context )
     {
         return getString( context, KEY_PROJECT_ID );
     }
 
-    protected String getBuildId( Map context )
-        throws ContinuumStoreException
+    public String getBuildId( Map context )
     {
         return getString( context, KEY_BUILD_ID );
     }
@@ -154,7 +150,6 @@
     {
         return ((ContinuumProject) getObject( context, KEY_UNVALIDATED_PROJECT ) );
     }
-
 
     protected ContinuumBuild getBuild( Map context )
         throws ContinuumStoreException

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddProjectToCheckOutQueueAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddProjectToCheckOutQueueAction.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- 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 Thu Jun 23 06:02:15 2005
@@ -21,10 +21,6 @@
     {
         ContinuumProject project = getProject( context );
 
-        System.out.println( "getProjectId( context ) = " + getProjectId( context ) );
-
-        System.out.println( "getProject( context ) = " + getProject( context ) );
-
         CheckOutTask checkOutTask = new CheckOutTask( project.getId(), new File( project.getWorkingDirectory() ) );
 
         getCheckOutQueue().put( checkOutTask );

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckOutProjectContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckOutProjectContinuumAction.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- 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 Thu Jun 23 06:02:15 2005
@@ -18,10 +18,16 @@
 
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.scm.CheckOutScmResult;
+import org.apache.maven.continuum.scm.ContinuumScmException;
+import org.apache.maven.continuum.store.AbstractContinuumStore;
+import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.apache.maven.scm.manager.NoSuchScmProviderException;
 
 import java.io.File;
 import java.util.Map;
 
+import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
+
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
@@ -39,11 +45,63 @@
 
         File workingDirectory = getWorkingDirectory( context );
 
-        CheckOutScmResult result;
+        CheckOutScmResult result = null;
+
+        String errorMessage = null;
 
-        result = getScm().checkOut( project, workingDirectory );
+        Throwable exception = null;
 
-//        getStore().setCheckoutDone( projectId, result, null, null );
+        // ----------------------------------------------------------------------
+        // Check out the project
+        // ----------------------------------------------------------------------
+
+        try
+        {
+            result = getScm().checkOut( project, workingDirectory );
+        }
+        catch ( ContinuumScmException e )
+        {
+            // TODO: Dissect the scm exception to be able to give better feedback
+            Throwable cause = e.getCause();
+
+            if ( cause instanceof NoSuchScmProviderException )
+            {
+                errorMessage = cause.getMessage();
+            }
+            else
+            {
+                exception = e;
+            }
+        }
+        catch ( Throwable e )
+        {
+            exception = e;
+        }
+
+        // ----------------------------------------------------------------------
+        // Store the check out result or error
+        // ----------------------------------------------------------------------
+
+        try
+        {
+            project = getStore().getProject( projectId );
+
+            project.setCheckOutScmResult( result );
+
+            project.setCheckOutErrorMessage( errorMessage );
+
+            project.setCheckOutErrorException( AbstractContinuumStore.throwableToString( exception ) );
+
+            getStore().updateProject( project );
+        }
+        catch ( ContinuumStoreException e )
+        {
+            throw new TaskExecutionException( "Error while storing the check out result.", e );
+        }
+
+        // ----------------------------------------------------------------------
+        // Safe the result in the context
+        // ----------------------------------------------------------------------
 
         context.put( KEY_CHECKOUT_SCM_RESULT, result );
     }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- 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/CreateProjectsFromMetadata.java Thu Jun 23 06:02:15 2005
@@ -5,8 +5,10 @@
 
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
+import org.apache.maven.continuum.ContinuumException;
 
 import java.net.URL;
+import java.net.MalformedURLException;
 import java.util.Map;
 
 /**
@@ -27,7 +29,18 @@
     {
         String projectBuilderId = getString( context, KEY_PROJECT_BUILDER_ID );
 
-        URL url = new URL( getString( context, KEY_URL ) );
+        String u = getString( context, KEY_URL );
+
+        URL url;
+
+        try
+        {
+            url = new URL( u );
+        }
+        catch ( MalformedURLException e )
+        {
+            throw new ContinuumException( "'" + u + "' is not a valid URL.", e );
+        }
 
         ContinuumProjectBuilder projectBuilder = getProjectBuilderManager().getProjectBuilder( projectBuilderId );
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- 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 Thu Jun 23 06:02:15 2005
@@ -28,7 +28,6 @@
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.scm.UpdateScmResult;
 import org.apache.maven.continuum.store.AbstractContinuumStore;
-import org.apache.maven.continuum.store.ContinuumStoreException;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -62,84 +61,68 @@
         {
             getLogger().info( "No files updated, not building. Project id '" + project.getId() + "'." );
 
-// No state in the project
-//            getStore().setBuildNotExecuted( getProjectId( context ) );
-
             return;
         }
 
         // ----------------------------------------------------------------------
-        // Make the build result
+        // Make the build
         // ----------------------------------------------------------------------
 
-//        String buildId = getStore().buildingProject( getProjectId( context ),
-//                                                     forced,
-//                                                     updateScmResult );
-
-        String buildId = createBuild( project, forced, updateScmResult );
-
-        context.put( KEY_BUILD_ID, buildId );
-
-        // ----------------------------------------------------------------------
-        //
-        // ----------------------------------------------------------------------
-
-        getNotifier().runningGoals( project, getBuild( context ) );
-
-        ContinuumBuildExecutionResult result = buildExecutor.build( project );
-
-        int state = result.isSuccess() ?
-                    ContinuumProjectState.OK : ContinuumProjectState.FAILED;
+        ContinuumBuild build = new ContinuumBuild();
 
-//        getStore().setBuildResult( buildId,
-//                                   state,
-//                                   result,
-//                                   updateScmResult,
-//                                   null );
+        build.setStartTime( new Date().getTime() );
 
-        ContinuumBuild build = getStore().getBuild( buildId );
+        build.setState( ContinuumProjectState.BUILDING );
 
-        build.setState( state );
+        build.setForced( forced );
 
-        build.setEndTime( new Date().getTime() );
+        build.setUpdateScmResult( updateScmResult );
 
-        build.setError( AbstractContinuumStore.throwableToString( null ) );
+        String buildId = getStore().addBuild( project.getId(), build );
 
-        build.setUpdateScmResult( updateScmResult );
+        context.put( KEY_BUILD_ID, buildId );
 
         // ----------------------------------------------------------------------
-        // Copy over the build result
+        //
         // ----------------------------------------------------------------------
 
-        build.setSuccess( result.isSuccess() );
+        build = getStore().getBuild( buildId );
 
-        build.setStandardOutput( result.getStandardOutput() );
-
-        build.setStandardError( result.getStandardError() );
+        try
+        {
+            getNotifier().runningGoals( project, getBuild( context ) );
 
-        build.setExitCode( result.getExitCode() );
+            ContinuumBuildExecutionResult result = buildExecutor.build( project );
 
-        getStore().updateBuild( build );
-    }
+            if ( result.isSuccess() )
+            {
+                build.setState( ContinuumProjectState.OK );
+            }
+            else
+            {
+                build.setState( ContinuumProjectState.FAILED );
+            }
 
-    private String createBuild( ContinuumProject project,
-                                boolean forced,
-                                UpdateScmResult scmResult )
-        throws ContinuumStoreException
-    {
-        ContinuumBuild build = new ContinuumBuild();
+            build.setSuccess( result.isSuccess() );
 
-        build.setStartTime( new Date().getTime() );
+            build.setStandardOutput( result.getStandardOutput() );
 
-        build.setState( ContinuumProjectState.BUILDING );
+            build.setStandardError( result.getStandardError() );
 
-//        project.setState( ContinuumProjectState.BUILDING );
+            build.setExitCode( result.getExitCode() );
+        }
+        finally
+        {
+            build.setEndTime( new Date().getTime() );
 
-        build.setForced( forced );
+            // ----------------------------------------------------------------------
+            // Copy over the build result
+            // ----------------------------------------------------------------------
 
-        build.setUpdateScmResult( scmResult );
+            getStore().updateBuild( build );
 
-        return getStore().addBuild( project.getId(), build );
+            getNotifier().goalsCompleted( project, build );
+        }
     }
 
     // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- 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 Thu Jun 23 06:02:15 2005
@@ -21,8 +21,6 @@
     {
         ContinuumProject project = getUnvalidatedProject( context );
 
-        File workingDirectory = getWorkingDirectory( context );
-
         // ----------------------------------------------------------------------
         //
         // ----------------------------------------------------------------------
@@ -37,7 +35,7 @@
         // Set the working directory
         // ----------------------------------------------------------------------
 
-        File projectWorkingDirectory = new File( workingDirectory, projectId );
+        File projectWorkingDirectory = new File( getCore().getWorkingDirectory(), projectId );
 
         if ( !projectWorkingDirectory.exists() && !projectWorkingDirectory.mkdirs() )
         {

Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java (from r191649, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectMetadataContinuumAction.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectMetadataContinuumAction.java&r1=191649&r2=193136&rev=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectMetadataContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java Thu Jun 23 06:02:15 2005
@@ -17,17 +17,39 @@
  */
 
 import java.util.Map;
+import java.io.File;
+
+import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
+import org.apache.maven.continuum.execution.ContinuumBuildExecutorException;
+import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.apache.maven.continuum.project.ContinuumProject;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
-public class UpdateProjectMetadataContinuumAction
+public class UpdateProjectFromWorkingDirectoryContinuumAction
     extends AbstractContinuumAction
 {
     public void execute( Map context )
         throws Exception
     {
-        getCore().updateProjectFromScm( getProjectId( context ) );
+        ContinuumProject project = getProject( context );
+
+        getLogger().info( "Updating project '" + project.getName() + "'." );
+
+        // ----------------------------------------------------------------------
+        // Make a new descriptor
+        // ----------------------------------------------------------------------
+
+        ContinuumBuildExecutor builder = getBuildExecutorManager().getBuildExecutor( project.getExecutorId() );
+
+        builder.updateProjectFromCheckOut( new File( project.getWorkingDirectory() ), project );
+
+        // ----------------------------------------------------------------------
+        // Store the new descriptor
+        // ----------------------------------------------------------------------
+
+        getStore().updateProject( project );
     }
 }

Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java (from r191649, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromScmContinuumAction.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromScmContinuumAction.java&r1=191649&r2=193136&rev=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromScmContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java Thu Jun 23 06:02:15 2005
@@ -25,7 +25,7 @@
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
-public class UpdateProjectFromScmContinuumAction
+public class UpdateWorkingDirectoryFromScmContinuumAction
     extends AbstractContinuumAction
 {
     public void execute( Map context )
@@ -33,20 +33,23 @@
     {
         ContinuumProject project = getProject( context );
 
-        String projectId = project.getId();
-
         // ----------------------------------------------------------------------
         //
         // ----------------------------------------------------------------------
 
-//        getStore().setIsUpdating( projectId );
-
         getNotifier().checkoutStarted( project );
 
-        UpdateScmResult updateScmResult = getScm().updateProject( project );
-
-        context.put( KEY_UPDATE_SCM_RESULT, updateScmResult );
+        UpdateScmResult updateScmResult = null;
 
-//        getStore().setUpdateDone( projectId );
+        try
+        {
+            updateScmResult = getScm().updateProject( project );
+
+            context.put( KEY_UPDATE_SCM_RESULT, updateScmResult );
+        }
+        finally
+        {
+            getNotifier().checkoutComplete( project, updateScmResult );
+        }
     }
 }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/registration/socket/UrlSocketRegistrar.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/registration/socket/UrlSocketRegistrar.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/registration/socket/UrlSocketRegistrar.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/registration/socket/UrlSocketRegistrar.java Thu Jun 23 06:02:15 2005
@@ -21,26 +21,25 @@
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.net.URL;
-import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.maven.continuum.core.ContinuumCore;
+import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.network.ConnectionConsumer;
-import org.apache.maven.continuum.project.builder.maven.MavenTwoContinuumProjectBuilder;
+import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
+import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.registration.AbstractContinuumRegistrar;
 import org.apache.maven.continuum.socket.SimpleSocket;
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id: UrlSocketRegistrar.java,v 1.1.1.1 2005/03/29 20:42:02 trygvis Exp $
+ * @version $Id$
  */
 public class UrlSocketRegistrar
     extends AbstractContinuumRegistrar
     implements ConnectionConsumer
 {
-    /** @requirement */
-    private ContinuumCore core;
+    /** @plexus.requirement */
+    private Continuum continuum;
 
     // ----------------------------------------------------------------------
     // ConnectionConsumer Implementation
@@ -55,15 +54,13 @@
         {
             String url = socket.readLine();
 
-            URL u = new URL( url );
+            ContinuumProjectBuildingResult result = continuum.addMavenTwoProject( url );
 
-            Collection ids = core.addProjectsFromUrl( u, MavenTwoContinuumProjectBuilder.ID );
-
-            for ( Iterator it = ids.iterator(); it.hasNext(); )
+            for ( Iterator it = result.getProjects().iterator(); it.hasNext(); )
             {
-                String id = (String) it.next();
+                ContinuumProject project = (ContinuumProject) it.next();
 
-                socket.writeLine( "id=" + id );
+                socket.writeLine( "id=" + project.getId() );
             }
 
             socket.writeLine( "OK" );

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- 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 Thu Jun 23 06:02:15 2005
@@ -17,16 +17,12 @@
  */
 
 import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 
-import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.scm.CheckOutScmResult;
-import org.apache.maven.continuum.scm.ContinuumScm;
-import org.apache.maven.continuum.scm.ContinuumScmException;
-import org.apache.maven.continuum.store.ContinuumStore;
-import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.apache.maven.continuum.store.AbstractContinuumStore;
-import org.apache.maven.scm.manager.NoSuchScmProviderException;
+import org.apache.maven.continuum.core.action.CheckOutProjectContinuumAction;
 
+import org.codehaus.plexus.action.ActionManager;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
@@ -41,10 +37,7 @@
     implements TaskExecutor
 {
     /** @plexus.requirement */
-    private ContinuumScm scm;
-
-    /** @plexus.requirement */
-    private ContinuumStore store;
+    private ActionManager actionManager;
 
     // ----------------------------------------------------------------------
     // TaskExecutor Implementation
@@ -53,14 +46,29 @@
     public void executeTask( Task t )
         throws TaskExecutionException
     {
-        // TODO: Replace with a exection of the "check out project" action
-
         CheckOutTask task = (CheckOutTask) t;
 
         String projectId = task.getProjectId();
 
-        File workingDirectory = task.getWorkingDirectory();
+        String workingDirectory = task.getWorkingDirectory().getAbsolutePath();
+
+        Map context = new HashMap();
 
+        context.put( CheckOutProjectContinuumAction.KEY_PROJECT_ID, projectId );
+
+        context.put( CheckOutProjectContinuumAction.KEY_WORKING_DIRECTORY, workingDirectory );
+
+        try
+        {
+            actionManager.lookup( "checkout-project" ).execute( context );
+        }
+        catch ( Exception e )
+        {
+            throw new TaskExecutionException( "Error checking out project.", e );
+        }
+
+        // TODO: Replace with a exection of the "check out project" action
+/*
         ContinuumProject project;
 
         try
@@ -82,7 +90,7 @@
         {
             result = scm.checkOut( project, workingDirectory );
         }
-        catch ( ContinuumScmException e )
+        catch( Throwable e )
         {
             // TODO: Dissect the scm exception to be able to give better feedback
             Throwable cause = e.getCause();
@@ -93,17 +101,14 @@
             }
             else
             {
+                errorMessage = "";
+
                 exception = e;
             }
         }
-        catch( Throwable e )
-        {
-            exception = e;
-        }
 
         try
         {
-//            store.setCheckoutDone( projectId, result, errorMessage, exception );
             project = store.getProject( projectId );
 
             project.setCheckOutScmResult( result );
@@ -118,5 +123,6 @@
         {
             throw new TaskExecutionException( "Error while storing the check out result.", e );
         }
+*/
     }
 }

Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- 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 Thu Jun 23 06:02:15 2005
@@ -78,19 +78,13 @@
       <implementation>org.apache.maven.continuum.buildcontroller.DefaultBuildController</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.notification.ContinuumNotificationDispatcher</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.continuum.scm.ContinuumScm</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.Continuum</role>
+          <role>org.codehaus.plexus.action.ActionManager</role>
         </requirement>
       </requirements>
     </component>
@@ -169,7 +163,7 @@
       <implementation>org.apache.maven.continuum.registration.socket.UrlSocketRegistrar</implementation>
       <requirements>
         <requirement>
-          <role>org.apache.maven.continuum.core.ContinuumCore</role>
+          <role>org.apache.maven.continuum.Continuum</role>
         </requirement>
       </requirements>
     </component>
@@ -397,10 +391,7 @@
       <implementation>org.apache.maven.continuum.scm.queue.CheckOutTaskExecutor</implementation>
       <requirements>
         <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.scm.ContinuumScm</role>
+          <role>org.codehaus.plexus.action.ActionManager</role>
         </requirement>
       </requirements>
     </component>
@@ -549,7 +540,7 @@
     </component>
     <component>
       <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>build-project</role-hint>
+      <role-hint>execute-builder</role-hint>
       <implementation>org.apache.maven.continuum.core.action.ExecuteBuilderContinuumAction</implementation>
       <requirements>
         <requirement>
@@ -582,18 +573,21 @@
     </component>
     <component>
       <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>update-project</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.UpdateProjectFromScmContinuumAction</implementation>
+      <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.core.ContinuumCore</role>
         </requirement>
+        <requirement>
+          <role>org.apache.maven.continuum.notification.ContinuumNotificationDispatcher</role>
+        </requirement>
       </requirements>
     </component>
     <component>
       <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>update-project-metadata</role-hint>
-      <implementation>org.apache.maven.continuum.core.action.UpdateProjectMetadataContinuumAction</implementation>
+      <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.core.ContinuumCore</role>

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/ContinuumJPoxStoreTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/ContinuumJPoxStoreTest.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/ContinuumJPoxStoreTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/ContinuumJPoxStoreTest.java Thu Jun 23 06:02:15 2005
@@ -157,36 +157,21 @@
         // Modify the first notifier
         // ----------------------------------------------------------------------
 
-        System.err.println( "***" );
-        System.err.println( "***" );
-        System.err.println( "***" );
-
-        System.err.println( "store.getContinuumProject( p.getId(), true );" );
         p = store.getContinuumProject( p.getId(), true );
 
-        System.err.println( "p.getNotifiers();" );
         notifiers = p.getNotifiers();
 
-        System.err.println( "notifiers.get( 0 );" );
         n = (ContinuumNotifier) notifiers.get( 0 );
 
-        System.err.println( "n.setType( \"baz\" );" );
         n.setType( "baz" );
 
         // change a existsing property
-        System.err.println( "n.getConfiguration().put( \"foo\", \"foo\" );" );
         n.getConfiguration().put( "foo", "foo" );
 
         // add another property
-        System.err.println( "n.getConfiguration().put( \"baz\", \"yay\" );" );
         n.getConfiguration().put( "baz", "yay" );
 
-        System.err.println( "store.storeContinuumProject( p );" );
         store.storeContinuumProject( p );
-        
-        System.err.println( "***" );
-        System.err.println( "***" );
-        System.err.println( "***" );
 
         // ----------------------------------------------------------------------
         //

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java Thu Jun 23 06:02:15 2005
@@ -264,7 +264,6 @@
         // ----------------------------------------------------------------------
 
         project = store.getProject( projectId );
-        System.err.println( ( (ContinuumNotifier) project.getNotifiers().get( 0 ) ).getConfiguration() );
 
         String name2 = "name 2";
         String scmUrl2 = "scm url 2";
@@ -282,13 +281,9 @@
         project.setVersion( version2 );
         project.setCommandLineArguments( commandLineArguments2 );
 
-        System.err.println( ( (ContinuumNotifier) project.getNotifiers().get( 0 ) ).getConfiguration() );
         store.updateProject( project );
-        System.err.println( ( (ContinuumNotifier) project.getNotifiers().get( 0 ) ).getConfiguration() );
 
         project = store.getProject( projectId );
-
-        System.err.println( ((ContinuumNotifier)project.getNotifiers().get(0)).getConfiguration() );
 
         notifier = new ContinuumNotifier();
         notifier.setType( "kewk" );

Modified: maven/continuum/trunk/continuum-model/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/pom.xml?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/pom.xml (original)
+++ maven/continuum/trunk/continuum-model/pom.xml Thu Jun 23 06:02:15 2005
@@ -22,6 +22,7 @@
         <version>1.0-SNAPSHOT</version>
         <executions>
           <execution>
+            <id>foo</id>
             <goals>
               <goal>enhance</goal>
             </goals>
@@ -39,6 +40,7 @@
         </configuration>
         <executions>
           <execution>
+            <id>foo</id>
             <goals>
               <goal>java</goal>
               <goal>jpox-jdo-mapping</goal>

Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java Thu Jun 23 06:02:15 2005
@@ -23,9 +23,9 @@
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.codehaus.plexus.ircbot.IrcBot;
 import org.codehaus.plexus.notification.NotificationException;
 import org.codehaus.plexus.notification.notifier.AbstractNotifier;
+import org.codehaus.plexus.ircbot.IrcBot;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -86,7 +86,7 @@
         {
             if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_BUILD_COMPLETE ) )
             {
-                buildComplete( project, build, source, recipients );
+                buildComplete( project, build );
             }
         }
         catch ( ContinuumException e )
@@ -96,9 +96,7 @@
     }
 
     private void buildComplete( ContinuumProject project,
-                                ContinuumBuild build,
-                                String source,
-                                Set recipients )
+                                ContinuumBuild build )
         throws ContinuumException
     {
         // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-plexus-application/build.sh
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-application/build.sh?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-plexus-application/build.sh (original)
+++ maven/continuum/trunk/continuum-plexus-application/build.sh Thu Jun 23 06:02:15 2005
@@ -1,8 +1,2 @@
 m2 \
-   -DapplicationConfiguration=src/conf/application.xml \
-   -DconfigurationsDirectory=src/conf \
-   -DconfigurationProperties=app.properties \
-   -DapplicationName=continuum  \
-   -DruntimeConfiguration=src/test/conf/test-runtime-configuration.xml \
-   -DruntimeConfigurationProperties=app.properties \
-   clean:clean plexus:app plexus:bundle-application plexus:test-runtime
+   clean:clean install plexus:runtime plexus:add-app plexus:add-services

Modified: maven/continuum/trunk/continuum-plexus-application/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-application/pom.xml?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-plexus-application/pom.xml (original)
+++ maven/continuum/trunk/continuum-plexus-application/pom.xml Thu Jun 23 06:02:15 2005
@@ -121,6 +121,11 @@
       <version>1.0-alpha-1</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <scope>runtime</scope>
+    </dependency>
 
     <dependency>
       <groupId>hsqldb</groupId>

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/FormicaValve.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/FormicaValve.java?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/FormicaValve.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/FormicaValve.java Thu Jun 23 06:02:15 2005
@@ -1,14 +1,13 @@
 package org.apache.maven.continuum.web.pipeline.valve;
 
+import org.apache.maven.continuum.web.tool.FormToolException;
+import org.apache.maven.continuum.web.tool.FormicaTool;
+
+import org.codehaus.plexus.formica.Form;
 import org.codehaus.plexus.summit.pipeline.valve.CreateViewContextValve;
 import org.codehaus.plexus.summit.pipeline.valve.ValveInvocationException;
 import org.codehaus.plexus.summit.rundata.RunData;
 import org.codehaus.plexus.summit.view.ViewContext;
-import org.codehaus.plexus.formica.FormManager;
-import org.codehaus.plexus.formica.Form;
-import org.codehaus.plexus.formica.FormNotFoundException;
-import org.apache.maven.continuum.web.tool.FormicaTool;
-import org.apache.maven.continuum.web.tool.FormToolException;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>

Modified: maven/continuum/trunk/continuum-xmlrpc/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xmlrpc/pom.xml?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/pom.xml (original)
+++ maven/continuum/trunk/continuum-xmlrpc/pom.xml Thu Jun 23 06:02:15 2005
@@ -31,6 +31,7 @@
         <version>1.1-alpha-3-SNAPSHOT</version>
         <executions>
           <execution>
+            <id>foo</id>
             <goals>
               <goal>descriptor</goal>
             </goals>

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/pom.xml?rev=193136&r1=193135&r2=193136&view=diff
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Thu Jun 23 06:02:15 2005
@@ -119,7 +119,10 @@
       <dependency>
         <groupId>jpox</groupId>
         <artifactId>jpox-enhancer</artifactId>
+        <!--
         <version>1.1.0-beta-3</version>
+        -->
+        <version>1.1.0-beta-4-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>



Mime
View raw message