continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r372929 [1/2] - in /maven/continuum/branches/continuum-1.0.x: ./ continuum-api/ continuum-api/src/main/java/org/apache/maven/continuum/ continuum-api/src/main/java/org/apache/maven/continuum/security/ continuum-api/src/main/java/org/apache/...
Date Fri, 27 Jan 2006 17:54:22 GMT
Author: evenisse
Date: Fri Jan 27 09:53:13 2006
New Revision: 372929

URL: http://svn.apache.org/viewcvs?rev=372929&view=rev
Log:
Merge from trunk (not tested yet)

Added:
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/utils/PlexusContainerManager.java   (with props)
    maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/release-notes.apt   (with props)
    maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/xdoc/
    maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/xdoc/index.xml   (with props)
Modified:
    maven/continuum/branches/continuum-1.0.x/continuum-api/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
    maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/security/ContinuumSecurity.java
    maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/security/ContinuumSecurityException.java
    maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
    maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStoreException.java
    maven/continuum/branches/continuum-1.0.x/continuum-cc/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-core-it/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/security/DefaultContinuumSecurityTest.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
    maven/continuum/branches/continuum-1.0.x/continuum-model/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-model/src/main/mdo/continuum.mdo
    maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-api/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-irc/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-jabber/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-msn/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-notifiers/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/src/conf/application.xml
    maven/continuum/branches/continuum-1.0.x/continuum-site/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/change-log.apt
    maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/continuum-features.apt
    maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/download.apt
    maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/guides/getting-started/index.apt
    maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/index.apt
    maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/fml/about.fml
    maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/fml/faqs.fml
    maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/resources/scripts/mvn.bat
    maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/site.xml
    maven/continuum/branches/continuum-1.0.x/continuum-store/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
    maven/continuum/branches/continuum-1.0.x/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
    maven/continuum/branches/continuum-1.0.x/continuum-test/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-web/pom.xml
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Login.java
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/navigations/DefaultTop.vm
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Error.vm
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Login.vm
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Summary.vm
    maven/continuum/branches/continuum-1.0.x/continuum-xmlrpc/pom.xml
    maven/continuum/branches/continuum-1.0.x/pom.xml

Modified: maven/continuum/branches/continuum-1.0.x/continuum-api/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-api/pom.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-api/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-api/pom.xml Fri Jan 27 09:53:13 2006
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>continuum-parent</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-api</artifactId>
   <name>Continuum API</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Fri Jan 27 09:53:13 2006
@@ -148,6 +148,12 @@
     void updateNotifier( int projectId, int notifierId, Map configuration )
         throws ContinuumException;
 
+    void updateNotifier( int projectId, ProjectNotifier notifier )
+        throws ContinuumException;
+
+    void addNotifier( int projectId, ProjectNotifier notifier )
+        throws ContinuumException;
+
     void addNotifier( int projectId, String notifierType, Map configuration )
         throws ContinuumException;
 
@@ -176,7 +182,13 @@
     BuildDefinition getBuildDefinition( int projectId, int buildDefinitionId )
         throws ContinuumException;
 
+    void updateBuildDefinition( BuildDefinition buildDefinition, int projectId )
+        throws ContinuumException;
+
     void updateBuildDefinition( int projectId, int buildDefinitionId, Map configuration )
+        throws ContinuumException;
+
+    void addBuildDefinition( int projectId, BuildDefinition buildDefinition )
         throws ContinuumException;
 
     void addBuildDefinition( int projectId, Map configuration )

Modified: maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/security/ContinuumSecurity.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/security/ContinuumSecurity.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/security/ContinuumSecurity.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/security/ContinuumSecurity.java Fri Jan 27 09:53:13 2006
@@ -17,7 +17,6 @@
  */
 
 import org.apache.maven.continuum.model.system.ContinuumUser;
-import org.apache.maven.continuum.model.system.Permission;
 import org.apache.maven.continuum.model.system.UserGroup;
 
 import java.util.List;
@@ -33,7 +32,7 @@
     static final String ADMIN_GROUP_NAME = "Continuum admin";
 
     static final String GUEST_GROUP_NAME = "Continuum guest";
-    
+
     List getPermissions( ContinuumUser user )
         throws ContinuumSecurityException;
 

Modified: maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/security/ContinuumSecurityException.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/security/ContinuumSecurityException.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/security/ContinuumSecurityException.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/security/ContinuumSecurityException.java Fri Jan 27 09:53:13 2006
@@ -20,7 +20,8 @@
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
  */
-public class ContinuumSecurityException extends Exception
+public class ContinuumSecurityException
+    extends Exception
 {
     public ContinuumSecurityException( String msg )
     {

Modified: maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java Fri Jan 27 09:53:13 2006
@@ -23,13 +23,12 @@
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.model.project.Schedule;
-import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.model.system.ContinuumUser;
-import org.apache.maven.continuum.model.system.SystemConfiguration;
+import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.model.system.Permission;
+import org.apache.maven.continuum.model.system.SystemConfiguration;
 import org.apache.maven.continuum.model.system.UserGroup;
 
-import java.io.File;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -203,7 +202,7 @@
 
     Permission addPermission( Permission perm );
 
-    UserGroup addUserGroup( UserGroup group);
+    UserGroup addUserGroup( UserGroup group );
 
     void updateUserGroup( UserGroup group )
         throws ContinuumStoreException;

Modified: maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStoreException.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStoreException.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStoreException.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStoreException.java Fri Jan 27 09:53:13 2006
@@ -20,7 +20,8 @@
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
-public class ContinuumStoreException extends Exception
+public class ContinuumStoreException
+    extends Exception
 {
     public ContinuumStoreException( String msg )
     {

Modified: maven/continuum/branches/continuum-1.0.x/continuum-cc/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-cc/pom.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-cc/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-cc/pom.xml Fri Jan 27 09:53:13 2006
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>continuum-parent</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-cc</artifactId>
   <name>Continuum Cruise Control Importer</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core-it/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core-it/pom.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core-it/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core-it/pom.xml Fri Jan 27 09:53:13 2006
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>continuum-parent</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-core-it</artifactId>
   <name>Continuum Core Integration Test</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java Fri Jan 27 09:53:13 2006
@@ -120,6 +120,10 @@
         if ( !plexusHome.isDirectory() )
         {
             assertTrue( plexusHome.mkdirs() );
+
+            File plexusHomeLib = new File( plexusHome, "lib" );
+
+            assertTrue( plexusHomeLib.mkdirs() );
         }
 
         context.put( "plexus.home", plexusHome.getAbsolutePath() );

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/pom.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/pom.xml Fri Jan 27 09:53:13 2006
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>continuum-parent</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-core</artifactId>
   <name>Continuum Core</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <repositories>
     <repository>
       <id>apache.snapshots</id>
@@ -166,4 +166,4 @@
       <artifactId>maven-scm-provider-svn</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Fri Jan 27 09:53:13 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum;
 
 /*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,11 +47,17 @@
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.apache.maven.continuum.utils.PlexusContainerManager;
 import org.apache.maven.continuum.utils.ProjectSorter;
 import org.apache.maven.continuum.utils.WorkingDirectoryService;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.action.Action;
 import org.codehaus.plexus.action.ActionManager;
 import org.codehaus.plexus.action.ActionNotFoundException;
+import org.codehaus.plexus.context.Context;
+import org.codehaus.plexus.context.ContextException;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -83,7 +89,7 @@
  */
 public class DefaultContinuum
     extends AbstractLogEnabled
-    implements Continuum, Initializable, Startable
+    implements Continuum, Contextualizable, Initializable, Startable
 {
     /**
      * @plexus.requirement
@@ -308,7 +314,7 @@
     public void buildProjects( int trigger )
         throws ContinuumException
     {
-        Collection projectsList = null;
+        Collection projectsList;
 
         try
         {
@@ -341,7 +347,7 @@
     public void buildProjects( Schedule schedule )
         throws ContinuumException
     {
-        Collection projectsList = null;
+        Collection projectsList;
         Map projectsMap = null;
 
         try
@@ -365,12 +371,12 @@
         {
             Project p = (Project) projectIterator.next();
 
-            int buildDefId = ( (Integer) projectsMap.get( new Integer( p.getId() ) ) ).intValue();
+            Integer buildDefId = ( (Integer) projectsMap.get( new Integer( p.getId() ) ) );
 
-            if ( !isInBuildingQueue( p.getId() ) && !isInCheckoutQueue( p.getId() ) )
+            if ( buildDefId != null && !isInBuildingQueue( p.getId() ) && !isInCheckoutQueue( p.getId() ) )
             {
                 //TODO: Fix trigger name
-                buildProject( p.getId(), buildDefId, ContinuumProjectState.TRIGGER_UNKNOWN, false );
+                buildProject( p.getId(), buildDefId.intValue(), ContinuumProjectState.TRIGGER_UNKNOWN, false );
             }
         }
     }
@@ -478,7 +484,7 @@
     public List getChangesSinceLastSuccess( int projectId, int buildResultId )
         throws ContinuumException
     {
-        ArrayList buildResults = null;
+        ArrayList buildResults;
 
         try
         {
@@ -552,7 +558,7 @@
     }
 
     private List getProjectsInBuildOrder( Collection projects )
-        throws CycleDetectedException, ContinuumException
+        throws CycleDetectedException
     {
         if ( projects == null || projects.isEmpty() )
         {
@@ -817,6 +823,21 @@
         return notifier;
     }
 
+    public void updateNotifier( int projectId, ProjectNotifier notifier )
+        throws ContinuumException
+    {
+        Project project = getProjectWithAllDetails( projectId );
+
+        ProjectNotifier notif = getNotifier( projectId, notifier.getId() );
+
+        // I remove notifier then add it instead of update it due to a ClassCastException in jpox
+        project.removeNotifier( notif );
+
+        updateProject( project );
+
+        addNotifier( projectId, notifier );
+    }
+
     public void updateNotifier( int projectId, int notifierId, Map configuration )
         throws ContinuumException
     {
@@ -863,6 +884,32 @@
         return notifierProperties;
     }
 
+    public void addNotifier( int projectId, ProjectNotifier notifier )
+        throws ContinuumException
+    {
+        ProjectNotifier notif = new ProjectNotifier();
+
+        notif.setSendOnSuccess( notifier.isSendOnSuccess() );
+
+        notif.setSendOnFailure( notifier.isSendOnFailure() );
+
+        notif.setSendOnError( notifier.isSendOnError() );
+
+        notif.setSendOnWarning( notifier.isSendOnWarning() );
+
+        notif.setConfiguration( notifier.getConfiguration() );
+
+        notif.setType( notifier.getType() );
+
+        notifier.setFrom( ProjectNotifier.FROM_USER );
+
+        Project project = getProjectWithAllDetails( projectId );
+
+        project.addNotifier( notif );
+
+        updateProject( project );
+    }
+
     public void addNotifier( int projectId, String notifierType, Map configuration )
         throws ContinuumException
     {
@@ -894,13 +941,7 @@
 
         notifier.setConfiguration( notifierProperties );
 
-        notifier.setFrom( ProjectNotifier.FROM_USER );
-
-        Project project = getProjectWithAllDetails( projectId );
-
-        project.addNotifier( notifier );
-
-        updateProject( project );
+        addNotifier( projectId, notifier );
     }
 
     public void removeNotifier( int projectId, int notifierId )
@@ -965,36 +1006,56 @@
         return buildDefinition;
     }
 
-    public void updateBuildDefinition( int projectId, int buildDefinitionId, Map configuration )
+    public void updateBuildDefinition( BuildDefinition buildDefinition, int projectId )
         throws ContinuumException
     {
-        BuildDefinition buildDefinition = getBuildDefinition( projectId, buildDefinitionId );
+        BuildDefinition bd = getBuildDefinition( projectId, buildDefinition.getId() );
 
-        buildDefinition.setBuildFile( (String) configuration.get( "buildFile" ) );
+        bd.setBuildFile( buildDefinition.getBuildFile() );
 
-        buildDefinition.setGoals( (String) configuration.get( "goals" ) );
+        bd.setGoals( buildDefinition.getGoals() );
 
-        buildDefinition.setArguments( (String) configuration.get( "arguments" ) );
+        bd.setArguments( buildDefinition.getArguments() );
 
-        Schedule schedule = getSchedule( new Integer( (String) configuration.get( "schedule" ) ).intValue() );
+        Schedule schedule = getSchedule( buildDefinition.getSchedule().getId() );
 
-        buildDefinition.setSchedule( schedule );
+        bd.setSchedule( schedule );
 
-        if ( convertBoolean( (String) configuration.get( "defaultForProject" ) ) && !buildDefinition.isDefaultForProject() )
+        if ( buildDefinition.isDefaultForProject() && !bd.isDefaultForProject() )
         {
-            buildDefinition.setDefaultForProject( true );
+            bd.setDefaultForProject( true );
             
-            BuildDefinition bd = getDefaultBuildDefinition( projectId );
+            BuildDefinition defaultBd = getDefaultBuildDefinition( projectId );
 
-            if ( bd != null )
+            if ( defaultBd != null )
             {
-                bd.setDefaultForProject( false );
+                defaultBd.setDefaultForProject( false );
 
-                storeBuildDefinition( bd );
+                storeBuildDefinition( defaultBd );
             }
         }
 
-        storeBuildDefinition( buildDefinition );
+        storeBuildDefinition( bd );
+    }
+
+    public void updateBuildDefinition( int projectId, int buildDefinitionId, Map configuration )
+        throws ContinuumException
+    {
+        BuildDefinition buildDefinition = getBuildDefinition( projectId, buildDefinitionId );
+
+        buildDefinition.setBuildFile( (String) configuration.get( "buildFile" ) );
+
+        buildDefinition.setGoals( (String) configuration.get( "goals" ) );
+
+        buildDefinition.setArguments( (String) configuration.get( "arguments" ) );
+
+        Schedule schedule = getSchedule( Integer.parseInt( (String) configuration.get( "schedule" ) ) );
+
+        buildDefinition.setSchedule( schedule );
+
+        buildDefinition.setDefaultForProject( true );
+
+        updateBuildDefinition( buildDefinition, projectId );
     }
 
     public BuildDefinition storeBuildDefinition( BuildDefinition buildDefinition )
@@ -1010,23 +1071,11 @@
         }
     }
 
-    public void addBuildDefinition( int projectId, Map configuration )
+    public void addBuildDefinition( int projectId, BuildDefinition buildDefinition )
         throws ContinuumException
     {
-        BuildDefinition buildDefinition = new BuildDefinition();
-
-        buildDefinition.setBuildFile( (String) configuration.get( "buildFile" ) );
-
-        buildDefinition.setGoals( (String) configuration.get( "goals" ) );
-
-        buildDefinition.setArguments( (String) configuration.get( "arguments" ) );
-
-        Schedule schedule = getSchedule( new Integer( (String) configuration.get( "schedule" ) ).intValue() );
-
-        if ( convertBoolean( (String) configuration.get( "defaultForProject" ) ) )
+        if ( buildDefinition.isDefaultForProject() )
         {
-            buildDefinition.setDefaultForProject( true );
-            
             BuildDefinition bd = getDefaultBuildDefinition( projectId );
 
             if ( bd != null )
@@ -1037,8 +1086,6 @@
             }
         }
 
-        buildDefinition.setSchedule( schedule );
-
         Project project = getProjectWithAllDetails( projectId );
 
         project.addBuildDefinition( buildDefinition );
@@ -1046,6 +1093,29 @@
         updateProject( project );
     }
 
+    public void addBuildDefinition( int projectId, Map configuration )
+        throws ContinuumException
+    {
+        BuildDefinition buildDefinition = new BuildDefinition();
+
+        buildDefinition.setBuildFile( (String) configuration.get( "buildFile" ) );
+
+        buildDefinition.setGoals( (String) configuration.get( "goals" ) );
+
+        buildDefinition.setArguments( (String) configuration.get( "arguments" ) );
+
+        Schedule schedule = getSchedule( Integer.parseInt( (String) configuration.get( "schedule" ) ) );
+
+        buildDefinition.setSchedule( schedule );
+
+        if ( convertBoolean( (String) configuration.get( "defaultForProject" ) ) )
+        {
+            buildDefinition.setDefaultForProject( true );
+        }
+
+        addBuildDefinition( projectId, buildDefinition );
+    }
+
     public void removeBuildDefinition( int projectId, int buildDefinitionId )
         throws ContinuumException
     {
@@ -1100,32 +1170,31 @@
     public void addSchedule( Schedule schedule )
         throws ContinuumException
     {
-        Schedule s = null;
+        Schedule s;
 
         try
         {
             s = store.getScheduleByName( schedule.getName() );
+
+            if ( s != null )
+            {
+                throw logAndCreateException( "Can't create schedule. A schedule with the same name already exists.", null );
+            }
+
+            s = store.addSchedule( schedule );
         }
         catch ( ContinuumStoreException e )
         {
+            throw logAndCreateException( "Error while accessing the store.", e );
         }
 
-        if ( s == null )
+        try
         {
-            s = store.addSchedule( schedule );
-
-            try
-            {
-                schedulesActivator.activateSchedule( s, this );
-            }
-            catch ( SchedulesActivationException e )
-            {
-                throw new ContinuumException( "Error activating schedule " + s.getName() + ".", e );
-            }
+            schedulesActivator.activateSchedule( s, this );
         }
-        else
+        catch ( SchedulesActivationException e )
         {
-            throw logAndCreateException( "Can't create schedule. A schedule with the same name already exists.", null );
+            throw new ContinuumException( "Error activating schedule " + s.getName() + ".", e );
         }
     }
 
@@ -1174,9 +1243,9 @@
 
         schedule.setCronExpression( (String) configuration.get( "schedule.cronExpression" ) );
 
-        schedule.setDelay( new Integer( (String) configuration.get( "schedule.delay" ) ).intValue() );
+        schedule.setDelay( Integer.parseInt( (String) configuration.get( "schedule.delay" ) ) );
 
-        schedule.setActive( new Boolean( (String) configuration.get( "schedule.active" ) ).booleanValue() );
+        schedule.setActive( Boolean.valueOf( (String) configuration.get( "schedule.active" ) ).booleanValue() );
 
         updateSchedule( schedule, true );
     }
@@ -1259,11 +1328,11 @@
     {
         List dirs = new ArrayList();
 
-        File workingDirectory = null;
+        File workingDirectory;
 
         if ( currentSubDirectory != null )
         {
-            workingDirectory = new File( baseDirectory, currentSubDirectory);
+            workingDirectory = new File( baseDirectory, currentSubDirectory );
         }
         else
         {
@@ -1276,17 +1345,17 @@
         {
             for ( int i = 0; i < files.length; i++ )
             {
-                File current = new File( workingDirectory, files[i] );
+                File current = new File( workingDirectory, files[ i ] );
 
-                String currentFile = null;
+                String currentFile;
 
                 if ( currentSubDirectory == null )
                 {
-                    currentFile = files[i];
+                    currentFile = files[ i ];
                 }
                 else
                 {
-                    currentFile = currentSubDirectory + "/" + files[i];
+                    currentFile = currentSubDirectory + "/" + files[ i ];
                 }
 
                 if ( userDirectory != null && current.isDirectory() && userDirectory.startsWith( currentFile ) )
@@ -1426,7 +1495,7 @@
 
         user.setEmail( (String) configuration.get( "user.email" ) );
 
-        user.setGroup( getUserGroup( new Integer( (String) configuration.get( "user.group" ) ).intValue() ) );
+        user.setGroup( getUserGroup( Integer.parseInt( (String) configuration.get( "user.group" ) ) ) );
 
         addUser( user );
     }
@@ -1457,7 +1526,7 @@
 
         user.setEmail( (String) configuration.get( "user.email" ) );
 
-        user.setGroup( getUserGroup( new Integer( (String) configuration.get( "user.group" ) ).intValue() ) );
+        user.setGroup( getUserGroup( Integer.parseInt( (String) configuration.get( "user.group" ) ) ) );
 
         updateUser( user );
     }
@@ -1663,18 +1732,6 @@
         store.removeUserGroup( group );
     }
 
-    private boolean convertBoolean( String value )
-    {
-        if ( "true".equalsIgnoreCase( value ) || "on".equalsIgnoreCase( value ) || "yes".equalsIgnoreCase( value ) )
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
     // ----------------------------------------------------------------------
     // Lifecycle Management
     // ----------------------------------------------------------------------
@@ -1732,6 +1789,14 @@
         }
     }
 
+    public void contextualize( Context context )
+        throws ContextException
+    {
+        PlexusContainer container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
+
+        PlexusContainerManager.getInstance().setContainer( container );
+    }
+
     public void start()
         throws StartingException
     {
@@ -1742,16 +1807,6 @@
             initializer.initialize();
 
             configurationService.load();
-
-            // ----------------------------------------------------------------------
-            // Activate all the Build settings in the system
-            // ----------------------------------------------------------------------
-
-            schedulesActivator.activateSchedules( this );
-        }
-        catch ( SchedulesActivationException e )
-        {
-            throw new StartingException( "Error activating schedules.", e );
         }
         catch ( ConfigurationLoadingException e )
         {
@@ -1761,6 +1816,19 @@
         {
             throw new StartingException( "Cannot initializing Continuum for the first time.", e );
         }
+
+        try
+        {
+            // ----------------------------------------------------------------------
+            // Activate all the schedules in the system
+            // ----------------------------------------------------------------------
+            schedulesActivator.activateSchedules( this );
+        }
+        catch ( SchedulesActivationException e )
+        {
+            // We don't throw an exception here, so users will can modify schedules in interface instead of database
+            getLogger().error( "Error activating schedules.", e );
+        }
     }
 
     public void stop()
@@ -1922,61 +1990,6 @@
         return workingDirectory;
     }
 
-    private void startMessage()
-    {
-        getLogger().info( "Starting Continuum." );
-
-        // ----------------------------------------------------------------------
-        //
-        // ----------------------------------------------------------------------
-
-        String banner = StringUtils.repeat( "-", getVersion().length() );
-
-        getLogger().info( "" );
-        getLogger().info( "" );
-        getLogger().info( "< Continuum " + getVersion() + " started! >" );
-        getLogger().info( "-----------------------" + banner );
-        getLogger().info( "       \\   ^__^" );
-        getLogger().info( "        \\  (oo)\\_______" );
-        getLogger().info( "           (__)\\       )\\/\\" );
-        getLogger().info( "               ||----w |" );
-        getLogger().info( "               ||     ||" );
-        getLogger().info( "" );
-        getLogger().info( "" );
-    }
-
-    private void stopMessage()
-    {
-        getLogger().info( "Stopping Continuum." );
-
-        getLogger().info( "Continuum stopped." );
-    }
-
-    private String getVersion()
-    {
-        try
-        {
-            Properties properties = new Properties();
-
-            String name = "META-INF/maven/org.apache.maven.continuum/continuum-core/pom.properties";
-
-            InputStream resourceAsStream = getClass().getClassLoader().getResourceAsStream( name );
-
-            if ( resourceAsStream == null )
-            {
-                return "unknown";
-            }
-
-            properties.load( resourceAsStream );
-
-            return properties.getProperty( "version", "unknown" );
-        }
-        catch ( IOException e )
-        {
-            return "unknown";
-        }
-    }
-
     public Project getProjectWithCheckoutResult( int projectId )
         throws ContinuumException
     {
@@ -2030,6 +2043,70 @@
         catch ( ContinuumStoreException e )
         {
             throw new ContinuumException( "Error retrieving the requested project", e );
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    // Private Utilities
+    // ----------------------------------------------------------------------
+
+    private boolean convertBoolean( String value )
+    {
+        return "true".equalsIgnoreCase( value ) || "on".equalsIgnoreCase( value ) || "yes".equalsIgnoreCase( value );
+    }
+
+    private void startMessage()
+    {
+        getLogger().info( "Starting Continuum." );
+
+        // ----------------------------------------------------------------------
+        //
+        // ----------------------------------------------------------------------
+
+        String banner = StringUtils.repeat( "-", getVersion().length() );
+
+        getLogger().info( "" );
+        getLogger().info( "" );
+        getLogger().info( "< Continuum " + getVersion() + " started! >" );
+        getLogger().info( "-----------------------" + banner );
+        getLogger().info( "       \\   ^__^" );
+        getLogger().info( "        \\  (oo)\\_______" );
+        getLogger().info( "           (__)\\       )\\/\\" );
+        getLogger().info( "               ||----w |" );
+        getLogger().info( "               ||     ||" );
+        getLogger().info( "" );
+        getLogger().info( "" );
+    }
+
+    private void stopMessage()
+    {
+        getLogger().info( "Stopping Continuum." );
+
+        getLogger().info( "Continuum stopped." );
+    }
+
+    private String getVersion()
+    {
+        try
+        {
+            Properties properties = new Properties();
+
+            String name = "META-INF/maven/org.apache.maven.continuum/continuum-core/pom.properties";
+
+            InputStream resourceAsStream = getClass().getClassLoader().getResourceAsStream( name );
+
+            if ( resourceAsStream == null )
+            {
+                return "unknown";
+            }
+
+            properties.load( resourceAsStream );
+
+            return properties.getProperty( "version", "unknown" );
+        }
+        catch ( IOException e )
+        {
+            return "unknown";
         }
     }
 }

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java Fri Jan 27 09:53:13 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.build.settings;
 
 /*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.apache.maven.continuum.scheduler.ContinuumSchedulerConstants;
 import org.apache.maven.continuum.scheduler.ContinuumSchedulerException;
 import org.apache.maven.continuum.store.ContinuumStore;
+import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
 import org.quartz.CronTrigger;
@@ -76,7 +77,26 @@
                 continue;
             }
 
-            schedule( schedule, continuum );
+            try
+            {
+                schedule( schedule, continuum );
+            }
+            catch ( SchedulesActivationException e )
+            {
+                getLogger().error( "Can't activate schedule '" + schedule.getName() + "'", e );
+
+                schedule.setActive( false );
+
+                try
+                {
+                    store.storeSchedule( schedule );
+                }
+                catch ( ContinuumStoreException e1 )
+                {
+                    throw new SchedulesActivationException( "Can't desactivate schedule '" + schedule.getName() + "'",
+                                                            e );
+                }
+            }
         }
     }
 

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java Fri Jan 27 09:53:13 2006
@@ -50,6 +50,7 @@
     {
         BuildProjectTask buildProjectTask = (BuildProjectTask) task;
 
-        controller.build( buildProjectTask.getProjectId(), buildProjectTask.getBuildDefinitionId(), buildProjectTask.getTrigger() );
+        controller.build( buildProjectTask.getProjectId(), buildProjectTask.getBuildDefinitionId(), buildProjectTask
+            .getTrigger() );
     }
 }

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Fri Jan 27 09:53:13 2006
@@ -19,6 +19,8 @@
 import org.apache.maven.continuum.core.action.AbstractContinuumAction;
 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.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.project.ContinuumProjectState;
@@ -32,6 +34,8 @@
 import org.codehaus.plexus.util.StringUtils;
 
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -166,6 +170,63 @@
 
                 scmResult = (ScmResult) actionContext.get( AbstractContinuumAction.KEY_UPDATE_SCM_RESULT );
 
+                List changes = scmResult.getChanges();
+
+                Iterator iterChanges = changes.iterator();
+
+                ChangeSet changeSet;
+
+                List changeFiles;
+
+                Iterator iterFiles;
+
+                ChangeFile changeFile;
+
+                boolean allChangesUnknown = true;
+
+                while ( iterChanges.hasNext() )
+                {
+
+                    changeSet = (ChangeSet) iterChanges.next();
+
+                    changeFiles = changeSet.getFiles();
+
+                    iterFiles = changeFiles.iterator();
+
+                    while ( iterFiles.hasNext() )
+                    {
+                        changeFile = (ChangeFile) iterFiles.next();
+
+                        if ( !"unknown".equalsIgnoreCase( changeFile.getStatus() ) )
+                        {
+                            allChangesUnknown = false;
+                            break;
+                        }
+                    }
+
+                    if ( !allChangesUnknown )
+                    {
+                        break;
+                    }
+                }
+
+                if ( allChangesUnknown && project.getOldState() != ContinuumProjectState.NEW &&
+                    trigger != ContinuumProjectState.TRIGGER_FORCED &&
+                    project.getState() != ContinuumProjectState.NEW )
+                {
+
+                    getLogger().info( "The project was not built because all changes are unknown." );
+
+                    project.setState( project.getOldState() );
+
+                    project.setOldState( 0 );
+
+                    store.updateProject( project );
+
+                    return;
+
+                }
+
                 actionManager.lookup( "update-project-from-working-directory" ).execute( actionContext );
 
                 actionManager.lookup( "execute-builder" ).execute( actionContext );
@@ -261,10 +322,9 @@
                 getLogger().error( "Internal error while building the project.", ex );
             }
 
-            if ( project.getState() != ContinuumProjectState.NEW &&
-                 project.getState() != ContinuumProjectState.OK &&
-                 project.getState() != ContinuumProjectState.FAILED &&
-                 project.getState() != ContinuumProjectState.ERROR )
+            if ( project.getState() != ContinuumProjectState.NEW && project.getState() != ContinuumProjectState.OK &&
+                project.getState() != ContinuumProjectState.FAILED &&
+                project.getState() != ContinuumProjectState.ERROR )
             {
                 try
                 {

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java Fri Jan 27 09:53:13 2006
@@ -23,12 +23,7 @@
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.io.Writer;
-import java.util.Date;
 import java.util.Map;
 
 /**

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java Fri Jan 27 09:53:13 2006
@@ -31,7 +31,6 @@
 
 import java.io.File;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -80,10 +79,8 @@
         // This is really a precondition for this action to execute
         // ----------------------------------------------------------------------
 
-        if ( project.getOldState() != ContinuumProjectState.NEW &&
-             scmResult.getChanges().size() == 0 &&
-             trigger != ContinuumProjectState.TRIGGER_FORCED &&
-            !isNew( project ) )
+        if ( project.getOldState() != ContinuumProjectState.NEW && scmResult.getChanges().size() == 0
+            && trigger != ContinuumProjectState.TRIGGER_FORCED && !isNew( project ) )
         {
             getLogger().info( "No files updated, not building. Project id '" + project.getId() + "'." );
 
@@ -151,7 +148,8 @@
 
             build.setBuildNumber( project.getBuildNumber() );
 
-            if ( build.getState() != ContinuumProjectState.OK && build.getState() != ContinuumProjectState.FAILED && build.getState() != ContinuumProjectState.ERROR )
+            if ( build.getState() != ContinuumProjectState.OK && build.getState() != ContinuumProjectState.FAILED
+                && build.getState() != ContinuumProjectState.ERROR )
             {
                 build.setState( ContinuumProjectState.ERROR );
             }

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java Fri Jan 27 09:53:13 2006
@@ -56,7 +56,7 @@
         }
         catch ( Exception e )
         {
-            throw new MavenOneMetadataHelperException( "Error while reading maven POM.", e );
+            throw new MavenOneMetadataHelperException( "Error while reading maven POM (" + e.getMessage() + ").", e );
         }
 
         // ----------------------------------------------------------------------
@@ -162,8 +162,7 @@
 
             if ( StringUtils.isEmpty( scmConnection ) )
             {
-                throw new MavenOneMetadataHelperException(
-                    "Missing both anonymous and developer SCM connection URLs." );
+                throw new MavenOneMetadataHelperException( "Missing both anonymous and developer SCM connection URLs." );
             }
         }
 
@@ -255,8 +254,6 @@
         }
         else
         {
-            String currentNagEmailAddress = null;
-
             String nagEmailAddress = getValue( build, "nagEmailAddress", null );
 
             if ( nagEmailAddress != null )

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Fri Jan 27 09:53:13 2006
@@ -23,14 +23,13 @@
 import org.apache.maven.continuum.model.project.ProjectDependency;
 import org.apache.maven.continuum.model.project.ProjectDeveloper;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
-import org.apache.maven.model.CiManagement;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Developer;
 import org.apache.maven.model.Notifier;
 import org.apache.maven.model.Scm;
+import org.apache.maven.project.DefaultMavenProjectBuilder;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.DefaultMavenProjectBuilder;
 import org.apache.maven.settings.MavenSettingsBuilder;
 import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -40,7 +39,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -237,7 +235,7 @@
         }
 
         continuumProject.setNotifiers( getNotifiers( mavenProject ) );
-        
+
         for ( Iterator i = userNotifiers.iterator(); i.hasNext(); )
         {
             ProjectNotifier notifier = (ProjectNotifier) i.next();
@@ -257,11 +255,11 @@
             //   This seems like code that is shared with DefaultMaven, so it should be mobed to the project
             //   builder perhaps
             // TODO: Remove cast
-            project = ( (DefaultMavenProjectBuilder) projectBuilder).build( file, getRepository(), null, false );
+            project = ( (DefaultMavenProjectBuilder) projectBuilder ).build( file, getRepository(), null, false );
         }
         catch ( Exception e )
         {
-            String msg = "Cannot build maven project from " + file + ".";
+            String msg = "Cannot build maven project from " + file + " (" + e.getMessage() + ").";
 
             getLogger().error( msg, e );
 
@@ -277,14 +275,16 @@
 
         if ( scm == null )
         {
-            throw new MavenBuilderHelperException( "Missing 'scm' element in the " + getProjectName( project ) + " POM." );
+            throw new MavenBuilderHelperException( "Missing 'scm' element in the " + getProjectName( project )
+                + " POM." );
         }
 
         String url = scm.getConnection();
 
         if ( StringUtils.isEmpty( url ) )
         {
-            throw new MavenBuilderHelperException( "Missing 'connection' element in the 'scm' element in the " + getProjectName( project ) + " POM." );
+            throw new MavenBuilderHelperException( "Missing 'connection' element in the 'scm' element in the "
+                + getProjectName( project ) + " POM." );
         }
 
         return project;

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java Fri Jan 27 09:53:13 2006
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.model.project.Project;
@@ -201,7 +200,7 @@
     }
 
     private void buildComplete( Project project, BuildResult build, String buildOutput, String source, Set recipients,
-                                Map configuration )
+                               Map configuration )
         throws NotificationException
     {
         // ----------------------------------------------------------------------
@@ -354,8 +353,10 @@
 
         if ( fromMailbox == null )
         {
-            getLogger().warn( project.getName() +
-                ": Project is missing nag email and global from mailbox is missing, not sending mail." );
+            getLogger()
+                .warn(
+                       project.getName()
+                           + ": Project is missing nag email and global from mailbox is missing, not sending mail." );
 
             return;
         }
@@ -448,8 +449,8 @@
 
         if ( currentBuild != null && build.getId() != currentBuild.getId() )
         {
-            throw new NotificationException( "INTERNAL ERROR: The current build wasn't the first in the build list. " +
-                "Current build: '" + currentBuild.getId() + "', " + "first build: '" + build.getId() + "'." );
+            throw new NotificationException( "INTERNAL ERROR: The current build wasn't the first in the build list. "
+                + "Current build: '" + currentBuild.getId() + "', " + "first build: '" + build.getId() + "'." );
         }
 
         return (BuildResult) builds.get( builds.size() - 2 );

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java Fri Jan 27 09:53:13 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.scheduler;
 
 /*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java Fri Jan 27 09:53:13 2006
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.model.project.Project;
 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;
@@ -28,9 +28,8 @@
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.checkout.CheckOutScmResult;
 import org.apache.maven.scm.command.update.UpdateScmResult;
-import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.manager.NoSuchScmProviderException;
-import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.apache.maven.scm.repository.ScmRepositoryException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -95,8 +94,6 @@
 
             ScmRepository repository = getScmRepositorty( project );
 
-            ScmProviderRepository providerRepository = repository.getProviderRepository();
-
             ScmResult result;
 
             synchronized ( this )
@@ -212,8 +209,6 @@
 
             ScmRepository repository = getScmRepositorty( project );
 
-            ScmProviderRepository providerRepository = repository.getProviderRepository();
-
             ScmResult result;
 
             ScmFileSet fileSet = new ScmFileSet( workingDirectory );
@@ -331,6 +326,8 @@
                 file.setName( scmFile.getPath() );
 
                 // TODO: revision?
+
+                file.setStatus(scmFile.getStatus().toString());
 
                 changeSet.addFile( file );
             }

Added: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/utils/PlexusContainerManager.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/utils/PlexusContainerManager.java?rev=372929&view=auto
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/utils/PlexusContainerManager.java (added)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/utils/PlexusContainerManager.java Fri Jan 27 09:53:13 2006
@@ -0,0 +1,54 @@
+package org.apache.maven.continuum.utils;
+
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import org.codehaus.plexus.PlexusContainer;
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public class PlexusContainerManager
+{
+    private PlexusContainer container;
+
+    private static PlexusContainerManager instance;
+
+    private PlexusContainerManager()
+    {
+    }
+    public static synchronized PlexusContainerManager getInstance()
+    {
+        if ( instance == null )
+        {
+            instance = new PlexusContainerManager();
+        }
+
+        return instance;
+    }
+
+    public PlexusContainer getContainer()
+    {
+        return container;
+    }
+
+    public void setContainer( PlexusContainer container )
+    {
+        this.container = container;
+    }
+}

Propchange: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/utils/PlexusContainerManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/utils/PlexusContainerManager.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/security/DefaultContinuumSecurityTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/security/DefaultContinuumSecurityTest.java?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/security/DefaultContinuumSecurityTest.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/security/DefaultContinuumSecurityTest.java Fri Jan 27 09:53:13 2006
@@ -19,7 +19,6 @@
 import org.apache.maven.continuum.AbstractContinuumTest;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.model.system.ContinuumUser;
-import org.apache.maven.continuum.model.system.UserGroup;
 
 /**
  * @author <a href="mailto:evenisse@apache">Emmanuel Venisse</a>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml Fri Jan 27 09:53:13 2006
@@ -11,13 +11,13 @@
      |
      | These point to the flows that we use as part of the runtime.
      |
-     | TODO: these should probably be packaged in the core package but the plexus-workflow package would
+     | TODO: these should probably be packaged in the core package but the plexus-osworkflow package would
      | need to be modified in order to find them all packaged in the JAR.
      |
      -->
     <component>
-      <role>org.codehaus.plexus.workflow.WorkflowEngine</role>
-      <implementation>org.codehaus.plexus.workflow.DefaultWorkflowEngine</implementation>
+      <role>org.codehaus.plexus.osworkflow.WorkflowEngine</role>
+      <implementation>org.codehaus.plexus.osworkflow.DefaultWorkflowEngine</implementation>
       <configuration>
         <workflowDirectory>${basedir}/../continuum-plexus-application/src/conf/workflows</workflowDirectory>
       </configuration>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-model/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-model/pom.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-model/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-model/pom.xml Fri Jan 27 09:53:13 2006
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>continuum-parent</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-model</artifactId>
   <name>Continuum Model</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-model/src/main/mdo/continuum.mdo
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-model/src/main/mdo/continuum.mdo?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-model/src/main/mdo/continuum.mdo (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-model/src/main/mdo/continuum.mdo Fri Jan 27 09:53:13 2006
@@ -533,6 +533,11 @@
           <version>1.0.0+</version>
           <type>String</type>
         </field>
+        <field>
+          <name>status</name>
+          <version>1.0.0+</version>
+          <type>String</type>
+        </field>
       </fields>
     </class>
 
@@ -731,11 +736,13 @@
           <name>workingDirectory</name>
           <version>1.0.0+</version>
           <type>String</type>
+          <defaultValue>working-directory</defaultValue>
         </field>
         <field>
           <name>buildOutputDirectory</name>
           <version>1.0.0+</version>
           <type>String</type>
+          <defaultValue>build-output-directory</defaultValue>
         </field>
         <field>
           <name>baseUrl</name>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-api/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-api/pom.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-api/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-api/pom.xml Fri Jan 27 09:53:13 2006
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-api</artifactId>
   <name>Continuum Notifier API</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
 </project>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-irc/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-irc/pom.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-irc/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-irc/pom.xml Fri Jan 27 09:53:13 2006
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-irc</artifactId>
   <name>Continuum IRC Notifier</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-notifier-api</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-jabber/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-jabber/pom.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-jabber/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-jabber/pom.xml Fri Jan 27 09:53:13 2006
@@ -2,17 +2,17 @@
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-jabber</artifactId>
   <name>Continuum Jabber Notifier</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-notifier-api</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-msn/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-msn/pom.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-msn/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-notifiers/continuum-notifier-msn/pom.xml Fri Jan 27 09:53:13 2006
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-msn</artifactId>
   <name>Continuum MSN Notifier</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-notifier-api</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-notifiers/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-notifiers/pom.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-notifiers/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-notifiers/pom.xml Fri Jan 27 09:53:13 2006
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>continuum-parent</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifiers</artifactId>
   <packaging>pom</packaging>
   <name>Continuum Notifiers</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <modules>
     <module>continuum-notifier-api</module>
     <module>continuum-notifier-irc</module>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/pom.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/pom.xml Fri Jan 27 09:53:13 2006
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>continuum-parent</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-plexus-application</artifactId>
   <packaging>plexus-application</packaging>
   <name>Continuum Plexus Application</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -22,7 +22,7 @@
         </executions>
         <configuration>
           <descriptor>src/assembly/bin.xml</descriptor>
-          <finalName>continuum-1.0.2</finalName>
+          <finalName>continuum-1.0.3-SNAPSHOT</finalName>
         </configuration>
       </plugin>
       <plugin>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/src/conf/application.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/src/conf/application.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/src/conf/application.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/src/conf/application.xml Fri Jan 27 09:53:13 2006
@@ -30,7 +30,7 @@
       <configuration>
         <webapps>
           <webapp>
-            <file>${plexus.home}/lib/continuum-web-1.0.2.jar</file>
+            <file>${plexus.home}/lib/continuum-web-1.0.3-SNAPSHOT.jar</file>
             <context>/continuum</context>
             <extraction-path>${plexus.home}/webapp</extraction-path>
             <listeners>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-site/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-site/pom.xml?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-site/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-site/pom.xml Fri Jan 27 09:53:13 2006
@@ -3,11 +3,11 @@
   <parent>
     <groupId>org.apache.maven.continuum</groupId>
     <artifactId>continuum-parent</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>continuum-site</artifactId>
   <groupId>org.apache.maven.continuum</groupId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.0.3-SNAPSHOT</version>
   <name>Continuum</name>
   <distributionManagement>
     <site>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/change-log.apt
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/change-log.apt?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/change-log.apt (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/change-log.apt Fri Jan 27 09:53:13 2006
@@ -4,12 +4,14 @@
  Trygve Laugstøl
  Emmanuel Venisse
  ------
- TUE October 25 2005
+ FRI December 09 2005
 
 Change Log
 
- This page lists the most important and noteworthy changes. For the complete
- list of issues look in JIRA for the respective version.
+* Changes from 1.0.1 to 1.0.2
+
+  {{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=12108&styleName=Html&projectId=10540}The
+  complete change log}}.
 
 * Changes from 1.0 to 1.0.1
 
@@ -41,98 +43,3 @@
   {{{http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&pid=10540&fixfor=10935}The
   complete change log}}.
 
-** User changes
-
- * Asynchronous checkouts. 
- 
-   Check outs from the source code repository will now happen in the
-   background. This means that the project is first stored and
-   then placed in the check out queue. All projects in the "checking out" state
-   will be added to the queue upon startup.
-
- * A build result will only be added when a build actually is executed.
- 
-   In the Alpha 1 release there is a build per hour without any real content as
-   the build wasn't executed. Now a build will only be created when the build
-   is actually executed.
-
- * Builds can be forced. 
- 
-   If some external resource has changed that Continuum won't detect you can
-   force a build. This is useful in if the SCM server is up again or some
-   snapshot has been updated) 
-
-~~* Read CruiseControl configuration files. 
-~~
-~~  Continuum can take a CC configuration and turn it into a set of Continuum
-~~  projects. Look at the {{{cc-support.apt}CruiseControl Support}} page for
-~~  more information.
-
- * Command line arguments per project. 
- 
-   Each project can be configured with command line arguments. This makes it
-   possible to fine tune each argument that's given to the build executor.
-
- * Recursivly add projects when reading Maven 2 metadata.
- 
-   Continuum will now read the <<<<modules>>>> element from the Maven 2 POMs
-   and recursivley turn each Maven 2 project into a Continuum project. This
-   is a very powerful feature as it makes it possible to add all the modules
-   a entire project in a single operation.
-
- * Maven 2 Final
-
-   Continuum use maven 2 final for building m2 projects.
-
- * Security
-
-   Continuum support now user/group access on pages. Guest account can be disabled.
-
- * Working copy browser
-
-   Each project files checkouted on continuum platform can be view in browser.
-
- * Blame mechanism
-
-   Continuum inform users on which files were modified since laste successful build.
-
-** Technical Changes
-
- These changes are more of a technical nature and mainly aimed at developers
- wanting to understand the inner workings of Continuum.
-
- * Build signaled state removed.
-
-   In the Alpha 1 release when a project was enqueued for building it would go
-   into the "build signaled" state and would then stay there until the build
-   was executed. This proved to be unnecessarily complex because it required a
-   build to exist to keep the state of the build. Instead the state was removed
-   and each project was put on a build queue instead.
-
-   When the build controller gets the build task from the queue it will update
-   the source code checked out and look for any changes. If there weren't any
-   changes the build execution is stopped and the controller goes back to
-   reading from the queue for more builds to execute.
-
-   Next the controller will read the project metadata and store any updated
-   information.
-
-   Now, if the project is either new, any files were updated or the build is
-   forced the build controller will create a build object and start the
-   exection of the build.
-
- * Split up project building and execution, <<<ContinuumBuilder>>> renamed to
-   <<<ContinuumExecutor>>>, <<<ContinuumProjectBuilder>>> added.
-
-   In Alpha 1 the <<<ContinuumBuilder>>> object had responsibility for both
-   the execution of a build (calling <<<m2>>>, <<<ant>>> etc) and the creation of
-   the <<<ContinuumProject>>> from an URL (where the URL was a pointer to a
-   <<<project.xml>>> or <<<pom.xml>>>).
-   
-   In Alpha 2 these two resposibilities have been split up into two components, namely:
-
-   * <<<ContinuumExecutor>>>: this component will do the actual build execution.
-
-   * <<<ContinuumProjectBuilder>>>: this component will build a set of
-     <<<ContinuumProjects>>>. This is also a change from Alpha 1 where the
-     builder would return a single project while now it's a set of projects.

Modified: maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/continuum-features.apt
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/continuum-features.apt?rev=372929&r1=372928&r2=372929&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/continuum-features.apt (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-site/src/site/apt/continuum-features.apt Fri Jan 27 09:53:13 2006
@@ -18,6 +18,10 @@
    
    * Starteam
 
+   * Clearcase
+
+   * Perforce
+
  * Easy to use web-based setup and interface
 
  * {{{http://www.opensymphony.com/quartz}Quartz}}-based scheduling



Mime
View raw message