maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1236422 - in /maven/surefire/trunk/maven-surefire-common: ./ src/main/java/org/apache/maven/plugin/surefire/ src/main/java/org/apache/maven/plugin/surefire/booterclient/ src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ s...
Date Thu, 26 Jan 2012 22:37:08 GMT
Author: krosenvold
Date: Thu Jan 26 22:37:06 2012
New Revision: 1236422

URL: http://svn.apache.org/viewvc?rev=1236422&view=rev
Log:
o Moved some classes around a bit, tidied the package structure

Added:
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefConsoleReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefFileReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputDirectReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DetailedConsoleReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Reporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/Reporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/Relocator.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/BlockingQueue.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/Java15BlockingQueue.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/Java15BlockingQueue.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java   (contents, props changed)
      - copied, changed from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueue.java
Removed:
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/Reporter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/Relocator.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/BlockingQueue.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/Java15BlockingQueue.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueue.java
Modified:
    maven/surefire/trunk/maven-surefire-common/pom.xml
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/runorder/StatisticsReporter.java
    maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
    maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java
    maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
    maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
    maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java
    maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java

Modified: maven/surefire/trunk/maven-surefire-common/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/pom.xml?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-common/pom.xml Thu Jan 26 22:37:06 2012
@@ -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>

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=1236422&r1=1236421&r2=1236422&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 Thu Jan 26 22:37:06 2012
@@ -57,7 +57,6 @@ import org.apache.maven.surefire.booter.
 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;

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java Thu Jan 26 22:37:06 2012
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.surefire
 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;
 

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java Thu Jan 26 22:37:06 2012
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.surefire
 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;
 

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java Thu Jan 26 22:37:06 2012
@@ -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 @@ package org.apache.maven.surefire.booter
 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 class StartupReportConfiguration
         return reportsDirectory;
     }
 
-    public XMLReporter2 instantiateXmlReporter()
+    public XMLReporter instantiateXmlReporter()
     {
         if ( !isDisableXmlReport() )
         {
-            return new XMLReporter2( trimStackTrace, reportsDirectory, reportNameSuffix );
+            return new XMLReporter( trimStackTrace, reportsDirectory, reportNameSuffix );
         }
         return null;
     }

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java Thu Jan 26 22:37:06 2012
@@ -30,11 +30,11 @@ import java.util.Properties;
 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;

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java Thu Jan 26 22:37:06 2012
@@ -32,6 +32,7 @@ import java.util.concurrent.Future;
 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.
 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;

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java Thu Jan 26 22:37:06 2012
@@ -19,8 +19,8 @@ package org.apache.maven.plugin.surefire
  * 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;
 
 /**

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java Thu Jan 26 22:37:06 2012
@@ -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.BufferedOutputStream;
 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.

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java Thu Jan 26 22:37:06 2012
@@ -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.File;
 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.

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractReporter.java Thu Jan 26 22:37:06 2012
@@ -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 @@ package org.apache.maven.surefire.report
 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>

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractReporter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java Thu Jan 26 22:37:06 2012
@@ -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 @@ package org.apache.maven.surefire.report
 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.

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefConsoleReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefConsoleReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefConsoleReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefConsoleReporter.java Thu Jan 26 22:37:06 2012
@@ -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

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefConsoleReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefConsoleReporter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefFileReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefFileReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefFileReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefFileReporter.java Thu Jan 26 22:37:06 2012
@@ -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

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefFileReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefFileReporter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputDirectReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputDirectReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputDirectReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputDirectReporter.java Thu Jan 26 22:37:06 2012
@@ -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 @@ package org.apache.maven.surefire.report
  */
 
 import java.io.PrintStream;
+import org.apache.maven.surefire.report.ReportEntry;
 
 /**
  * Outputs test system out/system err directly to the console

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputDirectReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java Thu Jan 26 22:37:06 2012
@@ -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.FileWriter;
 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;
 
 /**

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java Thu Jan 26 22:37:06 2012
@@ -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

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DetailedConsoleReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DetailedConsoleReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DetailedConsoleReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DetailedConsoleReporter.java Thu Jan 26 22:37:06 2012
@@ -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

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DetailedConsoleReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DetailedConsoleReporter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java Thu Jan 26 22:37:06 2012
@@ -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

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java Thu Jan 26 22:37:06 2012
@@ -19,23 +19,19 @@ package org.apache.maven.plugin.surefire
  * 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/>

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java Thu Jan 26 22:37:06 2012
@@ -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 @@ package org.apache.maven.surefire.report
  */
 
 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

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java Thu Jan 26 22:37:06 2012
@@ -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

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Reporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/Reporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Reporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Reporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/Reporter.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/Reporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Reporter.java Thu Jan 26 22:37:06 2012
@@ -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 @@ package org.apache.maven.surefire.report
  * under the License.
  */
 
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.ReporterException;
+
 /**
  * Persists reports somewhere
  * <p/>

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Reporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Reporter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java Thu Jan 26 22:37:06 2012
@@ -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 @@ package org.apache.maven.surefire.report
  */
 
 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 )
     {
 

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java Thu Jan 26 22:37:06 2012
@@ -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.Iterator;
 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 @@ import org.codehaus.plexus.util.xml.Xpp3
  * @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;

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/runorder/StatisticsReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/runorder/StatisticsReporter.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/runorder/StatisticsReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/runorder/StatisticsReporter.java Thu Jan 26 22:37:06 2012
@@ -21,8 +21,8 @@ package org.apache.maven.plugin.surefire
 
 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;
 
 /**

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/Relocator.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/Relocator.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/Relocator.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java Thu Jan 26 22:37:06 2012
@@ -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

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/BlockingQueue.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/BlockingQueue.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/BlockingQueue.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java Thu Jan 26 22:37:06 2012
@@ -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

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/FunkyTwoThreadBlockingQueue.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/FunkyTwoThreadBlockingQueue.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/FunkyTwoThreadBlockingQueue.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java Thu Jan 26 22:37:06 2012
@@ -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

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/Java15BlockingQueue.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/Java15BlockingQueue.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/Java15BlockingQueue.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/Java15BlockingQueue.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/Java15BlockingQueue.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/Java15BlockingQueue.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/Java15BlockingQueue.java Thu Jan 26 22:37:06 2012
@@ -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

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/Java15BlockingQueue.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java (from r1236421, maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueue.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java&p1=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueue.java&r1=1236421&r2=1236422&rev=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueue.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java Thu Jan 26 22:37:06 2012
@@ -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

Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java Thu Jan 26 22:37:06 2012
@@ -19,8 +19,8 @@ package org.apache.maven.plugin.surefire
  * under the License.
  */
 
+import org.apache.maven.plugin.surefire.StartupReportConfiguration;
 import org.apache.maven.plugin.surefire.report.FileReporterFactory;
-import org.apache.maven.surefire.booter.StartupReportConfiguration;
 import org.apache.maven.surefire.report.RunListener;
 
 /**

Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java Thu Jan 26 22:37:06 2012
@@ -20,6 +20,8 @@ package org.apache.maven.surefire.report
  */
 
 import java.io.File;
+import org.apache.maven.plugin.surefire.report.ConsoleOutputFileReporter;
+
 import junit.framework.TestCase;
 
 public class ConsoleOutputFileReporterTest

Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java Thu Jan 26 22:37:06 2012
@@ -20,6 +20,8 @@ package org.apache.maven.surefire.report
  */
 
 import java.io.File;
+import org.apache.maven.plugin.surefire.report.FileReporter;
+
 import junit.framework.TestCase;
 
 public class FileReporterTest

Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java Thu Jan 26 22:37:06 2012
@@ -20,6 +20,7 @@ package org.apache.maven.surefire.report
  */
 
 import java.io.File;
+import org.apache.maven.plugin.surefire.report.XMLReporter;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import junit.framework.AssertionFailedError;
@@ -29,7 +30,7 @@ public class XMLReporterTest
     extends TestCase
 {
 
-    private XMLReporter2 reporter;
+    private XMLReporter reporter;
 
     private ReportEntry reportEntry;
 
@@ -39,7 +40,7 @@ public class XMLReporterTest
         throws Exception
     {
         super.setUp();
-        reporter = new XMLReporter2( true, new File( "." ));
+        reporter = new XMLReporter( true, new File( "." ));
         message = "junit.framework.AssertionFailedError";
         reportEntry = new SimpleReportEntry( this.getClass().getName(), "XMLReporterTest",
                                              new PojoStackTraceWriter( "", "", new AssertionFailedError() ) ,
@@ -64,7 +65,7 @@ public class XMLReporterTest
         assertResult( reporter, message );
     }
 
-    private void assertResult( XMLReporter2 reporter, String message )
+    private void assertResult( XMLReporter reporter, String message )
     {
         Xpp3Dom result = (Xpp3Dom) reporter.getResults().next();
         Xpp3Dom child = result.getChild( "error" );
@@ -79,7 +80,7 @@ public class XMLReporterTest
         File reportDir = new File( "." );
         String testName = "org.apache.maven.surefire.report.XMLReporterTest";
         reportEntry = new SimpleReportEntry( this.getClass().getName(), testName, new Integer( 12) );
-        reporter = new XMLReporter2( true, reportDir, null );
+        reporter = new XMLReporter( true, reportDir, null );
         reporter.testSetCompleted( reportEntry );
 
         File expectedReportFile = new File( reportDir, "TEST-" + testName + ".xml" );
@@ -96,7 +97,7 @@ public class XMLReporterTest
         String testName = "org.apache.maven.surefire.report.XMLReporterTest";
         String suffixText = "sampleSuffixText";
         reportEntry = new SimpleReportEntry( this.getClass().getName(), testName );
-        reporter = new XMLReporter2( true, reportDir, suffixText );
+        reporter = new XMLReporter( true, reportDir, suffixText );
         reporter.testSetCompleted( reportEntry );
 
         File expectedReportFile = new File( reportDir, "TEST-" + testName + "-" + suffixText + ".xml" );

Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java Thu Jan 26 22:37:06 2012
@@ -19,6 +19,8 @@ package org.apache.maven.surefire.util;
  * under the License.
  */
 
+import org.apache.maven.plugin.surefire.util.Relocator;
+
 import junit.framework.TestCase;
 
 /**

Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java?rev=1236422&r1=1236421&r2=1236422&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java Thu Jan 26 22:37:06 2012
@@ -26,6 +26,10 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import org.apache.maven.plugin.surefire.util.internal.BlockingQueue;
+import org.apache.maven.plugin.surefire.util.internal.FunkyTwoThreadBlockingQueue;
+import org.apache.maven.plugin.surefire.util.internal.TwoThreadBlockingQueue;
+
 import junit.framework.Assert;
 import junit.framework.TestCase;
 



Mime
View raw message