continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r742493 - in /continuum/trunk: continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/ continuum-api/src/main/java/org/apache/continuum/buildmanager/ continuum-api/src/main/java/org/apache/continuum/dao/ continuum-api/...
Date Mon, 09 Feb 2009 13:45:15 GMT
Author: ctan
Date: Mon Feb  9 13:45:14 2009
New Revision: 742493

URL: http://svn.apache.org/viewvc?rev=742493&view=rev
Log:
[CONTINUUM-2067] removed scm result field from project


Modified:
    continuum/trunk/continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/DistributedBuildManager.java
    continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java
    continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectDao.java
    continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java
    continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
    continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/BuildContextToProject.java
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java
    continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java
    continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java
    continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
    continuum/trunk/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java
    continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildController.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateBuildProjectTaskAction.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
    continuum/trunk/continuum-core/src/test/java/org/apache/continuum/buildmanager/ParallelBuildsManagerTest.java
    continuum/trunk/continuum-core/src/test/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueueTest.java
    continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java
    continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java
    continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java
    continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java
    continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
    continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java
    continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java
    continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
    continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java
    continuum/trunk/continuum-model/src/main/mdo/continuum.xml
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java

Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/DistributedBuildManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/DistributedBuildManager.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/DistributedBuildManager.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/DistributedBuildManager.java Mon Feb  9 13:45:14 2009
@@ -33,9 +33,6 @@
     void cancelDistributedBuild( String buildAgentUrl, int projectGroupId, String scmRootAddress )
         throws ContinuumException;
 
-    void updateScmResult( Map context )
-        throws ContinuumException;
-
     void updateBuildResult( Map context )
         throws ContinuumException;
 

Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java Mon Feb  9 13:45:14 2009
@@ -27,6 +27,7 @@
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.BuildQueue;
 import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.codehaus.plexus.taskqueue.Task;
 
 /**
@@ -43,9 +44,10 @@
      * @param projects
      * @param projectsBuildDefinitionsMap
      * @param trigger
+     * @param scmResultMap TODO
      * @throws BuildManagerException
      */
-    void buildProjects( List<Project> projects, Map<Integer, BuildDefinition> projectsBuildDefinitionsMap, int trigger )
+    void buildProjects( List<Project> projects, Map<Integer, BuildDefinition> projectsBuildDefinitionsMap, int trigger, Map<Integer, ScmResult> scmResultMap )
         throws BuildManagerException;
 
     /**
@@ -57,9 +59,10 @@
      * @param buildDefinition 
      * @param projectName
      * @param trigger
+     * @param scmResult TODO
      * @throws BuildManagerException
      */
-    void buildProject( int projectId, BuildDefinition buildDefinition, String projectName, int trigger )
+    void buildProject( int projectId, BuildDefinition buildDefinition, String projectName, int trigger, ScmResult scmResult )
         throws BuildManagerException;
 
     /**

Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectDao.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectDao.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectDao.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectDao.java Mon Feb  9 13:45:14 2009
@@ -57,9 +57,6 @@
     Project getProjectWithCheckoutResult( int projectId )
         throws ContinuumStoreException;
 
-    Project getProjectWithScmDetails( int projectId )
-        throws ContinuumStoreException;
-
     List<Project> getProjectsInGroup( int projectGroupId )
         throws ContinuumStoreException;
 

Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java Mon Feb  9 13:45:14 2009
@@ -21,6 +21,7 @@
 
 import java.io.Serializable;
 
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.codehaus.plexus.taskqueue.Task;
 
 /**
@@ -46,8 +47,10 @@
     
     private String buildDefinitionLabel;
 
+    private ScmResult scmResult;
+
     public BuildProjectTask( int projectId, int buildDefinitionId, int trigger, String projectName,
-                             String buildDefinitionLabel )
+                             String buildDefinitionLabel, ScmResult scmResult )
     {
         this.projectId = projectId;
 
@@ -60,6 +63,8 @@
         this.projectName = projectName;
         
         this.buildDefinitionLabel = buildDefinitionLabel;
+
+        this.scmResult = scmResult;
     }
 
     public int getProjectId()
@@ -101,7 +106,12 @@
     {
         return buildDefinitionLabel;
     }    
-    
+
+    public ScmResult getScmResult()
+    {
+        return scmResult;
+    }
+
     public boolean equals( Object obj )
     {
         if ( obj == null )

Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Mon Feb  9 13:45:14 2009
@@ -228,9 +228,6 @@
     void removeBuildResult( int buildId )
         throws ContinuumException;
 
-    List<ChangeSet> getChangesSinceLastUpdate( int projectId )
-        throws ContinuumException;
-    
     // ----------------------------------------------------------------------
     // Projects
     // ----------------------------------------------------------------------

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java Mon Feb  9 13:45:14 2009
@@ -24,9 +24,6 @@
 
 public interface ContinuumBuildAgentService
 {
-    void updateProjects( List<Map> projectsBuildContext )
-        throws ContinuumBuildAgentException;
-
     void buildProjects( List<Map> projectsBuildContext )
         throws ContinuumBuildAgentException;
     

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java Mon Feb  9 13:45:14 2009
@@ -73,21 +73,6 @@
      */
     private BuildContextManager buildContextManager;
 
-    public void updateProjects( List<Map> projectsBuildContext )
-        throws ContinuumBuildAgentException
-    {
-        List<BuildContext> buildContextList = initializeBuildContext( projectsBuildContext );
-
-        try
-        {
-            buildAgentManager.prepareBuildProjects( buildContextList );
-        }
-        catch ( ContinuumException e )
-        {
-            throw new ContinuumBuildAgentException( e.getMessage(), e );
-        }
-    }
-
     public void buildProjects( List<Map> projectsBuildContext )
         throws ContinuumBuildAgentException
     {
@@ -95,7 +80,7 @@
 
         try
         {
-            buildAgentManager.buildProjects( buildContextList );
+            buildAgentManager.prepareBuildProjects( buildContextList );
         }
         catch ( ContinuumException e )
         {
@@ -213,6 +198,8 @@
             {
                 result.put( ContinuumBuildAgentUtil.KEY_BUILD_OUTPUT, buildOutput );
             }
+
+            result.put( ContinuumBuildAgentUtil.KEY_SCM_RESULT, ContinuumBuildAgentUtil.createScmResult( buildContext ) );
         }
         return result;
     }
@@ -270,7 +257,6 @@
             context.setLocalRepository( ContinuumBuildAgentUtil.getLocalRepository( map ) );
             context.setBuildNumber( ContinuumBuildAgentUtil.getBuildNumber( map ) );
             context.setOldScmResult( getOldScmResult( map ) );
-            //context.setScmResult( context.getOldScmResult() );
 
             buildContext.add( context );
         }

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java Mon Feb  9 13:45:14 2009
@@ -84,6 +84,8 @@
 
         buildResult.setBuildDefinition( buildDefinition );
 
+        buildResult.setScmResult( ContinuumBuildAgentUtil.getScmResult( context, null ) );
+
         context.put( ContinuumBuildAgentUtil.KEY_BUILD_RESULT, buildResult );
 
         try

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java Mon Feb  9 13:45:14 2009
@@ -32,9 +32,6 @@
     void prepareBuildProjects( List<BuildContext> buildContextList )
         throws ContinuumException;
 
-    void buildProjects( List<BuildContext> buildContextList )
-        throws ContinuumException;
-
     void returnBuildResult( Map result )
         throws ContinuumException;
     

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java Mon Feb  9 13:45:14 2009
@@ -21,7 +21,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,7 +37,6 @@
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.model.scm.ChangeFile;
 import org.apache.maven.continuum.model.scm.ChangeSet;
 import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumProjectState;
@@ -126,6 +124,11 @@
             {
                 endPrepareBuild( context );
             }
+
+            if ( checkProjectScmRoot( context ) )
+            {
+                buildProjects( buildContexts );
+            }
         }
         else
         {
@@ -318,7 +321,6 @@
         Map<String, Object> context = buildContext.getActionContext();
 
         ScmResult scmResult = ContinuumBuildAgentUtil.getScmResult( context, null );
-        Project project = ContinuumBuildAgentUtil.getProject( context );
 
         if ( scmResult == null || !scmResult.isSuccess() )
         {
@@ -328,22 +330,6 @@
         {
             buildContext.setScmResult( scmResult );
         }
-
-        // connect to continuum server (master)
-        try
-        {
-            MasterBuildAgentTransportClient client = new MasterBuildAgentTransportClient(
-                 new URL( buildAgentConfigurationService.getContinuumServerUrl() ) );
-            client.returnScmResult( createScmResult( buildContext ) );
-        }
-        catch ( MalformedURLException e )
-        {
-            throw new ContinuumException( "Invalid Continuum Server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" );
-        }
-        catch ( Exception e )
-        {
-            throw new ContinuumException( "Error while returning scm result to the continuum server", e );
-        }
     }
 
     private void endPrepareBuild( Map context )
@@ -396,50 +382,6 @@
         }
     }
 
-    private Map<String, Object> createScmResult( BuildContext buildContext )
-    {
-        Map<String, Object> result = new HashMap<String, Object>();
-        ScmResult scmResult = buildContext.getScmResult();
-
-        result.put( ContinuumBuildAgentUtil.KEY_PROJECT_ID, new Integer( buildContext.getProjectId() ) );
-        if ( StringUtils.isEmpty( scmResult.getCommandLine() ) )
-        {
-            result.put( ContinuumBuildAgentUtil.KEY_SCM_COMMAND_LINE, "" );
-        }
-        else
-        {
-            result.put( ContinuumBuildAgentUtil.KEY_SCM_COMMAND_LINE, scmResult.getCommandLine() );
-        }
-        if ( StringUtils.isEmpty( scmResult.getCommandOutput() ) )
-        {
-            result.put( ContinuumBuildAgentUtil.KEY_SCM_COMMAND_OUTPUT, "" );
-        }
-        else
-        {
-            result.put( ContinuumBuildAgentUtil.KEY_SCM_COMMAND_OUTPUT, scmResult.getCommandOutput() );
-        }
-        if ( StringUtils.isEmpty( scmResult.getProviderMessage() ) )
-        {
-            result.put( ContinuumBuildAgentUtil.KEY_SCM_PROVIDER_MESSAGE, "" );
-        }
-        else
-        {
-            result.put( ContinuumBuildAgentUtil.KEY_SCM_PROVIDER_MESSAGE, scmResult.getProviderMessage() );
-        }
-        if ( StringUtils.isEmpty( scmResult.getException() ) )
-        {
-            result.put( ContinuumBuildAgentUtil.KEY_SCM_EXCEPTION, "" );
-        }
-        else
-        {
-            result.put( ContinuumBuildAgentUtil.KEY_SCM_EXCEPTION, scmResult.getException() );
-        }
-        result.put( ContinuumBuildAgentUtil.KEY_SCM_SUCCESS, new Boolean( scmResult.isSuccess() ) );
-        result.put( ContinuumBuildAgentUtil.KEY_SCM_CHANGES, getScmChanges( scmResult ) );
-
-        return result;
-    }
-
     private String convertScmResultToError( ScmResult result )
     {
         String error = "";
@@ -514,7 +456,7 @@
         throw exception;
     }
     
-    public void buildProjects( List<BuildContext> buildContexts )
+    private void buildProjects( List<BuildContext> buildContexts )
         throws ContinuumException
     {
         for ( BuildContext buildContext : buildContexts )
@@ -527,7 +469,8 @@
                                                                           buildContext.getBuildDefinitionId(),
                                                                           buildContext.getTrigger(),
                                                                           buildContext.getProjectName(),
-                                                                          "" );
+                                                                          "", 
+                                                                          buildContext.getScmResult() );
                 try
                 {
                     buildAgentTaskQueueManager.getBuildQueue().put( buildProjectTask );
@@ -558,85 +501,6 @@
         }
     }
 
-    private List<Map> getScmChanges( ScmResult scmResult )
-    {
-        List<Map> scmChanges = new ArrayList<Map>();
-
-        List<ChangeSet> changes = scmResult.getChanges();
-
-        if ( changes != null )
-        {
-            for ( ChangeSet cs : changes )
-            {
-                Map changeSet = new HashMap();
-
-                if ( StringUtils.isNotEmpty( cs.getAuthor() ) )
-                {
-                    changeSet.put( ContinuumBuildAgentUtil.KEY_CHANGESET_AUTHOR, cs.getAuthor() );
-                }
-                else
-                {
-                    changeSet.put( ContinuumBuildAgentUtil.KEY_CHANGESET_AUTHOR, "" );
-                }
-                if ( StringUtils.isNotEmpty( cs.getComment() ) ) 
-                {
-                    changeSet.put( ContinuumBuildAgentUtil.KEY_CHANGESET_COMMENT, cs.getComment() );
-                }
-                else
-                {
-                    changeSet.put( ContinuumBuildAgentUtil.KEY_CHANGESET_COMMENT, "" );
-                }
-                changeSet.put( ContinuumBuildAgentUtil.KEY_CHANGESET_DATE, cs.getDateAsDate() );
-                changeSet.put( ContinuumBuildAgentUtil.KEY_CHANGESET_FILES, getChangeFiles( cs.getFiles() ) );
-
-                scmChanges.add( changeSet );
-            }
-        }
-
-        return scmChanges;
-    }
-
-    private List getChangeFiles( List<ChangeFile> changeFiles )
-    {
-        List<Map> files = new ArrayList<Map>();
-
-        if ( changeFiles != null )
-        {
-            for ( ChangeFile file : changeFiles )
-            {
-                Map changeFile = new HashMap();
-                if ( StringUtils.isNotEmpty( file.getName() ) )
-                {
-                    changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_NAME, file.getName() );
-                }
-                else
-                {
-                    changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_NAME, "" );
-                }
-                if ( StringUtils.isNotEmpty( file.getRevision() ) )
-                {
-                    changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_REVISION, file.getRevision() );
-                }
-                else
-                {
-                    changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_REVISION, "" );
-                }
-                if ( StringUtils.isNotEmpty( file.getStatus() ) )
-                {
-                    changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_STATUS, file.getStatus() );
-                }
-                else
-                {
-                    changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_STATUS, "" );
-                }
-
-                files.add( changeFile );
-            }
-        }
-
-        return files;
-    }
-
     private void mergeScmResults( BuildContext buildContext )
     {
         Map context = buildContext.getActionContext();

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java Mon Feb  9 13:45:14 2009
@@ -20,6 +20,7 @@
  */
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -40,6 +41,9 @@
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectGroup;
+import org.apache.maven.continuum.model.scm.ChangeFile;
+import org.apache.maven.continuum.model.scm.ChangeSet;
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.repository.ScmRepositoryException;
@@ -49,6 +53,7 @@
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -92,12 +97,11 @@
         BuildContext context = buildContextManager.getBuildContext( projectId );
         initializeBuildContext( context );
 
-        /*
         if ( !checkScmResult( context ) )
         {
             log.info( "Error updating from SCM, not building" );
             return;
-        }*/
+        }
         
         log.info( "Starting build of " + context.getProjectName() );
         startBuild( context );
@@ -147,6 +151,7 @@
         actionContext.put( ContinuumBuildAgentUtil.KEY_ENVIRONMENTS, getEnvironments( buildContext.getBuildDefinitionId(), 
                                                                                       getInstallationType( buildContext ) ) );
         actionContext.put( ContinuumBuildAgentUtil.KEY_LOCAL_REPOSITORY, buildContext.getLocalRepository() );
+        actionContext.put( ContinuumBuildAgentUtil.KEY_SCM_RESULT, buildContext.getScmResult() );
         buildContext.setActionContext( actionContext );
 
         buildContext.setBuildStartTime( System.currentTimeMillis() );
@@ -211,6 +216,8 @@
             result.put( ContinuumBuildAgentUtil.KEY_BUILD_ERROR, "" );
         }
 
+        result.put( ContinuumBuildAgentUtil.KEY_SCM_RESULT, ContinuumBuildAgentUtil.createScmResult( buildContext ) );
+
         try
         {
             buildAgentManager.returnBuildResult( result );
@@ -280,6 +287,8 @@
 
             build.setBuildDefinition( BuildContextToBuildDefinition.getBuildDefinition( context ) );
 
+            build.setScmResult( context.getScmResult() );
+
             if ( error != null )
             {
                 build.setError( error );

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/BuildContextToProject.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/BuildContextToProject.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/BuildContextToProject.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/BuildContextToProject.java Mon Feb  9 13:45:14 2009
@@ -51,8 +51,6 @@
 
         project.setBuildNumber( buildContext.getBuildNumber() );
 
-        project.setScmResult( buildContext.getOldScmResult() );
-
         return project;
     }
 }

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java Mon Feb  9 13:45:14 2009
@@ -23,13 +23,18 @@
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.continuum.buildagent.buildcontext.BuildContext;
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.scm.ChangeFile;
+import org.apache.maven.continuum.model.scm.ChangeSet;
 import org.apache.maven.continuum.model.scm.ScmResult;
+import org.codehaus.plexus.util.StringUtils;
 
 public class ContinuumBuildAgentUtil
 {
@@ -532,4 +537,130 @@
 
         return buffer.toString();
     }
+
+    public static Map<String, Object> createScmResult( BuildContext buildContext )
+    {
+        Map<String, Object> result = new HashMap<String, Object>();
+        ScmResult scmResult = buildContext.getScmResult();
+
+        result.put( ContinuumBuildAgentUtil.KEY_PROJECT_ID, new Integer( buildContext.getProjectId() ) );
+        if ( StringUtils.isEmpty( scmResult.getCommandLine() ) )
+        {
+            result.put( ContinuumBuildAgentUtil.KEY_SCM_COMMAND_LINE, "" );
+        }
+        else
+        {
+            result.put( ContinuumBuildAgentUtil.KEY_SCM_COMMAND_LINE, scmResult.getCommandLine() );
+        }
+        if ( StringUtils.isEmpty( scmResult.getCommandOutput() ) )
+        {
+            result.put( ContinuumBuildAgentUtil.KEY_SCM_COMMAND_OUTPUT, "" );
+        }
+        else
+        {
+            result.put( ContinuumBuildAgentUtil.KEY_SCM_COMMAND_OUTPUT, scmResult.getCommandOutput() );
+        }
+        if ( StringUtils.isEmpty( scmResult.getProviderMessage() ) )
+        {
+            result.put( ContinuumBuildAgentUtil.KEY_SCM_PROVIDER_MESSAGE, "" );
+        }
+        else
+        {
+            result.put( ContinuumBuildAgentUtil.KEY_SCM_PROVIDER_MESSAGE, scmResult.getProviderMessage() );
+        }
+        if ( StringUtils.isEmpty( scmResult.getException() ) )
+        {
+            result.put( ContinuumBuildAgentUtil.KEY_SCM_EXCEPTION, "" );
+        }
+        else
+        {
+            result.put( ContinuumBuildAgentUtil.KEY_SCM_EXCEPTION, scmResult.getException() );
+        }
+        result.put( ContinuumBuildAgentUtil.KEY_SCM_SUCCESS, new Boolean( scmResult.isSuccess() ) );
+        result.put( ContinuumBuildAgentUtil.KEY_SCM_CHANGES, getScmChanges( scmResult ) );
+
+        return result;
+    }
+
+    private static List<Map> getScmChanges( ScmResult scmResult )
+    {
+        List<Map> scmChanges = new ArrayList<Map>();
+
+        List<ChangeSet> changes = scmResult.getChanges();
+
+        if ( changes != null )
+        {
+            for ( ChangeSet cs : changes )
+            {
+                Map changeSet = new HashMap();
+
+                if ( StringUtils.isNotEmpty( cs.getAuthor() ) )
+                {
+                    changeSet.put( ContinuumBuildAgentUtil.KEY_CHANGESET_AUTHOR, cs.getAuthor() );
+                }
+                else
+                {
+                    changeSet.put( ContinuumBuildAgentUtil.KEY_CHANGESET_AUTHOR, "" );
+                }
+                if ( StringUtils.isNotEmpty( cs.getComment() ) ) 
+                {
+                    changeSet.put( ContinuumBuildAgentUtil.KEY_CHANGESET_COMMENT, cs.getComment() );
+                }
+                else
+                {
+                    changeSet.put( ContinuumBuildAgentUtil.KEY_CHANGESET_COMMENT, "" );
+                }
+                if ( cs.getDateAsDate() != null )
+                {
+                    changeSet.put( ContinuumBuildAgentUtil.KEY_CHANGESET_DATE, cs.getDateAsDate() );
+                }
+                changeSet.put( ContinuumBuildAgentUtil.KEY_CHANGESET_FILES, getChangeFiles( cs.getFiles() ) );
+
+                scmChanges.add( changeSet );
+            }
+        }
+
+        return scmChanges;
+    }
+
+    private static List getChangeFiles( List<ChangeFile> changeFiles )
+    {
+        List<Map> files = new ArrayList<Map>();
+
+        if ( changeFiles != null )
+        {
+            for ( ChangeFile file : changeFiles )
+            {
+                Map changeFile = new HashMap();
+                if ( StringUtils.isNotEmpty( file.getName() ) )
+                {
+                    changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_NAME, file.getName() );
+                }
+                else
+                {
+                    changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_NAME, "" );
+                }
+                if ( StringUtils.isNotEmpty( file.getRevision() ) )
+                {
+                    changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_REVISION, file.getRevision() );
+                }
+                else
+                {
+                    changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_REVISION, "" );
+                }
+                if ( StringUtils.isNotEmpty( file.getStatus() ) )
+                {
+                    changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_STATUS, file.getStatus() );
+                }
+                else
+                {
+                    changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_STATUS, "" );
+                }
+
+                files.add( changeFile );
+            }
+        }
+
+        return files;
+    }
 }
\ No newline at end of file

Modified: continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java (original)
+++ continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java Mon Feb  9 13:45:14 2009
@@ -110,10 +110,7 @@
                                                         prepareBuildTask.getScmRootAddress() );
 
             startTime = System.currentTimeMillis();
-            client.updateProjects( buildContext );
-            updateBuildContext( buildContext);
             client.buildProjects( buildContext );
-
             endTime = System.currentTimeMillis();
         }
         catch ( MalformedURLException e )
@@ -396,23 +393,4 @@
     
         return res;
     }
-
-    private void updateBuildContext( List<Map> buildContext )
-    {
-        for ( Map context : buildContext )
-        {
-            int projectId = ContinuumBuildConstant.getProjectId( context );
-            
-            if ( !shouldBuild() )
-            {
-                buildContext.remove( context );
-            }
-        }
-    }
-
-    //TODO: Fix this
-    private boolean shouldBuild()
-    {
-        return true;
-    }
 }

Modified: continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java (original)
+++ continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java Mon Feb  9 13:45:14 2009
@@ -138,6 +138,8 @@
 
     public static final String KEY_SCM_TAG = "scm-tag";
 
+    public static final String KEY_SCM_RESULT = "scm-result";
+
     public static final String KEY_PROJECT_PARENT = "project-parent";
 
     public static final String KEY_NOTIFIER_TYPE = "notifier-type";
@@ -451,6 +453,11 @@
         return getBoolean( context, KEY_NOTIFIER_SEND_ON_WARNING );
     }
 
+    public static Map getScmResult( Map context )
+    {
+        return getMap( context, KEY_SCM_RESULT );
+    }
+
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java Mon Feb  9 13:45:14 2009
@@ -332,33 +332,6 @@
         }
     }
 
-    public void updateScmResult( Map context )
-        throws ContinuumException
-    {
-        try
-        {
-            int projectId = ContinuumBuildConstant.getProjectId( context );
-
-            log.info( "update scm result of project" + projectId );
-            Project project = projectDao.getProjectWithScmDetails( projectId );
-            
-            ScmResult scmResult = new ScmResult();
-            scmResult.setCommandLine( ContinuumBuildConstant.getScmCommandLine( context ) );
-            scmResult.setCommandOutput( ContinuumBuildConstant.getScmCommandOutput( context ) );
-            scmResult.setException( ContinuumBuildConstant.getScmException( context ) );
-            scmResult.setProviderMessage( ContinuumBuildConstant.getScmProviderMessage( context ) );
-            scmResult.setSuccess( ContinuumBuildConstant.isScmSuccess( context ) );
-            scmResult.setChanges( getScmChanges( context ) );
-
-            project.setScmResult( scmResult );
-            projectDao.updateProject( project );
-        }
-        catch ( ContinuumStoreException e )
-        {
-            throw new ContinuumException( "Error updating project's scm result", e );
-        }
-    }
-
     public void updateBuildResult( Map context )
         throws ContinuumException
     {
@@ -397,7 +370,7 @@
                 buildResult.setBuildDefinition( buildDefinition );
                 buildResult.setBuildNumber( buildNumber );
                 buildResult.setModifiedDependencies( getModifiedDependencies( oldBuildResult, context ) );
-                buildResult.setScmResult( project.getScmResult() );
+                buildResult.setScmResult( getScmResult( context ) );
                 
                 buildResultDao.addBuildResult( project, buildResult );
             
@@ -656,7 +629,7 @@
                 buildResult.setBuildDefinition( buildDefinition );
                 buildResult.setBuildNumber( project.getBuildNumber() + 1 );
                 buildResult.setModifiedDependencies( getModifiedDependencies( oldBuildResult, result ) );
-                buildResult.setScmResult( project.getScmResult() );
+                buildResult.setScmResult( getScmResult( result ) );
 
                 String buildOutput = ContinuumBuildConstant.getBuildOutput( result );
                 
@@ -957,4 +930,24 @@
         }
         return projectNotifiers;
     }
+
+    private ScmResult getScmResult( Map context )
+    {
+        Map map = ContinuumBuildConstant.getScmResult( context );
+
+        if ( !map.isEmpty() )
+        {
+            ScmResult scmResult = new ScmResult();
+            scmResult.setCommandLine( ContinuumBuildConstant.getScmCommandLine( map ) );
+            scmResult.setCommandOutput( ContinuumBuildConstant.getScmCommandOutput( map ) );
+            scmResult.setException( ContinuumBuildConstant.getScmException( map ) );
+            scmResult.setProviderMessage( ContinuumBuildConstant.getScmProviderMessage( map ) );
+            scmResult.setSuccess( ContinuumBuildConstant.isScmSuccess( map ) );
+            scmResult.setChanges( getScmChanges( map ) );
+
+            return scmResult;
+        }
+
+        return null;
+    }
 }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java Mon Feb  9 13:45:14 2009
@@ -40,6 +40,7 @@
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.BuildQueue;
 import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
@@ -90,9 +91,9 @@
     private PlexusContainer container;
     
     /**
-     * @see BuildsManager#buildProject(int, BuildDefinition, String, int)
+     * @see BuildsManager#buildProject(int, BuildDefinition, String, int, ScmResult)
      */
-    public void buildProject( int projectId, BuildDefinition buildDefinition, String projectName, int trigger )
+    public void buildProject( int projectId, BuildDefinition buildDefinition, String projectName, int trigger, ScmResult scmResult )
         throws BuildManagerException
     {
         try
@@ -119,7 +120,7 @@
         }
 
         Task buildTask =
-            new BuildProjectTask( projectId, buildDefinition.getId(), trigger, projectName, buildDefinitionLabel );
+            new BuildProjectTask( projectId, buildDefinition.getId(), trigger, projectName, buildDefinitionLabel, scmResult );
         try
         {
             log.info( "Project '" + projectName + "' added to overall build queue '" + overallBuildQueue.getName() + "'." );
@@ -132,10 +133,10 @@
     }
 
     /**
-     * @see BuildsManager#buildProjects(List, Map, int)
+     * @see BuildsManager#buildProjects(List, Map, int, Map)
      */
     public void buildProjects( List<Project> projects, Map<Integer, BuildDefinition> projectsBuildDefinitionsMap,
-                               int trigger )
+                               int trigger, Map<Integer, ScmResult> scmResultMap )
         throws BuildManagerException
     {
         int firstProjectId = 0;
@@ -189,9 +190,10 @@
                         buildDefinitionLabel = buildDefinition.getGoals();
                     }
 
+                    ScmResult scmResult = scmResultMap.get( project.getId() );
                     BuildProjectTask buildTask =
                         new BuildProjectTask( project.getId(), buildDefinition.getId(), trigger, project.getName(),
-                                              buildDefinitionLabel );
+                                              buildDefinitionLabel, scmResult );
                     buildTask.setMaxExecutionTime( buildDefinition.getSchedule().getMaxJobExecutionTime() * 1000 );
 
                     try
@@ -851,7 +853,7 @@
                     buildDefinitionDao.getBuildDefinition( buildTask.getBuildDefinitionId() );
             
                 buildProject( buildTask.getProjectId(), buildDefinition, buildTask.getProjectName(),
-                              buildTask.getTrigger() );
+                              buildTask.getTrigger(), buildTask.getScmResult() );
             }
             catch ( ContinuumStoreException e )
             {

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java Mon Feb  9 13:45:14 2009
@@ -353,7 +353,7 @@
         }
 
         BuildProjectTask buildProjectTask =
-            new BuildProjectTask( projectId, buildDefinitionId, trigger, projectName, buildDefinitionLabel );
+            new BuildProjectTask( projectId, buildDefinitionId, trigger, projectName, buildDefinitionLabel, null );
 
         return getBuildQueue().remove( buildProjectTask );
     }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Mon Feb  9 13:45:14 2009
@@ -1199,32 +1199,6 @@
         return changes;
     }
 
-    public List<ChangeSet> getChangesSinceLastUpdate( int projectId )
-        throws ContinuumException
-    {
-        List<ChangeSet> changes = new ArrayList<ChangeSet>();
-        
-        Project project;
-        
-        try
-        {
-            project = projectDao.getProjectWithScmDetails( projectId );
-        }
-        catch ( ContinuumStoreException e )
-        {
-            throw new ContinuumException( "", e );
-        }
-        
-        ScmResult scmResult = project.getScmResult();
-        
-        if ( scmResult != null )
-        {
-            changes.addAll( scmResult.getChanges() );
-        }
-        
-        return changes;
-    }
-
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildController.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildController.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildController.java Mon Feb  9 13:45:14 2009
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 
 /**
@@ -29,6 +30,6 @@
 {
     String ROLE = BuildController.class.getName();
 
-    void build( int projectId, int buildDefinitionId, int trigger )
+    void build( int projectId, int buildDefinitionId, int trigger, ScmResult scmResult )
         throws TaskExecutionException;
 }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java Mon Feb  9 13:45:14 2009
@@ -46,6 +46,6 @@
         BuildProjectTask buildProjectTask = (BuildProjectTask) task;
 
         controller.build( buildProjectTask.getProjectId(), buildProjectTask.getBuildDefinitionId(), buildProjectTask
-            .getTrigger() );
+            .getTrigger(), buildProjectTask.getScmResult() );
     }
 }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Mon Feb  9 13:45:14 2009
@@ -36,6 +36,7 @@
 import org.apache.maven.continuum.model.project.ProjectDependency;
 import org.apache.maven.continuum.model.scm.ChangeFile;
 import org.apache.maven.continuum.model.scm.ChangeSet;
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
@@ -119,11 +120,11 @@
      * @param trigger
      * @throws TaskExecutionException
      */
-    public void build( int projectId, int buildDefinitionId, int trigger )
+    public void build( int projectId, int buildDefinitionId, int trigger, ScmResult scmResult )
         throws TaskExecutionException
     {
         log.info( "Initializing build" );
-        BuildContext context = initializeBuildContext( projectId, buildDefinitionId, trigger );
+        BuildContext context = initializeBuildContext( projectId, buildDefinitionId, trigger, scmResult );
 
         // ignore this if AlwaysBuild ?
         if ( !checkScmResult( context ) )
@@ -327,7 +328,7 @@
      * @return
      * @throws TaskExecutionException
      */
-    protected BuildContext initializeBuildContext( int projectId, int buildDefinitionId, int trigger )
+    protected BuildContext initializeBuildContext( int projectId, int buildDefinitionId, int trigger, ScmResult scmResult )
         throws TaskExecutionException
     {
         BuildContext context = new BuildContext();
@@ -338,7 +339,7 @@
 
         try
         {
-            Project project = projectDao.getProjectWithScmDetails( projectId );
+            Project project = projectDao.getProject( projectId );
 
             context.setProject( project );
 
@@ -351,7 +352,7 @@
 
             context.setOldBuildResult( oldBuildResult );
 
-		    context.setScmResult( project.getScmResult() );
+		    context.setScmResult( scmResult );
 
             // CONTINUUM-1871 olamy if continuum is killed during building oldBuildResult will have a endTime 0
             // this means all changes since the project has been loaded in continuum will be in memory

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java Mon Feb  9 13:45:14 2009
@@ -97,6 +97,8 @@
 
     public static final String KEY_CANCELLED = "cancelled";
 
+    public static final String KEY_SCM_RESULT_MAP = "scm-result-map";
+
     // ----------------------------------------------------------------------
     // Utils
     // ----------------------------------------------------------------------
@@ -235,6 +237,11 @@
         return (Map<Integer, BuildDefinition>) getObject( context, KEY_PROJECTS_BUILD_DEFINITIONS_MAP );
     }
 
+    public static Map<Integer, ScmResult> getScmResultMap( Map context )
+    {
+        return (Map<Integer, ScmResult>) getObject( context, KEY_SCM_RESULT_MAP );
+    }
+
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateBuildProjectTaskAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateBuildProjectTaskAction.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateBuildProjectTaskAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateBuildProjectTaskAction.java Mon Feb  9 13:45:14 2009
@@ -28,8 +28,8 @@
 import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
 import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
 import org.apache.maven.continuum.model.project.BuildDefinition;
-import org.apache.maven.continuum.model.project.BuildQueue;
 import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 
@@ -62,7 +62,8 @@
         List<Project> projects = AbstractContinuumAction.getListOfProjects( context );
         Map<Integer, BuildDefinition> projectsBuildDefinitionsMap =
             AbstractContinuumAction.getProjectsBuildDefinitionsMap( context );
-        
+        Map<Integer, ScmResult> scmResultMap = 
+            AbstractContinuumAction.getScmResultMap( context );
         List<Project> projectsToBeBuilt = new ArrayList<Project>();
         int trigger = AbstractContinuumAction.getTrigger( context );
         
@@ -126,6 +127,6 @@
             }
         }
         
-        parallelBuildsManager.buildProjects( projectsToBeBuilt, projectsBuildDefinitionsMap, trigger );      
+        parallelBuildsManager.buildProjects( projectsToBeBuilt, projectsBuildDefinitionsMap, trigger, scmResultMap );      
     }
 }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java Mon Feb  9 13:45:14 2009
@@ -344,7 +344,8 @@
 
                 context.put( "project", project );
 
-                context.put( "changesSinceLastUpdate", continuum.getChangesSinceLastUpdate( project.getId() ) );
+                context.put( "changesSinceLastSuccess", continuum.getChangesSinceLastSuccess( project.getId(), build
+                    .getId() ) );
 
                 context.put( "previousBuild", previousBuild );
 
@@ -716,7 +717,7 @@
                         {
                             if ( Boolean.parseBoolean( committerField ) )
                             {
-                                ScmResult scmResult = context.getProject().getScmResult();
+                                ScmResult scmResult = context.getBuildResult().getScmResult();
                                 if ( scmResult != null && scmResult.getChanges() != null &&
                                     !scmResult.getChanges().isEmpty() )
                                 {

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java Mon Feb  9 13:45:14 2009
@@ -109,6 +109,7 @@
         int trigger = prepareTask.getTrigger();
         Set<Integer> projectsId = projectsBuildDefinitionsMap.keySet();
         Map context = new HashMap();
+        Map<Integer, ScmResult> scmResultMap = new HashMap<Integer, ScmResult>();
 
         try
         {
@@ -153,6 +154,8 @@
                 finally
                 {
                     log.info( "Ending prepare build of project: " + AbstractContinuumAction.getProject( context).getName() );
+                    scmResultMap.put( AbstractContinuumAction.getProjectId( context ), 
+                                      AbstractContinuumAction.getScmResult( context, null ) );
                     endProjectPrepareBuild( context );
                 }
             }
@@ -166,7 +169,7 @@
         if ( checkProjectScmRoot( context ) )
         {
             int projectGroupId = AbstractContinuumAction.getProjectGroupId( context );
-            buildProjects( projectGroupId, projectsBuildDefinitionsMap, trigger );
+            buildProjects( projectGroupId, projectsBuildDefinitionsMap, trigger, scmResultMap );
         }
     }
 
@@ -177,7 +180,7 @@
 
         try
         {
-            Project project = projectDao.getProjectWithScmDetails( projectId );
+            Project project = projectDao.getProject( projectId );
             ProjectGroup projectGroup = project.getProjectGroup();
             
             List<ProjectScmRoot> scmRoots = projectScmRootDao.getProjectScmRootByProjectGroup( projectGroup.getId() );
@@ -329,17 +332,6 @@
             
             updateProjectScmRoot( context, error );
         }
-        
-        try
-        {
-            project.setScmResult( scmResult );
-
-            projectDao.updateProject( project );
-        }
-        catch ( ContinuumStoreException e )
-        {
-            throw new TaskExecutionException( "Error storing the project", e );
-        }
     }
 
     private ScmResult getOldScmResults( int projectId, long startId, long fromDate )
@@ -508,7 +500,8 @@
         }
     }
 
-    private void buildProjects( int projectGroupId, Map<Integer, Integer> projectsAndBuildDefinitionsMap, int trigger )
+    private void buildProjects( int projectGroupId, Map<Integer, Integer> projectsAndBuildDefinitionsMap, 
+                                int trigger, Map<Integer, ScmResult> scmResultMap )
         throws TaskExecutionException
     {
         List<Project> projects = projectDao.getProjectsWithDependenciesByGroupId( projectGroupId );
@@ -578,6 +571,7 @@
             context.put( AbstractContinuumAction.KEY_PROJECTS, projectsToBeBuilt );
             context.put( AbstractContinuumAction.KEY_PROJECTS_BUILD_DEFINITIONS_MAP, projectsBuildDefinitionsMap );
             context.put( AbstractContinuumAction.KEY_TRIGGER, trigger );
+            context.put( AbstractContinuumAction.KEY_SCM_RESULT_MAP, scmResultMap );
 
             log.info( "Performing action create-build-project-task" );
             actionManager.lookup( "create-build-project-task" ).execute( context );

Modified: continuum/trunk/continuum-core/src/test/java/org/apache/continuum/buildmanager/ParallelBuildsManagerTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/continuum/buildmanager/ParallelBuildsManagerTest.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test/java/org/apache/continuum/buildmanager/ParallelBuildsManagerTest.java (original)
+++ continuum/trunk/continuum-core/src/test/java/org/apache/continuum/buildmanager/ParallelBuildsManagerTest.java Mon Feb  9 13:45:14 2009
@@ -286,7 +286,7 @@
 
         recordBuildProjectBuildQueuesAreEmpty();
         
-        buildsManager.buildProject( 1, buildDef, "continuum-project-test-1", 1 );
+        buildsManager.buildProject( 1, buildDef, "continuum-project-test-1", 1, null );
         
         context.assertIsSatisfied();
     }
@@ -302,7 +302,7 @@
 
         recordBuildProjectBuildQueuesAreEmpty();
         
-        buildsManager.buildProject( 1, buildDef, "continuum-project-test-1", 1 );
+        buildsManager.buildProject( 1, buildDef, "continuum-project-test-1", 1, null );
         context.assertIsSatisfied();
         
         //queue second project - 1st queue is not empty, 2nd queue is empty 
@@ -311,7 +311,7 @@
         // the first build queue already has a task queued
         final List<Task> tasks = new ArrayList<Task>();
         final List<Task> tasksOfFirstBuildQueue = new ArrayList<Task>();
-        tasksOfFirstBuildQueue.add( new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", buildDef.getDescription() ) );        
+        tasksOfFirstBuildQueue.add( new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", buildDef.getDescription(), null ) );        
         context.checking( new Expectations()
         {
             {
@@ -329,7 +329,7 @@
         
         recordAddToBuildQueue();
         
-        buildsManager.buildProject( 2, buildDef, "continuum-project-test-2", 1 );
+        buildsManager.buildProject( 2, buildDef, "continuum-project-test-2", 1, null );
         context.assertIsSatisfied();
         
         // queue third project - both queues have 1 task queued each
@@ -349,7 +349,7 @@
                         
         recordAddToBuildQueue();
         
-        buildsManager.buildProject( 3, buildDef, "continuum-project-test-3", 1 );
+        buildsManager.buildProject( 3, buildDef, "continuum-project-test-3", 1, null );
         context.assertIsSatisfied();
     }
     
@@ -572,7 +572,7 @@
             context.mock( TaskQueueExecutor.class, "checkout-queue-executor" );
         
         final List<Task> buildTasks = new ArrayList<Task>();
-        buildTasks.add( new BuildProjectTask(  2, 1, 1, "continuum-project-test-2", "BUILD_DEF" ) );
+        buildTasks.add( new BuildProjectTask(  2, 1, 1, "continuum-project-test-2", "BUILD_DEF", null ) );
         
         final List<CheckOutTask> checkoutTasks = new ArrayList<CheckOutTask>();
         checkoutTasks.add( new CheckOutTask( 2, new File( getBasedir(), "/target/test-working-dir/1" ), "continuum-project-test-2",
@@ -692,10 +692,10 @@
         buildDef.setSchedule( getSchedule( 1, 1, 2 ) );
         
         final TaskQueueExecutor buildQueueExecutor = context.mock( TaskQueueExecutor.class, "build-queue-executor" );
-        final Task buildTask = new BuildProjectTask( 1, 1, 1, "continuum-project-test-1", "BUILD_DEF" );
+        final Task buildTask = new BuildProjectTask( 1, 1, 1, "continuum-project-test-1", "BUILD_DEF", null );
 
         final List<Task> buildTasks = new ArrayList<Task>();
-        buildTasks.add( new BuildProjectTask(  2, 1, 1, "continuum-project-test-2", "BUILD_DEF" ) );
+        buildTasks.add( new BuildProjectTask(  2, 1, 1, "continuum-project-test-2", "BUILD_DEF", null ) );
         
         final List<CheckOutTask> checkoutTasks = new ArrayList<CheckOutTask>();
         checkoutTasks.add( new CheckOutTask( 2, new File( getBasedir(), "/target/test-working-dir/1" ), "continuum-project-test-2",
@@ -765,7 +765,7 @@
             }            
         });
         
-        buildsManager.buildProject( 1, buildDef, "continuum-project-test-1", 1 );
+        buildsManager.buildProject( 1, buildDef, "continuum-project-test-1", 1, null );
         context.assertIsSatisfied();
     }
     
@@ -775,7 +775,7 @@
         setupMockOverallBuildQueues();
     
         final List<Task> tasks = new ArrayList<Task>();
-        tasks.add( new BuildProjectTask(  2, 1, 1, "continuum-project-test-2", "BUILD_DEF" ) );
+        tasks.add( new BuildProjectTask(  2, 1, 1, "continuum-project-test-2", "BUILD_DEF", null ) );
         
         context.checking( new Expectations()  
         {

Modified: continuum/trunk/continuum-core/src/test/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueueTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueueTest.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueueTest.java (original)
+++ continuum/trunk/continuum-core/src/test/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueueTest.java Mon Feb  9 13:45:14 2009
@@ -188,7 +188,7 @@
     public void testAddToBuildQueue()
         throws Exception
     {
-        final Task buildTask = new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF" );
+        final Task buildTask = new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF", null );
         final TaskQueue buildQueue = context.mock( TaskQueue.class, "build-queue" );
 
         context.checking( new Expectations()
@@ -210,7 +210,7 @@
     {
         final TaskQueue buildQueue = context.mock( TaskQueue.class, "build-queue" );
         final List<Task> tasks = new ArrayList<Task>();
-        tasks.add( new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF" ) );
+        tasks.add( new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF", null ) );
 
         context.checking( new Expectations()
         {
@@ -235,7 +235,7 @@
     {
         final TaskQueue buildQueue = context.mock( TaskQueue.class, "build-queue" );
         final List<Task> tasks = new ArrayList<Task>();
-        tasks.add( new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF" ) );
+        tasks.add( new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF", null ) );
 
         context.checking( new Expectations()
         {
@@ -255,7 +255,7 @@
     public void testCancelBuildTask()
         throws Exception
     {
-        final Task buildTask = new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF" );
+        final Task buildTask = new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF", null );
 
         context.checking( new Expectations()
         {
@@ -274,7 +274,7 @@
     public void testCancelCurrentBuild()
         throws Exception
     {
-        final Task buildTask = new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF" );
+        final Task buildTask = new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF", null );
 
         context.checking( new Expectations()
         {
@@ -319,7 +319,7 @@
     public void testRemoveProjectFromBuildQueue()
         throws Exception
     {
-        final Task buildTask = new BuildProjectTask( 1, 1, 1, "continuum-project-test-2", "BUILD_DEF" );
+        final Task buildTask = new BuildProjectTask( 1, 1, 1, "continuum-project-test-2", "BUILD_DEF", null );
 
         final TaskQueue buildQueue = context.mock( TaskQueue.class, "build-queue" );
         final List<Task> tasks = new ArrayList<Task>();

Modified: continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java (original)
+++ continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java Mon Feb  9 13:45:14 2009
@@ -246,7 +246,7 @@
         // projectGroup = continuumStore.addProjectGroup( projectGroup );
 
         BuildProjectTask task = new BuildProjectTask( project.getId(), buildDefinition.getId(), 0, project.getName(),
-                                                      buildDefinition.getDescription() );
+                                                      buildDefinition.getDescription(), null );
 
         task.setMaxExecutionTime( maxRunTime );
 

Modified: continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java (original)
+++ continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java Mon Feb  9 13:45:14 2009
@@ -127,7 +127,7 @@
         throws Exception
     {
         return controller.initializeBuildContext( projectId2, buildDefinitionId2,
-                                                  ContinuumProjectState.TRIGGER_SCHEDULED );
+                                                  ContinuumProjectState.TRIGGER_SCHEDULED, new ScmResult() );
     }
 
     private BuildContext getContext( int hourOfLastExecution )

Modified: continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java (original)
+++ continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java Mon Feb  9 13:45:14 2009
@@ -131,7 +131,7 @@
     private void buildProject( int projectId, int trigger )
         throws Exception
     {
-        buildQueue.put( new BuildProjectTask( projectId, 0, trigger, null, null ) );
+        buildQueue.put( new BuildProjectTask( projectId, 0, trigger, null, null, null ) );
     }
 
     private void assertNextBuildIs( int expectedProjectId )

Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java Mon Feb  9 13:45:14 2009
@@ -30,8 +30,6 @@
 public interface MasterBuildAgentTransportService
 {
     public Boolean returnBuildResult( Map buildResult ) throws Exception;
-    
-    public Boolean returnScmResult( Map scmResult ) throws Exception;
 
     public Boolean startProjectBuild( Integer projectId ) throws Exception;
 

Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java Mon Feb  9 13:45:14 2009
@@ -82,25 +82,6 @@
         return result;
     }
 
-    public Boolean returnScmResult( Map scmResult )
-        throws Exception
-    {
-        Boolean result = null;
-        
-        try
-        {
-            result = master.returnScmResult( scmResult );
-            log.info( "Returning the scm result." );
-        }
-        catch ( Exception e )
-        {
-            log.error( "Failed to return the SCM result.", e );
-            throw new Exception( "Failed to return the SCM result", e);
-        }
-        
-        return result;
-    }
-    
     public Boolean ping()
         throws Exception
     {

Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java Mon Feb  9 13:45:14 2009
@@ -49,14 +49,6 @@
         return Boolean.TRUE;
     }
 
-    public Boolean returnScmResult( Map scmResult )
-        throws Exception
-    {
-        log.info( "SCM result returned." );
-        distributedBuildManager.updateScmResult( scmResult );
-        return Boolean.TRUE;
-    }
-
     public Boolean ping()
         throws Exception
     {

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java Mon Feb  9 13:45:14 2009
@@ -41,6 +41,4 @@
     public Boolean ping() throws Exception;
 
     public Boolean cancelBuild() throws Exception;
-
-    public Boolean updateProjects( List<Map> projectsBuildContext ) throws Exception;
 }

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java Mon Feb  9 13:45:14 2009
@@ -177,23 +177,4 @@
 
         return null;
     }
-
-    public Boolean updateProjects( List<Map> projectsBuildContext )
-        throws Exception
-    {
-        Boolean result = null;
-
-        try
-        {
-            result = slave.updateProjects( projectsBuildContext );
-            log.info( "Updating projects" );
-        }
-        catch ( Exception e )
-        {
-            log.error( "Error updating projects" );
-            throw new Exception( "Error updating projects", e );
-        }
-
-        return result;
-    }
 }

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java Mon Feb  9 13:45:14 2009
@@ -135,23 +135,4 @@
 
         return result;
     }
-
-    public Boolean updateProjects( List<Map> projectsBuildContext )
-        throws Exception
-    {
-        Boolean result = Boolean.FALSE;
-
-        try
-        {
-            continuumBuildAgentService.updateProjects( projectsBuildContext );
-            result = Boolean.TRUE;
-            log.info( "Updating projects" );
-        }
-        catch ( ContinuumBuildAgentException e )
-        {
-            log.error( "Failed to update projects", e );
-        }
-
-        return result;
-    }
 }

Modified: continuum/trunk/continuum-model/src/main/mdo/continuum.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-model/src/main/mdo/continuum.xml?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-model/src/main/mdo/continuum.xml (original)
+++ continuum/trunk/continuum-model/src/main/mdo/continuum.xml Mon Feb  9 13:45:14 2009
@@ -343,13 +343,6 @@
             <type>BuildDefinition</type>
             <multiplicity>*</multiplicity>
           </association>
-        </field>     
-        <field jpox.fetch-groups="project-all-details project-with-scm-details">
-          <name>scmResult</name>
-          <version>1.1.3+</version>
-          <association>
-            <type>ScmResult</type>
-          </association>
         </field>
       </fields>
     </class>

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java Mon Feb  9 13:45:14 2009
@@ -58,8 +58,6 @@
 
     protected static final String BUILD_TEMPLATE_BUILD_DEFINITIONS = "build-template-build-definitions";
 
-    protected static final String PROJECT_WITH_SCM_DETAILS_FETCH_GROUP = "project-with-scm-details";
-
     /**
     * @plexus.requirement
     */

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java?rev=742493&r1=742492&r2=742493&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java Mon Feb  9 13:45:14 2009
@@ -185,12 +185,6 @@
         return (Project) getObjectById( Project.class, projectId, PROJECT_WITH_CHECKOUT_RESULT_FETCH_GROUP );
     }
 
-    public Project getProjectWithScmDetails( int projectId )
-        throws ContinuumStoreException
-    {
-        return (Project) getObjectById( Project.class, projectId, PROJECT_WITH_SCM_DETAILS_FETCH_GROUP );
-    }
-
     public List<Project> getProjectsInGroup( int projectGroupId )
         throws ContinuumStoreException
     {



Mime
View raw message