continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r233326 - in /maven/continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-web/src/main/resources/META-INF/plexus/ continuum-web/src/main/resources/templat...
Date Thu, 18 Aug 2005 15:20:05 GMT
Author: brett
Date: Thu Aug 18 08:19:51 2005
New Revision: 233326

URL: http://svn.apache.org/viewcvs?rev=233326&view=rev
Log:
fix output display

Modified:
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm

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=233326&r1=233325&r2=233326&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
Thu Aug 18 08:19:51 2005
@@ -90,6 +90,9 @@
     BuildResult getBuildResult( int buildId )
         throws ContinuumException;
 
+    String getBuildOutput( int projectId, int buildId )
+        throws ContinuumException;
+
     Collection getBuildResultsForProject( int projectId )
         throws ContinuumException;
 

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=233326&r1=233325&r2=233326&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
Thu Aug 18 08:19:51 2005
@@ -296,6 +296,19 @@
         }
     }
 
+    public String getBuildOutput( int projectId, int buildId )
+        throws ContinuumException
+    {
+        try
+        {
+            return store.getBuildOutput( buildId, projectId );
+        }
+        catch ( ContinuumStoreException e )
+        {
+            throw logAndCreateException( "Exception while getting build result for project.",
e );
+        }
+    }
+
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml?rev=233326&r1=233325&r2=233326&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml
Thu Aug 18 08:19:51 2005
@@ -186,6 +186,10 @@
                 <id>build</id>
                 <expression>getBuildResult(#buildId)</expression>
               </scalar>
+              <scalar>
+                <id>output</id>
+                <expression>getBuildOutput(#id,#buildId)</expression>
+              </scalar>
             </scalars>
           </view>
           <!--

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=233326&r1=233325&r2=233326&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
Thu Aug 18 08:19:51 2005
@@ -53,9 +53,9 @@
 #else
   <h4>Output</h4>
   <p>
-#if ( $build.output && $build.output != "" )
+#if ( $output && $output != "" )
     <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width:
1px">
-    <code><pre>$build.output</pre></code>
+    <code><pre>$output</pre></code>
     </div>
 #else
 No output.



Mime
View raw message