continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r377500 - in /maven/continuum/branches/continuum-1.0.x: continuum-core-it/src/test/java/org/apache/maven/continuum/it/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/buildcon...
Date Mon, 13 Feb 2006 21:42:54 GMT
Author: evenisse
Date: Mon Feb 13 13:42:52 2006
New Revision: 377500

URL: http://svn.apache.org/viewcvs?rev=377500&view=rev
Log:
Rename TRIGGER_UNKNOWN to TRIGGER_SCHEDULED

Modified:
    maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java
    maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenOneIntegrationTest.java
    maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java
    maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java
    maven/continuum/branches/continuum-1.0.x/continuum-model/src/main/java/org/apache/maven/continuum/project/ContinuumProjectState.java
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumTriggerContentGenerator.java

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java?rev=377500&r1=377499&r2=377500&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java
Mon Feb 13 13:42:52 2006
@@ -76,7 +76,7 @@
 
         progress( "Building SVN Ant project" );
 
-        int buildId = buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN ).getId();
+        int buildId = buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED ).getId();
 
         assertSuccessfulAntBuild( buildId, project.getId() );
 
@@ -120,7 +120,7 @@
 
         progress( "Building CVS Ant project" );
 
-        int buildId = buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN ).getId();
+        int buildId = buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED ).getId();
 
         assertSuccessfulAntBuild( buildId, projectId );
 

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenOneIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenOneIntegrationTest.java?rev=377500&r1=377499&r2=377500&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenOneIntegrationTest.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenOneIntegrationTest.java
Mon Feb 13 13:42:52 2006
@@ -68,7 +68,7 @@
 
         progress( "Building Maven 1 project" );
 
-        int buildId = buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN ).getId();
+        int buildId = buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED ).getId();
 
         assertSuccessfulMaven1Build( buildId, projectId );
 

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java?rev=377500&r1=377499&r2=377500&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java
Mon Feb 13 13:42:52 2006
@@ -77,7 +77,7 @@
         project = continuum.getProjectWithBuilds( projectId );
         int originalSize = project.getBuildResults().size();
 
-        int buildId = buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN ).getId();
+        int buildId = buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED ).getId();
 
         assertSuccessfulMaven2Build( buildId, projectId );
 
@@ -88,7 +88,7 @@
 
         assertEquals( "build list was not updated", originalSize + 1, expectedSize );
 
-        continuum.buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN );
+        continuum.buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED );
 
         Thread.sleep( 3000 );
 

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java?rev=377500&r1=377499&r2=377500&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java
Mon Feb 13 13:42:52 2006
@@ -71,7 +71,7 @@
         Project project = continuum.getProject( projectId );
         assertProject( projectId, "Shell Project", "3.0", "", "shell", project );
         progress( "Building Shell project" );
-        int buildId = buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN ).getId();
+        int buildId = buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED ).getId();
         assertSuccessfulShellBuild( buildId, projectId, "" );
 
         // Test project reconfiguration
@@ -97,7 +97,7 @@
         bd = (BuildDefinition) shellProject.getBuildDefinitions().iterator().next();
         assertEquals( "Updated command line arguments doesn't match", "a b", bd.getArguments()
);
 
-        buildId = buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN ).getId();
+        buildId = buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED ).getId();
         assertSuccessfulShellBuild( buildId, projectId, "a" + EOL + "b" + EOL );
 
         removeProject( projectId );

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=377500&r1=377499&r2=377500&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Mon Feb 13 13:42:52 2006
@@ -389,8 +389,7 @@
 
             if ( buildDefId != null && !isInBuildingQueue( p.getId() ) &&
!isInCheckoutQueue( p.getId() ) )
             {
-                //TODO: Fix trigger name
-                buildProject( p.getId(), buildDefId.intValue(), ContinuumProjectState.TRIGGER_UNKNOWN,
false );
+                buildProject( p.getId(), buildDefId.intValue(), ContinuumProjectState.TRIGGER_SCHEDULED,
false );
             }
         }
     }

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=377500&r1=377499&r2=377500&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
Mon Feb 13 13:42:52 2006
@@ -211,8 +211,7 @@
                 }
 
                 if ( allChangesUnknown && project.getOldState() != ContinuumProjectState.NEW
&&
-                    trigger != ContinuumProjectState.TRIGGER_FORCED &&
-                    project.getState() != ContinuumProjectState.NEW )
+                    trigger != ContinuumProjectState.TRIGGER_FORCED && project.getState()
!= ContinuumProjectState.NEW )
                 {
                     getLogger().info( "The project was not built because all changes are
unknown." );
 

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java?rev=377500&r1=377499&r2=377500&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
Mon Feb 13 13:42:52 2006
@@ -67,7 +67,7 @@
 
     public String formatTrigger( int trigger )
     {
-        if ( trigger == ContinuumProjectState.TRIGGER_UNKNOWN )
+        if ( trigger == ContinuumProjectState.TRIGGER_SCHEDULED )
         {
             // TODO: fix this
             return "Schedule";

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java?rev=377500&r1=377499&r2=377500&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java
Mon Feb 13 13:42:52 2006
@@ -46,18 +46,18 @@
 
         int projectId = project.getId();
 
-        buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN );
+        buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED );
 
         assertNextBuildIs( projectId );
 
         assertNextBuildIsNull();
 
-        buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN );
+        buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED );
 
-        buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN );
-        buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN );
-        buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN );
-        buildProject( projectId, ContinuumProjectState.TRIGGER_UNKNOWN );
+        buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED );
+        buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED );
+        buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED );
+        buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED );
 
         assertNextBuildIs( projectId );
 
@@ -71,9 +71,9 @@
 
         int projectId2 = addProject( getStore(), "Build Queue Project 3" ).getId();
 
-        buildProject( projectId1, ContinuumProjectState.TRIGGER_UNKNOWN );
+        buildProject( projectId1, ContinuumProjectState.TRIGGER_SCHEDULED );
 
-        buildProject( projectId2, ContinuumProjectState.TRIGGER_UNKNOWN );
+        buildProject( projectId2, ContinuumProjectState.TRIGGER_SCHEDULED );
 
         assertNextBuildIs( projectId1 );
 
@@ -83,8 +83,8 @@
 
         for ( int i = 0; i < 5; i++ )
         {
-            buildProject( projectId1, ContinuumProjectState.TRIGGER_UNKNOWN );
-            buildProject( projectId2, ContinuumProjectState.TRIGGER_UNKNOWN );
+            buildProject( projectId1, ContinuumProjectState.TRIGGER_SCHEDULED );
+            buildProject( projectId2, ContinuumProjectState.TRIGGER_SCHEDULED );
         }
 
         assertNextBuildIs( projectId1 );

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java?rev=377500&r1=377499&r2=377500&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java
Mon Feb 13 13:42:52 2006
@@ -45,7 +45,7 @@
  
         build.setState( ContinuumProjectState.BUILDING );
  
-        build.setTrigger( ContinuumProjectState.TRIGGER_UNKNOWN );
+        build.setTrigger( ContinuumProjectState.TRIGGER_SCHEDULED );
 
         store.addBuildResult( project, build );
 

Modified: maven/continuum/branches/continuum-1.0.x/continuum-model/src/main/java/org/apache/maven/continuum/project/ContinuumProjectState.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-model/src/main/java/org/apache/maven/continuum/project/ContinuumProjectState.java?rev=377500&r1=377499&r2=377500&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-model/src/main/java/org/apache/maven/continuum/project/ContinuumProjectState.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-model/src/main/java/org/apache/maven/continuum/project/ContinuumProjectState.java
Mon Feb 13 13:42:52 2006
@@ -69,7 +69,7 @@
     public static final int TRIGGER_FORCED = 1;
 
     // TODO: remove
-    public static final int TRIGGER_UNKNOWN = 0;
+    public static final int TRIGGER_SCHEDULED = 0;
 
     protected ContinuumProjectState( String name )
     {

Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumTriggerContentGenerator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumTriggerContentGenerator.java?rev=377500&r1=377499&r2=377500&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumTriggerContentGenerator.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumTriggerContentGenerator.java
Mon Feb 13 13:42:52 2006
@@ -37,7 +37,7 @@
         BuildResult result = (BuildResult) item;
         trigger = result.getTrigger();
 
-        if ( trigger == ContinuumProjectState.TRIGGER_UNKNOWN )
+        if ( trigger == ContinuumProjectState.TRIGGER_SCHEDULED )
         {
             return "Scheduled";
         }



Mime
View raw message