continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r225218 - in /maven/continuum/trunk: ./ continuum-api/src/main/java/org/apache/maven/continuum/execution/ continuum-api/src/main/java/org/apache/maven/continuum/store/ continuum-core/ continuum-core/src/main/java/org/apache/maven/continuum/...
Date Tue, 26 Jul 2005 01:56:55 GMT
Author: jvanzyl
Date: Mon Jul 25 18:56:33 2005
New Revision: 225218

URL: http://svn.apache.org/viewcvs?rev=225218&view=rev
Log:
o switch over to writing the build logs to disk instead of in memory


Added:
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/configuration/
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/configuration/jdk/
Modified:
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
    maven/continuum/trunk/continuum-core/pom.xml
    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/execution/AbstractBuildExecutor.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ExecutionResult.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ShellCommandHelper.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java
    maven/continuum/trunk/continuum-plexus-application/pom.xml
    maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
    maven/continuum/trunk/pom.xml

Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java
(original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java
Mon Jul 25 18:56:33 2005
@@ -38,7 +38,7 @@
 
     String SHELL_EXECUTOR_ID = "shell";
 
-    ContinuumBuildExecutionResult build( ContinuumProject project )
+    ContinuumBuildExecutionResult build( ContinuumProject project, File buildOutput )
         throws ContinuumBuildExecutorException;
 
     void updateProjectFromCheckOut( File workingDirectory, ContinuumProject project )

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=225218&r1=225217&r2=225218&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
Mon Jul 25 18:56:33 2005
@@ -18,6 +18,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.io.File;
 
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
@@ -81,9 +82,6 @@
     ContinuumBuild updateBuild( ContinuumBuild build )
         throws ContinuumStoreException;
 
-    void setBuildOutput( String buildId, String output )
-        throws ContinuumStoreException;
-
     ContinuumBuild getBuild( String buildId )
         throws ContinuumStoreException;
 
@@ -97,6 +95,9 @@
         throws ContinuumStoreException;
 
     List getChangedFilesForBuild( String buildId )
+        throws ContinuumStoreException;
+
+    File getBuildOutputFile( String buildId )
         throws ContinuumStoreException;
 
     // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/pom.xml?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/pom.xml (original)
+++ maven/continuum/trunk/continuum-core/pom.xml Mon Jul 25 18:56:33 2005
@@ -34,12 +34,16 @@
      |
      | Plexus Dependencies
      |
-     |-->
+     |-->     
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>     
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-jdo2</artifactId>
       <version>1.0-alpha-1</version>
-    </dependency>
+    </dependency>    
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-velocity</artifactId>

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=225218&r1=225217&r2=225218&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
Mon Jul 25 18:56:33 2005
@@ -31,6 +31,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.Map;
+import java.io.File;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -103,14 +104,14 @@
         {
             notifier.runningGoals( project, build );
 
-            ContinuumBuildExecutionResult result = buildExecutor.build( project );
+            File buildOutputFile = store.getBuildOutputFile( buildId );
+
+            ContinuumBuildExecutionResult result = buildExecutor.build( project, buildOutputFile
);
 
             build.setState( result.getExitCode() == 0 ?
                             ContinuumProjectState.OK : ContinuumProjectState.FAILED );
 
             build.setExitCode( result.getExitCode() );
-
-            output = result.getOutput();
         }
         catch( Throwable e )
         {
@@ -125,8 +126,6 @@
             // ----------------------------------------------------------------------
             // Copy over the build result
             // ----------------------------------------------------------------------
-
-            store.setBuildOutput( buildId, output );
 
             build = store.updateBuild( build );
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
Mon Jul 25 18:56:33 2005
@@ -114,13 +114,14 @@
 
     protected ContinuumBuildExecutionResult executeShellCommand( File workingDirectory,
                                                                  String executable,
-                                                                 String arguments )
+                                                                 String arguments,
+                                                                 File output )
         throws ContinuumBuildExecutorException
     {
         // ----------------------------------------------------------------------
         // If we're not searching the path for the executable, prefix the
         // executable with the working directory to make sure the path is
-        // absolute and thus won't be tried resolved by using the PATH
+        // absolute and thus won't be tried resoled by using the PATH
         // ----------------------------------------------------------------------
 
         String actualExecutable;
@@ -173,12 +174,12 @@
         {
             ExecutionResult result = shellCommandHelper.executeShellCommand( workingDirectory,
                                                                              actualExecutable,
-                                                                             arguments );
+                                                                             arguments,
+                                                                             output );
 
             getLogger().info( "Exit code: " + result.getExitCode() );
 
-            return new ContinuumBuildExecutionResult( result.getOutput(),
-                                                      result.getExitCode() );
+            return new ContinuumBuildExecutionResult( "", result.getExitCode() );
         }
         catch ( Exception e )
         {

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
Mon Jul 25 18:56:33 2005
@@ -57,7 +57,7 @@
     // ContinuumBuilder Implementation
     // ----------------------------------------------------------------------
 
-    public ContinuumBuildExecutionResult build( ContinuumProject p )
+    public ContinuumBuildExecutionResult build( ContinuumProject p, File buildOutput )
         throws ContinuumBuildExecutorException
     {
         AntProject project = (AntProject) p;
@@ -71,7 +71,8 @@
 
         return executeShellCommand( workingDirectory,
                                     executable,
-                                    arguments );
+                                    arguments,
+                                    buildOutput );
     }
 
     public void updateProjectFromCheckOut( File workingDirectory, ContinuumProject p )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
Mon Jul 25 18:56:33 2005
@@ -54,7 +54,7 @@
     // Builder Implementation
     // ----------------------------------------------------------------------
 
-    public ContinuumBuildExecutionResult build( ContinuumProject p )
+    public ContinuumBuildExecutionResult build( ContinuumProject p, File buildOutput )
         throws ContinuumBuildExecutorException
     {
         MavenOneProject project = (MavenOneProject) p;
@@ -66,7 +66,8 @@
 
         return executeShellCommand( workingDirectory, 
                                     null,
-                                    commandLine );
+                                    commandLine,
+                                    buildOutput );
     }
 
     public void updateProjectFromCheckOut( File workingDirectory, ContinuumProject project
)

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
Mon Jul 25 18:56:33 2005
@@ -62,7 +62,7 @@
     // ContinuumBuilder Implementation
     // ----------------------------------------------------------------------
 
-    public ContinuumBuildExecutionResult build( ContinuumProject p )
+    public ContinuumBuildExecutionResult build( ContinuumProject p, File buildOutput )
         throws ContinuumBuildExecutorException
     {
         MavenTwoProject project = (MavenTwoProject) p;
@@ -74,7 +74,8 @@
 
         return executeShellCommand( workingDirectory,
                                     null,
-                                    arguments );
+                                    arguments,
+                                    buildOutput );
     }
 
     public void updateProjectFromCheckOut( File workingDirectory, ContinuumProject project
)

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
Mon Jul 25 18:56:33 2005
@@ -54,7 +54,7 @@
     // ContinuumBuilder implementation
     // ----------------------------------------------------------------------
 
-    public synchronized ContinuumBuildExecutionResult build( ContinuumProject p )
+    public synchronized ContinuumBuildExecutionResult build( ContinuumProject p, File buildOutput
)
         throws ContinuumBuildExecutorException
     {
         ShellProject project = (ShellProject) p;
@@ -65,7 +65,8 @@
 
         return executeShellCommand( workingDirectory,
                                     executable,
-                                    project.getCommandLineArguments() );
+                                    project.getCommandLineArguments(),
+                                    buildOutput );
     }
 
     public void updateProjectFromCheckOut( File workingDirectory, ContinuumProject p )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
Mon Jul 25 18:56:33 2005
@@ -34,26 +34,10 @@
     /** @plexus.requirement */
     private ConfigurationService configurationService;
 
-    public void setBuildOutput( String buildId, String output )
-        throws ContinuumStoreException
-    {
-        File file = getOutputFile( buildId );
-
-        try
-        {
-            FileUtils.fileWrite( file.getAbsolutePath(), output );
-        }
-        catch ( IOException e )
-        {
-            throw new ContinuumStoreException( "Could not write the build output to file:
" +
-                                               "'" + file.getAbsolutePath() + "'.", e );
-        }
-    }
-
     public String getBuildOutput( String buildId )
         throws ContinuumStoreException
     {
-        File file = getOutputFile( buildId );
+        File file = getBuildOutputFile( buildId );
 
         try
         {
@@ -71,7 +55,7 @@
     //
     // ----------------------------------------------------------------------
 
-    private File getOutputFile( String buildId )
+    public File getBuildOutputFile( String buildId )
         throws ContinuumStoreException
     {
         File dir = new File( configurationService.getBuildOutputDirectory(),
@@ -83,8 +67,6 @@
                                                "'" + dir.getAbsolutePath() + "'." );
         }
 
-        File file = new File( dir, buildId + ".log.txt" );
-
-        return file;
+        return new File( dir, buildId + ".log.txt" );
     }
 }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
Mon Jul 25 18:56:33 2005
@@ -19,8 +19,13 @@
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
+import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.codehaus.plexus.util.cli.WriterStreamConsumer;
+import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
+import java.io.FileWriter;
+import java.io.Writer;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -36,7 +41,8 @@
 
     public ExecutionResult executeShellCommand( File workingDirectory,
                                                 String executable,
-                                                String arguments )
+                                                String arguments,
+                                                File output )
         throws Exception
     {
         Commandline cl = new Commandline();
@@ -47,12 +53,14 @@
 
         return executeShellCommand( workingDirectory,
                                     executable,
-                                    argument.getParts() );
+                                    argument.getParts(),
+                                    output );
     }
 
     public ExecutionResult executeShellCommand( File workingDirectory,
                                                 String executable,
-                                                String[] arguments )
+                                                String[] arguments,
+                                                File output )
         throws Exception
     {
         // ----------------------------------------------------------------------
@@ -76,18 +84,22 @@
         //
         // ----------------------------------------------------------------------
 
-        CommandLineUtils.StringStreamConsumer consumer = new CommandLineUtils.StringStreamConsumer();
+        //CommandLineUtils.StringStreamConsumer consumer = new CommandLineUtils.StringStreamConsumer();
+
+        Writer writer = new FileWriter( output );
+
+        StreamConsumer consumer = new WriterStreamConsumer( writer );
 
         int exitCode = CommandLineUtils.executeCommandLine( cl, consumer, consumer );
 
+        writer.flush();
+
+        writer.close();
+
         // ----------------------------------------------------------------------
         //
         // ----------------------------------------------------------------------
 
-        String output = consumer.getOutput();
-
-        ExecutionResult result = new ExecutionResult( output, exitCode );
-
-        return result;
+        return new ExecutionResult( exitCode );
     }
 }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ExecutionResult.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ExecutionResult.java?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ExecutionResult.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ExecutionResult.java
Mon Jul 25 18:56:33 2005
@@ -22,20 +22,11 @@
  */
 public class ExecutionResult
 {
-    private String output;
-
     private int exitCode;
 
-    public ExecutionResult( String output, int exitCode )
+    public ExecutionResult( int exitCode )
     {
-        this.output = output;
-
         this.exitCode = exitCode;
-    }
-
-    public String getOutput()
-    {
-        return output;
     }
 
     public int getExitCode()

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ShellCommandHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ShellCommandHelper.java?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ShellCommandHelper.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ShellCommandHelper.java
Mon Jul 25 18:56:33 2005
@@ -28,11 +28,13 @@
 
     ExecutionResult executeShellCommand( File workingDirectory,
                                          String executable,
-                                         String arguments )
+                                         String arguments,
+                                         File output )
         throws Exception;
 
     ExecutionResult executeShellCommand( File workingDirectory,
                                          String executable,
-                                         String[] arguments )
+                                         String[] arguments,
+                                         File output)
         throws Exception;
 }

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java
(original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java
Mon Jul 25 18:56:33 2005
@@ -463,7 +463,7 @@
 
         build.setExitCode( result.getExitCode() );
 
-        store.setBuildOutput( build.getId(), "output" );
+        //store.setBuildOutput( build.getId(), "output" );
 
         store.updateBuild( build );
     }

Modified: maven/continuum/trunk/continuum-plexus-application/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-application/pom.xml?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-plexus-application/pom.xml (original)
+++ maven/continuum/trunk/continuum-plexus-application/pom.xml Mon Jul 25 18:56:33 2005
@@ -63,7 +63,6 @@
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>plexus</groupId>

Modified: maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
(original)
+++ maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
Mon Jul 25 18:56:33 2005
@@ -34,11 +34,13 @@
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.apache.maven.continuum.utils.ContinuumUtils;
 import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
+import java.io.IOException;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -338,7 +340,16 @@
 
         build.setExitCode( result.getExitCode() );
 
-        store.setBuildOutput( build.getId(), result.getOutput() );
+        String outputFile = store.getBuildOutputFile( build.getId() ).getAbsolutePath();
+
+        try
+        {
+            FileUtils.fileWrite( outputFile, result.getOutput() );
+        }
+        catch ( IOException e )
+        {
+            // do nothing
+        }
 
         store.updateBuild( build );
     }

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/pom.xml?rev=225218&r1=225217&r2=225218&view=diff
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Mon Jul 25 18:56:33 2005
@@ -148,7 +148,17 @@
         <artifactId>jpox-enhancer</artifactId>
         <version>1.1.0-beta-4-c1</version>
       </dependency>
-    </dependencies>
+      <!--
+       |
+       | Plexus
+       |
+       -->
+      <dependency>
+        <groupId>plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>1.0.2-SNAPSHOT</version>
+      </dependency>       
+    </dependencies>    
   </dependencyManagement>
   
   <dependencies>



Mime
View raw message