Author: krosenvold
Date: Thu Dec 16 09:33:20 2010
New Revision: 1049847
URL: http://svn.apache.org/viewvc?rev=1049847&view=rev
Log:
o Fixed java 1.3 break
Added:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
(contents, props changed)
- copied, changed from r1049846,
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StringUtils.java
Removed:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StringUtils.java
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java?rev=1049847&r1=1049846&r2=1049847&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
Thu Dec 16 09:33:20 2010
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.report
* under the License.
*/
-import org.codehaus.plexus.util.StringUtils;
+
+import org.apache.maven.surefire.util.internal.StringUtils;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -62,7 +63,7 @@ public class PojoStackTraceWriter
String marker = "at " + testClass + "." + testMethod;
- String[] lines = StringUtils.split( text, "\n" );
+ String[] lines = StringUtils.split(text, "\n");
int lastLine = lines.length - 1;
int causedByLine = -1;
// skip first
Copied:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
(from r1049846,
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StringUtils.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java?p2=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java&p1=maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StringUtils.java&r1=1049846&r2=1049847&rev=1049847&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StringUtils.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
Thu Dec 16 09:33:20 2010
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.booter;
+package org.apache.maven.surefire.util.internal;
/* ====================================================================
* The Apache Software License, Version 1.1
@@ -80,6 +80,8 @@ import java.util.StringTokenizer;
*
* A quick borrow from plexus-utils by Kristian Rosenvold, to restore jdk1.3
compat
* Threw away all the unused stuff.
+ *
+ * NOTE: This class is not part of any api and is public purely for technical
reasons !
*/
public class StringUtils
{
Propchange:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java?rev=1049847&r1=1049846&r2=1049847&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
Thu Dec 16 09:33:20 2010
@@ -22,6 +22,7 @@ import org.apache.maven.surefire.report.
import org.apache.maven.surefire.testset.DirectoryScannerParameters;
import org.apache.maven.surefire.testset.TestArtifactInfo;
import org.apache.maven.surefire.testset.TestRequest;
+import org.apache.maven.surefire.util.internal.StringUtils;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -130,7 +131,7 @@ public class BooterDeserializer
List list = new ArrayList();
- String[] stringArray = StringUtils.split( sl, "," );
+ String[] stringArray = StringUtils.split(sl, ",");
for ( int i = 0; i < stringArray.length; i++ )
{
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java?rev=1049847&r1=1049846&r2=1049847&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
Thu Dec 16 09:33:20 2010
@@ -20,6 +20,7 @@ package org.apache.maven.surefire.booter
*/
import org.apache.maven.surefire.util.ReflectionUtils;
+import org.apache.maven.surefire.util.internal.StringUtils;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -193,7 +194,7 @@ public class PropertiesWrapper
List list = new ArrayList();
- String[] stringArray = StringUtils.split( sl, "," );
+ String[] stringArray = StringUtils.split(sl, ",");
for ( int i = 0; i < stringArray.length; i++ )
{
