You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2005/08/12 18:31:22 UTC
svn commit: r232327 - in /maven/continuum/trunk:
continuum-api/src/main/java/org/apache/maven/continuum/store/
continuum-core-it/src/test/java/org/apache/maven/continuum/it/
continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/
conti...
Author: brett
Date: Fri Aug 12 09:30:57 2005
New Revision: 232327
URL: http://svn.apache.org/viewcvs?rev=232327&view=rev
Log:
break build -> project link temporarily to make build conversion simpler
Modified:
maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java
maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenOneIntegrationTest.java
maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java
maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.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/action/ExecuteBuilderContinuumAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo
maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
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=232327&r1=232326&r2=232327&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 Fri Aug 12 09:30:57 2005
@@ -59,9 +59,6 @@
ContinuumProject getProject( String projectId )
throws ContinuumStoreException;
- ContinuumProject getProjectForBuild( String buildId )
- throws ContinuumStoreException;
-
ScmResult getScmResultForProject( String projectId )
throws ContinuumStoreException;
@@ -74,7 +71,7 @@
ContinuumBuild getBuild( String buildId )
throws ContinuumStoreException;
- String getBuildOutput( String buildId )
+ String getBuildOutput( String buildId, String projectId )
throws ContinuumStoreException;
ContinuumBuild getLatestBuildForProject( String projectId )
@@ -86,7 +83,7 @@
List getChangedFilesForBuild( String buildId )
throws ContinuumStoreException;
- File getBuildOutputFile( String buildId )
+ File getBuildOutputFile( String buildId, String projectId )
throws ContinuumStoreException;
void removeNotifier( ProjectNotifier notifier )
Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java?rev=232327&r1=232326&r2=232327&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java Fri Aug 12 09:30:57 2005
@@ -590,7 +590,7 @@
return build;
}
- public ContinuumBuild assertSuccessfulBuild( String buildId )
+ public ContinuumBuild assertSuccessfulBuild( String buildId, String projectId )
throws Exception
{
ContinuumBuild build = waitForBuild( buildId );
@@ -602,37 +602,37 @@
line();
print( "Output" );
line();
- print( getStore().getBuildOutput( buildId ) );
+ print( getStore().getBuildOutput( buildId, projectId ) );
line();
fail( "The build was not successful" );
}
- String output = getStore().getBuildOutput( buildId );
+ String output = getStore().getBuildOutput( buildId, projectId );
assertNotNull( "Output was null.", output );
return build;
}
- public ContinuumBuild assertSuccessfulMaven1Build( String buildId )
+ public ContinuumBuild assertSuccessfulMaven1Build( String buildId, String projectId )
throws Exception
{
- return assertSuccessfulAntBuild( buildId );
+ return assertSuccessfulAntBuild( buildId, projectId );
}
- public ContinuumBuild assertSuccessfulMaven2Build( String buildId )
+ public ContinuumBuild assertSuccessfulMaven2Build( String buildId, String projectId )
throws Exception
{
- return assertSuccessfulMaven1Build( buildId );
+ return assertSuccessfulMaven1Build( buildId, projectId );
}
- public ContinuumBuild assertSuccessfulAntBuild( String buildId )
+ public ContinuumBuild assertSuccessfulAntBuild( String buildId, String projectId )
throws Exception
{
- ContinuumBuild build = assertSuccessfulBuild( buildId );
+ ContinuumBuild build = assertSuccessfulBuild( buildId, projectId );
- String output = getStore().getBuildOutput( buildId );
+ String output = getStore().getBuildOutput( buildId, projectId );
if ( output.indexOf( "BUILD SUCCESSFUL" ) < 0 )
{
@@ -643,12 +643,12 @@
return build;
}
- public ContinuumBuild assertSuccessfulShellBuild( String buildId, String expectedStandardOutput )
+ public ContinuumBuild assertSuccessfulShellBuild( String buildId, String projectId, String expectedStandardOutput )
throws Exception
{
- ContinuumBuild build = assertSuccessfulBuild( buildId );
+ ContinuumBuild build = assertSuccessfulBuild( buildId, projectId );
- String output = getStore().getBuildOutput( buildId );
+ String output = getStore().getBuildOutput( buildId, projectId );
assertEquals( "Standard output didn't contain the expected output.", expectedStandardOutput, output );
Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java?rev=232327&r1=232326&r2=232327&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java Fri Aug 12 09:30:57 2005
@@ -72,7 +72,7 @@
String buildId = buildProject( project.getId(), false ).getId();
- assertSuccessfulAntBuild( buildId );
+ assertSuccessfulAntBuild( buildId, project.getId() );
removeProject( projectId );
}
@@ -112,7 +112,7 @@
String buildId = buildProject( projectId, false ).getId();
- assertSuccessfulAntBuild( buildId );
+ assertSuccessfulAntBuild( buildId, projectId );
removeProject( projectId );
}
Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenOneIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenOneIntegrationTest.java?rev=232327&r1=232326&r2=232327&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenOneIntegrationTest.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenOneIntegrationTest.java Fri Aug 12 09:30:57 2005
@@ -16,18 +16,17 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor;
import org.apache.maven.continuum.project.ContinuumProject;
-
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -58,7 +57,7 @@
assertProject( projectId, "Maven 1 Project", "1.0", "", MavenOneBuildExecutor.ID, project );
- assertCheckedOutFiles( project, new String[]{ "/project.xml", "/src/main/java/Foo.java" } );
+ assertCheckedOutFiles( project, new String[]{"/project.xml", "/src/main/java/Foo.java"} );
// ----------------------------------------------------------------------
//
@@ -68,7 +67,7 @@
String buildId = buildProject( projectId, false ).getId();
- assertSuccessfulMaven1Build( buildId );
+ assertSuccessfulMaven1Build( buildId, projectId );
// ----------------------------------------------------------------------
//
@@ -102,21 +101,17 @@
removeProject( project.getId() );
}
- private void initMaven1Project( File root,
- String artifactId, String scm,
- File scmRoot )
+ private void initMaven1Project( File root, String artifactId, String scm, File scmRoot )
throws IOException, CommandLineException
{
deleteAndCreateDirectory( root );
- writeMavenOnePom( new File( root, "/project.xml" ),
- artifactId,
- makeScmUrl( scm, scmRoot, artifactId ),
+ writeMavenOnePom( new File( root, "/project.xml" ), artifactId, makeScmUrl( scm, scmRoot, artifactId ),
getEmail() );
assertTrue( new File( root, "/src/main/java" ).mkdirs() );
- PrintWriter writer = new PrintWriter( new FileWriter( new File( root, "/src/main/java/Foo.java" ) ) );
+ PrintWriter writer = new PrintWriter( new FileWriter( new File( root, "/src/main/java/Foo.java" ) ) );
writer.write( "class Foo { }" );
writer.close();
Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java?rev=232327&r1=232326&r2=232327&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java Fri Aug 12 09:30:57 2005
@@ -77,7 +77,7 @@
String buildId = buildProject( projectId, false ).getId();
- assertSuccessfulMaven2Build( buildId );
+ assertSuccessfulMaven2Build( buildId, projectId );
progress( "Test that a build without any files changed won't execute the executor" );
@@ -95,7 +95,7 @@
buildId = buildProject( projectId, true ).getId();
- ContinuumBuild build = assertSuccessfulMaven2Build( buildId );
+ ContinuumBuild build = assertSuccessfulMaven2Build( buildId, projectId );
assertEquals( "The 'build forced' flag wasn't true", ContinuumProjectState.TRIGGER_FORCED, build.getTrigger() );
Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java?rev=232327&r1=232326&r2=232327&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java Fri Aug 12 09:30:57 2005
@@ -70,7 +70,7 @@
assertProject( projectId, "Shell Project", "3.0", "", "shell", project );
progress( "Building Shell project" );
String buildId = buildProject( projectId, false ).getId();
- assertSuccessfulShellBuild( buildId, "" );
+ assertSuccessfulShellBuild( buildId, projectId, "" );
// Test project reconfiguration
// Test that a project will be built after a changed file is committed
@@ -95,7 +95,7 @@
assertEquals( "Updated command line arguments doesn't match", "a b", bd.getArguments() );
buildId = buildProject( projectId, false ).getId();
- assertSuccessfulShellBuild( buildId, "a" + EOL + "b" + EOL );
+ assertSuccessfulShellBuild( buildId, projectId, "a" + EOL + "b" + EOL );
removeProject( 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=232327&r1=232326&r2=232327&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 Fri Aug 12 09:30:57 2005
@@ -125,7 +125,7 @@
else
{
actionContext.put( AbstractContinuumAction.KEY_WORKING_DIRECTORY,
- workingDirectoryService.getWorkingDirectory( project ) );
+ workingDirectoryService.getWorkingDirectory( project ).getAbsolutePath() );
actionManager.lookup( "checkout-project" ).execute( actionContext );
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=232327&r1=232326&r2=232327&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 Fri Aug 12 09:30:57 2005
@@ -101,7 +101,7 @@
{
notifier.runningGoals( project, build );
- File buildOutputFile = store.getBuildOutputFile( buildId );
+ File buildOutputFile = store.getBuildOutputFile( buildId, project.getId() );
ContinuumBuildExecutionResult result = buildExecutor.build( project, buildOutputFile );
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=232327&r1=232326&r2=232327&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 Fri Aug 12 09:30:57 2005
@@ -117,7 +117,7 @@
if ( build.getEndTime() != 0 )
{
- context.put( CONTEXT_BUILD_OUTPUT, store.getBuildOutput( build.getId() ) );
+ context.put( CONTEXT_BUILD_OUTPUT, store.getBuildOutput( build.getId(), project.getId() ) );
}
context.put( CONTEXT_UPDATE_SCM_RESULT, build.getScmResult() );
Modified: maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo?rev=232327&r1=232326&r2=232327&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo Fri Aug 12 09:30:57 2005
@@ -925,14 +925,6 @@
any builder specific objects/variables.</description>
]]></description>
<fields>
- <field>
- <name>project</name>
- <version>1.0.0</version>
- <required>true</required>
- <association stash.part="false">
- <type>ContinuumProject</type>
- </association>
- </field>
<!-- TODO: this is often used as a build number - it shouldn't be user facing -->
<field>
<name>id</name>
Modified: maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo?rev=232327&r1=232326&r2=232327&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo Fri Aug 12 09:30:57 2005
@@ -28,6 +28,7 @@
<!-- Collections -->
<field name="builds" persistence-modifier="persistent">
<collection element-type="ContinuumBuild" dependent-element="true"/>
+ <join/>
</field>
<field name="developers" persistence-modifier="persistent">
<collection element-type="org.apache.maven.continuum.model.project.ProjectDeveloper" dependent-element="true"/>
@@ -55,6 +56,7 @@
<field name="notifiers"/>
<field name="dependencies"/>
<field name="projectGroup"/>
+ <field name="buildDefinitions"/>
</fetch-group>
</class>
@@ -85,7 +87,6 @@
</class>
<class name="ContinuumBuild" detachable="true" identity-type="application"
objectid-class="javax.jdo.identity.StringIdentity" table="build">
- <field name="project" persistence-modifier="persistent" null-value="exception" default-fetch-group="false"/>
<field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
<field name="state" persistence-modifier="persistent"/>
<field name="trigger" persistence-modifier="persistent"/>
Modified: maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java?rev=232327&r1=232326&r2=232327&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java Fri Aug 12 09:30:57 2005
@@ -37,10 +37,10 @@
*/
private ConfigurationService configurationService;
- public String getBuildOutput( String buildId )
+ public String getBuildOutput( String buildId, String projectId )
throws ContinuumStoreException
{
- File file = getBuildOutputFile( buildId );
+ File file = getBuildOutputFile( buildId, projectId );
try
{
@@ -58,10 +58,10 @@
//
// ----------------------------------------------------------------------
- public File getBuildOutputFile( String buildId )
+ public File getBuildOutputFile( String buildId, String projectId )
throws ContinuumStoreException
{
- File dir = new File( configurationService.getBuildOutputDirectory(), getProjectForBuild( buildId ).getId() );
+ File dir = new File( configurationService.getBuildOutputDirectory(), projectId );
if ( !dir.exists() && !dir.mkdirs() )
{
Modified: maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?rev=232327&r1=232326&r2=232327&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Fri Aug 12 09:30:57 2005
@@ -40,7 +40,10 @@
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Query;
import javax.jdo.Transaction;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
@@ -271,33 +274,6 @@
}
}
- public ContinuumProject getProjectForBuild( String buildId )
- throws ContinuumStoreException
- {
- PersistenceManager pm = pmf.getPersistenceManager();
-
- Transaction tx = pm.currentTransaction();
-
- try
- {
- tx.begin();
-
- ContinuumBuild build = getContinuumBuild( pm, buildId );
-
- String projectId = build.getProject().getId();
-
- ContinuumProject project = getContinuumProject( pm, projectId, true );
-
- tx.commit();
-
- return project;
- }
- finally
- {
- rollback( tx );
- }
- }
-
public ScmResult getScmResultForProject( String projectId )
throws ContinuumStoreException
{
@@ -345,8 +321,6 @@
ContinuumProject project = getContinuumProject( pm, projectId, false );
- build.setProject( project );
-
build = (ContinuumBuild) makePersistent( pm, build, false );
project.setLatestBuildId( build.getId() );
@@ -419,6 +393,21 @@
public Collection getBuildsForProject( String projectId, int start, int end )
throws ContinuumStoreException
{
+ ContinuumProject project = (ContinuumProject) getDetailedObject( ContinuumProject.class, projectId,
+ PROJECT_DETAIL_FG );
+ List builds = new ArrayList( project.getBuilds() );
+ Collections.sort( builds, new Comparator()
+ {
+ public int compare( Object o1, Object o2 )
+ {
+ ContinuumBuild b1 = (ContinuumBuild) o1;
+ ContinuumBuild b2 = (ContinuumBuild) o2;
+
+ return (int) ( ( b2 != null ? b2.getStartTime() : 0 ) - ( b1 != null ? b1.getStartTime() : 0 ) );
+ }
+ } );
+ return builds;
+/* TODO: remove - check usages and replace by project.getBuilds
PersistenceManager pm = pmf.getPersistenceManager();
Transaction tx = pm.currentTransaction();
@@ -451,6 +440,7 @@
{
rollback( tx );
}
+*/
}
public List getChangedFilesForBuild( String buildId )