o Moved some classes around a bit, tidied the package structure

git-svn-id: https://svn.apache.org/repos/asf/maven/surefire/trunk@1236422 13f79535-47bb-0310-9956-ffa450edef68
jsievers · Jan 26, 2012 · 5ecdf5a · 5ecdf5a
1 parent 4071d48
commit 5ecdf5a
Show file tree

Hide file tree

Showing 37 changed files with 92 additions and 63 deletions.
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
@@ -112,8 +112,8 @@
               </artifactSet>
               <relocations>
                 <relocation>
-                  <pattern>org.codehaus.plexus.util</pattern>
-                  <shadedPattern>org.apache.maven.plugin.surefire.report.plexus.util</shadedPattern>
+                  <pattern>org.codehaus.plexus.util.xml</pattern>
+                  <shadedPattern>org.apache.maven.plugin.surefire.report.plexus.util.xml</shadedPattern>
                 </relocation>
               </relocations>
             </configuration>

diff --git a/...-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/...-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -57,7 +57,6 @@
 import org.apache.maven.surefire.booter.ProviderConfiguration;
 import org.apache.maven.surefire.booter.ProviderParameterNames;
 import org.apache.maven.surefire.booter.StartupConfiguration;
-import org.apache.maven.surefire.booter.StartupReportConfiguration;
 import org.apache.maven.surefire.booter.SurefireBooterForkException;
 import org.apache.maven.surefire.booter.SurefireExecutionException;
 import org.apache.maven.surefire.report.ReporterConfiguration;

diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
@@ -22,7 +22,6 @@
 import java.io.File;
 import java.lang.reflect.Constructor;
 import org.apache.maven.plugin.surefire.report.FileReporterFactory;
-import org.apache.maven.surefire.booter.StartupReportConfiguration;
 import org.apache.maven.surefire.util.ReflectionUtils;
 import org.apache.maven.surefire.util.SurefireReflectionException;
 

diff --git a/...fire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java b/...fire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java
@@ -22,7 +22,6 @@
 import org.apache.maven.surefire.booter.ProviderConfiguration;
 import org.apache.maven.surefire.booter.ProviderFactory;
 import org.apache.maven.surefire.booter.StartupConfiguration;
-import org.apache.maven.surefire.booter.StartupReportConfiguration;
 import org.apache.maven.surefire.booter.SurefireExecutionException;
 import org.apache.maven.surefire.suite.RunResult;
 

diff --git a/...re/booter/StartupReportConfiguration.java → .../surefire/StartupReportConfiguration.java b/...re/booter/StartupReportConfiguration.java → .../surefire/StartupReportConfiguration.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.booter;
+package org.apache.maven.plugin.surefire;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,18 +22,18 @@
 import java.io.File;
 import java.io.PrintStream;
 import java.util.Properties;
+import org.apache.maven.plugin.surefire.report.AbstractConsoleReporter;
+import org.apache.maven.plugin.surefire.report.AbstractFileReporter;
+import org.apache.maven.plugin.surefire.report.BriefConsoleReporter;
+import org.apache.maven.plugin.surefire.report.BriefFileReporter;
+import org.apache.maven.plugin.surefire.report.ConsoleOutputDirectReporter;
+import org.apache.maven.plugin.surefire.report.ConsoleOutputFileReporter;
+import org.apache.maven.plugin.surefire.report.ConsoleReporter;
+import org.apache.maven.plugin.surefire.report.DetailedConsoleReporter;
+import org.apache.maven.plugin.surefire.report.FileReporter;
+import org.apache.maven.plugin.surefire.report.Reporter;
+import org.apache.maven.plugin.surefire.report.XMLReporter;
 import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
-import org.apache.maven.surefire.report.AbstractConsoleReporter;
-import org.apache.maven.surefire.report.AbstractFileReporter;
-import org.apache.maven.surefire.report.BriefConsoleReporter;
-import org.apache.maven.surefire.report.BriefFileReporter;
-import org.apache.maven.surefire.report.ConsoleOutputDirectReporter;
-import org.apache.maven.surefire.report.ConsoleOutputFileReporter;
-import org.apache.maven.surefire.report.ConsoleReporter;
-import org.apache.maven.surefire.report.DetailedConsoleReporter;
-import org.apache.maven.surefire.report.FileReporter;
-import org.apache.maven.surefire.report.Reporter;
-import org.apache.maven.surefire.report.XMLReporter2;
 
 /**
  * All the parameters used to construct reporters
@@ -135,11 +135,11 @@ public File getReportsDirectory()
         return reportsDirectory;
     }
 
-    public XMLReporter2 instantiateXmlReporter()
+    public XMLReporter instantiateXmlReporter()
     {
         if ( !isDisableXmlReport() )
         {
-            return new XMLReporter2( trimStackTrace, reportsDirectory, reportNameSuffix );
+            return new XMLReporter( trimStackTrace, reportsDirectory, reportNameSuffix );
         }
         return null;
     }

diff --git a/...common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java b/...common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
@@ -30,11 +30,11 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
+import org.apache.maven.plugin.surefire.util.Relocator;
 import org.apache.maven.surefire.booter.ClassLoaderConfiguration;
 import org.apache.maven.surefire.booter.Classpath;
 import org.apache.maven.surefire.booter.ForkedBooter;
 import org.apache.maven.surefire.booter.SurefireBooterForkException;
-import org.apache.maven.surefire.util.Relocator;
 import org.apache.maven.surefire.util.UrlUtils;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.Commandline;

diff --git a/...efire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/...efire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -32,6 +32,7 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import org.apache.maven.plugin.surefire.CommonReflector;
+import org.apache.maven.plugin.surefire.StartupReportConfiguration;
 import org.apache.maven.plugin.surefire.booterclient.output.ForkClient;
 import org.apache.maven.plugin.surefire.booterclient.output.ThreadedStreamConsumer;
 import org.apache.maven.plugin.surefire.report.FileReporterFactory;
@@ -40,7 +41,6 @@
 import org.apache.maven.surefire.booter.ProviderConfiguration;
 import org.apache.maven.surefire.booter.ProviderFactory;
 import org.apache.maven.surefire.booter.StartupConfiguration;
-import org.apache.maven.surefire.booter.StartupReportConfiguration;
 import org.apache.maven.surefire.booter.SurefireBooterForkException;
 import org.apache.maven.surefire.booter.SurefireExecutionException;
 import org.apache.maven.surefire.booter.SystemPropertyManager;

diff --git a/...ain/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java b/...ain/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import org.apache.maven.surefire.util.internal.BlockingQueue;
-import org.apache.maven.surefire.util.internal.Java15BlockingQueue;
+import org.apache.maven.plugin.surefire.util.internal.BlockingQueue;
+import org.apache.maven.plugin.surefire.util.internal.Java15BlockingQueue;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
 /**

diff --git a/...efire/report/AbstractConsoleReporter.java → ...efire/report/AbstractConsoleReporter.java b/...efire/report/AbstractConsoleReporter.java → ...efire/report/AbstractConsoleReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,8 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintStream;
 import java.io.PrintWriter;
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.ReporterException;
 
 /**
  * Base class for console reporters.

diff --git a/...surefire/report/AbstractFileReporter.java → ...surefire/report/AbstractFileReporter.java b/...surefire/report/AbstractFileReporter.java → ...surefire/report/AbstractFileReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,8 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.ReporterException;
 
 /**
  * Base class for file reporters.

diff --git a/...ven/surefire/report/AbstractReporter.java → ...gin/surefire/report/AbstractReporter.java b/...ven/surefire/report/AbstractReporter.java → ...gin/surefire/report/AbstractReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,9 @@
 import java.io.File;
 import java.text.NumberFormat;
 import java.util.Locale;
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.ReporterException;
+import org.apache.maven.surefire.report.StackTraceWriter;
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>

diff --git a/...surefire/report/AbstractTextReporter.java → ...surefire/report/AbstractTextReporter.java b/...surefire/report/AbstractTextReporter.java → ...surefire/report/AbstractTextReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,8 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.ReporterException;
 
 /**
  * Text based reporter.

diff --git a/...surefire/report/BriefConsoleReporter.java → ...surefire/report/BriefConsoleReporter.java b/...surefire/report/BriefConsoleReporter.java → ...surefire/report/BriefConsoleReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/...en/surefire/report/BriefFileReporter.java → ...in/surefire/report/BriefFileReporter.java b/...en/surefire/report/BriefFileReporter.java → ...in/surefire/report/BriefFileReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/...e/report/ConsoleOutputDirectReporter.java → ...e/report/ConsoleOutputDirectReporter.java b/...e/report/ConsoleOutputDirectReporter.java → ...e/report/ConsoleOutputDirectReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,7 @@
  */
 
 import java.io.PrintStream;
+import org.apache.maven.surefire.report.ReportEntry;
 
 /**
  * Outputs test system out/system err directly to the console

diff --git a/...ire/report/ConsoleOutputFileReporter.java → ...ire/report/ConsoleOutputFileReporter.java b/...ire/report/ConsoleOutputFileReporter.java → ...ire/report/ConsoleOutputFileReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,6 +25,8 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.ReporterException;
 import org.apache.maven.surefire.util.NestedRuntimeException;
 
 /**

diff --git a/...aven/surefire/report/ConsoleReporter.java → ...ugin/surefire/report/ConsoleReporter.java b/...aven/surefire/report/ConsoleReporter.java → ...ugin/surefire/report/ConsoleReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/...efire/report/DetailedConsoleReporter.java → ...efire/report/DetailedConsoleReporter.java b/...efire/report/DetailedConsoleReporter.java → ...efire/report/DetailedConsoleReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/...e/maven/surefire/report/FileReporter.java → .../plugin/surefire/report/FileReporter.java b/...e/maven/surefire/report/FileReporter.java → .../plugin/surefire/report/FileReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/...ire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java b/...ire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java
@@ -19,23 +19,19 @@
  * under the License.
  */
 
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.maven.plugin.surefire.StartupReportConfiguration;
 import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
-import org.apache.maven.surefire.booter.StartupReportConfiguration;
 import org.apache.maven.surefire.report.ConsoleLogger;
 import org.apache.maven.surefire.report.DefaultDirectConsoleReporter;
-import org.apache.maven.surefire.report.MulticastingReporter;
-import org.apache.maven.surefire.report.Reporter;
 import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.report.ReporterFactory;
 import org.apache.maven.surefire.report.RunListener;
 import org.apache.maven.surefire.report.RunStatistics;
-import org.apache.maven.surefire.report.TestSetRunListener;
 import org.apache.maven.surefire.suite.RunResult;
 
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Provides RunListener implementations to the providers.
  * <p/>

diff --git a/...surefire/report/MulticastingReporter.java → ...surefire/report/MulticastingReporter.java b/...surefire/report/MulticastingReporter.java → ...surefire/report/MulticastingReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,8 @@
  */
 
 import java.util.List;
+import org.apache.maven.surefire.report.CategorizedReportEntry;
+import org.apache.maven.surefire.report.ReportEntry;
 
 /**
  * A reporter that broadcasts to other reporters

diff --git a/...surefire/report/PrettyPrintXMLWriter.java → ...surefire/report/PrettyPrintXMLWriter.java b/...surefire/report/PrettyPrintXMLWriter.java → ...surefire/report/PrettyPrintXMLWriter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/...pache/maven/surefire/report/Reporter.java → ...aven/plugin/surefire/report/Reporter.java b/...pache/maven/surefire/report/Reporter.java → ...aven/plugin/surefire/report/Reporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,9 @@
  * under the License.
  */
 
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.ReporterException;
+
 /**
  * Persists reports somewhere
  * <p/>

diff --git a/...n/surefire/report/TestSetRunListener.java → ...n/surefire/report/TestSetRunListener.java b/...n/surefire/report/TestSetRunListener.java → ...n/surefire/report/TestSetRunListener.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,12 @@
  */
 
 import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
+import org.apache.maven.surefire.report.ConsoleLogger;
+import org.apache.maven.surefire.report.ConsoleOutputReceiver;
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.RunListener;
+import org.apache.maven.surefire.report.RunStatistics;
+import org.apache.maven.surefire.report.TestSetStatistics;
 import org.apache.maven.surefire.util.internal.ByteBuffer;
 
 import java.util.ArrayList;
@@ -46,7 +52,7 @@ public class TestSetRunListener
 
 
     public TestSetRunListener( AbstractConsoleReporter consoleReporter, AbstractFileReporter fileReporter,
-                               XMLReporter2 xmlReporter, Reporter reporter, StatisticsReporter statisticsReporter,
+                               XMLReporter xmlReporter, Reporter reporter, StatisticsReporter statisticsReporter,
                                RunStatistics globalStats )
     {
 

diff --git a/...e/maven/surefire/report/XMLReporter2.java → ...n/plugin/surefire/report/XMLReporter.java b/...e/maven/surefire/report/XMLReporter2.java → ...n/plugin/surefire/report/XMLReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.report;
+package org.apache.maven.plugin.surefire.report;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -33,6 +33,8 @@
 import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.ReporterException;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomWriter;
@@ -70,7 +72,7 @@
  * @see <a href="http://wiki.apache.org/ant/Proposals/EnhancedTestReports">Ant's format enhancement proposal</a>
  * (not yet implemented by Ant 1.8.2)
  */
-public class XMLReporter2
+public class XMLReporter
     extends AbstractReporter
 {
     private static final String LS = System.getProperty( "line.separator" );
@@ -85,12 +87,12 @@ public class XMLReporter2
 
     private int elapsed = 0;
 
-    public XMLReporter2( boolean trimStackTrace, File reportsDirectory )
+    public XMLReporter( boolean trimStackTrace, File reportsDirectory )
     {
         this( trimStackTrace, reportsDirectory, null );
     }
 
-    public XMLReporter2( boolean trimStackTrace, File reportsDirectory, String reportNameSuffix )
+    public XMLReporter( boolean trimStackTrace, File reportsDirectory, String reportNameSuffix )
     {
         super( trimStackTrace );
         this.reportsDirectory = reportsDirectory;

diff --git a/...re-common/src/main/java/org/apache/maven/plugin/surefire/runorder/StatisticsReporter.java b/...re-common/src/main/java/org/apache/maven/plugin/surefire/runorder/StatisticsReporter.java
@@ -21,8 +21,8 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import org.apache.maven.plugin.surefire.report.Reporter;
 import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.Reporter;
 import org.apache.maven.surefire.util.NestedRuntimeException;
 
 /**

diff --git a/...apache/maven/surefire/util/Relocator.java → ...maven/plugin/surefire/util/Relocator.java b/...apache/maven/surefire/util/Relocator.java → ...maven/plugin/surefire/util/Relocator.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.util;
+package org.apache.maven.plugin.surefire.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/...surefire/util/internal/BlockingQueue.java → ...surefire/util/internal/BlockingQueue.java b/...surefire/util/internal/BlockingQueue.java → ...surefire/util/internal/BlockingQueue.java
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.util.internal;
+package org.apache.maven.plugin.surefire.util.internal;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one