From 728221f4d8d26dec735f8683cfe70b771ded8f3f Mon Sep 17 00:00:00 2001 From: Stephane Bailliez Date: Fri, 1 Feb 2002 23:53:23 +0000 Subject: [PATCH] Moving to rjunit package to avoid conflicts git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271045 13f79535-47bb-0310-9956-ffa450edef68 --- .../{junit => rjunit}/ArrayEnumeration.java | 2 +- .../{junit => rjunit}/BatchTestElement.java | 2 +- .../ClasspathTestCollector.java | 6 +-- .../{junit => rjunit}/ClientElement.java | 2 +- .../CompoundEnumeration.java | 4 +- .../{junit => rjunit}/FilterElement.java | 10 ++-- .../{junit => rjunit}/JUnitHelper.java | 2 +- .../KeepAliveOutputStream.java | 2 +- .../{junit => rjunit}/OutputAttribute.java | 2 +- .../{junit => rjunit}/RJUnitTask.java | 2 +- .../{junit => rjunit}/Resources.properties | 0 .../ResultFormatterElement.java} | 12 ++--- .../{junit => rjunit}/ServerElement.java | 10 ++-- .../{junit => rjunit}/TestElement.java | 2 +- .../{junit => rjunit}/WatchdogTest.java | 2 +- .../{junit => rjunit}/ZipScanner.java | 4 +- .../formatter/BaseFormatter.java | 4 +- .../formatter/BaseStreamFormatter.java | 4 +- .../formatter/BriefFormatter.java | 4 +- .../formatter/FilterFormatter.java | 4 +- .../formatter/FilterStackFormatter.java | 4 +- .../formatter/Formatter.java | 4 +- .../formatter/PlainFormatter.java | 4 +- .../formatter/Resources.properties | 0 .../formatter/SummaryFormatter.java | 2 +- .../formatter/XMLFormatter.java | 4 +- .../{junit => rjunit}/remote/Base64.java | 2 +- .../remote/EventDispatcher.java | 22 ++++---- .../{junit => rjunit}/remote/Messenger.java | 2 +- .../{junit => rjunit}/remote/Server.java | 2 +- .../{junit => rjunit}/remote/SocketUtil.java | 2 +- .../remote/TestRunEvent.java | 2 +- .../remote/TestRunListener.java | 2 +- .../{junit => rjunit}/remote/TestRunner.java | 5 +- .../ant/taskdefs/optional/rjunit/usecase.xml | 51 +++++++++++++++++++ 35 files changed, 119 insertions(+), 69 deletions(-) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/ArrayEnumeration.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/BatchTestElement.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/ClasspathTestCollector.java (97%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/ClientElement.java (99%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/CompoundEnumeration.java (97%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/FilterElement.java (93%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/JUnitHelper.java (99%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/KeepAliveOutputStream.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/OutputAttribute.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/RJUnitTask.java (99%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/Resources.properties (100%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit/FormatterElement.java => rjunit/ResultFormatterElement.java} (95%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/ServerElement.java (93%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/TestElement.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/WatchdogTest.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/ZipScanner.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/formatter/BaseFormatter.java (96%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/formatter/BaseStreamFormatter.java (97%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/formatter/BriefFormatter.java (96%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/formatter/FilterFormatter.java (96%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/formatter/FilterStackFormatter.java (97%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/formatter/Formatter.java (95%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/formatter/PlainFormatter.java (96%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/formatter/Resources.properties (100%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/formatter/SummaryFormatter.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/formatter/XMLFormatter.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/remote/Base64.java (99%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/remote/EventDispatcher.java (82%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/remote/Messenger.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/remote/Server.java (99%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/remote/SocketUtil.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/remote/TestRunEvent.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/remote/TestRunListener.java (98%) rename proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/remote/TestRunner.java (98%) create mode 100644 proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/usecase.xml diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ArrayEnumeration.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ArrayEnumeration.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ArrayEnumeration.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ArrayEnumeration.java index 9fe96990f..d3ce5a7cd 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ArrayEnumeration.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ArrayEnumeration.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.util.Enumeration; import java.util.NoSuchElementException; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTestElement.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/BatchTestElement.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTestElement.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/BatchTestElement.java index 1acde5759..5262a8c05 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTestElement.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/BatchTestElement.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.util.Enumeration; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ClasspathTestCollector.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClasspathTestCollector.java similarity index 97% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ClasspathTestCollector.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClasspathTestCollector.java index e2855293b..9c65788b7 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ClasspathTestCollector.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClasspathTestCollector.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.io.File; import java.util.Enumeration; @@ -88,7 +88,7 @@ public class ClasspathTestCollector extends ProjectComponent // override last one in case there are duplicates. // ie mimic classpath behavior. String[] paths = path.list(); - for (int i = paths.length; i >= 0; i--) { + for (int i = paths.length - 1; i >= 0; i--) { File f = new File(paths[i]); Vector included = null; if (f.isDirectory()) { diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ClientElement.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClientElement.java similarity index 99% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ClientElement.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClientElement.java index 0d4ce4978..dd80c9bc9 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ClientElement.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClientElement.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.io.BufferedOutputStream; import java.io.File; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/CompoundEnumeration.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/CompoundEnumeration.java similarity index 97% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/CompoundEnumeration.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/CompoundEnumeration.java index cbe23e457..85fd68740 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/CompoundEnumeration.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/CompoundEnumeration.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.util.Enumeration; import java.util.NoSuchElementException; @@ -87,7 +87,7 @@ import java.util.NoSuchElementException; * * @author Stephane Bailliez */ - class CompoundEnumeration implements Enumeration { +public class CompoundEnumeration implements Enumeration { /** enumeration array */ private Enumeration[] enumArray; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/FilterElement.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/FilterElement.java similarity index 93% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/FilterElement.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/FilterElement.java index 7074f437e..e04aa1e29 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/FilterElement.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/FilterElement.java @@ -51,18 +51,18 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.lang.reflect.Constructor; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.optional.junit.formatter.FilterFormatter; -import org.apache.tools.ant.taskdefs.optional.junit.formatter.FilterStackFormatter; -import org.apache.tools.ant.taskdefs.optional.junit.formatter.Formatter; +import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.FilterFormatter; +import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.FilterStackFormatter; +import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.Formatter; import org.apache.tools.ant.types.EnumeratedAttribute; /** - * A filter element that can be use inside a FormatterElement to denote + * A filter element that can be used inside a ResultFormatterElement to denote * a filtering. Note that the filtering order correspond to the element * order. The first element being the top filter, the last element * being the bottom filter. diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitHelper.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/JUnitHelper.java similarity index 99% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitHelper.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/JUnitHelper.java index 13d3e82ed..f5a713652 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitHelper.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/JUnitHelper.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.io.File; import java.lang.reflect.Method; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/KeepAliveOutputStream.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/KeepAliveOutputStream.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/KeepAliveOutputStream.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/KeepAliveOutputStream.java index 5776931eb..6141cd194 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/KeepAliveOutputStream.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/KeepAliveOutputStream.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/OutputAttribute.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/OutputAttribute.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/OutputAttribute.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/OutputAttribute.java index 880822cca..e7758d24f 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/OutputAttribute.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/OutputAttribute.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.io.File; import java.io.FileOutputStream; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/RJUnitTask.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/RJUnitTask.java similarity index 99% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/RJUnitTask.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/RJUnitTask.java index 82bac161f..1b8e50b07 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/RJUnitTask.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/RJUnitTask.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/Resources.properties b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/Resources.properties similarity index 100% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/Resources.properties rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/Resources.properties diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ResultFormatterElement.java similarity index 95% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ResultFormatterElement.java index 80a5798a5..95cf782ff 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ResultFormatterElement.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.io.OutputStream; import java.io.File; @@ -60,10 +60,10 @@ import java.util.StringTokenizer; import java.util.Vector; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.optional.junit.formatter.BriefFormatter; -import org.apache.tools.ant.taskdefs.optional.junit.formatter.Formatter; -import org.apache.tools.ant.taskdefs.optional.junit.formatter.XMLFormatter; -import org.apache.tools.ant.taskdefs.optional.junit.formatter.PlainFormatter; +import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.BriefFormatter; +import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.Formatter; +import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.XMLFormatter; +import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.PlainFormatter; import org.apache.tools.ant.types.EnumeratedAttribute; /** @@ -82,7 +82,7 @@ import org.apache.tools.ant.types.EnumeratedAttribute; * @see RJUnitTask * @see Formatter */ -public class FormatterElement { +public class ResultFormatterElement { /** output stream for the formatter */ private OutputStream out = new KeepAliveOutputStream(System.out); diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ServerElement.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ServerElement.java similarity index 93% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ServerElement.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ServerElement.java index 41cf6c8ab..59b4092fe 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ServerElement.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ServerElement.java @@ -51,15 +51,15 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.util.Enumeration; import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ProjectComponent; -import org.apache.tools.ant.taskdefs.optional.junit.formatter.Formatter; -import org.apache.tools.ant.taskdefs.optional.junit.remote.Server; +import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.Formatter; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.Server; /** * An element representing the server configuration. @@ -103,7 +103,7 @@ public final class ServerElement extends ProjectComponent { server = new Server(port); Enumeration listeners = formatterElements.elements(); while (listeners.hasMoreElements()) { - FormatterElement fe = (FormatterElement)listeners.nextElement(); + ResultFormatterElement fe = (ResultFormatterElement)listeners.nextElement(); Formatter formatter = fe.createFormatter(); server.addListener( formatter ); } @@ -133,7 +133,7 @@ public final class ServerElement extends ProjectComponent { } /** add a new formatter element */ - public void addFormatter(FormatterElement fe) { + public void addFormatter(ResultFormatterElement fe) { formatterElements.addElement(fe); } } diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/TestElement.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/TestElement.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/TestElement.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/TestElement.java index 252a8ace8..2a83ac20c 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/TestElement.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/TestElement.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.util.Enumeration; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/WatchdogTest.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/WatchdogTest.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/WatchdogTest.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/WatchdogTest.java index 7ae0666a3..6ada1ffff 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/WatchdogTest.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/WatchdogTest.java @@ -52,7 +52,7 @@ * . * */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import junit.extensions.TestDecorator; import junit.framework.AssertionFailedError; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ZipScanner.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ZipScanner.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ZipScanner.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ZipScanner.java index c7fc98067..4aac20857 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/ZipScanner.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ZipScanner.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.io.File; import java.io.IOException; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/BaseFormatter.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/BaseFormatter.java similarity index 96% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/BaseFormatter.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/BaseFormatter.java index 33e5a5923..7a9894207 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/BaseFormatter.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/BaseFormatter.java @@ -51,12 +51,12 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.formatter; +package org.apache.tools.ant.taskdefs.optional.rjunit.formatter; import java.util.Properties; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunEvent; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunEvent; /** * Provide a common set of attributes and methods to factorize diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/BaseStreamFormatter.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/BaseStreamFormatter.java similarity index 97% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/BaseStreamFormatter.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/BaseStreamFormatter.java index 1149be7cc..bc52988cc 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/BaseStreamFormatter.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/BaseStreamFormatter.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.formatter; +package org.apache.tools.ant.taskdefs.optional.rjunit.formatter; import java.io.BufferedWriter; import java.io.FileOutputStream; @@ -62,7 +62,7 @@ import java.io.PrintWriter; import java.util.Properties; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.optional.junit.KeepAliveOutputStream; +import org.apache.tools.ant.taskdefs.optional.rjunit.KeepAliveOutputStream; /** * Base formatter providing default implementation to deal with diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/BriefFormatter.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/BriefFormatter.java similarity index 96% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/BriefFormatter.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/BriefFormatter.java index 98f8124f1..87f5cbc9c 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/BriefFormatter.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/BriefFormatter.java @@ -51,11 +51,11 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.formatter; +package org.apache.tools.ant.taskdefs.optional.rjunit.formatter; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunEvent; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunEvent; /** * Display additional messages from a SummaryFormatter diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterFormatter.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterFormatter.java similarity index 96% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterFormatter.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterFormatter.java index 55ab0d93f..430709a21 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterFormatter.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterFormatter.java @@ -51,12 +51,12 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.formatter; +package org.apache.tools.ant.taskdefs.optional.rjunit.formatter; import java.util.Properties; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunEvent; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunEvent; /** * A base class that can be used to filter data. diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterStackFormatter.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterStackFormatter.java similarity index 97% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterStackFormatter.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterStackFormatter.java index 16cbdd705..4ee0cbb99 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterStackFormatter.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterStackFormatter.java @@ -51,12 +51,12 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.formatter; +package org.apache.tools.ant.taskdefs.optional.rjunit.formatter; import java.util.StringTokenizer; import org.apache.tools.ant.util.StringUtils; -import org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunEvent; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunEvent; /** * Filtered Formatter that strips out unwanted stack frames from the full diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/Formatter.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/Formatter.java similarity index 95% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/Formatter.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/Formatter.java index 28397cd74..4b732c5a0 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/Formatter.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/Formatter.java @@ -51,12 +51,12 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.formatter; +package org.apache.tools.ant.taskdefs.optional.rjunit.formatter; import java.util.Properties; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener; /** * The formatter interface. diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/PlainFormatter.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/PlainFormatter.java similarity index 96% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/PlainFormatter.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/PlainFormatter.java index d0b1b9663..ea59c0304 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/PlainFormatter.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/PlainFormatter.java @@ -51,11 +51,11 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.formatter; +package org.apache.tools.ant.taskdefs.optional.rjunit.formatter; import java.util.Properties; -import org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunEvent; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunEvent; /** * Default formatter to text. diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/Resources.properties b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/Resources.properties similarity index 100% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/Resources.properties rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/Resources.properties diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/SummaryFormatter.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/SummaryFormatter.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/SummaryFormatter.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/SummaryFormatter.java index 1fe710f51..f65599f77 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/SummaryFormatter.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/SummaryFormatter.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.formatter; +package org.apache.tools.ant.taskdefs.optional.rjunit.formatter; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/XMLFormatter.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/XMLFormatter.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/XMLFormatter.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/XMLFormatter.java index 14bcd9c36..bf15fd6f0 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/formatter/XMLFormatter.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/XMLFormatter.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.formatter; +package org.apache.tools.ant.taskdefs.optional.rjunit.formatter; import java.util.Hashtable; import java.io.IOException; @@ -64,7 +64,7 @@ import org.w3c.dom.Text; import org.apache.tools.ant.util.DOMElementWriter; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunEvent; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunEvent; /** * XML Formatter. Due to the nature of the XML we are forced to store diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Base64.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/Base64.java similarity index 99% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Base64.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/Base64.java index e5609fdc0..7609094df 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Base64.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/Base64.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.remote; +package org.apache.tools.ant.taskdefs.optional.rjunit.remote; /** * This class has been taken from jakarta-commons-sandbox in the diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/EventDispatcher.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/EventDispatcher.java similarity index 82% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/EventDispatcher.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/EventDispatcher.java index 3808bae41..56a56ebcd 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/EventDispatcher.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/EventDispatcher.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.remote; +package org.apache.tools.ant.taskdefs.optional.rjunit.remote; import java.util.Vector; import java.io.InputStream; @@ -76,7 +76,7 @@ public class EventDispatcher { listeners.addElement(listener); } - public void removeListener(org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener listener) { + public void removeListener(org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener listener) { listeners.removeElement(listener); } @@ -123,7 +123,7 @@ public class EventDispatcher { protected void fireRunStarted(TestRunEvent evt) { synchronized (listeners) { for (int i = 0; i < listeners.size(); i++) { - ((org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener) listeners.elementAt(i)).onRunStarted(evt); + ((org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener) listeners.elementAt(i)).onRunStarted(evt); } } } @@ -131,7 +131,7 @@ public class EventDispatcher { protected void fireRunEnded(TestRunEvent evt) { synchronized (listeners) { for (int i = 0; i < listeners.size(); i++) { - ((org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener) listeners.elementAt(i)).onRunEnded(evt); + ((org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener) listeners.elementAt(i)).onRunEnded(evt); } } } @@ -139,7 +139,7 @@ public class EventDispatcher { protected void fireTestStarted(TestRunEvent evt) { synchronized (listeners) { for (int i = 0; i < listeners.size(); i++) { - ((org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener) listeners.elementAt(i)).onTestStarted(evt); + ((org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener) listeners.elementAt(i)).onTestStarted(evt); } } } @@ -147,7 +147,7 @@ public class EventDispatcher { protected void fireTestEnded(TestRunEvent evt) { synchronized (listeners) { for (int i = 0; i < listeners.size(); i++) { - ((org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener) listeners.elementAt(i)).onTestEnded(evt); + ((org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener) listeners.elementAt(i)).onTestEnded(evt); } } } @@ -155,7 +155,7 @@ public class EventDispatcher { protected void fireTestFailure(TestRunEvent evt) { synchronized (listeners) { for (int i = 0; i < listeners.size(); i++) { - ((org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener) listeners.elementAt(i)).onTestFailure(evt); + ((org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener) listeners.elementAt(i)).onTestFailure(evt); } } } @@ -163,7 +163,7 @@ public class EventDispatcher { protected void fireTestError(TestRunEvent evt) { synchronized (listeners) { for (int i = 0; i < listeners.size(); i++) { - ((org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener) listeners.elementAt(i)).onTestError(evt); + ((org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener) listeners.elementAt(i)).onTestError(evt); } } } @@ -171,7 +171,7 @@ public class EventDispatcher { protected void fireSuiteStarted(TestRunEvent evt) { synchronized (listeners) { for (int i = 0; i < listeners.size(); i++) { - ((org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener) listeners.elementAt(i)).onSuiteStarted(evt); + ((org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener) listeners.elementAt(i)).onSuiteStarted(evt); } } } @@ -179,7 +179,7 @@ public class EventDispatcher { protected void fireSuiteEnded(TestRunEvent evt) { synchronized (listeners) { for (int i = 0; i < listeners.size(); i++) { - ((org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener) listeners.elementAt(i)).onSuiteEnded(evt); + ((org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener) listeners.elementAt(i)).onSuiteEnded(evt); } } } @@ -187,7 +187,7 @@ public class EventDispatcher { protected void fireRunStopped(TestRunEvent evt) { synchronized (listeners) { for (int i = 0; i < listeners.size(); i++) { - ((org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener) listeners.elementAt(i)).onRunStopped(evt); + ((org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener) listeners.elementAt(i)).onRunStopped(evt); } } } diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Messenger.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/Messenger.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Messenger.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/Messenger.java index 4ca310575..7de44cea0 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Messenger.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/Messenger.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.remote; +package org.apache.tools.ant.taskdefs.optional.rjunit.remote; import java.io.OutputStream; import java.io.InputStream; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Server.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/Server.java similarity index 99% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Server.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/Server.java index ccf6278f4..42729df58 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Server.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/Server.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.remote; +package org.apache.tools.ant.taskdefs.optional.rjunit.remote; import java.io.IOException; import java.net.ServerSocket; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/SocketUtil.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/SocketUtil.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/SocketUtil.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/SocketUtil.java index c98e33a5d..70bbe06c7 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/SocketUtil.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/SocketUtil.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.remote; +package org.apache.tools.ant.taskdefs.optional.rjunit.remote; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunEvent.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestRunEvent.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunEvent.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestRunEvent.java index 8f946f24a..23e57718a 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunEvent.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestRunEvent.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.remote; +package org.apache.tools.ant.taskdefs.optional.rjunit.remote; import java.util.EventObject; import java.util.Properties; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunListener.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestRunListener.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunListener.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestRunListener.java index 4476a8c5a..1cf46ba63 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunListener.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestRunListener.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.remote; +package org.apache.tools.ant.taskdefs.optional.rjunit.remote; import java.util.EventListener; diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunner.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestRunner.java similarity index 98% rename from proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunner.java rename to proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestRunner.java index ce537ef5b..dd9c04fb4 100644 --- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunner.java +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestRunner.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.remote; +package org.apache.tools.ant.taskdefs.optional.rjunit.remote; import java.io.BufferedReader; import java.io.FileInputStream; @@ -70,8 +70,7 @@ import junit.framework.TestListener; import junit.framework.TestResult; import junit.framework.TestSuite; -import org.apache.tools.ant.taskdefs.optional.junit.JUnitHelper; -import org.apache.tools.ant.taskdefs.optional.junit.TestRunListener; +import org.apache.tools.ant.taskdefs.optional.rjunit.JUnitHelper; import org.apache.tools.ant.util.StringUtils; /** diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/usecase.xml b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/usecase.xml new file mode 100644 index 000000000..ef673c432 --- /dev/null +++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/usecase.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file