svn commit: r1095315 - in /maven/surefire/trunk: maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ surefire-booter/src/main/java/org/apache/maven/surefire/booter/

[kr...@apache.org]

Author: krosenvold
Date: Wed Apr 20 08:20:37 2011
New Revision: 1095315

URL: http://svn.apache.org/viewvc?rev=1095315&view=rev
Log:
o Removed unused code

Modified:
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java?rev=1095315&r1=1095314&r2=1095315&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java Wed Apr 20 08:20:37 2011
@@ -19,6 +19,11 @@ package org.apache.maven.plugin.surefire
  * under the License.
  */
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Properties;
 import org.apache.maven.surefire.booter.BooterConstants;
 import org.apache.maven.surefire.booter.ClassLoaderConfiguration;
 import org.apache.maven.surefire.booter.PropertiesWrapper;
@@ -32,13 +37,6 @@ import org.apache.maven.surefire.testset
 import org.apache.maven.surefire.util.NestedRuntimeException;
 import org.codehaus.plexus.util.StringUtils;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
 /**
  * Knows how to serialize and deserialize the booter configuration.
  * <p/>
@@ -72,11 +70,6 @@ public class BooterSerializer
                            Object testSet )
         throws IOException
     {
-        List params = new ArrayList();
-        params.add(
-            new Object[]{ BooterConstants.DIRSCANNER_OPTIONS, booterConfiguration.getDirScannerParamsArray() } );
-        addPropertiesForTypeHolder( params, properties.getProperties(), BooterConstants.DIRSCANNER_PROPERTY_PREFIX );
-
         providerConfiguration.getClasspathConfiguration().setForkProperties( properties);
 
         TestArtifactInfo testNg = booterConfiguration.getTestArtifact();

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java?rev=1095315&r1=1095314&r2=1095315&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java Wed Apr 20 08:20:37 2011
@@ -29,8 +29,6 @@ public interface BooterConstants
 {
     String INCLUDES_PROPERTY_PREFIX = "includes";
     String EXCLUDES_PROPERTY_PREFIX = "excludes";
-    String DIRSCANNER_PROPERTY_PREFIX = "dirscanner.";
-    String DIRSCANNER_OPTIONS = "directoryScannerOptions";
     String REPORT_PROPERTY_PREFIX = "report.";
     String PARAMS_SUFIX = ".params";
     String TYPES_SUFIX = ".types";

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java?rev=1095315&r1=1095314&r2=1095315&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java Wed Apr 20 08:20:37 2011
@@ -19,15 +19,14 @@ package org.apache.maven.surefire.booter
  * under the License.
  */
 
+import java.io.File;
+import java.util.List;
+import java.util.Properties;
 import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.testset.DirectoryScannerParameters;
 import org.apache.maven.surefire.testset.TestArtifactInfo;
 import org.apache.maven.surefire.testset.TestRequest;
 
-import java.io.File;
-import java.util.List;
-import java.util.Properties;
-
 /**
  * Represents the surefire configuration that passes all the way into the provider
  * classloader and the provider.
@@ -99,16 +98,6 @@ public class ProviderConfiguration
         return dirScannerParams;
     }
 
-    public Object[] getDirScannerParamsArray()
-    {
-        if ( dirScannerParams == null )
-        {
-            return null;
-        }
-        return new Object[]{ dirScannerParams.getTestClassesDirectory(), dirScannerParams.getIncludes(),
-            dirScannerParams.getExcludes() };
-    }
-
     public List getIncludes()
     {
         return dirScannerParams.getIncludes();