From 860d78b1c0b3de68eec522ecc19e604693e5ea4e Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sat, 15 Apr 2006 15:46:05 +0000 Subject: [PATCH] o align the borrowed utilities from plexus with plexus' package structure so that we can just drop in new versions of classes when necessary. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@394310 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/maven/it/Verifier.java | 10 ++++++---- .../maven/it => codehaus/plexus/util}/FileUtils.java | 2 +- .../plexus/util}/cli/CommandLineException.java | 2 +- .../plexus/util}/cli/CommandLineUtils.java | 5 ++++- .../it => codehaus/plexus/util}/cli/Commandline.java | 2 +- .../plexus/util}/cli/DefaultConsumer.java | 2 +- .../plexus/util}/cli/EnhancedStringTokenizer.java | 2 +- .../plexus/util}/cli/StreamConsumer.java | 2 +- .../it => codehaus/plexus/util}/cli/StreamFeeder.java | 2 +- .../it => codehaus/plexus/util}/cli/StreamPumper.java | 4 +++- .../plexus/util/cli}/WriterStreamConsumer.java | 4 ++-- 11 files changed, 22 insertions(+), 15 deletions(-) rename maven-core-it-verifier/src/main/java/org/{apache/maven/it => codehaus/plexus/util}/FileUtils.java (99%) rename maven-core-it-verifier/src/main/java/org/{apache/maven/it => codehaus/plexus/util}/cli/CommandLineException.java (97%) rename maven-core-it-verifier/src/main/java/org/{apache/maven/it => codehaus/plexus/util}/cli/CommandLineUtils.java (96%) rename maven-core-it-verifier/src/main/java/org/{apache/maven/it => codehaus/plexus/util}/cli/Commandline.java (99%) rename maven-core-it-verifier/src/main/java/org/{apache/maven/it => codehaus/plexus/util}/cli/DefaultConsumer.java (98%) rename maven-core-it-verifier/src/main/java/org/{apache/maven/it => codehaus/plexus/util}/cli/EnhancedStringTokenizer.java (99%) rename maven-core-it-verifier/src/main/java/org/{apache/maven/it => codehaus/plexus/util}/cli/StreamConsumer.java (98%) rename maven-core-it-verifier/src/main/java/org/{apache/maven/it => codehaus/plexus/util}/cli/StreamFeeder.java (98%) rename maven-core-it-verifier/src/main/java/org/{apache/maven/it => codehaus/plexus/util}/cli/StreamPumper.java (98%) rename maven-core-it-verifier/src/main/java/org/{apache/maven/it => codehaus/plexus/util/cli}/WriterStreamConsumer.java (82%) diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java b/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java index c352888a4d..992147476f 100644 --- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java +++ b/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java @@ -1,9 +1,11 @@ package org.apache.maven.it; -import org.apache.maven.it.cli.CommandLineException; -import org.apache.maven.it.cli.CommandLineUtils; -import org.apache.maven.it.cli.Commandline; -import org.apache.maven.it.cli.StreamConsumer; +import org.codehaus.plexus.util.cli.CommandLineException; +import org.codehaus.plexus.util.cli.CommandLineUtils; +import org.codehaus.plexus.util.cli.Commandline; +import org.codehaus.plexus.util.cli.StreamConsumer; +import org.codehaus.plexus.util.cli.WriterStreamConsumer; +import org.codehaus.plexus.util.FileUtils; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/FileUtils.java b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/FileUtils.java similarity index 99% rename from maven-core-it-verifier/src/main/java/org/apache/maven/it/FileUtils.java rename to maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/FileUtils.java index 0607747444..be98b74065 100644 --- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/FileUtils.java +++ b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/FileUtils.java @@ -1,4 +1,4 @@ -package org.apache.maven.it; +package org.codehaus.plexus.util; /* ==================================================================== * The Apache Software License, Version 1.1 diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/CommandLineException.java b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java similarity index 97% rename from maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/CommandLineException.java rename to maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java index 4c46ed11e2..7d5010a850 100644 --- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/CommandLineException.java +++ b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java @@ -1,4 +1,4 @@ -package org.apache.maven.it.cli; +package org.codehaus.plexus.util.cli; /* * The MIT License diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/CommandLineUtils.java b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java similarity index 96% rename from maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/CommandLineUtils.java rename to maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java index a8aca85e37..eb02ff434d 100644 --- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/CommandLineUtils.java +++ b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java @@ -1,4 +1,4 @@ -package org.apache.maven.it.cli; +package org.codehaus.plexus.util.cli; /* * The MIT License @@ -24,6 +24,9 @@ package org.apache.maven.it.cli; * SOFTWARE. */ +import org.codehaus.plexus.util.cli.Commandline; +import org.codehaus.plexus.util.cli.CommandLineException; + import java.io.InputStream; /** diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/Commandline.java b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/Commandline.java similarity index 99% rename from maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/Commandline.java rename to maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/Commandline.java index 19a5102d91..aa9d2a4ca2 100644 --- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/Commandline.java +++ b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/Commandline.java @@ -1,4 +1,4 @@ -package org.apache.maven.it.cli; +package org.codehaus.plexus.util.cli; /* * The MIT License diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/DefaultConsumer.java b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java similarity index 98% rename from maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/DefaultConsumer.java rename to maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java index 1384c5888e..2ff2e26368 100644 --- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/DefaultConsumer.java +++ b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java @@ -1,4 +1,4 @@ -package org.apache.maven.it.cli; +package org.codehaus.plexus.util.cli; /* * The MIT License diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/EnhancedStringTokenizer.java b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java similarity index 99% rename from maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/EnhancedStringTokenizer.java rename to maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java index bc5b2c6d3b..0f5cc0d925 100644 --- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/EnhancedStringTokenizer.java +++ b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java @@ -1,4 +1,4 @@ -package org.apache.maven.it.cli; +package org.codehaus.plexus.util.cli; /* * The MIT License diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/StreamConsumer.java b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java similarity index 98% rename from maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/StreamConsumer.java rename to maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java index b7cc141c6c..9e15847e1f 100644 --- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/StreamConsumer.java +++ b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java @@ -1,4 +1,4 @@ -package org.apache.maven.it.cli; +package org.codehaus.plexus.util.cli; /* * The MIT License diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/StreamFeeder.java b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java similarity index 98% rename from maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/StreamFeeder.java rename to maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java index 34eb20696b..5077f958a6 100644 --- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/StreamFeeder.java +++ b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java @@ -1,4 +1,4 @@ -package org.apache.maven.it.cli; +package org.codehaus.plexus.util.cli; /* * The MIT License diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/StreamPumper.java b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java similarity index 98% rename from maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/StreamPumper.java rename to maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java index 845fef34d5..04746af3f1 100644 --- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/cli/StreamPumper.java +++ b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java @@ -1,4 +1,4 @@ -package org.apache.maven.it.cli; +package org.codehaus.plexus.util.cli; /* * The MIT License @@ -78,6 +78,8 @@ package org.apache.maven.it.cli; * ==================================================================== */ +import org.codehaus.plexus.util.cli.StreamConsumer; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/WriterStreamConsumer.java b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java similarity index 82% rename from maven-core-it-verifier/src/main/java/org/apache/maven/it/WriterStreamConsumer.java rename to maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java index 4eb30b68ae..da6f4dbdd6 100644 --- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/WriterStreamConsumer.java +++ b/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java @@ -1,6 +1,6 @@ -package org.apache.maven.it; +package org.codehaus.plexus.util.cli; -import org.apache.maven.it.cli.StreamConsumer; +import org.codehaus.plexus.util.cli.StreamConsumer; import java.io.Writer; import java.io.PrintWriter;