You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/01/26 23:33:53 UTC
svn commit: r1236421 - in /maven/surefire/trunk: maven-surefire-common/
maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/
maven-surefire-common/src/main/java/org/apache/maven/surefire/report/
maven-surefire-common/src/test/java/org/...
Author: krosenvold
Date: Thu Jan 26 22:33:52 2012
New Revision: 1236421
URL: http://svn.apache.org/viewvc?rev=1236421&view=rev
Log:
o Moved the XmlReporter into surefire-common
Added:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java (contents, props changed)
- copied, changed from r1235885, maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java (contents, props changed)
- copied, changed from r1235885, maven/surefire/trunk/surefire-api/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 (contents, props changed)
- copied, changed from r1235885, maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/Reporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java (contents, props changed)
- copied, changed from r1235885, maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java (contents, props changed)
- copied, changed from r1235885, maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
Removed:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/Reporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
Modified:
maven/surefire/trunk/maven-surefire-common/pom.xml
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/TestSetRunListener.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
maven/surefire/trunk/surefire-integration-tests/pom.xml
Modified: maven/surefire/trunk/maven-surefire-common/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/pom.xml?rev=1236421&r1=1236420&r2=1236421&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-common/pom.xml Thu Jan 26 22:33:52 2012
@@ -94,6 +94,32 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <minimizeJar>true</minimizeJar>
+ <artifactSet>
+ <includes>
+ <include>org.codehaus.plexus:plexus-utils</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.codehaus.plexus.util</pattern>
+ <shadedPattern>org.apache.maven.plugin.surefire.report.plexus.util</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: 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/surefire/booter/StartupReportConfiguration.java?rev=1236421&r1=1236420&r2=1236421&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/surefire/booter/StartupReportConfiguration.java Thu Jan 26 22:33:52 2012
@@ -19,6 +19,9 @@ package org.apache.maven.surefire.booter
* under the License.
*/
+import java.io.File;
+import java.io.PrintStream;
+import java.util.Properties;
import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
import org.apache.maven.surefire.report.AbstractConsoleReporter;
import org.apache.maven.surefire.report.AbstractFileReporter;
@@ -30,11 +33,7 @@ import org.apache.maven.surefire.report.
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.XMLReporter;
-
-import java.io.File;
-import java.io.PrintStream;
-import java.util.Properties;
+import org.apache.maven.surefire.report.XMLReporter2;
/**
* All the parameters used to construct reporters
@@ -136,11 +135,11 @@ public class StartupReportConfiguration
return reportsDirectory;
}
- public XMLReporter instantiateXmlReporter()
+ public XMLReporter2 instantiateXmlReporter()
{
if ( !isDisableXmlReport() )
{
- return new XMLReporter( trimStackTrace, reportsDirectory, reportNameSuffix );
+ return new XMLReporter2( trimStackTrace, reportsDirectory, reportNameSuffix );
}
return null;
}
Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java (from r1235885, maven/surefire/trunk/surefire-api/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/surefire/report/AbstractReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java&r1=1235885&r2=1236421&rev=1236421&view=diff
==============================================================================
(empty)
Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java (from r1235885, maven/surefire/trunk/surefire-api/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/surefire/report/PrettyPrintXMLWriter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java&r1=1235885&r2=1236421&rev=1236421&view=diff
==============================================================================
(empty)
Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/Reporter.java (from r1235885, maven/surefire/trunk/surefire-api/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/surefire/report/Reporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/Reporter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/Reporter.java&r1=1235885&r2=1236421&rev=1236421&view=diff
==============================================================================
(empty)
Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/Reporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/Reporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: 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/surefire/report/TestSetRunListener.java?rev=1236421&r1=1236420&r2=1236421&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/surefire/report/TestSetRunListener.java Thu Jan 26 22:33:52 2012
@@ -46,7 +46,7 @@ public class TestSetRunListener
public TestSetRunListener( AbstractConsoleReporter consoleReporter, AbstractFileReporter fileReporter,
- XMLReporter xmlReporter, Reporter reporter, StatisticsReporter statisticsReporter,
+ XMLReporter2 xmlReporter, Reporter reporter, StatisticsReporter statisticsReporter,
RunStatistics globalStats )
{
Copied: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java (from r1235885, maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java&r1=1235885&r2=1236421&rev=1236421&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java Thu Jan 26 22:33:52 2012
@@ -70,7 +70,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 XMLReporter
+public class XMLReporter2
extends AbstractReporter
{
private static final String LS = System.getProperty( "line.separator" );
@@ -85,12 +85,12 @@ public class XMLReporter
private int elapsed = 0;
- public XMLReporter( boolean trimStackTrace, File reportsDirectory )
+ public XMLReporter2( boolean trimStackTrace, File reportsDirectory )
{
this( trimStackTrace, reportsDirectory, null );
}
- public XMLReporter( boolean trimStackTrace, File reportsDirectory, String reportNameSuffix )
+ public XMLReporter2( boolean trimStackTrace, File reportsDirectory, String reportNameSuffix )
{
super( trimStackTrace );
this.reportsDirectory = reportsDirectory;
Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java (from r1235885, maven/surefire/trunk/surefire-api/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?p2=maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java&p1=maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java&r1=1235885&r2=1236421&rev=1236421&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/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:33:52 2012
@@ -29,7 +29,7 @@ public class XMLReporterTest
extends TestCase
{
- private XMLReporter reporter;
+ private XMLReporter2 reporter;
private ReportEntry reportEntry;
@@ -39,7 +39,7 @@ public class XMLReporterTest
throws Exception
{
super.setUp();
- reporter = new XMLReporter( true, new File( "." ));
+ reporter = new XMLReporter2( true, new File( "." ));
message = "junit.framework.AssertionFailedError";
reportEntry = new SimpleReportEntry( this.getClass().getName(), "XMLReporterTest",
new PojoStackTraceWriter( "", "", new AssertionFailedError() ) ,
@@ -64,7 +64,7 @@ public class XMLReporterTest
assertResult( reporter, message );
}
- private void assertResult( XMLReporter reporter, String message )
+ private void assertResult( XMLReporter2 reporter, String message )
{
Xpp3Dom result = (Xpp3Dom) reporter.getResults().next();
Xpp3Dom child = result.getChild( "error" );
@@ -79,7 +79,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 XMLReporter( true, reportDir, null );
+ reporter = new XMLReporter2( true, reportDir, null );
reporter.testSetCompleted( reportEntry );
File expectedReportFile = new File( reportDir, "TEST-" + testName + ".xml" );
@@ -96,7 +96,7 @@ public class XMLReporterTest
String testName = "org.apache.maven.surefire.report.XMLReporterTest";
String suffixText = "sampleSuffixText";
reportEntry = new SimpleReportEntry( this.getClass().getName(), testName );
- reporter = new XMLReporter( true, reportDir, suffixText );
+ reporter = new XMLReporter2( true, reportDir, suffixText );
reporter.testSetCompleted( reportEntry );
File expectedReportFile = new File( reportDir, "TEST-" + testName + "-" + suffixText + ".xml" );
Propchange: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java?rev=1236421&r1=1236420&r2=1236421&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java Thu Jan 26 22:33:52 2012
@@ -137,13 +137,13 @@ public class Classpath
}
- public ClassLoader createClassLoader( ClassLoader parent, boolean childDelegation, boolean enableAssertions )
+ public ClassLoader createClassLoader( ClassLoader parent, boolean childDelegation, boolean enableAssertions, String roleName )
throws SurefireExecutionException
{
try
{
List urls = getAsUrlList();
- IsolatedClassLoader classLoader = new IsolatedClassLoader( parent, childDelegation );
+ IsolatedClassLoader classLoader = new IsolatedClassLoader( parent, childDelegation, roleName );
for ( Iterator iter = urls.iterator(); iter.hasNext(); )
{
URL url = (URL) iter.next();
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java?rev=1236421&r1=1236420&r2=1236421&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java Thu Jan 26 22:33:52 2012
@@ -88,25 +88,25 @@ public class ClasspathConfiguration
public ClassLoader createTestClassLoader( boolean childDelegation )
throws SurefireExecutionException
{
- return classpathUrls.createClassLoader( null, childDelegation, enableAssertions );
+ return classpathUrls.createClassLoader( null, childDelegation, enableAssertions, "test" );
}
public ClassLoader createTestClassLoader()
throws SurefireExecutionException
{
- return classpathUrls.createClassLoader( null, this.childDelegation, enableAssertions );
+ return classpathUrls.createClassLoader( null, this.childDelegation, enableAssertions, "test" );
}
public ClassLoader createSurefireClassLoader( ClassLoader parent )
throws SurefireExecutionException
{
- return surefireClasspathUrls.createClassLoader( parent, false, enableAssertions );
+ return surefireClasspathUrls.createClassLoader( parent, false, enableAssertions, "provider" );
}
public ClassLoader createInprocSurefireClassLoader( ClassLoader parent )
throws SurefireExecutionException
{
- return inprocClasspath.createClassLoader( parent, false, enableAssertions );
+ return inprocClasspath.createClassLoader( parent, false, enableAssertions, "provider" );
}
public Classpath getTestClasspath()
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java?rev=1236421&r1=1236420&r2=1236421&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java Thu Jan 26 22:33:52 2012
@@ -33,16 +33,20 @@ public class IsolatedClassLoader
private final ClassLoader parent = ClassLoader.getSystemClassLoader();
private final Set urls = new HashSet();
+
+ private final String roleName;
private boolean childDelegation = true;
private static final URL[] EMPTY_URL_ARRAY = new URL[0];
- public IsolatedClassLoader( ClassLoader parent, boolean childDelegation )
+ public IsolatedClassLoader( ClassLoader parent, boolean childDelegation, String roleName )
{
super( EMPTY_URL_ARRAY, parent );
this.childDelegation = childDelegation;
+
+ this.roleName = roleName;
}
public void addURL( URL url )
@@ -95,4 +99,11 @@ public class IsolatedClassLoader
return c;
}
+
+ public String toString()
+ {
+ return "IsolatedClassLoader{" +
+ "roleName='" + roleName + '\'' +
+ '}';
+ }
}
Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=1236421&r1=1236420&r2=1236421&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Thu Jan 26 22:33:52 2012
@@ -37,7 +37,6 @@
<it.settings.showPasswords>false</it.settings.showPasswords>
<testng.version>5.7</testng.version>
<surefire.threadcount>1</surefire.threadcount>
- <surefire.build.version>2.11</surefire.build.version>
</properties>
<dependencies>
@@ -85,7 +84,7 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.build.version}</version>
+ <version>${shadedVersion}</version>
<configuration>
<!-- Pass current surefire version to the main suite so that it -->
<!-- can forward to all integration test projects. SUREFIRE-513 -->
@@ -163,7 +162,7 @@
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.build.version}</version>
+ <version>${shadedVersion}</version>
<configuration>
<parallel>classes</parallel>
<threadCount>${surefire.threadcount}</threadCount>
@@ -181,9 +180,6 @@
<scope>test</scope>
</dependency>
</dependencies>
- <properties>
- <surefire.build.version>2.11</surefire.build.version>
- </properties>
</profile>
</profiles>