You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by br...@apache.org on 2006/03/03 07:22:44 UTC
svn commit: r382688 - in /maven/surefire/branches/surefire-testng:
surefire-api/src/main/java/org/apache/maven/surefire/report/
surefire-booter/src/main/java/org/apache/maven/surefire/booter/
surefire-providers/surefire-junit/ surefire-providers/surefi...
Author: brett
Date: Thu Mar 2 22:22:42 2006
New Revision: 382688
URL: http://svn.apache.org/viewcvs?rev=382688&view=rev
Log:
update copyright
Modified:
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
maven/surefire/branches/surefire-testng/surefire-providers/surefire-junit/pom.xml
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGTestSet.java
Modified: maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java?rev=382688&r1=382687&r2=382688&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java Thu Mar 2 22:22:42 2006
@@ -1,11 +1,5 @@
package org.apache.maven.surefire.report;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/*
* Copyright 2001-2006 The Apache Software Foundation.
*
@@ -21,6 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
* Text based reporter.
Modified: maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java?rev=382688&r1=382687&r2=382688&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java Thu Mar 2 22:22:42 2006
@@ -1,7 +1,5 @@
package org.apache.maven.surefire.report;
-import java.io.File;
-
/*
* Copyright 2001-2006 The Apache Software Foundation.
*
@@ -17,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import java.io.File;
/**
* Brief format file reporter.
Modified: maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java?rev=382688&r1=382687&r2=382688&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java Thu Mar 2 22:22:42 2006
@@ -1,7 +1,5 @@
package org.apache.maven.surefire.report;
-import java.io.File;
-
/*
* Copyright 2001-2006 The Apache Software Foundation.
*
@@ -17,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import java.io.File;
/**
* Text file reporter.
Modified: maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java?rev=382688&r1=382687&r2=382688&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java (original)
+++ maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java Thu Mar 2 22:22:42 2006
@@ -1,15 +1,5 @@
package org.apache.maven.surefire.booter;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.Commandline;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
/*
* Copyright 2001-2006 The Apache Software Foundation.
*
@@ -26,8 +16,18 @@
* limitations under the License.
*/
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
/**
- * TODO: Description.
+ * Configuration for forking tests.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
@@ -85,13 +85,6 @@
public void setSystemProperties( Properties systemProperties )
{
this.systemProperties = new Properties( systemProperties );
- }
-
- // TODO: remove once mojo is back to Properties
- public void setSystemProperties( Map systemProperties )
- {
- this.systemProperties = new Properties();
- systemProperties.putAll( systemProperties );
}
public void setJvmExecutable( String jvmExecutable )
Modified: maven/surefire/branches/surefire-testng/surefire-providers/surefire-junit/pom.xml
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-providers/surefire-junit/pom.xml?rev=382688&r1=382687&r2=382688&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-providers/surefire-junit/pom.xml (original)
+++ maven/surefire/branches/surefire-testng/surefire-providers/surefire-junit/pom.xml Thu Mar 2 22:22:42 2006
@@ -1,5 +1,21 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.surefire</groupId>
Modified: maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml?rev=382688&r1=382687&r2=382688&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml Thu Mar 2 22:22:42 2006
@@ -1,3 +1,19 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Modified: maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGTestSet.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGTestSet.java?rev=382688&r1=382687&r2=382688&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGTestSet.java (original)
+++ maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGTestSet.java Thu Mar 2 22:22:42 2006
@@ -158,6 +158,7 @@
private static IAnnotationFinder getAnnotationFinder()
{
+ // TODO: is this right? isn't it dependant on the version of the TestNG JAR being used?
if ( annotationFinder == null )
{
if ( System.getProperty( "java.version" ).indexOf( "1.5" ) > -1 )