Mailing-List: contact surefire-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
Reply-To: surefire-dev@maven.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1042299 - in /maven/surefire/trunk:
 maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Date: Sun, 05 Dec 2010 10:00:09 -0000
To: surefire-commits@maven.apache.org
From: krosenvold@apache.org
Message-Id: <20101205100009.175E523889E7@eris.apache.org>

Author: krosenvold
Date: Sun Dec  5 10:00:08 2010
New Revision: 1042299

URL: http://svn.apache.org/viewvc?rev=1042299&view=rev
Log:
o Removed some dead code that also contained sout's

Thanks to the watchful eyes out there ;)

Modified:
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
    maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.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=1042299&r1=1042298&r2=1042299&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 Sun Dec  5 10:00:08 2010
@@ -153,7 +153,7 @@ public abstract class AbstractSurefireMo
             }
             if ( objects.size() > 1 )
             {
-                throw new IllegalArgumentException( "Surefire currently only supports " );
+                throw new IllegalArgumentException( "Surefire currently only supports on manually configured provider" );
             }
             return (String) objects.iterator().next();
 

Modified: maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=1042299&r1=1042298&r2=1042299&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java Sun Dec  5 10:00:08 2010
@@ -31,26 +31,16 @@ import org.apache.maven.plugin.surefire.
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.surefire.booter.BooterConfiguration;
 import org.apache.maven.surefire.booter.Classpath;
-import org.apache.maven.surefire.booter.ProviderDetector;
 import org.apache.maven.surefire.booter.SurefireBooterForkException;
 import org.apache.maven.surefire.booter.SurefireExecutionException;
-import org.apache.maven.surefire.providerapi.ProviderFactory;
-import org.apache.maven.surefire.providerapi.SurefireProvider;
 import org.apache.maven.toolchain.ToolchainManager;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.context.Context;
-import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
 
 /**
  * Run tests using Surefire.
@@ -65,7 +55,7 @@ import java.util.Set;
  */
 public class SurefirePlugin
     extends AbstractSurefireMojo
-    implements SurefireExecutionParameters, SurefireReportParameters, org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable
+    implements SurefireExecutionParameters, SurefireReportParameters
 {
 
     /**
@@ -574,15 +564,6 @@ public class SurefirePlugin
      */
     private ToolchainManager toolchainManager;
 
-    private PlexusContainer container;
-
-
-    public void contextualize( Context context )
-        throws ContextException
-    {
-        container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
-    }
-
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
@@ -594,17 +575,6 @@ public class SurefirePlugin
 
             BooterConfiguration booterConfiguration = createBooterConfiguration( forkConfiguration, provider );
 
-            try
-            {
-                final Set objects =
-                    ProviderDetector.getServiceNames( SurefireProvider.class, Thread.currentThread().getContextClassLoader());
-                System.out.println(objects);
-            }
-            catch ( IOException e )
-            {
-                e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-            }
-
             getLog().info(
                 StringUtils.capitalizeFirstLetter( getPluginName() ) + " report directory: " + getReportsDirectory() );