continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r724670 [1/2] - in /continuum/branches/continuum-distributed-builds: ./ continuum-api/ continuum-api/src/main/java/org/apache/continuum/builder/ continuum-api/src/main/java/org/apache/continuum/scm/queue/ continuum-api/src/main/java/org/apa...
Date Tue, 09 Dec 2008 12:12:18 GMT
Author: ctan
Date: Tue Dec  9 04:12:07 2008
New Revision: 724670

URL: http://svn.apache.org/viewvc?rev=724670&view=rev
Log:
merge trunk to branch revision 713270:724659

Added:
    continuum/branches/continuum-distributed-builds/continuum-core/continuum-core.fbp
      - copied unchanged from r724659, continuum/trunk/continuum-core/continuum-core.fbp
    continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasySSLSocketFactory.java
      - copied unchanged from r724659, continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasySSLSocketFactory.java
    continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasyX509TrustManager.java
      - copied unchanged from r724659, continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasyX509TrustManager.java
    continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutorTest.java
      - copied unchanged from r724659, continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutorTest.java
    continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/applicationContextSlf4jPlexusLogger.xml
      - copied unchanged from r724659, continuum/trunk/continuum-core/src/test/resources/applicationContextSlf4jPlexusLogger.xml
    continuum/branches/continuum-distributed-builds/continuum-purge/src/main/resources/log4j.xml
      - copied unchanged from r724659, continuum/trunk/continuum-purge/src/main/resources/log4j.xml
    continuum/branches/continuum-distributed-builds/continuum-release/continuum-release.fbp
      - copied unchanged from r724659, continuum/trunk/continuum-release/continuum-release.fbp
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/
      - copied from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/add_and_build_project.html
      - copied unchanged from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/add_and_build_project.html
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/add_and_delete_local_repo.html
      - copied unchanged from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/add_and_delete_local_repo.html
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/add_and_delete_project_group.html
      - copied unchanged from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/add_and_delete_project_group.html
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/add_and_delete_user.html
      - copied unchanged from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/add_and_delete_user.html
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/add_duplicate_project_group.html
      - copied unchanged from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/add_duplicate_project_group.html
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/check_menu_options.html
      - copied unchanged from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/check_menu_options.html
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/continuum_failing_test_suite.html
      - copied unchanged from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/continuum_failing_test_suite.html
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/continuum_online_test_suite.html
      - copied unchanged from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/continuum_online_test_suite.html
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/continuum_test_suite.html
      - copied unchanged from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/continuum_test_suite.html
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/create_admin_user_and_general_configuration.html
      - copied unchanged from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/create_admin_user_and_general_configuration.html
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/edit_project_group.html
      - copied unchanged from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/edit_project_group.html
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/src/test/selenium-ide/test_build_definition_templates.html
      - copied unchanged from r724659, continuum/trunk/continuum-webapp-test/src/test/selenium-ide/test_build_definition_templates.html
    continuum/branches/continuum-distributed-builds/continuum.fbp
      - copied unchanged from r724659, continuum/trunk/continuum.fbp
    continuum/branches/continuum-distributed-builds/src/site/
      - copied from r724659, continuum/trunk/src/site/
    continuum/branches/continuum-distributed-builds/src/site/apt/
      - copied from r724659, continuum/trunk/src/site/apt/
    continuum/branches/continuum-distributed-builds/src/site/apt/findbugs.apt
      - copied unchanged from r724659, continuum/trunk/src/site/apt/findbugs.apt
Removed:
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/AbstractBuildQueueAction.java
Modified:
    continuum/branches/continuum-distributed-builds/   (props changed)
    continuum/branches/continuum-distributed-builds/continuum-api/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/builder/ContinuumBuilder.java
    continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/scm/queue/PrepareBuildProjectsTask.java
    continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java
    continuum/branches/continuum-distributed-builds/continuum-base/continuum-configuration/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-base/continuum-scm/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-base/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-builder/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
    continuum/branches/continuum-distributed-builds/continuum-commons/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-commons/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java
    continuum/branches/continuum-distributed-builds/continuum-core/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java
    continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
    continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
    continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
    continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
    continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/log4j.xml
    continuum/branches/continuum-distributed-builds/continuum-data-management/continuum-legacy/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-jdo/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-redback-jdo/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-data-management/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-data-management/redback-legacy/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-distributed-build/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-docs/   (props changed)
    continuum/branches/continuum-distributed-builds/continuum-docs/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-docs/src/site/apt/index.apt
    continuum/branches/continuum-distributed-builds/continuum-docs/src/site/apt/installation/upgrade.apt
    continuum/branches/continuum-distributed-builds/continuum-docs/src/site/site.xml
    continuum/branches/continuum-distributed-builds/continuum-docs/src/site/xdoc/   (props changed)
    continuum/branches/continuum-distributed-builds/continuum-docs/src/site/xdoc/release-notes.xml
    continuum/branches/continuum-distributed-builds/continuum-jetty/   (props changed)
    continuum/branches/continuum-distributed-builds/continuum-jetty/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-model/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-notifiers/continuum-notifier-api/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-notifiers/continuum-notifier-irc/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-notifiers/continuum-notifier-jabber/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-notifiers/continuum-notifier-msn/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-notifiers/continuum-notifier-wagon/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-notifiers/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-purge/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java
    continuum/branches/continuum-distributed-builds/continuum-release/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
    continuum/branches/continuum-distributed-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java
    continuum/branches/continuum-distributed-builds/continuum-reports/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-security/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-store/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-test/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/Readme.txt
    continuum/branches/continuum-distributed-builds/continuum-webapp-test/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-webapp/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java   (props changed)
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/localization/Continuum.properties
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/struts.xml
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
    continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
    continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-client/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml
    continuum/branches/continuum-distributed-builds/continuum-xmlrpc/pom.xml
    continuum/branches/continuum-distributed-builds/maven-continuum-plugin/pom.xml
    continuum/branches/continuum-distributed-builds/pom.xml

Propchange: continuum/branches/continuum-distributed-builds/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec  9 04:12:07 2008
@@ -1 +1,2 @@
-/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339
+/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk:713270-724659

Modified: continuum/branches/continuum-distributed-builds/continuum-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-api/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-api/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-api/pom.xml Tue Dec  9 04:12:07 2008
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-api</artifactId>

Modified: continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/builder/ContinuumBuilder.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/builder/ContinuumBuilder.java?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/builder/ContinuumBuilder.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/builder/ContinuumBuilder.java Tue Dec  9 04:12:07 2008
@@ -19,14 +19,13 @@
  * under the License.
  */
 
-import java.util.Map;
-
+import org.apache.continuum.scm.queue.PrepareBuildProjectsTask;
 import org.apache.maven.continuum.ContinuumException;
 
 public interface ContinuumBuilder
 {
     String ROLE = ContinuumBuilder.class.getName();
 
-    void buildProjects( Map<Integer, Integer> projectsAndBuildDefinitionsMap, int trigger )
+    void buildProjects( PrepareBuildProjectsTask task )
         throws ContinuumException;
 }

Modified: continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/scm/queue/PrepareBuildProjectsTask.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/scm/queue/PrepareBuildProjectsTask.java?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/scm/queue/PrepareBuildProjectsTask.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/scm/queue/PrepareBuildProjectsTask.java Tue Dec  9 04:12:07 2008
@@ -11,10 +11,17 @@
 
     private int trigger;
 
-    public PrepareBuildProjectsTask( Map<Integer, Integer> projectsBuildDefinitionsMap, int trigger )
+    private int projectGroupId;
+
+    private String scmRootAddress;
+
+    public PrepareBuildProjectsTask( Map<Integer, Integer> projectsBuildDefinitionsMap, int trigger,
+                                     int projectGroupId, String scmRootAddress )
     {
         this.projectsBuildDefinitionsMap = projectsBuildDefinitionsMap;
         this.trigger = trigger;
+        this.projectGroupId = projectGroupId;
+        this.scmRootAddress = scmRootAddress;
     }
     
     public long getMaxExecutionTime()
@@ -46,5 +53,25 @@
     public int getHashCode()
     {
         return this.hashCode();
-    }    
+    }
+
+    public int getProjectGroupId()
+    {
+        return projectGroupId;
+    }
+
+    public void setProjectGroupId( int projectGroupId )
+    {
+        this.projectGroupId = projectGroupId;
+    }
+
+    public String getScmRootAddress()
+    {
+        return scmRootAddress;
+    }
+
+    public void setScmRootAddress( String scmRootAddress )
+    {
+        this.scmRootAddress = scmRootAddress;
+    }
 }

Modified: continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java Tue Dec  9 04:12:07 2008
@@ -19,6 +19,9 @@
     void cancelBuildTask( int projectId )
         throws TaskQueueManagerException;
 
+    boolean cancelCheckout( int projectId )
+        throws TaskQueueManagerException;
+
     boolean cancelCurrentBuild()
         throws TaskQueueManagerException;
 
@@ -89,6 +92,9 @@
     boolean removeFromBuildingQueue( int projectId, int buildDefinitionId, int trigger, String projectName )
         throws TaskQueueManagerException;
 
+    boolean removeFromPrepareBuildQueue( int projectGroupId, String scmRootAddress )
+        throws TaskQueueManagerException;
+
     /**
      * Remove local repository from the purge queue
      * 

Modified: continuum/branches/continuum-distributed-builds/continuum-base/continuum-configuration/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-base/continuum-configuration/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-base/continuum-configuration/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-base/continuum-configuration/pom.xml Tue Dec  9 04:12:07 2008
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>continuum-base</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-configuration</artifactId>

Modified: continuum/branches/continuum-distributed-builds/continuum-base/continuum-scm/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-base/continuum-scm/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-base/continuum-scm/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-base/continuum-scm/pom.xml Tue Dec  9 04:12:07 2008
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>continuum-base</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-scm</artifactId>

Modified: continuum/branches/continuum-distributed-builds/continuum-base/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-base/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-base/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-base/pom.xml Tue Dec  9 04:12:07 2008
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-base</artifactId>

Modified: continuum/branches/continuum-distributed-builds/continuum-builder/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-builder/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-builder/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-builder/pom.xml Tue Dec  9 04:12:07 2008
@@ -23,11 +23,11 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <artifactId>continuum-builder</artifactId>
   <name>Continuum :: Builder</name>
-  <version>1.3-SNAPSHOT</version>
+  <version>1.3.1-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>

Modified: continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java Tue Dec  9 04:12:07 2008
@@ -7,10 +7,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.continuum.builder.AbstractContinuumBuilder;
 import org.apache.continuum.builder.distributed.BuildAgentListener;
 import org.apache.continuum.builder.distributed.DefaultBuildAgentListener;
-import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
 import org.apache.continuum.configuration.BuildAgentConfiguration;
 import org.apache.continuum.dao.BuildDefinitionDao;
 import org.apache.continuum.dao.BuildResultDao;
@@ -40,8 +38,7 @@
  * @author Maria Catherine Tan
  */
 public class DefaultDistributedBuildManager
-    extends AbstractContinuumBuilder
-    implements DistributedBuildManager
+    extends AbstractDistributedBuildManager
 {
     private Logger log = LoggerFactory.getLogger( this.getClass() );
 

Modified: continuum/branches/continuum-distributed-builds/continuum-commons/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-commons/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-commons/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-commons/pom.xml Tue Dec  9 04:12:07 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <artifactId>continuum-commons</artifactId>
   <name>Continuum :: Commons</name>

Modified: continuum/branches/continuum-distributed-builds/continuum-commons/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-commons/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-commons/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-commons/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java Tue Dec  9 04:12:07 2008
@@ -102,11 +102,14 @@
 
         cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
 
-        for ( int i = 0; i < arguments.length; i++ )
+        if ( arguments != null )
         {
-            String argument = arguments[i];
+            for ( int i = 0; i < arguments.length; i++ )
+            {
+                String argument = arguments[i];
 
-            cl.createArgument().setValue( argument );
+                cl.createArgument().setValue( argument );
+            }
         }
 
         return cl;

Modified: continuum/branches/continuum-distributed-builds/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/pom.xml Tue Dec  9 04:12:07 2008
@@ -21,7 +21,7 @@
   <parent>  
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-core</artifactId>

Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java Tue Dec  9 04:12:07 2008
@@ -95,14 +95,62 @@
     {
         Task currentTask = getBuildTaskQueueExecutor().getCurrentTask();
         
-        if ( currentTask instanceof BuildProjectTask )
+        if ( currentTask != null )
         {
-            if ( ( (BuildProjectTask) currentTask ).getProjectId() == projectId )
+            if ( currentTask instanceof BuildProjectTask )
             {
-                getLogger().info( "Cancelling task for project " + projectId );
-                getBuildTaskQueueExecutor().cancelTask( currentTask );
+                if ( ( (BuildProjectTask) currentTask ).getProjectId() == projectId )
+                {
+                    getLogger().info( "Cancelling task for project " + projectId );
+                    getBuildTaskQueueExecutor().cancelTask( currentTask );
+                }
+                else
+                {
+                    getLogger().warn( "Current task is not for the given projectId (" + projectId + "): "
+                                          + ( (BuildProjectTask) currentTask ).getProjectId() + "; not cancelling" );
+                }
+            }
+            else
+            {
+                getLogger().warn( "Current task not a BuildProjectTask - not cancelling" );
             }
         }
+        else
+        {
+            getLogger().warn( "No task running - not cancelling" );
+        }
+    }
+
+    public boolean cancelCheckout( int projectId )
+        throws TaskQueueManagerException
+    {
+        Task task = getCheckoutTaskQueueExecutor().getCurrentTask();
+
+        if ( task != null )
+        {
+            if ( task instanceof CheckOutTask )
+            {
+                if ( ( (CheckOutTask) task ).getProjectId() == projectId )
+                {
+                    getLogger().info( "Cancelling checkout for project " + projectId );
+                    return getCheckoutTaskQueueExecutor().cancelTask( task );
+                }
+                else
+                {
+                    getLogger().warn( "Current task is not for the given projectId (" + projectId + "): "
+                                          + ( (CheckOutTask) task ).getProjectId() + "; not cancelling checkout" );
+                }
+            }
+            else
+            {
+                getLogger().warn( "Current task not a CheckOutTask - not cancelling checkout" );
+            }
+        }
+        else
+        {
+            getLogger().warn( "No task running - not cancelling checkout" );
+        }
+        return false;
     }
 
     public boolean cancelCurrentBuild()
@@ -624,6 +672,28 @@
         }
     }
 
+    public boolean removeFromPrepareBuildQueue( int projectGroupId, String scmRootAddress )
+        throws TaskQueueManagerException
+    {
+        try
+        {
+            List<PrepareBuildProjectsTask> queue = prepareBuildQueue.getQueueSnapshot();
+            
+            for ( PrepareBuildProjectsTask task : queue )
+            {
+                if ( task != null && task.getProjectGroupId() == projectGroupId && task.getScmRootAddress().equals( scmRootAddress ) )
+                {
+                    return prepareBuildQueue.remove( task );
+                }
+            }
+            return false;
+        }
+        catch ( TaskQueueException e )
+        {
+            throw new TaskQueueManagerException( "Error while getting the prepare build projects task in queue", e );
+        }
+    }
+    
     public void contextualize( Context context )
         throws ContextException
     {

Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Tue Dec  9 04:12:07 2008
@@ -920,7 +920,7 @@
             }
         }
 
-        prepareBuildProjects( map.values(), ContinuumProjectState.TRIGGER_SCHEDULED );
+        prepareBuildProjects( map, ContinuumProjectState.TRIGGER_SCHEDULED );
     }
 
     public void buildProject( int projectId )
@@ -932,26 +932,7 @@
     public void buildProjectWithBuildDefinition( int projectId, int buildDefinitionId )
         throws ContinuumException
     {
-        try
-        {
-            if ( taskQueueManager.isInBuildingQueue( projectId ) || taskQueueManager.isInPrepareBuildQueue( projectId ) )
-            {
-                return;
-            }
-
-            if ( taskQueueManager.isInCheckoutQueue( projectId ) )
-            {
-                taskQueueManager.removeProjectFromCheckoutQueue( projectId );
-            }
-        }
-        catch ( TaskQueueManagerException e )
-        {
-            throw new ContinuumException( e.getMessage(), e );
-        }
-
-        Map<Integer, Integer> projectsAndBuildDefinitionsMap = new HashMap<Integer, Integer>( projectId, buildDefinitionId );
-
-        prepareBuildProjects( projectsAndBuildDefinitionsMap, ContinuumProjectState.TRIGGER_FORCED );
+        buildProject( projectId, buildDefinitionId, ContinuumProjectState.TRIGGER_FORCED );
     }
 
     public void buildProject( int projectId, int trigger )
@@ -978,9 +959,11 @@
             throw new ContinuumException( e.getMessage(), e );
         }
 
-        Map<Integer, Integer> projectsBuildDefinitionsMap = new HashMap<Integer, Integer>( projectId, buildDef.getId() );
-
-        prepareBuildProjects( projectsBuildDefinitionsMap, trigger );
+        Map<Integer, Integer> projectsBuildDefinitionsMap = new HashMap<Integer, Integer>();
+        projectsBuildDefinitionsMap.put( projectId, buildDef.getId() );
+        
+        ProjectScmRoot scmRoot = getProjectScmRootByProject( projectId );
+        prepareBuildProjects( projectsBuildDefinitionsMap, trigger, scmRoot.getScmRootAddress(), scmRoot.getProjectGroup().getId() );
     }
 
     public void buildProject( int projectId, int buildDefinitionId, int trigger )
@@ -999,10 +982,12 @@
         {
             throw new ContinuumException( e.getMessage(), e );
         }
-        
-        Map<Integer, Integer> projectsBuildDefinitionsMap = new HashMap<Integer, Integer>( projectId, buildDefinitionId );
 
-        prepareBuildProjects( projectsBuildDefinitionsMap, trigger );
+        Map<Integer, Integer> projectsBuildDefinitionsMap = new HashMap<Integer, Integer>();
+        projectsBuildDefinitionsMap.put( projectId, buildDefinitionId );
+
+        ProjectScmRoot scmRoot = getProjectScmRootByProject( projectId );
+        prepareBuildProjects( projectsBuildDefinitionsMap, trigger, scmRoot.getScmRootAddress(), scmRoot.getProjectGroup().getId() );
     }
 
     public BuildResult getBuildResult( int buildId )
@@ -3209,9 +3194,9 @@
         }
         return null;
     }
-   
+
     private void prepareBuildProjects( Collection<Project> projects, List<BuildDefinition> bds,
-                                       boolean checkDefaultBuildDefinitionForProject, int trigger )
+                                      boolean checkDefaultBuildDefinitionForProject, int trigger )
         throws ContinuumException
     {
         Map<ProjectScmRoot, Map<Integer, Integer>> map = new HashMap<ProjectScmRoot, Map<Integer, Integer>>();
@@ -3298,7 +3283,7 @@
             map.put( scmRoot, projectsAndBuildDefinitionsMap );
         }
 
-        prepareBuildProjects( map.values(), trigger );
+        prepareBuildProjects( map, trigger );
     }
 
     private void prepareBuildProjects( Collection<Project> projects, int buildDefinitionId, int trigger )
@@ -3342,30 +3327,33 @@
             }
         }
 
-        prepareBuildProjects( map.values(), trigger );
+        prepareBuildProjects( map, trigger );
     }
 
-    private void prepareBuildProjects( Collection<Map<Integer, Integer>> projectsBuildDefinitions, int trigger )
+    private void prepareBuildProjects( Map<ProjectScmRoot, Map<Integer, Integer>> map, int trigger )
         throws ContinuumException
     {
-        for ( Map<Integer, Integer> map : projectsBuildDefinitions )
+        for ( ProjectScmRoot scmRoot : map.keySet() )
         {
-            prepareBuildProjects( map, trigger );
+            prepareBuildProjects( map.get( scmRoot ), trigger, scmRoot.getScmRootAddress(), scmRoot.getProjectGroup().getId() );
         }
     }
 
-    private void prepareBuildProjects( Map<Integer, Integer> projectsBuildDefinitionsMap, int trigger )
+    private void prepareBuildProjects( Map<Integer, Integer> projectsBuildDefinitionsMap, int trigger, 
+                                       String scmRootAddress, int projectGroupId )
         throws ContinuumException
     {
+        PrepareBuildProjectsTask task = new PrepareBuildProjectsTask( projectsBuildDefinitionsMap, trigger,
+                                                                      projectGroupId, scmRootAddress );
+
         if ( configurationService.isDistributedBuildEnabled() )
         {
-            distributedBuilder.buildProjects( projectsBuildDefinitionsMap, trigger );
+            distributedBuilder.buildProjects( task );
         }
         else
         {
             try
             {
-                PrepareBuildProjectsTask task = new PrepareBuildProjectsTask( projectsBuildDefinitionsMap, trigger );
                 taskQueueManager.getPrepareBuildQueue().put( task );
             }
             catch ( TaskQueueException e )

Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java Tue Dec  9 04:12:07 2008
@@ -36,6 +36,8 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.Collections;
@@ -52,6 +54,9 @@
     extends AbstractLogEnabled
     implements ContinuumBuildExecutor, Initializable
 {
+    
+    protected Logger logger = LoggerFactory.getLogger( getClass() );
+    
     private static final String SUDO_EXECUTABLE = "sudo";
 
     private static final String CHROOT_EXECUTABLE = "chroot";

Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java Tue Dec  9 04:12:07 2008
@@ -25,7 +25,6 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -54,6 +53,8 @@
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -63,6 +64,7 @@
     extends AbstractBuildExecutor
     implements ContinuumBuildExecutor
 {
+    
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------
@@ -394,15 +396,17 @@
         throws ContinuumBuildExecutorException
     {
         //Check if it's a recursive build
-        boolean isRecursive = StringUtils.isNotEmpty( buildDefinition.getArguments() ) && !(
-            buildDefinition.getArguments().indexOf( "-N" ) < 0 ||
-                buildDefinition.getArguments().indexOf( "--non-recursive" ) < 0 );
-
-        if ( isRecursive )
+        boolean isRecursive = false;
+        if (StringUtils.isNotEmpty( buildDefinition.getArguments() ) )
+            {
+            isRecursive =  buildDefinition.getArguments().indexOf( "-N" ) < 0 &&
+                buildDefinition.getArguments().indexOf( "--non-recursive" ) < 0 ;
+            }
+        if ( isRecursive && changes != null && !changes.isEmpty() )
         {
-            if ( getLogger().isDebugEnabled() )
+            if ( logger.isInfoEnabled() )
             {
-                getLogger().debug( "isRecursive --> shouldBuild = true" );
+                logger.info( "recursive build and changes found --> building" );
             }
             return true;
         }
@@ -412,15 +416,15 @@
         //CONTINUUM-1815: additional check for projects recently released
         if ( !continuumProject.getVersion().equals( project.getVersion() ) )
         {
-            getLogger().info( "Found changes in project's version ( maybe project was recently released ), building" );
+            logger.info( "Found changes in project's version ( maybe project was recently released ), building" );
             return true;
         }
         
         if ( changes.isEmpty() )
         {
-            if ( getLogger().isDebugEnabled() )
+            if ( logger.isInfoEnabled() )
             {
-                getLogger().info( "Found no changes, not building" );
+                logger.info( "Found no changes, not building" );
             }
             return false;
         }
@@ -438,15 +442,28 @@
         while ( i <= files.size() - 1 )
         {
             ChangeFile file = files.get( i );
+            if ( logger.isDebugEnabled() )
+            {
+                logger.debug( "changeFile.name " + file.getName() );
+                logger.debug( "check in modules " + modules );
+            }
             boolean found = false;
             for ( String module : modules )
             {
-                if ( file.getName().indexOf( module ) > 0 )
+                if ( file.getName().indexOf( module ) >= 0 )
                 {
+                    if ( logger.isDebugEnabled() )
+                    {
+                        logger.debug( "changeFile.name " + file.getName() + " removed because in a module" );
+                    }                    
                     files.remove( file );
                     found = true;
                     break;
                 }
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug( "no remving file " + file.getName() + " not in module " + module );
+                }
             }
             if ( !found )
             {
@@ -458,12 +475,12 @@
 
         if ( !shouldBuild )
         {
-            getLogger().info( "Changes are only in sub-modules." );
+            logger.info( "Changes are only in sub-modules." );
         }
 
-        if ( getLogger().isDebugEnabled() )
+        if ( logger.isDebugEnabled() )
         {
-            getLogger().debug( "shoulbuild = " + shouldBuild );
+            logger.debug( "shoulbuild = " + shouldBuild );
         }
         return shouldBuild;
     }

Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java Tue Dec  9 04:12:07 2008
@@ -27,11 +27,13 @@
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.conn.params.ConnManagerPNames;
 import org.apache.http.conn.params.ConnPerRouteBean;
 import org.apache.http.conn.scheme.PlainSocketFactory;
 import org.apache.http.conn.scheme.Scheme;
 import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.scheme.SocketFactory;
 import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
@@ -51,7 +53,9 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.InetAddress;
 import java.net.MalformedURLException;
+import java.net.Socket;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -79,11 +83,7 @@
         // http scheme
         schemeRegistry.register( new Scheme( "http", PlainSocketFactory.getSocketFactory(), 80 ) );
         // https scheme
-        SSLSocketFactory sslSocketFactory = SSLSocketFactory.getSocketFactory();
-
-        // ignore cert
-        sslSocketFactory.setHostnameVerifier( SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER );
-        schemeRegistry.register( new Scheme( "https", sslSocketFactory, 443 ) );
+        schemeRegistry.register( new Scheme( "https", new EasySSLSocketFactory(), 443 ) );
 
         HttpParams params = new BasicHttpParams();
         // TODO put this values to a configuration way ???

Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java Tue Dec  9 04:12:07 2008
@@ -87,15 +87,15 @@
                 
                 getLogger().info( "Initializing prepare build" );
                 context = initializeContext( projectId, buildDefinitionId );
-                
-                getLogger().info( "Starting prepare build of project: " + AbstractContinuumAction.getProject( context ).getName() );
-                startPrepareBuild( context );
-                
+
                 if ( !checkProjectScmRoot( context ) )
                 {
                     break;
                 }
-                
+
+                getLogger().info( "Starting prepare build of project: " + AbstractContinuumAction.getProject( context ).getName() );
+                startPrepareBuild( context );
+
                 try
                 {
                     if ( AbstractContinuumAction.getBuildDefinition( context ).isBuildFresh() )
@@ -103,7 +103,7 @@
                         getLogger().info( "Purging existing working copy" );
                         cleanWorkingDirectory( context );
                     }
-                    
+
                     // ----------------------------------------------------------------------
                     // TODO: Centralize the error handling from the SCM related actions.
                     // ContinuumScmResult should return a ContinuumScmResult from all
@@ -111,7 +111,7 @@
                     // ----------------------------------------------------------------------
                     getLogger().info( "Updating working dir" );
                     updateWorkingDirectory( context );
-            
+
                     getLogger().info( "Merging SCM results" );
                     //CONTINUUM-1393
                     if ( !AbstractContinuumAction.getBuildDefinition( context ).isBuildFresh() )
@@ -132,10 +132,13 @@
             endPrepareBuild( context );
         }
 
-        int projectGroupId = AbstractContinuumAction.getProjectGroupId( context );
-        buildProjects( projectGroupId, projectsBuildDefinitionsMap, trigger );
+        if ( checkProjectScmRoot( context ) )
+        {
+            int projectGroupId = AbstractContinuumAction.getProjectGroupId( context );
+            buildProjects( projectGroupId, projectsBuildDefinitionsMap, trigger );
+        }
     }
-    
+
     private Map initializeContext( int projectId, int buildDefinitionId )
         throws TaskExecutionException
     {
@@ -288,7 +291,7 @@
         try
         {
             project.setScmResult( scmResult );
-            
+
             projectDao.updateProject( project );
         }
         catch ( ContinuumStoreException e )
@@ -414,7 +417,7 @@
         {
             projectScmRoot.setState( ContinuumProjectState.ERROR );
             projectScmRoot.setError( error );
-            
+
             projectScmRootDao.updateProjectScmRoot( projectScmRoot );
             
             context.put( AbstractContinuumAction.KEY_PROJECT_SCM_ROOT, projectScmRoot );

Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/log4j.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/log4j.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/log4j.xml Tue Dec  9 04:12:07 2008
@@ -1,41 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<!-- ===================================================================== -->
-<!-- Log4j Configuration -->
-<!-- ===================================================================== -->
 
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
-  debug="false">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
 
   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-    <param name="Target" value="System.out"/>
     <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}.%M](%L) %m%n"/>
+      <param name="ConversionPattern" value="%d %-5p %c %x - %m%n"/>
     </layout>
   </appender>
 
   <!-- quiet spring loading :-) -->
-  <category name="org.springframework">
-    <priority value="ERROR"/>
-  </category>
-  <category name="org.codehaus.plexus">
-    <priority value="ERROR"/>
-  </category>
+  <logger name="org.springframework">
+    <level value="ERROR"/>
+  </logger>
+  <logger name="org.codehaus.plexus">
+    <level value="ERROR"/>
+  </logger>
   
-  <category name="org.apache.commons">
-    <priority value="ERROR"/>
-  </category>  
+  <logger name="org.apache.commons">
+    <level value="ERROR"/>
+  </logger>  
+  
+  <logger name="org.apache.maven.continuum.execution.maven.m2">
+    <level value="debug" />
+  </logger>
 
   <!-- JPOX -->
-  <category name="JPOX">
-    <priority value="WARN"/>
-  </category>
-  <category name="JPOX.RDBMS">
-    <priority value="ERROR"/>
-  </category>
+  <logger name="JPOX">
+    <level value="WARN"/>
+  </logger>
+  <logger name="JPOX.RDBMS">
+    <level value="ERROR"/>
+  </logger>
 
   <root>
-    <priority value="INFO"/>
+    <level value="INFO"/>
     <appender-ref ref="CONSOLE"/>
   </root>
 

Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/continuum-legacy/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/continuum-legacy/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/continuum-legacy/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/continuum-legacy/pom.xml Tue Dec  9 04:12:07 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>continuum-data-management</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-legacy</artifactId>

Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/pom.xml Tue Dec  9 04:12:07 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>continuum-data-management</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>data-management-api</artifactId>

Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/pom.xml Tue Dec  9 04:12:07 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>continuum-data-management</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>data-management-cli</artifactId>

Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-jdo/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-jdo/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-jdo/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-jdo/pom.xml Tue Dec  9 04:12:07 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>continuum-data-management</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>data-management-jdo</artifactId>

Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-redback-jdo/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-redback-jdo/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-redback-jdo/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-redback-jdo/pom.xml Tue Dec  9 04:12:07 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>continuum-data-management</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>data-management-redback-jdo</artifactId>

Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/pom.xml Tue Dec  9 04:12:07 2008
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>continuum-data-management</artifactId>

Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/redback-legacy/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/redback-legacy/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/redback-legacy/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/redback-legacy/pom.xml Tue Dec  9 04:12:07 2008
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>continuum-data-management</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>redback-legacy</artifactId>

Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/pom.xml Tue Dec  9 04:12:07 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.continuum</groupId>
     <artifactId>continuum-distributed-build</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.continuum</groupId>

Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/pom.xml Tue Dec  9 04:12:07 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.continuum</groupId>
     <artifactId>continuum</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.continuum</groupId>

Propchange: continuum/branches/continuum-distributed-builds/continuum-docs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Dec  9 04:12:07 2008
@@ -3,3 +3,5 @@
 .settings
 .project
 *.iml
+*.ipr
+*.iws

Modified: continuum/branches/continuum-distributed-builds/continuum-docs/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-docs/pom.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-docs/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-docs/pom.xml Tue Dec  9 04:12:07 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.continuum</groupId>
     <artifactId>continuum</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
   <artifactId>continuum-docs</artifactId>
   <groupId>org.apache.continuum</groupId>

Modified: continuum/branches/continuum-distributed-builds/continuum-docs/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-docs/src/site/apt/index.apt?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-docs/src/site/apt/index.apt (original)
+++ continuum/branches/continuum-distributed-builds/continuum-docs/src/site/apt/index.apt Tue Dec  9 04:12:07 2008
@@ -5,6 +5,13 @@
  ------
  Oct 3 2007
 
+Welcome to Apache Continuum
+
+  Apache Continuum is an enterprise-ready continuous integration server with features such as automated builds,
+  release management, role-based security, and integration with popular build tools and source control management
+  systems. Whether you have a centralized build team or want to put control of releases in the hands of developers,
+  Continuum can help you improve quality and maintain a consistent build environment. 
+
 Documentation
 
 * Installation/Upgrade Guides
@@ -30,7 +37,7 @@
 
 ** Upgrade
 
-    {{{installation/upgrade.html} How to upgrade from a previous versions?}}
+    {{{installation/upgrade.html} How to upgrade from a previous version}}
 
 * User's Guide
 
@@ -42,14 +49,14 @@
 
 * Developer's Guide
 
-    {{{developer_guides/building.html}Guide to build Continuum}}
+    {{{developer_guides/building.html}Guide to building Continuum}}
 
 * Knowledge Base
 
     {{{http://continuum.apache.org/faqs.html}Frequently Asked Questions}}
 
-    {{{http://docs.codehaus.org/display/CONTINUUMUSER/Home}Wiki}}
-    
-    {{{http://cwiki.apache.org/confluence/display/CONTINUUM}New Wiki}}
-    
+    {{{http://cwiki.apache.org/confluence/display/CONTINUUM}Wiki}}
+
+    {{{http://docs.codehaus.org/display/CONTINUUMUSER/Home}Old Wiki}}
+
     {{{http://apache-continuum.blogspot.com/}Blog}}

Modified: continuum/branches/continuum-distributed-builds/continuum-docs/src/site/apt/installation/upgrade.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-docs/src/site/apt/installation/upgrade.apt?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-docs/src/site/apt/installation/upgrade.apt (original)
+++ continuum/branches/continuum-distributed-builds/continuum-docs/src/site/apt/installation/upgrade.apt Tue Dec  9 04:12:07 2008
@@ -40,7 +40,7 @@
 
         * {{http://repo1.maven.org/maven2/org/apache/maven/continuum/data-management-cli/1.1/data-management-cli-1.1-app.jar}}
         
-        * {{http://repo1.maven.org/maven2/org/apache/maven/continuum/data-management-cli/1.2/data-management-cli-1.2-app.jar}}
+        * {{http://repo1.maven.org/maven2/org/apache/continuum/data-management-cli/1.2/data-management-cli-1.2-app.jar}}
 
     The first version of this tool is 1.1-beta-2
 

Modified: continuum/branches/continuum-distributed-builds/continuum-docs/src/site/site.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-docs/src/site/site.xml?rev=724670&r1=724669&r2=724670&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-docs/src/site/site.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-docs/src/site/site.xml Tue Dec  9 04:12:07 2008
@@ -21,7 +21,7 @@
 <project name="Apache Continuum">
   <body>
     <breadcrumbs>
-      <item name="1.2" href="/" />
+      <item name="1.3.0" href="/" />
     </breadcrumbs>
     <menu name="Documentation">
       <item name="Index (category)" href="index.html"/>

Propchange: continuum/branches/continuum-distributed-builds/continuum-docs/src/site/xdoc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec  9 04:12:07 2008
@@ -1,2 +1,2 @@
-/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339
-/continuum/trunk/continuum-docs/src/site/xdoc:690494-690520
+/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
+/continuum/trunk/continuum-docs/src/site/xdoc:690494-690520,713270-724659



Mime
View raw message