continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tryg...@apache.org
Subject svn commit: r209447 - in /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action: AbstractContinuumAction.java StoreCheckOutScmResultAction.java
Date Wed, 06 Jul 2005 11:24:33 GMT
Author: trygvis
Date: Wed Jul  6 04:24:28 2005
New Revision: 209447

URL: http://svn.apache.org/viewcvs?rev=209447&view=rev
Log:
o Making sure that the check out result is always stored when there is a error.

Modified:
    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/StoreCheckOutScmResultAction.java

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=209447&r1=209446&r2=209447&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  6 04:24:28 2005
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+import java.io.File;
+import java.util.Map;
+
 import org.apache.maven.continuum.core.ContinuumCore;
 import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
 import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
@@ -27,14 +30,11 @@
 import org.apache.maven.continuum.scm.UpdateScmResult;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+
 import org.codehaus.plexus.action.Action;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.util.StringUtils;
-
-import java.io.File;
-import java.util.Map;
-import java.util.Iterator;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>

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=209447&r1=209446&r2=209447&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  6 04:24:28 2005
@@ -19,6 +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.store.ContinuumStoreException;
 
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
@@ -35,13 +36,27 @@
     {
         try
         {
+            // ----------------------------------------------------------------------
+            //
+            // ----------------------------------------------------------------------
+
+            CheckOutScmResult checkOutScmResult = (CheckOutScmResult) context.get( KEY_CHECKOUT_SCM_RESULT
);
+
+            String checkoutErrorMessage = (String) context.get( KEY_CHECKOUT_ERROR_MESSAGE
);
+
+            String checkoutErrorException = (String) context.get( KEY_CHECKOUT_ERROR_EXCEPTION
);
+
+            // ----------------------------------------------------------------------
+            //
+            // ----------------------------------------------------------------------
+
             ContinuumProject project = getProject( context );
 
-            project.setCheckOutScmResult( getCheckoutResult( context ) );
+            project.setCheckOutScmResult( checkOutScmResult );
 
-            project.setCheckOutErrorMessage( nullIfEmpty( getCheckoutErrorMessage( context
) ) );
+            project.setCheckOutErrorMessage( checkoutErrorMessage );
 
-            project.setCheckOutErrorException( nullIfEmpty( getCheckoutErrorException( context
) ) );
+            project.setCheckOutErrorException( checkoutErrorException );
 
             getStore().updateProject( project );
         }



Mime
View raw message