continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r216232 - 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-core/s...
Date Wed, 13 Jul 2005 20:46:39 GMT
Author: evenisse
Date: Wed Jul 13 13:46:37 2005
New Revision: 216232

URL: http://svn.apache.org/viewcvs?rev=216232&view=rev
Log:
[CONTINUUM-193]. Collapse CheckOutScmResult and UpdateScmResult in ScmResult.

Added:
    maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/ScmResult.java
      - copied, changed from r215987, maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/CheckOutScmResult.java
    maven/continuum/trunk/continuum-xfire/src/main/resources/org/apache/maven/continuum/xfire/ScmResult.aegis.xml
      - copied, changed from r215987, maven/continuum/trunk/continuum-xfire/src/main/resources/org/apache/maven/continuum/xfire/CheckOutScmResult.aegis.xml
Removed:
    maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/CheckOutScmResult.java
    maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/UpdateScmResult.java
    maven/continuum/trunk/continuum-xfire/src/main/resources/org/apache/maven/continuum/xfire/CheckOutScmResult.aegis.xml
    maven/continuum/trunk/continuum-xfire/src/main/resources/org/apache/maven/continuum/xfire/UpdateScmResult.aegis.xml
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-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/ContinuumCore.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/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/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/DefaultContinuumScm.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java
    maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/ContinuumJPoxStoreTest.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java
    maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm
    maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/Build.java
    maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/ContinuumWebService.java
    maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/DelegatingContinuumWebService.java
    maven/continuum/trunk/continuum-xfire/src/test/java/org/apache/maven/continuum/xfire/ContinuumXFireTest.java
    maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpc.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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -27,7 +27,7 @@
 import org.apache.maven.continuum.project.ShellProject;
 import org.apache.maven.continuum.project.ContinuumNotifier;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
-import org.apache.maven.continuum.scm.CheckOutScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -54,7 +54,7 @@
     Collection getAllProjects( int start, int end )
         throws ContinuumException;
 
-    CheckOutScmResult getCheckOutScmResultForProject( String projectId )
+    ScmResult getScmResultForProject( String projectId )
         throws ContinuumException;
 
     Collection getProjects()

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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -18,7 +18,7 @@
 
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.scm.UpdateScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -50,7 +50,7 @@
 
     String CONTEXT_BUILD_RESULT = "result";
 
-    String CONTEXT_UPDATE_SCM_RESULT = "updateScmResult";
+    String CONTEXT_UPDATE_SCM_RESULT = "scmResult";
 
     // ----------------------------------------------------------------------
     //
@@ -60,7 +60,7 @@
 
     void checkoutStarted( ContinuumProject project );
 
-    void checkoutComplete( ContinuumProject project, UpdateScmResult scmResult );
+    void checkoutComplete( ContinuumProject project, ScmResult scmResult );
 
     void runningGoals( ContinuumProject project, ContinuumBuild build );
 

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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -22,8 +22,7 @@
 import org.apache.maven.continuum.execution.ContinuumBuildExecutionResult;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.scm.CheckOutScmResult;
-import org.apache.maven.continuum.scm.UpdateScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.ContinuumException;
 
 /**
@@ -63,7 +62,7 @@
     ContinuumProject getProject( String projectId )
         throws ContinuumStoreException;
 
-    CheckOutScmResult getCheckOutScmResultForProject( String projectId )
+    ScmResult getScmResultForProject( String projectId )
         throws ContinuumStoreException;
 
     // ----------------------------------------------------------------------

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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -35,7 +35,7 @@
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.apache.maven.continuum.project.builder.maven.MavenOneContinuumProjectBuilder;
 import org.apache.maven.continuum.project.builder.maven.MavenTwoContinuumProjectBuilder;
-import org.apache.maven.continuum.scm.CheckOutScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 import org.codehaus.plexus.action.ActionManager;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
@@ -130,10 +130,10 @@
         return core.getAllProjects( start, end );
     }
 
-    public CheckOutScmResult getCheckOutScmResultForProject( String projectId )
+    public ScmResult getScmResultForProject( String projectId )
         throws ContinuumException
     {
-        return core.getCheckOutScmResultForProject( projectId );
+        return core.getScmResultForProject( projectId );
     }
 
     // ----------------------------------------------------------------------

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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -26,9 +26,7 @@
 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.CheckOutScmResult;
 import org.apache.maven.continuum.scm.ScmFile;
-import org.apache.maven.continuum.scm.UpdateScmResult;
 import org.apache.maven.continuum.scm.ContinuumScmException;
 import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.store.ContinuumStore;
@@ -106,7 +104,7 @@
 
             actionContext.put( AbstractContinuumAction.KEY_FORCED, Boolean.valueOf( forced ) );
 
-            UpdateScmResult scmResult = null;
+            ScmResult scmResult = null;
 
             try
             {
@@ -124,7 +122,7 @@
 
                     actionManager.lookup( "checkout-project" ).execute( actionContext );
 
-                    CheckOutScmResult checkOutScmResult = AbstractContinuumAction.getCheckoutResult( actionContext, null );
+                    ScmResult checkOutScmResult = AbstractContinuumAction.getCheckoutResult( actionContext, null );
 
                     String checkoutErrorMessage = AbstractContinuumAction.getCheckoutErrorMessage( actionContext, null );
 
@@ -160,25 +158,25 @@
                      }
 
                     // TODO: remove once CONTINUUM-193 is resolved
-                    UpdateScmResult updateScmResult = new UpdateScmResult();
+//                    UpdateScmResult updateScmResult = new UpdateScmResult();
 
-                    updateScmResult.setCommandOutput( checkOutScmResult.getCommandOutput() );
+//                    updateScmResult.setCommandOutput( checkOutScmResult.getCommandOutput() );
 
-                    updateScmResult.setProviderMessage( checkOutScmResult.getProviderMessage() );
+//                    updateScmResult.setProviderMessage( checkOutScmResult.getProviderMessage() );
 
-                    updateScmResult.setSuccess( false );
+//                    updateScmResult.setSuccess( false );
 
-                    for ( Iterator it = checkOutScmResult.getCheckedOutFiles().iterator(); it.hasNext(); )
-                    {
-                        ScmFile scmFile = (ScmFile) it.next();
+//                    for ( Iterator it = checkOutScmResult.getFiles().iterator(); it.hasNext(); )
+//                    {
+//                        ScmFile scmFile = (ScmFile) it.next();
 
-                        updateScmResult.getUpdatedFiles().add( scmFile );
-                    }
+//                        updateScmResult.getFiles().add( scmFile );
+//                    }
 
-                    actionContext.put( AbstractContinuumAction.KEY_UPDATE_SCM_RESULT, updateScmResult );
+                    actionContext.put( AbstractContinuumAction.KEY_UPDATE_SCM_RESULT, checkOutScmResult );
                 }
 
-                scmResult = (UpdateScmResult) actionContext.get( AbstractContinuumAction.KEY_UPDATE_SCM_RESULT );
+                scmResult = (ScmResult) actionContext.get( AbstractContinuumAction.KEY_UPDATE_SCM_RESULT );
 
                 actionManager.lookup( "update-project-from-working-directory" ).execute( actionContext );
 
@@ -268,7 +266,7 @@
         return buildId;
     }
 
-    private ContinuumBuild makeBuildResult( UpdateScmResult scmResult,
+    private ContinuumBuild makeBuildResult( ScmResult scmResult,
                                             long startTime,
                                             boolean forced )
     {
@@ -284,7 +282,7 @@
 
         build.setSuccess( false );
 
-        build.setUpdateScmResult( scmResult );
+        build.setScmResult( scmResult );
 
         return build;
     }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java Wed Jul 13 13:46:37 2005
@@ -24,7 +24,7 @@
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager;
-import org.apache.maven.continuum.scm.CheckOutScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.scm.ContinuumScm;
 import org.apache.maven.continuum.store.ContinuumStore;
 
@@ -51,7 +51,7 @@
     Collection getAllProjects( int start, int end )
         throws ContinuumException;
 
-    CheckOutScmResult getCheckOutScmResultForProject( String projectId )
+    ScmResult getScmResultForProject( String projectId )
         throws ContinuumException;
 
     void buildProject( String projectId, boolean force )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java Wed Jul 13 13:46:37 2005
@@ -30,7 +30,7 @@
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager;
-import org.apache.maven.continuum.scm.CheckOutScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.scm.ContinuumScm;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
@@ -250,12 +250,12 @@
         }
     }
 
-    public CheckOutScmResult getCheckOutScmResultForProject( String projectId )
+    public ScmResult getScmResultForProject( String projectId )
         throws ContinuumException
     {
         try
         {
-            return store.getCheckOutScmResultForProject( projectId );
+            return store.getScmResultForProject( projectId );
         }
         catch ( ContinuumStoreException ex )
         {

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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -25,9 +25,8 @@
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager;
-import org.apache.maven.continuum.scm.CheckOutScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.scm.ContinuumScm;
-import org.apache.maven.continuum.scm.UpdateScmResult;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 
@@ -181,9 +180,9 @@
         return new File( getString( context, KEY_WORKING_DIRECTORY ) );
     }
 
-    public static CheckOutScmResult getCheckoutResult( Map context, Object defaultValue )
+    public static ScmResult getCheckoutResult( Map context, Object defaultValue )
     {
-        return (CheckOutScmResult) getObject( context, KEY_CHECKOUT_SCM_RESULT, defaultValue );
+        return (ScmResult) getObject( context, KEY_CHECKOUT_SCM_RESULT, defaultValue );
     }
 
     public static String getCheckoutErrorMessage( Map context, String defaultValue )
@@ -196,14 +195,14 @@
         return getString( context, KEY_CHECKOUT_ERROR_EXCEPTION, defaultValue );
     }
 
-    public static UpdateScmResult getUpdateScmResult( Map context )
+    public static ScmResult getUpdateScmResult( Map context )
     {
-        return (UpdateScmResult) getObject( context, KEY_UPDATE_SCM_RESULT );
+        return (ScmResult) getObject( context, KEY_UPDATE_SCM_RESULT );
     }
 
-    public static UpdateScmResult getUpdateScmResult(  Map context, UpdateScmResult defaultValue )
+    public static ScmResult getUpdateScmResult(  Map context, ScmResult defaultValue )
     {
-        return (UpdateScmResult) getObject( context, KEY_UPDATE_SCM_RESULT, 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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -20,7 +20,6 @@
 import java.util.Map;
 
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.scm.CheckOutScmResult;
 import org.apache.maven.continuum.scm.ContinuumScmException;
 import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.utils.ContinuumUtils;
@@ -47,7 +46,7 @@
 
         try
         {
-            CheckOutScmResult result = getScm().checkOut( project, workingDirectory );
+            ScmResult result = getScm().checkOut( project, workingDirectory );
 
             context.put( KEY_CHECKOUT_SCM_RESULT, result );
         }

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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -28,7 +28,7 @@
 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.UpdateScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -48,7 +48,7 @@
 
         boolean forced = isForced( context );
 
-        UpdateScmResult updateScmResult = getUpdateScmResult( context );
+        ScmResult scmResult = getUpdateScmResult( context );
 
         ContinuumBuildExecutor buildExecutor = getCore().getBuildExecutor( project.getExecutorId() );
 
@@ -56,7 +56,7 @@
         // This is really a precondition for this action to execute
         // ----------------------------------------------------------------------
 
-        if ( updateScmResult.getUpdatedFiles().size() == 0 &&
+        if ( scmResult.getFiles().size() == 0 &&
              !forced &&
              !isNew( project ) )
         {
@@ -77,7 +77,7 @@
 
         build.setForced( forced );
 
-        build.setUpdateScmResult( updateScmResult );
+        build.setScmResult( scmResult );
 
         String buildId = getStore().addBuild( project.getId(), build );
 

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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -19,7 +19,7 @@
 import java.util.Map;
 
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.scm.CheckOutScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
@@ -40,7 +40,7 @@
             //
             // ----------------------------------------------------------------------
 
-            CheckOutScmResult checkOutScmResult = AbstractContinuumAction.getCheckoutResult( context, null );
+            ScmResult scmResult = AbstractContinuumAction.getCheckoutResult( context, null );
 
             String checkoutErrorMessage = AbstractContinuumAction.getCheckoutErrorMessage( context, null );
 
@@ -52,7 +52,7 @@
 
             ContinuumProject project = getProject( context );
 
-            project.setCheckOutScmResult( checkOutScmResult );
+            project.setScmResult( scmResult );
 
             project.setCheckOutErrorMessage( checkoutErrorMessage );
 

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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -17,7 +17,7 @@
  */
 
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.scm.UpdateScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 
 import java.util.Map;
 
@@ -33,19 +33,19 @@
     {
         ContinuumProject project = getProject( context );
 
-        UpdateScmResult updateScmResult = null;
+        ScmResult scmResult = null;
 
         try
         {
             getNotifier().checkoutStarted( project );
 
-            updateScmResult = getScm().updateProject( project );
+            scmResult = getScm().updateProject( project );
 
-            context.put( KEY_UPDATE_SCM_RESULT, updateScmResult );
+            context.put( KEY_UPDATE_SCM_RESULT, scmResult );
         }
         finally
         {
-            getNotifier().checkoutComplete( project, updateScmResult );
+            getNotifier().checkoutComplete( project, scmResult );
         }
     }
 }

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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -24,7 +24,7 @@
 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.scm.UpdateScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 
@@ -71,7 +71,7 @@
         sendNotification( MESSAGE_ID_CHECKOUT_STARTED, project, null );
     }
 
-    public void checkoutComplete( ContinuumProject project, UpdateScmResult scmResult )
+    public void checkoutComplete( ContinuumProject project, ScmResult scmResult )
     {
         sendNotification( MESSAGE_ID_CHECKOUT_COMPLETE, project, null );
     }
@@ -106,7 +106,7 @@
     private void sendNotification( String messageId,
                                    ContinuumProject project,
                                    ContinuumBuild build,
-                                   UpdateScmResult scmResult )
+                                   ScmResult scmResult )
     {
         Map context = new HashMap();
 

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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -28,12 +28,12 @@
 {
     String ROLE = ContinuumScm.class.getName();
 
-    CheckOutScmResult checkOut( ContinuumProject project, File workingDirectory )
+    ScmResult checkOut( ContinuumProject project, File workingDirectory )
         throws ContinuumScmException;
 
-    CheckOutScmResult checkOutProject( ContinuumProject project )
+    ScmResult checkOutProject( ContinuumProject project )
         throws ContinuumScmException;
 
-    UpdateScmResult updateProject( ContinuumProject project )
+    ScmResult updateProject( ContinuumProject project )
         throws ContinuumScmException;
 }

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=216232&r1=216231&r2=216232&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 Wed Jul 13 13:46:37 2005
@@ -22,6 +22,8 @@
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.scm.ScmException;
 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.repository.ScmRepository;
 import org.apache.maven.scm.repository.ScmRepositoryException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -42,7 +44,7 @@
     // ContinuumScm implementation
     // ----------------------------------------------------------------------
 
-    public CheckOutScmResult checkOut( ContinuumProject project, File workingDirectory )
+    public ScmResult checkOut( ContinuumProject project, File workingDirectory )
         throws ContinuumScmException
     {
         try
@@ -53,7 +55,7 @@
 
             ScmRepository repository = scmManager.makeScmRepository( project.getScmUrl() );
 
-            CheckOutScmResult result;
+            ScmResult result;
 
             synchronized ( this )
             {
@@ -69,7 +71,7 @@
 
                 ScmFileSet fileSet = new ScmFileSet( workingDirectory );
 
-                result = convertCheckOutScmResult( scmManager.checkOut( repository, fileSet, tag ) );
+                result = convertScmResult( scmManager.checkOut( repository, fileSet, tag ) );
             }
 
             if ( !result.isSuccess() )
@@ -83,7 +85,7 @@
                 throw new ContinuumScmException( "Error while checking out the project.", result );
             }
 
-            getLogger().info( "Checked out " + result.getCheckedOutFiles().size() + " files." );
+            getLogger().info( "Checked out " + result.getFiles().size() + " files." );
 
             return result;
         }
@@ -103,7 +105,7 @@
      * @param project The project to check out.
      * @throws ContinuumScmException Thrown in case of a exception while checking out the sources.
      */
-    public CheckOutScmResult checkOutProject( ContinuumProject project )
+    public ScmResult checkOutProject( ContinuumProject project )
         throws ContinuumScmException
     {
         String workingDirectory = project.getWorkingDirectory();
@@ -116,7 +118,7 @@
         return checkOut( project, new File( workingDirectory ) );
     }
 
-    public UpdateScmResult updateProject( ContinuumProject project )
+    public ScmResult updateProject( ContinuumProject project )
         throws ContinuumScmException
     {
         try
@@ -134,13 +136,13 @@
 
             String tag = null;
 
-            UpdateScmResult result;
+            ScmResult result;
 
             ScmFileSet fileSet = new ScmFileSet( workingDirectory );
 
             synchronized ( this )
             {
-                result = convertUpdateScmResult( scmManager.update( repository, fileSet, tag ) );
+                result = convertScmResult( scmManager.update( repository, fileSet, tag ) );
             }
 
             if ( !result.isSuccess() )
@@ -154,7 +156,7 @@
                 throw new ContinuumScmException( "Error while checking out the project.", result );
             }
 
-            getLogger().info( "Updated " + result.getUpdatedFiles().size() + " files." );
+            getLogger().info( "Updated " + result.getFiles().size() + " files." );
 
             return result;
         }
@@ -172,9 +174,9 @@
     //
     // ----------------------------------------------------------------------
 
-    private CheckOutScmResult convertCheckOutScmResult( org.apache.maven.scm.command.checkout.CheckOutScmResult scmResult )
+    private ScmResult convertScmResult( CheckOutScmResult scmResult )
     {
-        CheckOutScmResult result = new CheckOutScmResult();
+        ScmResult result = new ScmResult();
 
         result.setSuccess( scmResult.isSuccess() );
 
@@ -192,16 +194,16 @@
 
                 file.setPath( scmFile.getPath() );
 
-                result.addCheckedOutFile( file );
+                result.addFile( file );
             }
         }
 
         return result;
     }
 
-    private UpdateScmResult convertUpdateScmResult( org.apache.maven.scm.command.update.UpdateScmResult scmResult )
+    private ScmResult convertScmResult( UpdateScmResult scmResult )
     {
-        UpdateScmResult result = new UpdateScmResult();
+        ScmResult result = new ScmResult();
 
         result.setSuccess( scmResult.isSuccess() );
 
@@ -219,7 +221,7 @@
 
                 file.setPath( scmFile.getPath() );
 
-                result.addUpdatedFile( file );
+                result.addFile( file );
             }
         }
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java Wed Jul 13 13:46:37 2005
@@ -30,7 +30,7 @@
 import org.apache.maven.continuum.project.ContinuumJPoxStore;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.apache.maven.continuum.scm.CheckOutScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.scm.ScmFile;
 
 import org.codehaus.plexus.jdo.JdoFactory;
@@ -263,7 +263,7 @@
         }
     }
 
-    public CheckOutScmResult getCheckOutScmResultForProject( String projectId )
+    public ScmResult getScmResultForProject( String projectId )
         throws ContinuumStoreException
     {
         try
@@ -272,7 +272,7 @@
 
             ContinuumProject project = store.getContinuumProject( projectId, false );
 
-            if ( project.getCheckOutScmResult() == null )
+            if ( project.getScmResult() == null )
             {
                 store.commit();
 
@@ -281,15 +281,15 @@
 
             PersistenceManager pm = JDOHelper.getPersistenceManager( project );
 
-            CheckOutScmResult result = project.getCheckOutScmResult();
+            ScmResult result = project.getScmResult();
 
             pm.retrieve( result );
 
             pm.makeTransient( result );
 
-            pm.retrieveAll( result.getCheckedOutFiles(), false );
+            pm.retrieveAll( result.getFiles(), false );
 
-            pm.makeTransientAll( result.getCheckedOutFiles() );
+            pm.makeTransientAll( result.getFiles() );
 
             store.commit();
 
@@ -423,7 +423,7 @@
 
             ContinuumBuild build = store.getContinuumBuild( buildId, false );
 
-            if ( build.getUpdateScmResult() == null )
+            if ( build.getScmResult() == null )
             {
                 return Collections.EMPTY_LIST;
             }
@@ -432,7 +432,7 @@
 
             List changedFiles = new ArrayList();
 
-            for ( Iterator it = build.getUpdateScmResult().getUpdatedFiles().iterator(); it.hasNext(); )
+            for ( Iterator it = build.getScmResult().getFiles().iterator(); it.hasNext(); )
             {
                 ScmFile scmFile = (ScmFile) it.next();
 

Modified: maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm (original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm Wed Jul 13 13:46:37 2005
@@ -28,12 +28,12 @@
   Exit code: $build.exitCode
   Building machine hostname: $buildHost
 
-#if ( $build.updateScmResult )
+#if ( $build.scmResult )
 Changes
-#if ( $build.updateScmResult.updatedFiles.size() == 0 )
+#if ( $build.scmResult.files.size() == 0 )
  No files changed
 #else
- #foreach ( $file in $build.updateScmResult.updatedFiles )
+ #foreach ( $file in $build.scmResult.files )
  * $file.path
  #end
 #end

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java Wed Jul 13 13:46:37 2005
@@ -28,7 +28,7 @@
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.project.MavenTwoProject;
-import org.apache.maven.continuum.scm.UpdateScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.scm.ScmFile;
 
 import org.codehaus.plexus.PlexusTestCase;
@@ -184,15 +184,15 @@
 
         build.setExitCode( 10 );
 
-        UpdateScmResult updateScmResult = new UpdateScmResult();
+        ScmResult scmResult = new ScmResult();
 
         ScmFile file = new ScmFile();
 
         file.setPath( "/hey/yo/lets/go");
 
-        updateScmResult.getUpdatedFiles().add( file );
+        scmResult.getFiles().add( file );
 
-        build.setUpdateScmResult( updateScmResult );
+        build.setScmResult( scmResult );
 
         return build;
     }

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/ContinuumJPoxStoreTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/ContinuumJPoxStoreTest.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/ContinuumJPoxStoreTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/ContinuumJPoxStoreTest.java Wed Jul 13 13:46:37 2005
@@ -26,7 +26,7 @@
 import javax.jdo.PersistenceManagerFactory;
 import javax.jdo.JDOHelper;
 
-import org.apache.maven.continuum.scm.CheckOutScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 import org.apache.maven.continuum.scm.ScmFile;
 
 import org.codehaus.plexus.PlexusTestCase;
@@ -357,7 +357,7 @@
 
         assertEquals( 0, store.getContinuumBuildCollection( true, "", "" ).size() );
 
-        assertEquals( 0, store.getCheckOutScmResultCollection( true, "", "" ).size() );
+        assertEquals( 0, store.getScmResultCollection( true, "", "" ).size() );
     }
 
     public void testFetchGroups()
@@ -377,7 +377,7 @@
 
         assertEquals( "check out error exception", p.getCheckOutErrorException() );
 
-        p.getCheckOutScmResult();
+        p.getScmResult();
 
         p.getBuilds();
 
@@ -405,7 +405,7 @@
 
         try
         {
-            p.getCheckOutScmResult();
+            p.getScmResult();
 
             fail( "Expected a JDODetachedFieldAccessException." );
         }
@@ -475,7 +475,7 @@
         //
         // ----------------------------------------------------------------------
 
-        CheckOutScmResult result = new CheckOutScmResult();
+        ScmResult result = new ScmResult();
 
         result.setCommandOutput( "command output" );
 
@@ -487,9 +487,9 @@
 
         scmFile.setPath( "/foo" );
 
-        result.getCheckedOutFiles().add( scmFile );
+        result.getFiles().add( scmFile );
 
-        p.setCheckOutScmResult( result );
+        p.setScmResult( result );
 
         p.setCheckOutErrorException( "check out error exception" );
 

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java Wed Jul 13 13:46:37 2005
@@ -35,9 +35,8 @@
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.project.MavenTwoProject;
-import org.apache.maven.continuum.scm.CheckOutScmResult;
 import org.apache.maven.continuum.scm.ScmFile;
-import org.apache.maven.continuum.scm.UpdateScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 
 import org.codehaus.plexus.jdo.JdoFactory;
 
@@ -244,11 +243,11 @@
         //
         // ----------------------------------------------------------------------
 
-        CheckOutScmResult checkOutScmResult = new CheckOutScmResult();
+        ScmResult scmResult = new ScmResult();
 
-        checkOutScmResult.setSuccess( true );
+        scmResult.setSuccess( true );
 
-        setCheckoutDone( store, projectId, checkOutScmResult, null, null );
+        setCheckoutDone( store, projectId, scmResult, null, null );
 
         project = store.getProject( projectId );
 
@@ -401,13 +400,13 @@
 
         String buildId = createBuild( store, projectId, false );
 
-        UpdateScmResult scmResult = new UpdateScmResult();
+        ScmResult scmResult = new ScmResult();
 
         ScmFile file = new ScmFile();
 
         file.setPath( "foo" );
 
-        scmResult.addUpdatedFile( file );
+        scmResult.addFile( file );
 
         setBuildResult( store,
                         buildId,
@@ -510,23 +509,23 @@
 
         String buildId = createBuild( store, projectId, false );
 
-        UpdateScmResult updateScmResult = new UpdateScmResult();
+        ScmResult scmResult = new ScmResult();
 
-        updateScmResult.setCommandOutput( "commandOutput" );
+        scmResult.setCommandOutput( "commandOutput" );
 
-        updateScmResult.setProviderMessage( "providerMessage" );
+        scmResult.setProviderMessage( "providerMessage" );
 
-        updateScmResult.setSuccess( true );
+        scmResult.setSuccess( true );
 
         ScmFile scmFile = new ScmFile();
 
         scmFile.setPath( "/foo" );
 
-        updateScmResult.getUpdatedFiles().add( scmFile );
+        scmResult.getFiles().add( scmFile );
 
         setBuildComplete( store,
                           buildId,
-                          updateScmResult,
+                          scmResult,
                           makeContinuumBuildExecutionResult( true, "stdout", "stderr", 10 ) );
 
         // ----------------------------------------------------------------------
@@ -548,13 +547,13 @@
 
     private void setBuildComplete( ContinuumStore store,
                                    String buildId,
-                                   UpdateScmResult updateScmResult,
+                                   ScmResult scmResult,
                                    ContinuumBuildExecutionResult result )
         throws ContinuumStoreException
     {
         ContinuumBuild build = store.getBuild( buildId );
 
-        build.setUpdateScmResult( updateScmResult );
+        build.setScmResult( scmResult );
 
         build.setSuccess( result.isSuccess() );
 
@@ -711,7 +710,7 @@
 
         assertIsCommitted( store );
 
-        UpdateScmResult scmResult = new UpdateScmResult();
+        ScmResult scmResult = new ScmResult();
 
         setBuildResult( store,
                         buildId,
@@ -758,21 +757,21 @@
     {
         String projectId = store.addProject( project );
 
-        CheckOutScmResult checkOutScmResult = new CheckOutScmResult();
+        ScmResult scmResult = new ScmResult();
 
-        checkOutScmResult.setSuccess( true );
+        scmResult.setSuccess( true );
 
-        checkOutScmResult.setCommandOutput( "commandOutput" );
+        scmResult.setCommandOutput( "commandOutput" );
 
-        checkOutScmResult.setProviderMessage( "providerMessage" );
+        scmResult.setProviderMessage( "providerMessage" );
 
         ScmFile scmFile = new ScmFile();
 
         scmFile.setPath( "/foo" );
 
-        checkOutScmResult.addCheckedOutFile( scmFile );
+        scmResult.addFile( scmFile );
 
-        setCheckoutDone( store, projectId, checkOutScmResult, null, null );
+        setCheckoutDone( store, projectId, scmResult, null, null );
 
         project = store.getProject( projectId );
 
@@ -805,11 +804,11 @@
                                                                   commandLineArguments,
                                                                   workingDirectory ) );
 
-        CheckOutScmResult checkOutScmResult = new CheckOutScmResult();
+        ScmResult scmResult = new ScmResult();
 
-        checkOutScmResult.setSuccess( true );
+        scmResult.setSuccess( true );
 
-        setCheckoutDone( store, projectId, checkOutScmResult, null, null );
+        setCheckoutDone( store, projectId, scmResult, null, null );
 
         ContinuumProject project = store.getProject( projectId );
 
@@ -834,14 +833,14 @@
 
     private static void setCheckoutDone( ContinuumStore store,
                                   String projectId,
-                                  CheckOutScmResult checkOutScmResult,
+                                  ScmResult scmResult,
                                   String errorMessage,
                                   Throwable exception  )
         throws ContinuumStoreException
     {
         ContinuumProject project = store.getProject( projectId );
 
-        project.setCheckOutScmResult( checkOutScmResult );
+        project.setScmResult( scmResult );
 
         project.setCheckOutErrorMessage( errorMessage );
 
@@ -854,7 +853,7 @@
                                        String buildId,
                                        int state,
                                        ContinuumBuildExecutionResult result,
-                                       UpdateScmResult scmResult,
+                                       ScmResult scmResult,
                                        Throwable error )
         throws ContinuumStoreException
     {
@@ -866,7 +865,7 @@
 
         build.setError( ContinuumUtils.throwableToString( error ) );
 
-        build.setUpdateScmResult( scmResult );
+        build.setScmResult( scmResult );
 
         // ----------------------------------------------------------------------
         // Copy over the build result

Modified: maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo Wed Jul 13 13:46:37 2005
@@ -80,10 +80,10 @@
           </association>
         </field>
         <field>
-          <name>checkOutScmResult</name>
+          <name>scmResult</name>
           <version>1.0.0</version>
           <association>
-            <type>CheckOutScmResult</type>
+            <type>ScmResult</type>
           </association>
         </field>
         <field>
@@ -344,10 +344,10 @@
           <type>int</type>
         </field>
         <field>
-          <name>updateScmResult</name>
+          <name>scmResult</name>
           <version>1.0.0</version>
           <association stash.part="true">
-            <type>UpdateScmResult</type>
+            <type>ScmResult</type>
           </association>
         </field>
       </fields>
@@ -358,7 +358,7 @@
      | Scm Result
      |
      |-->
-    <class java.abstract="true">
+    <class stash.storable="true">
       <name>ScmResult</name>
       <packageName>org.apache.maven.continuum.scm</packageName>
       <version>1.0.0</version>
@@ -378,6 +378,14 @@
           <version>1.0.0</version>
           <type>String</type>
         </field>
+        <field>
+          <name>files</name>
+          <version>1.0.0</version>
+          <association stash.part="true">
+            <type>ScmFile</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
       </fields>
     </class>
 
@@ -398,40 +406,6 @@
                   <type>ScmFileStatus</type>
                 </field>
         -->
-      </fields>
-    </class>
-
-    <class stash.storable="true">
-      <name>CheckOutScmResult</name>
-      <packageName>org.apache.maven.continuum.scm</packageName>
-      <superClass>ScmResult</superClass>
-      <version>1.0.0</version>
-      <fields>
-        <field>
-          <name>checkedOutFiles</name>
-          <version>1.0.0</version>
-          <association stash.part="true">
-            <type>ScmFile</type>
-            <multiplicity>*</multiplicity>
-          </association>
-        </field>
-      </fields>
-    </class>
-
-    <class stash.storable="true">
-      <name>UpdateScmResult</name>
-      <packageName>org.apache.maven.continuum.scm</packageName>
-      <superClass>ScmResult</superClass>
-      <version>1.0.0</version>
-      <fields>
-        <field>
-          <name>updatedFiles</name>
-          <version>1.0.0</version>
-          <association stash.part="true">
-            <type>ScmFile</type>
-            <multiplicity>*</multiplicity>
-          </association>
-        </field>
       </fields>
     </class>
   </classes>

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java Wed Jul 13 13:46:37 2005
@@ -38,7 +38,13 @@
         throws FormicaException
     {
         List messages = scmManager.validateScmRepository( scmUrl );
-
-        return messages.size() == 0;
+        if (messages.size() != 0)
+        {
+            throw new RuntimeException( "Error : " + messages.get(0));
+        }
+        else
+        {
+            return messages.size() == 0;
+        }
     }
 }

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm Wed Jul 13 13:46:37 2005
@@ -23,14 +23,14 @@
     </table>
   </p>
 
-  #if ( $build.updateScmResult )
+  #if ( $build.scmResult )
   <h4>Changes</h4>
   <p>
-    #if ( $build.updateScmResult.updatedFiles.size() == 0 )
+    #if ( $build.scmResult.files.size() == 0 )
     <b>No files changed</b>
     #else
     <table border="1" cellspacing="2" cellpadding="3" width="100%">
-      #foreach ( $file in $build.updateScmResult.updatedFiles )
+      #foreach ( $file in $build.scmResult.files )
       <tr class="a">
         <td>$file.path</td>
       </tr>

Modified: maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/Build.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/Build.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/Build.java (original)
+++ maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/Build.java Wed Jul 13 13:46:37 2005
@@ -14,7 +14,7 @@
     private String standardError;
     private int exitCode;
     
-    private UpdateScmResult updateScmResult;
+    private ScmResult scmResult;
 
     public Date getEndTime()
     {
@@ -106,13 +106,13 @@
         this.state = state;
     }
 
-    public UpdateScmResult getUpdateScmResult()
+    public ScmResult getScmResult()
     {
-        return updateScmResult;
+        return scmResult;
     }
 
-    public void setUpdateScmResult(UpdateScmResult updateScmResult)
+    public void setScmResult(ScmResult scmResult)
     {
-        this.updateScmResult = updateScmResult;
+        this.scmResult = scmResult;
     }
 }

Modified: maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/ContinuumWebService.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/ContinuumWebService.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/ContinuumWebService.java (original)
+++ maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/ContinuumWebService.java Wed Jul 13 13:46:37 2005
@@ -108,9 +108,9 @@
     /**
      * @@WebMethod()
      * @@.projectId WebParam("ProjectId")
-     * @@.return WebResult(name="CheckOutScmResult", targetNamespace="http://continuum.maven.apache.org")
+     * @@.return WebResult(name="ScmResult", targetNamespace="http://continuum.maven.apache.org")
      */
-    CheckOutScmResult getCheckOutScmResult( String projectId )
+    ScmResult getScmResult( String projectId )
         throws XFireFault;
 
 }

Modified: maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/DelegatingContinuumWebService.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/DelegatingContinuumWebService.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/DelegatingContinuumWebService.java (original)
+++ maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/DelegatingContinuumWebService.java Wed Jul 13 13:46:37 2005
@@ -144,13 +144,13 @@
     }
 
 
-    public CheckOutScmResult getCheckOutScmResult(String projectId)
+    public ScmResult getScmResult(String projectId)
         throws XFireFault
     {
         try
         {
-            org.apache.maven.continuum.scm.CheckOutScmResult localCSR = 
-                continuum.getCheckOutScmResultForProject(projectId);
+            org.apache.maven.continuum.scm.ScmResult localCSR = 
+                continuum.getScmResultForProject(projectId);
             
             if (localCSR == null) return null;
             
@@ -162,24 +162,6 @@
         }
     }
 
-    private CheckOutScmResult convertToRemote(org.apache.maven.continuum.scm.CheckOutScmResult localUSR)
-    {
-        CheckOutScmResult result = new CheckOutScmResult();
-        result.setCommandOutput(localUSR.getCommandOutput());
-        result.setProviderMessage(localUSR.getProviderMessage());
-        result.setSuccess(localUSR.isSuccess());
-        
-        ArrayList files = new ArrayList();
-        for (Iterator itr = localUSR.getCheckedOutFiles().iterator(); itr.hasNext();)
-        {
-            ScmFile file = (ScmFile) itr.next();
-            files.add(file.getPath());
-        }
-        result.setCheckedOutFiles(files);
-        
-        return result;
-    }
-
     public Build getLatestBuild(String projectId) throws XFireFault
     {
         try
@@ -209,24 +191,24 @@
         remBuild.setStandardError(build.getStandardError());
         remBuild.setStandardOutput(build.getStandardOutput());
         remBuild.setState(build.getState());
-        remBuild.setUpdateScmResult(convertToRemote(build.getUpdateScmResult()));
+        remBuild.setScmResult(convertToRemote(build.getScmResult()));
         return remBuild;
     }
 
-    private UpdateScmResult convertToRemote(org.apache.maven.continuum.scm.UpdateScmResult localUSR)
+    private ScmResult convertToRemote(org.apache.maven.continuum.scm.ScmResult localUSR)
     {
-        UpdateScmResult result = new UpdateScmResult();
+        ScmResult result = new ScmResult();
         result.setCommandOutput(localUSR.getCommandOutput());
         result.setProviderMessage(localUSR.getProviderMessage());
         result.setSuccess(localUSR.isSuccess());
         
         ArrayList files = new ArrayList();
-        for (Iterator itr = localUSR.getUpdatedFiles().iterator(); itr.hasNext();)
+        for (Iterator itr = localUSR.getFiles().iterator(); itr.hasNext();)
         {
             ScmFile file = (ScmFile) itr.next();
             files.add(file.getPath());
         }
-        result.setUpdatedFiles(files);
+        result.setFiles(files);
         
         return result;
     }

Copied: maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/ScmResult.java (from r215987, maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/CheckOutScmResult.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/ScmResult.java?p2=maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/ScmResult.java&p1=maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/CheckOutScmResult.java&r1=215987&r2=216232&rev=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/CheckOutScmResult.java (original)
+++ maven/continuum/trunk/continuum-xfire/src/main/java/org/apache/maven/continuum/xfire/ScmResult.java Wed Jul 13 13:46:37 2005
@@ -17,20 +17,20 @@
  */
 import java.util.List;
 
-public class CheckOutScmResult
+public class ScmResult
 {
-    private List checkedOutFiles;
+    private List files;
     private boolean success;
     private String providerMessage;
     private String commandOutput;
     
-    public List getCheckedOutFiles()
+    public List getFiles()
     {
-        return checkedOutFiles;
+        return files;
     }
-    public void setCheckedOutFiles(List checkedOutFiles)
+    public void setFiles(List files)
     {
-        this.checkedOutFiles = checkedOutFiles;
+        this.files = files;
     }
     public String getCommandOutput()
     {

Copied: maven/continuum/trunk/continuum-xfire/src/main/resources/org/apache/maven/continuum/xfire/ScmResult.aegis.xml (from r215987, maven/continuum/trunk/continuum-xfire/src/main/resources/org/apache/maven/continuum/xfire/CheckOutScmResult.aegis.xml)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xfire/src/main/resources/org/apache/maven/continuum/xfire/ScmResult.aegis.xml?p2=maven/continuum/trunk/continuum-xfire/src/main/resources/org/apache/maven/continuum/xfire/ScmResult.aegis.xml&p1=maven/continuum/trunk/continuum-xfire/src/main/resources/org/apache/maven/continuum/xfire/CheckOutScmResult.aegis.xml&r1=215987&r2=216232&rev=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xfire/src/main/resources/org/apache/maven/continuum/xfire/CheckOutScmResult.aegis.xml (original)
+++ maven/continuum/trunk/continuum-xfire/src/main/resources/org/apache/maven/continuum/xfire/ScmResult.aegis.xml Wed Jul 13 13:46:37 2005
@@ -1,5 +1,5 @@
 <mappings xmlns:c="http://continuum.maven.apache.org/">
-  <mapping name="c:CheckOutScmResult">
-    <property name="checkedOutFiles" componentType="java.lang.String"/>
+  <mapping name="c:ScmResult">
+    <property name="files" componentType="java.lang.String"/>
   </mapping>
 </mappings>

Modified: maven/continuum/trunk/continuum-xfire/src/test/java/org/apache/maven/continuum/xfire/ContinuumXFireTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xfire/src/test/java/org/apache/maven/continuum/xfire/ContinuumXFireTest.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xfire/src/test/java/org/apache/maven/continuum/xfire/ContinuumXFireTest.java (original)
+++ maven/continuum/trunk/continuum-xfire/src/test/java/org/apache/maven/continuum/xfire/ContinuumXFireTest.java Wed Jul 13 13:46:37 2005
@@ -66,7 +66,7 @@
         assertEquals(project.getScmUrl(), p2.getScmUrl());
         assertEquals(project.getExecutable(), p2.getExecutable());
         
-        CheckOutScmResult result = ws.getCheckOutScmResult(id);
+        ScmResult result = ws.getScmResult(id);
 
         Collection builds = ws.getBuilds(id);
         assertEquals(0, builds.size());

Modified: maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpc.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpc.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpc.java (original)
+++ maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpc.java Wed Jul 13 13:46:37 2005
@@ -41,7 +41,7 @@
 
     Hashtable getProjects();
 
-    Hashtable getCheckOutScmResultForProject( String projectId );
+    Hashtable getScmResultForProject( String projectId );
 
     Hashtable getLatestBuildForProject( String projectId );
 

Modified: maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java?rev=216232&r1=216231&r2=216232&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java (original)
+++ maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java Wed Jul 13 13:46:37 2005
@@ -35,7 +35,7 @@
 import org.apache.maven.continuum.project.AntProject;
 import org.apache.maven.continuum.project.ShellProject;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
-import org.apache.maven.continuum.scm.CheckOutScmResult;
+import org.apache.maven.continuum.scm.ScmResult;
 
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
@@ -116,17 +116,17 @@
         }
     }
 
-    public Hashtable getCheckOutScmResultForProject( String projectId )
+    public Hashtable getScmResultForProject( String projectId )
     {
         try
         {
-            CheckOutScmResult result = continuum.getCheckOutScmResultForProject( projectId );
+            ScmResult result = continuum.getScmResultForProject( projectId );
 
-            return makeHashtable( "checkOutScmResult", convertCheckOutScmResult( result ) );
+            return makeHashtable( "scmResult", convertScmResult( result ) );
         }
         catch ( Throwable e )
         {
-            return handleException( "ContinuumXmlRpc.getCheckOutScmResultForProject()",
+            return handleException( "ContinuumXmlRpc.getScmResultForProject()",
                                     "Project id: '" + projectId + "'.", e );
         }
     }
@@ -141,7 +141,7 @@
         }
         catch ( Throwable e )
         {
-            return handleException( "ContinuumXmlRpc.getCheckOutScmResultForProject()",
+            return handleException( "ContinuumXmlRpc.getLatestBuildForProject()",
                                     "Project id: '" + projectId + "'.", e );
         }
 
@@ -530,7 +530,7 @@
         return xmlRpcHelper.objectToHashtable( object, excludedProperties );
     }
 
-    private Hashtable convertCheckOutScmResult( Object object )
+    private Hashtable convertScmResult( Object object )
         throws IllegalAccessException, InvocationTargetException
     {
         Set excludedProperties = new HashSet();



Mime
View raw message