continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r386338 - in /maven/continuum/branches/continuum-1.0.x: continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/ continuum-core/src/main/java/org/apache/maven/continuu...
Date Thu, 16 Mar 2006 14:15:13 GMT
Author: evenisse
Date: Thu Mar 16 06:15:10 2006
New Revision: 386338

URL: http://svn.apache.org/viewcvs?rev=386338&view=rev
Log:
Rename CHECKOUTED to CHECKEDOUT as suggested by brett

Modified:
    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/core/action/CheckoutProjectContinuumAction.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.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-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/ContinuumStateContentGenerator.java

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=386338&r1=386337&r2=386338&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
Thu Mar 16 06:15:10 2006
@@ -464,7 +464,7 @@
             Project project = store.getProject( projectId );
 
             if ( project.getState() != ContinuumProjectState.NEW &&
-                project.getState() != ContinuumProjectState.CHECKOUTED &&
+                project.getState() != ContinuumProjectState.CHECKEDOUT &&
                 project.getState() != ContinuumProjectState.OK && project.getState()
!= ContinuumProjectState.FAILED &&
                 project.getState() != ContinuumProjectState.ERROR )
             {
@@ -1840,7 +1840,7 @@
             Project project = (Project) it.next();
 
             if ( project.getState() != ContinuumProjectState.NEW &&
-                project.getState() != ContinuumProjectState.CHECKOUTED &&
+                project.getState() != ContinuumProjectState.CHECKEDOUT &&
                 project.getState() != ContinuumProjectState.OK && project.getState()
!= ContinuumProjectState.FAILED &&
                 project.getState() != ContinuumProjectState.ERROR )
             {

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=386338&r1=386337&r2=386338&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
Thu Mar 16 06:15:10 2006
@@ -236,10 +236,10 @@
                 }
 
                 if ( allChangesUnknown && project.getOldState() != ContinuumProjectState.NEW
&&
-                    project.getOldState() != ContinuumProjectState.CHECKOUTED &&
+                    project.getOldState() != ContinuumProjectState.CHECKEDOUT &&
                     trigger != ContinuumProjectState.TRIGGER_FORCED &&
                     project.getState() != ContinuumProjectState.NEW &&
-                    project.getState() != ContinuumProjectState.CHECKOUTED )
+                    project.getState() != ContinuumProjectState.CHECKEDOUT )
                 {
                     getLogger().info( "The project was not built because all changes are
unknown." );
 
@@ -350,7 +350,7 @@
             }
 
             if ( project.getState() != ContinuumProjectState.NEW &&
-                project.getState() != ContinuumProjectState.CHECKOUTED &&
+                project.getState() != ContinuumProjectState.CHECKEDOUT &&
                 project.getState() != ContinuumProjectState.OK && project.getState()
!= ContinuumProjectState.FAILED &&
                 project.getState() != ContinuumProjectState.ERROR )
             {

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java?rev=386338&r1=386337&r2=386338&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
Thu Mar 16 06:15:10 2006
@@ -90,7 +90,7 @@
         }
         finally
         {
-            project.setState( ContinuumProjectState.CHECKOUTED );
+            project.setState( ContinuumProjectState.CHECKEDOUT );
 
             store.updateProject( project );
         }

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=386338&r1=386337&r2=386338&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
Thu Mar 16 06:15:10 2006
@@ -80,7 +80,7 @@
         // ----------------------------------------------------------------------
 
         if ( project.getOldState() != ContinuumProjectState.NEW &&
-            project.getOldState() != ContinuumProjectState.CHECKOUTED && scmResult.getChanges().size()
== 0 &&
+            project.getOldState() != ContinuumProjectState.CHECKEDOUT && scmResult.getChanges().size()
== 0 &&
             trigger != ContinuumProjectState.TRIGGER_FORCED && !isNew( project )
)
         {
             getLogger().info( "No files updated, not building. Project id '" + project.getId()
+ "'." );
@@ -180,6 +180,6 @@
     private boolean isNew( Project project )
     {
         return project.getState() == ContinuumProjectState.NEW ||
-            project.getState() == ContinuumProjectState.CHECKOUTED;
+            project.getState() == ContinuumProjectState.CHECKEDOUT;
     }
 }

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=386338&r1=386337&r2=386338&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
Thu Mar 16 06:15:10 2006
@@ -39,7 +39,7 @@
     // TODO: Add i18n
     public String formatProjectState( int state )
     {
-        if ( state == ContinuumProjectState.NEW || state == ContinuumProjectState.CHECKOUTED
)
+        if ( state == ContinuumProjectState.NEW || state == ContinuumProjectState.CHECKEDOUT
)
         {
             return "New";
         }

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=386338&r1=386337&r2=386338&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
Thu Mar 16 06:15:10 2006
@@ -67,7 +67,7 @@
     /**
      * This state indicates that sources are checkouted.
      */
-    public final static int CHECKOUTED = 10;
+    public final static int CHECKEDOUT = 10;
 
     private String name;
 

Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.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/ContinuumStateContentGenerator.java?rev=386338&r1=386337&r2=386338&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java
Thu Mar 16 06:15:10 2006
@@ -49,7 +49,7 @@
             state = buildResult.getState();
         }
 
-        if ( state == ContinuumProjectState.NEW || state == ContinuumProjectState.CHECKOUTED
)
+        if ( state == ContinuumProjectState.NEW || state == ContinuumProjectState.CHECKEDOUT
)
         {
             return "New";
         }



Mime
View raw message