continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r232221 [1/2] - in /maven/continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-api/src/main/java/org/apache/maven/continuum/notification/ continuum-api/src/main/java/org/apache/maven/continuum/store/ continuum-...
Date Fri, 12 Aug 2005 07:22:29 GMT
Author: brett
Date: Fri Aug 12 00:21:44 2005
New Revision: 232221

URL: http://svn.apache.org/viewcvs?rev=232221&view=rev
Log:
move over to classes in the new package where they are identical

Removed:
    maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo
Modified:
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcher.java
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
    maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java
    maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
    maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java
    maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java
    maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/ContinuumRecipientSource.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScm.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScmException.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
    maven/continuum/trunk/continuum-model/pom.xml
    maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo
    maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
    maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
    maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java

Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Fri Aug 12 00:21:44 2005
@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.model.project.ProjectNotifier;
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.AntProject;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumBuildSettings;
-import org.apache.maven.continuum.project.ContinuumNotifier;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectGroup;
 import org.apache.maven.continuum.project.ContinuumSchedule;
@@ -27,7 +28,6 @@
 import org.apache.maven.continuum.project.MavenTwoProject;
 import org.apache.maven.continuum.project.ShellProject;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
-import org.apache.maven.continuum.scm.ScmResult;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
 
 import java.util.Collection;
@@ -172,7 +172,7 @@
     // Notification
     // ----------------------------------------------------------------------
 
-    ContinuumNotifier getNotifier( String projectId, String notifierType )
+    ProjectNotifier getNotifier( String projectId, String notifierType )
         throws ContinuumException;
 
     void updateNotifier( String projectId, String notifierType, Map configuration )

Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcher.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcher.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcher.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcher.java Fri Aug 12 00:21:44 2005
@@ -18,7 +18,6 @@
 
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.scm.ScmResult;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>

Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java Fri Aug 12 00:21:44 2005
@@ -20,15 +20,15 @@
 import org.apache.maven.continuum.model.project.Profile;
 import org.apache.maven.continuum.model.project.Project;
 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.scm.ScmResult;
 import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumBuildSettings;
-import org.apache.maven.continuum.project.ContinuumNotifier;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectGroup;
 import org.apache.maven.continuum.project.ContinuumSchedule;
-import org.apache.maven.continuum.scm.ScmResult;
 
 import java.io.File;
 import java.util.Collection;
@@ -91,10 +91,10 @@
     File getBuildOutputFile( String buildId )
         throws ContinuumStoreException;
 
-    void removeNotifier( ContinuumNotifier notifier )
+    void removeNotifier( ProjectNotifier notifier )
         throws ContinuumStoreException;
 
-    ContinuumNotifier storeNotifier( ContinuumNotifier notifier )
+    ProjectNotifier storeNotifier( ProjectNotifier notifier )
         throws ContinuumStoreException;
 
     ContinuumSchedule addSchedule( ContinuumSchedule schedule )

Modified: maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java (original)
+++ maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java Fri Aug 12 00:21:44 2005
@@ -16,49 +16,41 @@
  * limitations under the License.
  */
 
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
 import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.project.AntProject;
-import org.apache.maven.continuum.project.ContinuumNotifier;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.MavenOneProject;
 import org.apache.maven.continuum.project.builder.AbstractContinuumProjectBuilder;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuilderException;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
-
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
 /**
- * @plexus.component
- *   role="org.apache.maven.continuum.project.builder.ContinuumProjectBuilder"
-     role-hint="cc-builder"
- *
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ * @plexus.component role="org.apache.maven.continuum.project.builder.ContinuumProjectBuilder"
+ * role-hint="cc-builder"
  */
 public class CruiseControlProjectBuilder
     extends AbstractContinuumProjectBuilder
 {
     public static final String ID = "cc-builder";
 
-    private final static String[] IGNORED_MODIFICATION_SET_TYPES = new String[]{
-        "alwaysbuild",
-        "buildstatus",
-        "forceonly",
-    };
-
-    private final static String[] IGNORED_SCHEDULE_TYPES = new String[]{
-        "pause",
-    };
+    private final static String[] IGNORED_MODIFICATION_SET_TYPES = new String[]{"alwaysbuild", "buildstatus",
+        "forceonly",};
+
+    private final static String[] IGNORED_SCHEDULE_TYPES = new String[]{"pause",};
 
     // ----------------------------------------------------------------------
     // ContinuumProjectBuilder Implementation
@@ -75,7 +67,7 @@
 
         for ( int i = 0; i < projects.length; i++ )
         {
-            Xpp3Dom project = projects[ i ];
+            Xpp3Dom project = projects[i];
 
             ContinuumProject continuumProject = findProject( project.getChild( "schedule" ) );
 
@@ -87,7 +79,8 @@
 
             if ( StringUtils.isEmpty( name ) )
             {
-                throw new ContinuumProjectBuilderException( "Missing required attribute 'name' from 'project' element." );
+                throw new ContinuumProjectBuilderException(
+                    "Missing required attribute 'name' from 'project' element." );
             }
 
             continuumProject.setName( name );
@@ -100,7 +93,8 @@
 
             if ( modifactionsets == null )
             {
-                throw new ContinuumProjectBuilderException( "The configuration must contain at a 'modificationset' element." );
+                throw new ContinuumProjectBuilderException(
+                    "The configuration must contain at a 'modificationset' element." );
             }
 
             String scmUrl = findScmUrl( modifactionsets.getChildren() );
@@ -122,7 +116,7 @@
                     emailAddress = findNagEmailAddress( publishers.getChild( "htmlemail" ) );
                 }
 
-                ContinuumNotifier notifier = new ContinuumNotifier();
+                ProjectNotifier notifier = new ProjectNotifier();
 
                 Properties props = new Properties();
 
@@ -161,7 +155,7 @@
 
         for ( int i = 0; i < children.length; i++ )
         {
-            Xpp3Dom child = children[ i ];
+            Xpp3Dom child = children[i];
 
             if ( contains( child.getName(), IGNORED_SCHEDULE_TYPES ) )
             {
@@ -172,7 +166,8 @@
             {
                 if ( project != null )
                 {
-                    throw new ContinuumProjectBuilderException( "A configuration can only have a single 'ant' or 'maven' schedule." );
+                    throw new ContinuumProjectBuilderException(
+                        "A configuration can only have a single 'ant' or 'maven' schedule." );
                 }
 
                 project = new AntProject();
@@ -183,7 +178,8 @@
             {
                 if ( project != null )
                 {
-                    throw new ContinuumProjectBuilderException( "A configuration can only have a single 'ant' or 'maven' schedule." );
+                    throw new ContinuumProjectBuilderException(
+                        "A configuration can only have a single 'ant' or 'maven' schedule." );
                 }
 
                 project = new MavenOneProject();
@@ -192,13 +188,15 @@
             }
             else
             {
-                throw new ContinuumProjectBuilderException( "Can't handle schedule '" + schedule.getName() + "'. Continuum only supports 'ant' and 'maven' schedules." );
+                throw new ContinuumProjectBuilderException( "Can't handle schedule '" + schedule.getName() +
+                    "'. Continuum only supports 'ant' and 'maven' schedules." );
             }
         }
 
         if ( project == null )
         {
-            throw new ContinuumProjectBuilderException( "There must be exactly one 'ant' or 'maven' build scheduled.." );
+            throw new ContinuumProjectBuilderException(
+                "There must be exactly one 'ant' or 'maven' build scheduled.." );
         }
 
         return project;
@@ -211,7 +209,7 @@
 
         for ( int j = 0; j < modifactionsets.length; j++ )
         {
-            Xpp3Dom modifactionset = modifactionsets[ j ];
+            Xpp3Dom modifactionset = modifactionsets[j];
 
             if ( contains( modifactionset.getName(), IGNORED_MODIFICATION_SET_TYPES ) )
             {
@@ -222,14 +220,16 @@
             {
                 if ( scmUrl != null )
                 {
-                    throw new ContinuumProjectBuilderException( "A 'modificationset' element can only contain a single 'cvs' or 'svn' element." );
+                    throw new ContinuumProjectBuilderException(
+                        "A 'modificationset' element can only contain a single 'cvs' or 'svn' element." );
                 }
 
                 String cvsrot = modifactionset.getAttribute( "cvsroot" );
 
                 if ( StringUtils.isEmpty( cvsrot ) )
                 {
-                    throw new ContinuumProjectBuilderException( "A 'cvsroot' attribute is required when using a cvs modification set. The usage of 'localworkingcopy' is not supported." );
+                    throw new ContinuumProjectBuilderException(
+                        "A 'cvsroot' attribute is required when using a cvs modification set. The usage of 'localworkingcopy' is not supported." );
                 }
 
                 String tag = modifactionset.getAttribute( "tag" );
@@ -245,21 +245,24 @@
             {
                 if ( scmUrl != null )
                 {
-                    throw new ContinuumProjectBuilderException( "A 'modificationset' element can only contain a single 'cvs' or 'svn' element." );
+                    throw new ContinuumProjectBuilderException(
+                        "A 'modificationset' element can only contain a single 'cvs' or 'svn' element." );
                 }
 
                 String repositoryLocation = modifactionset.getAttribute( "repositoryLocation" );
 
                 if ( StringUtils.isEmpty( repositoryLocation ) )
                 {
-                    throw new ContinuumProjectBuilderException( "A 'repositoryLocation' attribute is required when using a svn modification set. The usage of 'localworkingcopy' is not supported." );
+                    throw new ContinuumProjectBuilderException(
+                        "A 'repositoryLocation' attribute is required when using a svn modification set. The usage of 'localworkingcopy' is not supported." );
                 }
 
                 scmUrl = "scm:svn:" + repositoryLocation;
             }
             else
             {
-                throw new ContinuumProjectBuilderException( "Unsupported modification set found '" + modifactionset.getName() + "'." );
+                throw new ContinuumProjectBuilderException(
+                    "Unsupported modification set found '" + modifactionset.getName() + "'." );
             }
 
             break;
@@ -267,7 +270,8 @@
 
         if ( scmUrl == null )
         {
-            throw new ContinuumProjectBuilderException( "The configuration must contain at least one 'modificationset'." );
+            throw new ContinuumProjectBuilderException(
+                "The configuration must contain at least one 'modificationset'." );
         }
 
         return scmUrl;
@@ -287,7 +291,7 @@
             return null;
         }
 
-        String nagEmailAddress = failure[ 0 ].getAttribute( "address" );
+        String nagEmailAddress = failure[0].getAttribute( "address" );
 
         if ( StringUtils.isEmpty( nagEmailAddress ) )
         {
@@ -305,7 +309,7 @@
     {
         for ( int i = 0; i < data.length; i++ )
         {
-            if ( data[ i ].equals( target ) )
+            if ( data[i].equals( target ) )
             {
                 return true;
             }
@@ -325,11 +329,13 @@
         }
         catch ( XmlPullParserException e )
         {
-            throw new ContinuumProjectBuilderException( "Error while parsing the CruiseControl configuration file.", e );
+            throw new ContinuumProjectBuilderException( "Error while parsing the CruiseControl configuration file.",
+                                                        e );
         }
         catch ( IOException e )
         {
-            throw new ContinuumProjectBuilderException( "Error while downloading the CruiseControl configuration file.", e );
+            throw new ContinuumProjectBuilderException( "Error while downloading the CruiseControl configuration file.",
+                                                        e );
         }
     }
 }

Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java Fri Aug 12 00:21:44 2005
@@ -20,15 +20,17 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.configuration.ConfigurationService;
+import org.apache.maven.continuum.model.scm.ChangeFile;
+import org.apache.maven.continuum.model.scm.ChangeSet;
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
-import org.apache.maven.continuum.scm.ChangeSet;
-import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.xmlrpc.XmlRpcHelper;
+import org.apache.maven.scm.ScmFile;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.util.FileUtils;
@@ -558,9 +560,9 @@
 
             for ( Iterator it = actualCheckedOutFiles.iterator(); it.hasNext(); )
             {
-                ScmFile scmFile = (ScmFile) it.next();
+                ChangeFile scmFile = (ChangeFile) it.next();
 
-                print( " " + scmFile.getPath() );
+                print( " " + scmFile.getName() );
             }
 
             assertEquals(

Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java Fri Aug 12 00:21:44 2005
@@ -18,8 +18,8 @@
 
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.execution.ant.AntBuildExecutor;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.project.AntProject;
-import org.apache.maven.continuum.project.ContinuumNotifier;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.codehaus.plexus.util.FileUtils;
 
@@ -117,9 +117,9 @@
         removeProject( projectId );
     }
 
-    private ContinuumNotifier makeMailNotifier( String address )
+    private ProjectNotifier makeMailNotifier( String address )
     {
-        ContinuumNotifier notifier = new ContinuumNotifier();
+        ProjectNotifier notifier = new ProjectNotifier();
 
         notifier.setType( "mail" );
 

Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java Fri Aug 12 00:21:44 2005
@@ -18,16 +18,16 @@
 
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.AntProject;
 import org.apache.maven.continuum.project.ContinuumBuild;
-import org.apache.maven.continuum.project.ContinuumNotifier;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumSchedule;
 import org.apache.maven.continuum.project.MavenOneProject;
 import org.apache.maven.continuum.project.MavenTwoProject;
 import org.apache.maven.continuum.project.ShellProject;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
-import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.xmlrpc.XmlRpcHelper;
 import org.apache.xmlrpc.XmlRpcClient;
 import org.apache.xmlrpc.XmlRpcClientLite;
@@ -315,7 +315,7 @@
     // Notification
     // ----------------------------------------------------------------------
 
-    public ContinuumNotifier getNotifier( String projectId, String notifierType )
+    public ProjectNotifier getNotifier( String projectId, String notifierType )
         throws ContinuumException
     {
         throw new UnsupportedOperationException();

Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java Fri Aug 12 00:21:44 2005
@@ -18,8 +18,8 @@
 
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.project.ContinuumBuild;
-import org.apache.maven.continuum.project.ContinuumNotifier;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.codehaus.plexus.util.FileUtils;
@@ -63,11 +63,11 @@
         assertEquals( "project.notifiers.size", 2, project.getNotifiers().size() );
 
         //TODO: Activate this test when CONTINUUM-252 will be fixed
-        //removeNotifier( projectId, ( (ContinuumNotifier) project.getNotifiers().get( 1 ) ).getType() );
+        //removeNotifier( projectId, ( (ProjectNotifier) project.getNotifiers().get( 1 ) ).getType() );
 
         //assertEquals( "project.notifiers.size", 1, project.getNotifiers().size() );
 
-        Map configuration = ( (ContinuumNotifier) project.getNotifiers().get( 0 ) ).getConfiguration();
+        Map configuration = ( (ProjectNotifier) project.getNotifiers().get( 0 ) ).getConfiguration();
 
         assertEquals( "project.notifiers[1].configuration.size", 1, configuration.size() );
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Fri Aug 12 00:21:44 2005
@@ -32,10 +32,11 @@
 import org.apache.maven.continuum.execution.shell.ShellBuildExecutor;
 import org.apache.maven.continuum.initialization.ContinuumInitializationException;
 import org.apache.maven.continuum.initialization.ContinuumInitializer;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.AntProject;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumBuildSettings;
-import org.apache.maven.continuum.project.ContinuumNotifier;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectGroup;
 import org.apache.maven.continuum.project.ContinuumSchedule;
@@ -46,7 +47,6 @@
 import org.apache.maven.continuum.project.builder.maven.MavenOneContinuumProjectBuilder;
 import org.apache.maven.continuum.project.builder.maven.MavenTwoContinuumProjectBuilder;
 import org.apache.maven.continuum.scheduler.ContinuumScheduler;
-import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
@@ -762,18 +762,18 @@
     // This whole section needs a scrub but will need to be dealt with generally
     // when we add schedules and profiles to the mix.
 
-    public ContinuumNotifier getNotifier( String projectId, String notifierType )
+    public ProjectNotifier getNotifier( String projectId, String notifierType )
         throws ContinuumException
     {
         ContinuumProject project = getProject( projectId );
 
         List notifiers = project.getNotifiers();
 
-        ContinuumNotifier notifier = null;
+        ProjectNotifier notifier = null;
 
         for ( Iterator i = notifiers.iterator(); i.hasNext(); )
         {
-            notifier = (ContinuumNotifier) i.next();
+            notifier = (ProjectNotifier) i.next();
 
             if ( notifier.getType().equals( notifierType ) )
             {
@@ -787,7 +787,7 @@
     public void updateNotifier( String projectId, String notifierType, Map configuration )
         throws ContinuumException
     {
-        ContinuumNotifier notifier = getNotifier( projectId, notifierType );
+        ProjectNotifier notifier = getNotifier( projectId, notifierType );
 
         Properties notifierProperties = createNotifierProperties( configuration );
 
@@ -818,7 +818,7 @@
     public void addNotifier( String projectId, String notifierType, Map configuration )
         throws ContinuumException
     {
-        ContinuumNotifier notifier = new ContinuumNotifier();
+        ProjectNotifier notifier = new ProjectNotifier();
 
         notifier.setType( notifierType );
 
@@ -840,7 +840,7 @@
     public void removeNotifier( String projectId, String notifierType )
         throws ContinuumException
     {
-        ContinuumNotifier n = getNotifier( projectId, notifierType );
+        ProjectNotifier n = getNotifier( projectId, notifierType );
 
         if ( n != null )
         {
@@ -1097,7 +1097,7 @@
         }
     }
 
-    public void removeNotifier( ContinuumNotifier notifier )
+    public void removeNotifier( ProjectNotifier notifier )
         throws ContinuumException
     {
         try
@@ -1110,7 +1110,7 @@
         }
     }
 
-    public ContinuumNotifier storeNotifier( ContinuumNotifier notifier )
+    public ProjectNotifier storeNotifier( ProjectNotifier notifier )
         throws ContinuumException
     {
         try

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Fri Aug 12 00:21:44 2005
@@ -17,12 +17,12 @@
  */
 
 import org.apache.maven.continuum.core.action.AbstractContinuumAction;
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.scm.ContinuumScmException;
-import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.apache.maven.continuum.utils.ContinuumUtils;

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java Fri Aug 12 00:21:44 2005
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectGroup;
-import org.apache.maven.continuum.scm.ScmResult;
 import org.codehaus.plexus.action.AbstractAction;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -133,7 +133,7 @@
         return (ScmResult) getObject( context, KEY_UPDATE_SCM_RESULT );
     }
 
-    public static ScmResult getUpdateScmResult(  Map context, ScmResult defaultValue )
+    public static ScmResult getUpdateScmResult( Map context, ScmResult defaultValue )
     {
         return (ScmResult) getObject( context, KEY_UPDATE_SCM_RESULT, defaultValue );
     }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java Fri Aug 12 00:21:44 2005
@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.scm.ContinuumScmException;
-import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.scm.ContinuumScm;
-import org.apache.maven.continuum.utils.ContinuumUtils;
+import org.apache.maven.continuum.scm.ContinuumScmException;
 import org.apache.maven.continuum.store.ContinuumStore;
+import org.apache.maven.continuum.utils.ContinuumUtils;
 import org.apache.maven.scm.manager.NoSuchScmProviderException;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -88,11 +88,14 @@
                 if ( result != null )
                 {
                     errorMessage = "";
-                    errorMessage += "Provider message: "  + StringUtils.clean( result.getProviderMessage() ) + System.getProperty( "line.separator" );
+                    errorMessage += "Provider message: " + StringUtils.clean( result.getProviderMessage() ) +
+                        System.getProperty( "line.separator" );
                     errorMessage += "Command output: " + System.getProperty( "line.separator" );
-                    errorMessage += "-------------------------------------------------------------------------------" + System.getProperty( "line.separator" );
+                    errorMessage += "-------------------------------------------------------------------------------" +
+                        System.getProperty( "line.separator" );
                     errorMessage += StringUtils.clean( result.getCommandOutput() );
-                    errorMessage += "-------------------------------------------------------------------------------" + System.getProperty( "line.separator" );
+                    errorMessage += "-------------------------------------------------------------------------------" +
+                        System.getProperty( "line.separator" );
                 }
                 else
                 {

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java Fri Aug 12 00:21:44 2005
@@ -19,11 +19,11 @@
 import org.apache.maven.continuum.execution.ContinuumBuildExecutionResult;
 import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
 import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.apache.maven.continuum.utils.ContinuumUtils;

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java Fri Aug 12 00:21:44 2005
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java Fri Aug 12 00:21:44 2005
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.model.scm.ScmResult;
+import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.scm.ContinuumScm;
-import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.store.ContinuumStore;
 
 import java.util.Map;

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java Fri Aug 12 00:21:44 2005
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.notification.ContinuumRecipientSource;
-import org.apache.maven.continuum.project.ContinuumNotifier;
 import org.apache.maven.continuum.project.MavenOneProject;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
@@ -109,8 +109,7 @@
 
         String version = getValue( mavenProject, "currentVersion", project.getVersion() );
 
-        if ( StringUtils.isEmpty( project.getVersion() ) &&
-             StringUtils.isEmpty( version ) )
+        if ( StringUtils.isEmpty( project.getVersion() ) && StringUtils.isEmpty( version ) )
         {
             throw new MavenOneMetadataHelperException( "Missing 'version' element in the POM." );
         }
@@ -121,8 +120,7 @@
 
         String name = getValue( mavenProject, "name", project.getName() );
 
-        if ( StringUtils.isEmpty( project.getName() ) &&
-             StringUtils.isEmpty( name ) )
+        if ( StringUtils.isEmpty( project.getName() ) && StringUtils.isEmpty( name ) )
         {
             throw new MavenOneMetadataHelperException( "Missing 'name' element in POM." );
         }
@@ -154,7 +152,8 @@
 
             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." );
             }
         }
 
@@ -166,7 +165,7 @@
 
         List notifiers = null;
 
-        ContinuumNotifier notifier = new ContinuumNotifier();
+        ProjectNotifier notifier = new ProjectNotifier();
 
         if ( build == null )
         {
@@ -187,12 +186,13 @@
             {
                 for ( Iterator i = project.getNotifiers().iterator(); i.hasNext(); )
                 {
-                    ContinuumNotifier notif = (ContinuumNotifier) i.next();
+                    ProjectNotifier notif = (ProjectNotifier) i.next();
 
                     // Can we have an other type for maven 1 project?
                     if ( "mail".equals( notif.getType() ) )
                     {
-                        currentNagEmailAddress = (String) notif.getConfiguration().get( ContinuumRecipientSource.ADDRESS_FIELD );
+                        currentNagEmailAddress = (String) notif.getConfiguration().get(
+                            ContinuumRecipientSource.ADDRESS_FIELD );
                     }
                 }
             }
@@ -211,7 +211,8 @@
 
         if ( notifiers == null && notifier.getConfiguration().isEmpty() )
         {
-            throw new MavenOneMetadataHelperException( "Missing 'nagEmailAddress' element in the 'build' element in the POM." );
+            throw new MavenOneMetadataHelperException(
+                "Missing 'nagEmailAddress' element in the 'build' element in the POM." );
         }
         else
         {

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Fri Aug 12 00:21:44 2005
@@ -19,9 +19,9 @@
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.continuum.project.ContinuumDependency;
-import org.apache.maven.continuum.project.ContinuumDeveloper;
-import org.apache.maven.continuum.project.ContinuumNotifier;
+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.continuum.project.MavenTwoProject;
 import org.apache.maven.model.CiManagement;
 import org.apache.maven.model.Dependency;
@@ -150,7 +150,7 @@
             {
                 Developer d = (Developer) i.next();
 
-                ContinuumDeveloper cd = new ContinuumDeveloper();
+                ProjectDeveloper cd = new ProjectDeveloper();
 
                 cd.setScmId( d.getId() );
 
@@ -176,7 +176,7 @@
             {
                 Dependency dependency = (Dependency) i.next();
 
-                ContinuumDependency cd = new ContinuumDependency();
+                ProjectDependency cd = new ProjectDependency();
 
                 cd.setGroupId( dependency.getGroupId() );
 
@@ -284,7 +284,7 @@
         {
             Notifier projectNotifier = (Notifier) i.next();
 
-            ContinuumNotifier notifier = new ContinuumNotifier();
+            ProjectNotifier notifier = new ProjectNotifier();
 
             if ( StringUtils.isEmpty( projectNotifier.getType() ) )
             {

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/ContinuumRecipientSource.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/ContinuumRecipientSource.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/ContinuumRecipientSource.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/ContinuumRecipientSource.java Fri Aug 12 00:21:44 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.project.ContinuumNotifier;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.codehaus.plexus.notification.AbstractRecipientSource;
 import org.codehaus.plexus.notification.NotificationException;
@@ -39,7 +39,9 @@
 {
     public static String ADDRESS_FIELD = "address";
 
-    /** @plexus.configuration */
+    /**
+     * @plexus.configuration
+     */
     private String toOverride;
 
     // ----------------------------------------------------------------------
@@ -54,7 +56,8 @@
 
         if ( StringUtils.isEmpty( toOverride ) )
         {
-            getLogger().info( "To override address is not configured, will use the nag email address from the project." );
+            getLogger().info(
+                "To override address is not configured, will use the nag email address from the project." );
         }
         else
         {
@@ -86,9 +89,10 @@
         {
             for ( Iterator notifierIterator = project.getNotifiers().iterator(); notifierIterator.hasNext(); )
             {
-                ContinuumNotifier notifier = (ContinuumNotifier) notifierIterator.next();
+                ProjectNotifier notifier = (ProjectNotifier) notifierIterator.next();
 
-                if ( notifier.getType().equals( notifierType ) && notifier.getConfiguration().containsKey( ADDRESS_FIELD ) )
+                if ( notifier.getType().equals( notifierType ) &&
+                    notifier.getConfiguration().containsKey( ADDRESS_FIELD ) )
                 {
                     String addressField = (String) notifier.getConfiguration().get( ADDRESS_FIELD );
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java Fri Aug 12 00:21:44 2005
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.project.ContinuumBuild;
-import org.apache.maven.continuum.project.ContinuumNotifier;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
@@ -132,11 +132,11 @@
 
         for ( Iterator i = project.getNotifiers().iterator(); i.hasNext(); )
         {
-            ContinuumNotifier continuumNotifier = (ContinuumNotifier) i.next();
+            ProjectNotifier projectNotifier = (ProjectNotifier) i.next();
 
-            String notifierType = continuumNotifier.getType();
+            String notifierType = projectNotifier.getType();
 
-            Map configuration = continuumNotifier.getConfiguration();
+            Map configuration = projectNotifier.getConfiguration();
 
             try
             {
@@ -144,7 +144,7 @@
 
                 Set recipients = recipientSource.getRecipients( notifierType, messageId, configuration, context );
 
-                notifier.sendNotification( messageId, recipients, continuumNotifier.getConfiguration(), context );
+                notifier.sendNotification( messageId, recipients, projectNotifier.getConfiguration(), context );
             }
             catch ( NotificationException e )
             {

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScm.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScm.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScm.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScm.java Fri Aug 12 00:21:44 2005
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumProject;
 
 import java.io.File;

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScmException.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScmException.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScmException.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScmException.java Fri Aug 12 00:21:44 2005
@@ -1,5 +1,7 @@
 package org.apache.maven.continuum.scm;
 
+import org.apache.maven.continuum.model.scm.ScmResult;
+
 /*
  * Copyright 2004-2005 The Apache Software Foundation.
  *

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java Fri Aug 12 00:21:44 2005
@@ -16,9 +16,13 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.model.scm.ChangeFile;
+import org.apache.maven.continuum.model.scm.ChangeSet;
+import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.utils.WorkingDirectoryService;
 import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.checkout.CheckOutScmResult;
 import org.apache.maven.scm.command.update.UpdateScmResult;
@@ -231,7 +235,7 @@
             // TODO: author, etc.
             for ( Iterator it = files.iterator(); it.hasNext(); )
             {
-                org.apache.maven.scm.ScmFile scmFile = (org.apache.maven.scm.ScmFile) it.next();
+                ScmFile scmFile = (ScmFile) it.next();
 
                 ChangeFile file = new ChangeFile();
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java Fri Aug 12 00:21:44 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.project.ContinuumDependency;
+import org.apache.maven.continuum.model.project.ProjectDependency;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
 import org.codehaus.plexus.util.dag.DAG;
@@ -79,7 +79,7 @@
 
             for ( Iterator j = project.getDependencies().iterator(); j.hasNext(); )
             {
-                ContinuumDependency dependency = (ContinuumDependency) j.next();
+                ProjectDependency dependency = (ProjectDependency) j.next();
 
                 String dependencyId = getDependencyId( dependency );
 
@@ -107,7 +107,7 @@
         return project.getGroupId() + ":" + project.getArtifactId();
     }
 
-    private static String getDependencyId( ContinuumDependency project )
+    private static String getDependencyId( ProjectDependency project )
     {
         return project.getGroupId() + ":" + project.getArtifactId();
     }

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java Fri Aug 12 00:21:44 2005
@@ -18,7 +18,7 @@
 
 import org.apache.maven.continuum.AbstractContinuumTest;
 import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
-import org.apache.maven.continuum.project.ContinuumNotifier;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.project.MavenOneProject;
 import org.codehaus.plexus.util.FileUtils;
 
@@ -39,7 +39,8 @@
     {
         BuildExecutorManager builderManager = (BuildExecutorManager) lookup( BuildExecutorManager.ROLE );
 
-        MavenOneBuildExecutor executor = (MavenOneBuildExecutor) builderManager.getBuildExecutor( MavenOneBuildExecutor.ID );
+        MavenOneBuildExecutor executor = (MavenOneBuildExecutor) builderManager.getBuildExecutor(
+            MavenOneBuildExecutor.ID );
 
         // ----------------------------------------------------------------------
         // Make a checkout
@@ -66,11 +67,11 @@
 
         project.setGroupId( "org.apache.maven" );
 
-        project.setArtifactId( "maven");
+        project.setArtifactId( "maven" );
 
         project.setScmUrl( "scm:svn:http://svn.apache.org/repos/asf:maven/maven-1/core/trunk/" );
 
-        ContinuumNotifier notifier = new ContinuumNotifier();
+        ProjectNotifier notifier = new ProjectNotifier();
 
         Properties props = new Properties();
 
@@ -104,7 +105,7 @@
 
         assertEquals( "scm:svn:http://svn.apache.org/repos/asf:maven/maven-1/core/trunk/", project.getScmUrl() );
 
-        ContinuumNotifier actualNotifier = (ContinuumNotifier) project.getNotifiers().get( 0 );
+        ProjectNotifier actualNotifier = (ProjectNotifier) project.getNotifiers().get( 0 );
 
         assertEquals( "dev@maven.apache.org", actualNotifier.getConfiguration().get( "address" ) );
 

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java Fri Aug 12 00:21:44 2005
@@ -16,15 +16,14 @@
  * limitations under the License.
  */
 
-import java.util.Iterator;
-
-import org.apache.maven.continuum.project.ContinuumNotifier;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.project.MavenOneProject;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
-
 import org.codehaus.plexus.PlexusTestCase;
 
+import java.util.Iterator;
+
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
@@ -35,9 +34,11 @@
     public void testBuildingAProjectFromMetadataWithACompleteMaven1Pom()
         throws Exception
     {
-        ContinuumProjectBuilder projectBuilder = (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, MavenOneContinuumProjectBuilder.ID );
+        ContinuumProjectBuilder projectBuilder = (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE,
+                                                                                   MavenOneContinuumProjectBuilder.ID );
 
-        ContinuumProjectBuildingResult result = projectBuilder.buildProjectsFromMetadata( getTestFile( "src/test/resources/projects/maven-1.pom.xml" ).toURL() );
+        ContinuumProjectBuildingResult result = projectBuilder.buildProjectsFromMetadata(
+            getTestFile( "src/test/resources/projects/maven-1.pom.xml" ).toURL() );
 
         assertNotNull( result.getWarnings() );
 
@@ -62,7 +63,7 @@
 
         assertEquals( "scm:svn:http://svn.apache.org/repos/asf:maven/maven-1/core/trunk/", project.getScmUrl() );
 
-        ContinuumNotifier notifier = (ContinuumNotifier) project.getNotifiers().get( 0 );
+        ProjectNotifier notifier = (ProjectNotifier) project.getNotifiers().get( 0 );
 
         assertEquals( "mail", notifier.getType() );
 

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java Fri Aug 12 00:21:44 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.project.ContinuumNotifier;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.project.ContinuumProjectGroup;
 import org.apache.maven.continuum.project.MavenTwoProject;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
@@ -62,7 +62,7 @@
 
         assertEquals( 1, project.getNotifiers().size() );
 
-        ContinuumNotifier notifier = (ContinuumNotifier) project.getNotifiers().get( 0 );
+        ProjectNotifier notifier = (ProjectNotifier) project.getNotifiers().get( 0 );
 
         assertEquals( "mail", notifier.getType() );
 
@@ -93,7 +93,7 @@
 
         assertEquals( 1, project.getNotifiers().size() );
 
-        ContinuumNotifier notifier = (ContinuumNotifier) project.getNotifiers().get( 0 );
+        ProjectNotifier notifier = (ProjectNotifier) project.getNotifiers().get( 0 );
 
         assertEquals( "mail", notifier.getType() );
 

Modified: maven/continuum/trunk/continuum-model/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/pom.xml?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/pom.xml (original)
+++ maven/continuum/trunk/continuum-model/pom.xml Fri Aug 12 00:21:44 2005
@@ -36,23 +36,10 @@
         <configuration>
           <version>1.0.0</version>
           <packageWithVersion>false</packageWithVersion>
+          <model>src/main/mdo/continuum.mdo</model>
         </configuration>
         <executions>
-          <!-- TODO: remove -->
           <execution>
-            <id>old</id>
-            <configuration>
-              <model>src/main/resources/continuum.mdo</model>
-            </configuration>
-            <goals>
-              <goal>java</goal>
-            </goals>
-          </execution>
-          <execution>
-            <!-- TODO: push back up -->
-            <configuration>
-              <model>src/main/mdo/continuum.mdo</model>
-            </configuration>
             <goals>
               <goal>java</goal>
               <!--

Modified: maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo Fri Aug 12 00:21:44 2005
@@ -724,5 +724,473 @@
       </fields>
     </class>
 
+    <!-- TODO: old ones to remove -->
+
+    <class rootElement="true" stash.storable="true" java.abstract="true">
+      <packageName>org.apache.maven.continuum.project</packageName>
+      <name>ContinuumProject</name>
+      <version>1.0.0</version>
+      <fields>
+        <field>
+          <name>id</name>
+          <required>true</required>
+          <identifier>true</identifier>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>name</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <!-- TODO: Remove -->
+        <field>
+          <name>scmUrl</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>version</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field stash.storable="false">
+          <name>state</name>
+          <version>1.0.0</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>executorId</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>latestBuildId</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>buildNumber</name>
+          <version>1.0.0</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>builds</name>
+          <version>1.0.0</version>
+          <association stash.part="true">
+            <type>ContinuumBuild</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>checkoutResult</name>
+          <version>1.0.0</version>
+          <association>
+            <type>ScmResult</type>
+          </association>
+        </field>
+        <field>
+          <name>url</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>artifactId</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>groupId</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>developers</name>
+          <version>1.0.0</version>
+          <association stash.part="true">
+            <type>ProjectDeveloper</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>notifiers</name>
+          <version>1.0.0</version>
+          <association stash.part="true">
+            <type>ProjectNotifier</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>dependencies</name>
+          <version>1.0.0</version>
+          <association stash.part="true">
+            <type>ProjectDependency</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>projectGroup</name>
+          <version>1.0.0</version>
+          <type>Set</type>
+          <association stash.part="false">
+            <type>ContinuumProjectGroup</type>
+          </association>
+        </field>
+      </fields>
+    </class>
+
+    <class stash.storable="true">
+      <packageName>org.apache.maven.continuum.project</packageName>
+      <name>ContinuumSchedule</name>
+      <version>1.0.0</version>
+      <description><![CDATA[
+          Schedule for a project.
+        ]]></description>
+      <fields>
+        <field>
+          <name>projects</name>
+          <version>1.0.0</version>
+          <type>Set</type>
+          <association stash.part="false">
+            <type>ContinuumProject</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>id</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>active</name>
+          <version>1.0.0</version>
+          <type>boolean</type>
+        </field>
+        <field>
+          <name>name</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>description</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <!--
+        | update
+        | clean checkout
+        -->
+        <field>
+          <name>scmMode</name>
+          <version>1.0.0</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>delay</name>
+          <description><![CDATA[
+              Delay in seconds.
+            ]]></description>
+          <version>1.0.0</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>cronExpression</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+
+    <class stash.storable="true">
+      <packageName>org.apache.maven.continuum.project</packageName>
+      <name>MavenTwoProject</name>
+      <version>1.0.0</version>
+      <superClass>ContinuumProject</superClass>
+      <fields>
+        <field>
+          <name>goals</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>commandLineArguments</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+
+    <class stash.storable="true">
+      <packageName>org.apache.maven.continuum.project</packageName>
+      <name>MavenOneProject</name>
+      <version>1.0.0</version>
+      <superClass>ContinuumProject</superClass>
+      <fields>
+        <field>
+          <name>goals</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>commandLineArguments</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+
+    <class stash.storable="true">
+      <packageName>org.apache.maven.continuum.project</packageName>
+      <name>AntProject</name>
+      <version>1.0.0</version>
+      <superClass>ContinuumProject</superClass>
+      <fields>
+        <field>
+          <name>executable</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>targets</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>commandLineArguments</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+
+    <class stash.storable="true">
+      <packageName>org.apache.maven.continuum.project</packageName>
+      <name>ShellProject</name>
+      <version>1.0.0</version>
+      <superClass>ContinuumProject</superClass>
+      <fields>
+        <field>
+          <name>executable</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>commandLineArguments</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+
+    <!--
+    |
+    | Builds
+    |
+    -->
+    <class stash.storable="true">
+      <packageName>org.apache.maven.continuum.project</packageName>
+      <name>ContinuumBuild</name>
+      <version>1.0.0</version>
+      <description><![CDATA[
+          This class is a single continuum build.
+          It has a reference to a {@link BuilderBuildResult} which contains
+          any builder specific objects/variables.</description>
+        ]]></description>
+      <fields>
+        <field>
+          <name>project</name>
+          <version>1.0.0</version>
+          <required>true</required>
+          <association stash.part="false">
+            <type>ContinuumProject</type>
+          </association>
+        </field>
+        <!-- TODO: this is often used as a build number - it shouldn't be user facing -->
+        <field>
+          <name>id</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>state</name>
+          <version>1.0.0</version>
+          <type>int</type>
+          <!--
+          <association>
+            <type>BuildResultState</type>
+          </association>
+          -->
+        </field>
+        <field>
+          <name>trigger</name>
+          <version>1.0.0</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>startTime</name>
+          <version>1.0.0</version>
+          <type>long</type>
+        </field>
+        <field>
+          <name>endTime</name>
+          <version>1.0.0</version>
+          <type>long</type>
+        </field>
+        <field stash.maxSize="8000">
+          <name>error</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <!--
+          <association>
+            <type>java.lang.Throwable</type>
+          </association>
+          -->
+        </field>
+
+        <field>
+          <name>success</name>
+          <version>1.0.0</version>
+          <type>boolean</type>
+        </field>
+        <field>
+          <name>exitCode</name>
+          <version>1.0.0</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>scmResult</name>
+          <version>1.0.0</version>
+          <association stash.part="true">
+            <type>ScmResult</type>
+          </association>
+        </field>
+      </fields>
+    </class>
+
+    <!-- Profiles -->
+
+    <class>
+      <name>ContinuumProfile</name>
+      <packageName>org.apache.maven.continuum.profile</packageName>
+      <version>1.0.0</version>
+      <fields>
+        <field>
+          <name>jdk</name>
+          <version>1.0.0</version>
+          <association>
+            <type>ContinuumJdk</type>
+          </association>
+        </field>
+      </fields>
+    </class>
+
+    <class>
+      <name>ContinuumJdk</name>
+      <packageName>org.apache.maven.continuum.profile</packageName>
+      <version>1.0.0</version>
+      <fields>
+        <field>
+          <name>version</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>home</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+
+    <!-- New Object Model -->
+
+    <class>
+      <packageName>org.apache.maven.continuum.project</packageName>
+      <name>ContinuumProjectGroup</name>
+      <version>1.0.0</version>
+      <fields>
+        <field>
+          <name>id</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>groupId</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>name</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>description</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>url</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>projects</name>
+          <version>1.0.0</version>
+          <type>Set</type>
+          <association stash.part="false">
+            <type>ContinuumProject</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
+
+    <class>
+      <packageName>org.apache.maven.continuum.project</packageName>
+      <name>ContinuumBuildSettings</name>
+      <version>1.0.0</version>
+      <fields>
+        <field>
+          <name>id</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>name</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>notificationScheme</name>
+          <version>1.0.0</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>labelingScheme</name>
+          <version>1.0.0</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>scmMode</name>
+          <version>1.0.0</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>jdkVersion</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>cronExpression</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
   </classes>
 </model>

Modified: maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo Fri Aug 12 00:21:44 2005
@@ -30,13 +30,13 @@
         <collection element-type="ContinuumBuild" dependent-element="true"/>
       </field>
       <field name="developers" persistence-modifier="persistent">
-        <collection element-type="ContinuumDeveloper" dependent-element="true"/>
+        <collection element-type="org.apache.maven.continuum.model.project.ProjectDeveloper" dependent-element="true"/>
       </field>
       <field name="notifiers" persistence-modifier="persistent">
-        <collection element-type="ContinuumNotifier" dependent-element="true"/>
+        <collection element-type="org.apache.maven.continuum.model.project.ProjectNotifier" dependent-element="true"/>
       </field>
       <field name="dependencies" persistence-modifier="persistent">
-        <collection element-type="ContinuumDependency" dependent-element="true"/>
+        <collection element-type="org.apache.maven.continuum.model.project.ProjectDependency" dependent-element="true"/>
       </field>
 
       <field name="projectGroup" persistence-modifier="persistent"/>
@@ -69,24 +69,6 @@
       </fetch-group>
     </class>
 
-    <class name="ContinuumNotifier" detachable="true" identity-type="datastore" table="notifier">
-      <field name="type" persistence-modifier="persistent"/>
-      <field name="configuration" persistence-modifier="persistent" default-fetch-group="true"
-             table="notifier_configuration">
-        <map key-type="java.lang.String" value-type="java.lang.String" dependent-key="true" dependent-value="true"/>
-        <join/>
-      </field>
-    </class>
-    <class name="ContinuumDeveloper" detachable="true" table="developer">
-      <field name="scmId" persistence-modifier="persistent"/>
-      <field name="name" persistence-modifier="persistent"/>
-      <field name="email" persistence-modifier="persistent"/>
-    </class>
-    <class name="ContinuumDependency" detachable="true" identity-type="datastore" table="dependency">
-      <field name="groupId" persistence-modifier="persistent"/>
-      <field name="artifactId" persistence-modifier="persistent"/>
-      <field name="version" persistence-modifier="persistent"/>
-    </class>
     <class name="MavenTwoProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject"
            detachable="true">
       <inheritance strategy="new-table"/>
@@ -165,31 +147,6 @@
     </class>
 
   </package>
-  <package name="org.apache.maven.continuum.scm">
-    <class name="ScmResult" detachable="true" identity-type="datastore" table="scm_result">
-      <field name="success" persistence-modifier="persistent"/>
-      <field name="providerMessage" persistence-modifier="persistent">
-      </field>
-      <field name="commandOutput" persistence-modifier="persistent">
-      </field>
-      <field name="changes" persistence-modifier="persistent" default-fetch-group="true">
-        <collection element-type="ChangeSet" dependent-element="true"/>
-      </field>
-    </class>
-    <class name="ChangeSet" detachable="true" identity-type="datastore" table="change_set">
-      <field name="author" persistence-modifier="persistent"/>
-      <field name="comment" persistence-modifier="persistent"/>
-      <field name="date" persistence-modifier="persistent"/>
-      <field name="files" persistence-modifier="persistent">
-        <collection dependent-element="true" element-type="ChangeFile"/>
-      </field>
-    </class>
-    <class name="ChangeFile" detachable="true" identity-type="datastore" table="change_file">
-      <field name="name" persistence-modifier="persistent"/>
-      <field name="revision" persistence-modifier="persistent"/>
-    </class>
-  </package>
-
   <!-- Profiles -->
 
   <package name="org.apache.maven.continuum.profile">

Modified: maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?rev=232221&r1=232220&r2=232221&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Fri Aug 12 00:21:44 2005
@@ -20,16 +20,16 @@
 import org.apache.maven.continuum.model.project.Profile;
 import org.apache.maven.continuum.model.project.Project;
 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.scm.ScmResult;
 import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumBuildSettings;
-import org.apache.maven.continuum.project.ContinuumNotifier;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectGroup;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.project.ContinuumSchedule;
-import org.apache.maven.continuum.scm.ScmResult;
 import org.codehaus.plexus.jdo.JdoFactory;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -584,13 +584,13 @@
         }
     }
 
-    public void removeNotifier( ContinuumNotifier notifier )
+    public void removeNotifier( ProjectNotifier notifier )
         throws ContinuumStoreException
     {
         attachAndDelete( notifier );
     }
 
-    public ContinuumNotifier storeNotifier( ContinuumNotifier notifier )
+    public ProjectNotifier storeNotifier( ProjectNotifier notifier )
         throws ContinuumStoreException
     {
         updateObject( notifier );



Mime
View raw message