svn commit: r398535 - in /maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter: ForkConfiguration.java SurefireBooter.java

[brett]

Author: brett
Date: Sun Apr 30 22:53:28 2006
New Revision: 398535

URL: http://svn.apache.org/viewcvs?rev=398535&view=rev
Log:
[MSUREFIRE-56] rename none to never

Modified:
    
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
    
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java

Modified: 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
URL: 
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java?rev=398535&r1=398534&r2=398535&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
 (original)
+++ 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
 Sun Apr 30 22:53:28 2006
@@ -36,7 +36,7 @@
 
     public static final String FORK_ALWAYS = "always";
 
-    public static final String FORK_NONE = "none";
+    public static final String FORK_NEVER = "never";
 
     private String forkMode;
 
@@ -60,7 +60,11 @@
         {
             this.forkMode = FORK_ALWAYS;
         }
-        else if ( forkMode.equals( FORK_NONE ) || forkMode.equals( FORK_ONCE ) 
|| forkMode.equals( FORK_ALWAYS ) )
+        else if ( "none".equalsIgnoreCase( forkMode ) )
+        {
+            this.forkMode = FORK_NEVER;
+        }
+        else if ( forkMode.equals( FORK_NEVER ) || forkMode.equals( FORK_ONCE 
) || forkMode.equals( FORK_ALWAYS ) )
         {
             this.forkMode = forkMode;
         }
@@ -82,7 +86,7 @@
 
     public boolean isForking()
     {
-        return !FORK_NONE.equals( forkMode );
+        return !FORK_NEVER.equals( forkMode );
     }
 
     public void setSystemProperties( Properties systemProperties )

Modified: 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
URL: 
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java?rev=398535&r1=398534&r2=398535&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
 (original)
+++ 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
 Sun Apr 30 22:53:28 2006
@@ -129,7 +129,7 @@
     {
         boolean result = false;
 
-        if ( ForkConfiguration.FORK_NONE.equals( 
forkConfiguration.getForkMode() ) )
+        if ( ForkConfiguration.FORK_NEVER.equals( 
forkConfiguration.getForkMode() ) )
         {
             result = runSuitesInProcess( false );
         }