You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by tr...@apache.org on 2005/06/14 14:52:47 UTC
svn commit: r190586 - in /maven/continuum/trunk/continuum-core/src:
main/java/org/apache/maven/continuum/core/action/
test/java/org/apache/maven/continuum/buildqueue/
test/java/org/apache/maven/continuum/notification/
test/java/org/apache/maven/continuum/store/
Author: trygvis
Date: Tue Jun 14 05:52:47 2005
New Revision: 190586
URL: http://svn.apache.org/viewcvs?rev=190586&view=rev
Log:
o Renaming makeProject() and addProject() to makeMavenTwoProject() and
addMavenTwoProject() to better reflect reality.
Modified:
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java Tue Jun 14 05:52:47 2005
@@ -30,7 +30,7 @@
String projectId = getStore().addProject( project );
/*
- String projectId = getStore().addProject( project.getName(),
+ String projectId = getStore().addMavenTwoProject( project.getName(),
project.getScmUrl(),
project.getNagEmailAddress(),
project.getVersion(),
Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java Tue Jun 14 05:52:47 2005
@@ -47,7 +47,7 @@
public void testTestTheQueueWithASingleProject()
throws Exception
{
- String projectId = ModelloJPoxContinuumStoreTest.addProject( store, "Build Queue Project 1", "1" );
+ String projectId = ModelloJPoxContinuumStoreTest.addMavenTwoProject( store, "Build Queue Project 1", "1" );
buildProject( projectId, false );
@@ -70,9 +70,9 @@
public void testTheQueueWithMultipleProjects()
throws Exception
{
- String projectId1 = ModelloJPoxContinuumStoreTest.addProject( store, "Build Queue Project 2", "foo" );
+ String projectId1 = ModelloJPoxContinuumStoreTest.addMavenTwoProject( store, "Build Queue Project 2", "foo" );
- String projectId2 = ModelloJPoxContinuumStoreTest.addProject( store, "Build Queue Project 3", "bar" );
+ String projectId2 = ModelloJPoxContinuumStoreTest.addMavenTwoProject( store, "Build Queue Project 3", "bar" );
buildProject( projectId1, false );
@@ -108,7 +108,7 @@
{
String name = "Build Queue Project 4";
- String projectId = ModelloJPoxContinuumStoreTest.addProject( store, name, "4" );
+ String projectId = ModelloJPoxContinuumStoreTest.addMavenTwoProject( store, name, "4" );
buildProject( projectId, true );
Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java Tue Jun 14 05:52:47 2005
@@ -36,7 +36,7 @@
ContinuumStore store = (ContinuumStore) lookup( ContinuumStore.ROLE );
- String projectId = ModelloJPoxContinuumStoreTest.addProject( store,
+ String projectId = ModelloJPoxContinuumStoreTest.addMavenTwoProject( store,
"Notification Dispatcher Test Project",
"scm:notification/dispatcher" );
Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java Tue Jun 14 05:52:47 2005
@@ -170,7 +170,7 @@
configuration.setProperty( "foo", "bar" );
- ContinuumProject expected = makeProject( "Test Project",
+ ContinuumProject expected = makeMavenTwoProject( "Test Project",
"scm:local:src/test/repo",
"foo@bar.com",
"1.0",
@@ -178,7 +178,7 @@
"maven2",
"/tmp" );
- String projectId = store.addProject( makeProject( "Test Project",
+ String projectId = store.addProject( makeMavenTwoProject( "Test Project",
"scm:local:src/test/repo",
"foo@bar.com",
"1.0",
@@ -223,7 +223,7 @@
String builderId = "maven2";
String workingDirectory = "/tmp";
- String projectId = store.addProject( makeProject( name,
+ String projectId = store.addProject( makeMavenTwoProject( name,
scmUrl,
nagEmailAddress,
version,
@@ -321,7 +321,7 @@
String builderId1 = "maven2";
String workingDirectory1 = "/tmp";
- String id1 = addProject( store,
+ String id1 = addMavenTwoProject( store,
name1,
scmUrl1,
nagEmailAddress1,
@@ -338,7 +338,7 @@
String builderId2 = "maven2";
String workingDirectory2 = "/tmp";
- String id2 = addProject( store,
+ String id2 = addMavenTwoProject( store,
name2,
scmUrl2,
nagEmailAddress2,
@@ -390,7 +390,7 @@
{
ContinuumStore store = (ContinuumStore) lookup( ContinuumStore.ROLE );
- String projectId = addProject( "Remove Test Project", "scm:remove-project" );
+ String projectId = addMavenTwoProject( "Remove Test Project", "scm:remove-project" );
store.setIsUpdating( projectId );
@@ -414,6 +414,15 @@
}
// ----------------------------------------------------------------------
+ // Maven Two project tests
+ // ----------------------------------------------------------------------
+
+ public void testUpdateMavenTwoProject()
+ {
+
+ }
+
+ // ----------------------------------------------------------------------
// Build
// ----------------------------------------------------------------------
@@ -424,7 +433,7 @@
lookup( JdoFactory.ROLE );
- String projectId = addProject( "Build Test Project", "scm:build" );
+ String projectId = addMavenTwoProject( "Build Test Project", "scm:build" );
store.setIsUpdating( projectId );
@@ -488,19 +497,19 @@
// Set up projects
// ----------------------------------------------------------------------
- String projectId = addProject( "Association Test Project", "scm:association" );
+ String projectId = addMavenTwoProject( "Association Test Project", "scm:association" );
store.setIsUpdating( projectId );
store.setUpdateDone( projectId );
- String projectIdFoo = addProject( "Foo Project", "scm:association-foo" );
+ String projectIdFoo = addMavenTwoProject( "Foo Project", "scm:association-foo" );
store.setIsUpdating( projectIdFoo );
store.setUpdateDone( projectIdFoo );
- String projectIdBar = addProject( "Bar Project", "scm:association-bar" );
+ String projectIdBar = addMavenTwoProject( "Bar Project", "scm:association-bar" );
store.setIsUpdating( projectIdBar );
@@ -554,7 +563,7 @@
public void testGetLatestBuild()
throws Exception
{
- String projectId = addProject( "Association Test Project", "scm:association" );
+ String projectId = addMavenTwoProject( "Association Test Project", "scm:association" );
store.setIsUpdating( projectId );
@@ -593,7 +602,7 @@
//
// ----------------------------------------------------------------------
- String projectId = addProject( "Build Result Project", "scm:build/result" );
+ String projectId = addMavenTwoProject( "Build Result Project", "scm:build/result" );
store.setIsUpdating( projectId );
@@ -684,20 +693,20 @@
// Private utility methods
// ----------------------------------------------------------------------
- private String addProject( String name, String scmUrl )
+ private String addMavenTwoProject( String name, String scmUrl )
throws Exception
{
- return addProject( (ContinuumStore) lookup( ContinuumStore.ROLE ),
- makeStubProject( name, scmUrl ) );
+ return addMavenTwoProject( (ContinuumStore) lookup( ContinuumStore.ROLE ),
+ makeStubMavenTwoProject( name, scmUrl ) );
}
// ----------------------------------------------------------------------
// Public utility methods
// ----------------------------------------------------------------------
- public static ContinuumProject makeStubProject( String name, String scmUrl )
+ public static ContinuumProject makeStubMavenTwoProject( String name, String scmUrl )
{
- return makeProject( name,
+ return makeMavenTwoProject( name,
scmUrl,
"foo@bar.com",
"1.0",
@@ -706,7 +715,7 @@
"/tmp" );
}
- public static ContinuumProject makeProject( String name,
+ public static ContinuumProject makeMavenTwoProject( String name,
String scmUrl,
String nagEmailAddress,
String version,
@@ -727,7 +736,7 @@
return project;
}
- public static String addProject( ContinuumStore store, ContinuumProject project )
+ public static String addMavenTwoProject( ContinuumStore store, ContinuumProject project )
throws Exception
{
String projectId = store.addProject( project );
@@ -757,13 +766,13 @@
return projectId;
}
- public static String addProject( ContinuumStore store, String name, String scmUrl )
+ public static String addMavenTwoProject( ContinuumStore store, String name, String scmUrl )
throws Exception
{
- return addProject( store, makeStubProject( name, scmUrl ) );
+ return addMavenTwoProject( store, makeStubMavenTwoProject( name, scmUrl ) );
}
- public static String addProject( ContinuumStore store,
+ public static String addMavenTwoProject( ContinuumStore store,
String name,
String scmUrl,
String nagEmailAddress,
@@ -773,7 +782,7 @@
String workingDirectory )
throws Exception
{
- String projectId = store.addProject( makeProject( name,
+ String projectId = store.addProject( makeMavenTwoProject( name,
scmUrl,
nagEmailAddress,
version,