continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r209703 - in /maven/continuum/trunk: continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java continuum-model/src/main/resources/continuum.mdo continuum-web/src/main/resources/templates/screens/Summary.vm
Date Fri, 08 Jul 2005 03:37:58 GMT
Author: jvanzyl
Date: Thu Jul  7 20:37:56 2005
New Revision: 209703

URL: http://svn.apache.org/viewcvs?rev=209703&view=rev
Log:
o tracking the build number

Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java
    maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm

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=209703&r1=209702&r2=209703&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
Thu Jul  7 20:37:56 2005
@@ -322,11 +322,11 @@
 
             project.setLastBuildId( build.getId() );
 
+            project.setBuildNumber( project.getBuildNumber() + 1 );
+
             store.commit();
 
             build = store.getContinuumBuildByJdoId( id, true );
-
-            System.out.println( "build.getId() = " + build.getId() );
 
             return build.getId();
         }

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=209703&r1=209702&r2=209703&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo Thu Jul  7 20:37:56
2005
@@ -62,6 +62,11 @@
           <type>String</type>
         </field>
         <field>
+          <name>buildNumber</name>
+          <version>1.0.0</version>
+          <type>int</type>
+        </field>        
+        <field>
           <name>builds</name>
           <version>1.0.0</version>
           <association stash.part="true">

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm?rev=209703&r1=209702&r2=209703&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm Thu
Jul  7 20:37:56 2005
@@ -16,13 +16,14 @@
 <div class="app">
   <div id="h3">
     <h3>Continuum Projects</h3>
-    <table border="1" cellspacing="2" cellpadding="3" width="100%">
+    <table border="1" cellspacing="2" cellpadding="3" width="100%" id="projectSummaryTable">
 
       <!-- i18n -->
       <tr>
         <th>Status</th>
         <th>Project Name</th>
         <th>Version</th>
+        <th>Build</th>
         <th colspan="7"></th>
       </tr>
 
@@ -41,6 +42,7 @@
         <td>$state.generate( $item )</td>
         <td>$item.name</td>
         <td>$item.version</td>
+        <td>$item.buildNumber</td>
         <td><a href="$link.setPage('View.vm').addPathInfo('fid', "${item.executorId}Project").addPathInfo('id',
$item.id)">View</a></td>
 
         ## Operations
@@ -53,14 +55,14 @@
         <td>Delete</td>
         #end
 
-        #if ( $item.state != 1 )
+        #if ( $item.lastBuildId )
         #set ( $build = $continuum.getLatestBuildForProject($item.id) )
         <td><a href="$link.setPage('ProjectBuild.vm').addPathInfo('view', "ProjectBuild").addPathInfo('id',
$item.id).addPathInfo('buildId', $build.id)">Last Result</a></td>
         #else
         <td>Last Result</td>
         #end
 
-        #if ( $item.state != 1 )
+        #if ( $item.lastBuildId )
         <td><a href="$link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id',
$item.id)">All Results</a></td>
         #else
         <td>All Results</td>



Mime
View raw message