From 0fa0e394dcd0e4f9ebf0547ac4fc25d3b46f118b Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 3 Mar 2002 07:11:40 +0000 Subject: [PATCH] Move all rmc stuff into its own package git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271701 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java | 1 - .../main/org/apache/tools/ant/taskdefs/{ => rmic}/Rmic.java | 5 ++--- .../main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java | 1 - .../apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java | 1 - .../todo/org/apache/tools/ant/taskdefs/{ => rmic}/Rmic.java | 5 ++--- .../todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java | 1 - 6 files changed, 4 insertions(+), 10 deletions(-) rename proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/{ => rmic}/Rmic.java (99%) rename proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/{ => rmic}/Rmic.java (99%) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java index 1bb4af0d0..12442424c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.Random; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.taskdefs.Rmic; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/Rmic.java similarity index 99% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/Rmic.java index 5a0115221..ea51a7cee 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/Rmic.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.taskdefs; +package org.apache.tools.ant.taskdefs.rmic; import java.io.File; import java.io.IOException; @@ -16,13 +16,12 @@ import java.util.ArrayList; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.AbstractTask; -import org.apache.tools.ant.taskdefs.rmic.RmicAdapter; -import org.apache.tools.ant.taskdefs.rmic.RmicAdapterFactory; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.util.mappers.FileNameMapper; +import org.apache.tools.ant.taskdefs.MatchingTask; /** * Task to compile RMI stubs and skeletons. This task can take the following diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java index e8f0a0d23..f4b2ac1c7 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.taskdefs.rmic; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.taskdefs.Rmic; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.mappers.FileNameMapper; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java index 1bb4af0d0..12442424c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.Random; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.taskdefs.Rmic; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/Rmic.java similarity index 99% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/Rmic.java index 5a0115221..ea51a7cee 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/Rmic.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.taskdefs; +package org.apache.tools.ant.taskdefs.rmic; import java.io.File; import java.io.IOException; @@ -16,13 +16,12 @@ import java.util.ArrayList; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.AbstractTask; -import org.apache.tools.ant.taskdefs.rmic.RmicAdapter; -import org.apache.tools.ant.taskdefs.rmic.RmicAdapterFactory; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.util.mappers.FileNameMapper; +import org.apache.tools.ant.taskdefs.MatchingTask; /** * Task to compile RMI stubs and skeletons. This task can take the following diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java index e8f0a0d23..f4b2ac1c7 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.taskdefs.rmic; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.taskdefs.Rmic; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.mappers.FileNameMapper;