@@ -225,7 +226,7 @@ public class JUnitTestRunner implements TestListener */ public static String getFilteredTrace( Throwable t ) { - String trace = StringUtils.getStackTrace( t ); + final String trace = ExceptionUtil.printStackTrace( t ); return JUnitTestRunner.filterStack( trace ); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index 3493690d2..865c65649 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java @@ -18,6 +18,7 @@ import java.util.Vector; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.avalon.excalibur.io.FileUtil; +import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; @@ -296,7 +297,7 @@ public class XMLResultAggregator extends Task implements XMLConstants // a testcase might have failed and write a zero-length document, // It has already failed, but hey.... mm. just put a warning log( "The file " + files[ i ] + " is not a valid XML document. It is possibly corrupted.", Project.MSG_WARN ); - log( StringUtils.getStackTrace( e ), Project.MSG_DEBUG ); + log( ExceptionUtil.printStackTrace( e ), Project.MSG_DEBUG ); } catch( IOException e ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/RecorderEntry.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/RecorderEntry.java index 6a0fd03dd..5f6667161 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/RecorderEntry.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/RecorderEntry.java @@ -22,6 +22,10 @@ import org.apache.tools.ant.util.StringUtils; */ public class RecorderEntry implements BuildLogger { + /** + * the line separator for this OS + */ + private final static String LINE_SEP = System.getProperty( "line.separator" ); ////////////////////////////////////////////////////////////////////// // ATTRIBUTES @@ -128,11 +132,11 @@ public class RecorderEntry implements BuildLogger Throwable error = event.getException(); if( error == null ) { - out.println( StringUtils.LINE_SEP + "BUILD SUCCESSFUL" ); + out.println( LINE_SEP + "BUILD SUCCESSFUL" ); } else { - out.println( StringUtils.LINE_SEP + "BUILD FAILED" + StringUtils.LINE_SEP ); + out.println( LINE_SEP + "BUILD FAILED" + LINE_SEP ); error.printStackTrace( out ); } out.flush(); @@ -177,7 +181,7 @@ public class RecorderEntry implements BuildLogger public void targetStarted( BuildEvent event ) { log( ">> TARGET STARTED -- " + event.getTarget(), Project.MSG_DEBUG ); - log( StringUtils.LINE_SEP + event.getTarget().getName() + ":", Project.MSG_INFO ); + log( LINE_SEP + event.getTarget().getName() + ":", Project.MSG_INFO ); targetStartTime = System.currentTimeMillis(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java index ab5bf81f1..28dd777dd 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java @@ -43,6 +43,7 @@ import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; import org.apache.tools.ant.util.StringUtils; +import org.apache.avalon.framework.ExceptionUtil; /** * This is a simple grafical user interface to provide the information needed by @@ -1403,7 +1404,7 @@ public class VAJAntToolGUI extends Frame private void handleException( Throwable exception ) { // Write exceptions to the log-window - String trace = StringUtils.getStackTrace( exception ); + String trace = ExceptionUtil.printStackTrace( exception ); getMessageTextArea().append( lineSeparator + lineSeparator + trace ); getMessageFrame().show(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java index e5045fca8..5adaa2ee7 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java @@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.util.StringUtils; +import org.apache.avalon.framework.ExceptionUtil; /** * Abstract base class to provide common services for the VAJ tool API servlets @@ -72,7 +73,7 @@ public abstract class VAJToolsServlet extends HttpServlet { if( !( e instanceof TaskException ) ) { - String trace = StringUtils.getStackTrace( e ); + String trace = ExceptionUtil.printStackTrace( e ); util.log( "Program error in " + this.getClass().getName() + ":\n" + trace, VAJUtil.MSG_ERR ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 7139d8b00..266c26fb0 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -30,6 +30,7 @@ import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.Project; import org.apache.tools.ant.util.StringUtils; +import org.apache.avalon.framework.ExceptionUtil; /** * Simple Testrunner for JUnit that runs all tests of a testsuite.
@@ -225,7 +226,7 @@ public class JUnitTestRunner implements TestListener */ public static String getFilteredTrace( Throwable t ) { - String trace = StringUtils.getStackTrace( t ); + final String trace = ExceptionUtil.printStackTrace( t ); return JUnitTestRunner.filterStack( trace ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index 3493690d2..865c65649 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java @@ -18,6 +18,7 @@ import java.util.Vector; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.avalon.excalibur.io.FileUtil; +import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; @@ -296,7 +297,7 @@ public class XMLResultAggregator extends Task implements XMLConstants // a testcase might have failed and write a zero-length document, // It has already failed, but hey.... mm. just put a warning log( "The file " + files[ i ] + " is not a valid XML document. It is possibly corrupted.", Project.MSG_WARN ); - log( StringUtils.getStackTrace( e ), Project.MSG_DEBUG ); + log( ExceptionUtil.printStackTrace( e ), Project.MSG_DEBUG ); } catch( IOException e ) {