maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1043216 - in /maven/surefire/trunk: maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
Date Tue, 07 Dec 2010 22:18:04 GMT
Author: krosenvold
Date: Tue Dec  7 22:18:04 2010
New Revision: 1043216

URL: http://svn.apache.org/viewvc?rev=1043216&view=rev
Log:
o Removed some dead code

Modified:
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java?rev=1043216&r1=1043215&r2=1043216&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
(original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
Tue Dec  7 22:18:04 2010
@@ -242,14 +242,11 @@ public abstract class AbstractSurefireMo
 
         surefireArtifact.isSnapshot(); // MNG-2961: before Maven 2.0.8, fixes getBaseVersion
to be -SNAPSHOT if needed
 
-        Artifact junitArtifact;
         Artifact testNgArtifact;
         try
         {
             addArtifact( forkConfiguration.getBootClasspath(), surefireArtifact );
 
-            junitArtifact = getJunitArtifact();
-
             testNgArtifact = getTestNgArtifact();
         }
         catch ( ArtifactNotFoundException e )

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java?rev=1043216&r1=1043215&r2=1043216&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
(original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
Tue Dec  7 22:18:04 2010
@@ -63,15 +63,8 @@ public class BooterDeserializer
         throws IOException
     {
         DirectoryScannerParameters dirScannerParams;
-        boolean enableAssertions = false;
-        boolean childDelegation = true;
         boolean failIfNotests = false;  // todo; check this out.
-        boolean useSystemClassLoader = false; // todo check default value
-        boolean useManifestOnlyJar = false; // todo check default value
-
-        SortedMap classPathUrls = new TreeMap();
 
-        SortedMap surefireClassPathUrls = new TreeMap();
         SortedMap reportsMap = new TreeMap();
 
         boolean isTrimStackTrace = false;
@@ -83,7 +76,6 @@ public class BooterDeserializer
         String requestedTest = null;
         File sourceDirectory = null;
         Object[] testSuiteXmlFiles = null;
-        String providerConfiguration = null;
         SortedMap includes = new TreeMap();
         SortedMap excludes = new TreeMap();
         File testClassesDirectory = null;
@@ -107,32 +99,6 @@ public class BooterDeserializer
                 String className = properties.getProperty( name );
                 excludes.put( name, className );
             }
-            else if ( name.startsWith( CLASSPATH_URL ) )
-            {
-                classPathUrls.put( Integer.valueOf( name.substring( name.indexOf( '.' ) +
1 ) ),
-                                   properties.getProperty( name ) );
-            }
-            else if ( name.startsWith( SUREFIRE_CLASSPATHURL ) )
-            {
-                surefireClassPathUrls.put( Integer.valueOf( name.substring( name.indexOf(
'.' ) + 1 ) ),
-                                           properties.getProperty( name ) );
-            }
-            else if ( CHILD_DELEGATION.equals( name ) )
-            {
-                childDelegation = properties.getBooleanProperty( CHILD_DELEGATION );
-            }
-            else if ( ENABLE_ASSERTIONS.equals( name ) )
-            {
-                enableAssertions = properties.getBooleanProperty( ENABLE_ASSERTIONS );
-            }
-            else if ( USESYSTEMCLASSLOADER.equals( name ) )
-            {
-                useSystemClassLoader = properties.getBooleanProperty( USESYSTEMCLASSLOADER
);
-            }
-            else if ( USEMANIFESTONLYJAR.equals( name ) )
-            {
-                useManifestOnlyJar = properties.getBooleanProperty( USEMANIFESTONLYJAR );
-            }
             else if ( FAILIFNOTESTS.equals( name ) )
             {
                 failIfNotests = properties.getBooleanProperty( FAILIFNOTESTS );
@@ -175,10 +141,6 @@ public class BooterDeserializer
             {
                 testSuiteXmlFiles = constructParamObjects( properties.getProperty( TEST_SUITE_XML_FILES
), File.class );
             }
-            else if ( PROVIDER_CONFIGURATION.equals( name ) )
-            {
-                providerConfiguration = properties.getProperty( PROVIDER_CONFIGURATION );
-            }
         }
 
         dirScannerParams = new DirectoryScannerParameters( testClassesDirectory, new ArrayList(
includes.values() ),
@@ -188,19 +150,11 @@ public class BooterDeserializer
         TestArtifactInfo testNg = new TestArtifactInfo( testNgVersion, testNgClassifier );
         TestRequest testSuiteDefinition = new TestRequest( testSuiteXmlFiles, sourceDirectory,
requestedTest );
 
-        ClassLoaderConfiguration classLoaderConfiguration =
-            new ClassLoaderConfiguration( useSystemClassLoader, useManifestOnlyJar );
-
-        ClasspathConfiguration classpathConfiguration =
-            new ClasspathConfiguration( classPathUrls, surefireClassPathUrls, enableAssertions,
childDelegation );
-
         List reports = new ArrayList( reportsMap.values() );
 
         ReporterConfiguration reporterConfiguration =
             new ReporterConfiguration( reports, reportsDirectory, valueOf( isTrimStackTrace
) );
 
-        StartupConfiguration surefireStarterConfiguration =
-            StartupConfiguration.inForkedVm( providerConfiguration, classpathConfiguration,
classLoaderConfiguration );
         return new ProviderConfiguration(reports, dirScannerParams, failIfNotests,
                                         reporterConfiguration, testNg, testSuiteDefinition,
properties.getProperties(),
                                         testForFork );



Mime
View raw message