Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o making the packages unique. when used with the verifier we get class cast exceptions because Maven has already loaded 

another version of the plexus utils.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@463971 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2006-10-14 16:20:52 +00:00
parent 7dfed188b8
commit 270fdef090
15 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
View File

@ -9,8 +9,8 @@ import javax.xml.parsers.*;
import junit.framework.*; import junit.framework.*;
import org.codehaus.plexus.util.*; import org.apache.maven.it.util.*;
import org.codehaus.plexus.util.cli.*; import org.apache.maven.it.util.cli.*;
import org.xml.sax.*; import org.xml.sax.*;
import org.xml.sax.helpers.*; import org.xml.sax.helpers.*;

2
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/DirectoryScanner.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/DirectoryScanner.java
View File

@ -52,7 +52,7 @@
* <http://www.codehaus.org/>. * <http://www.codehaus.org/>.
*/ */
package org.codehaus.plexus.util; package org.apache.maven.it.util;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

5
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/FileUtils.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/FileUtils.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.util; package org.apache.maven.it.util;
/* ==================================================================== /* ====================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -55,7 +55,6 @@ package org.codehaus.plexus.util;
* *
*/ */
import java.io.*;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@ -77,8 +76,6 @@ import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.Vector; import java.util.Vector;
import org.apache.maven.it.*;
/** /**
* This class provides basic facilities for manipulating files and file paths. * This class provides basic facilities for manipulating files and file paths.
* *

2
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/IOUtil.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/IOUtil.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.util; package org.apache.maven.it.util;
/* ==================================================================== /* ====================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1

2
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/SelectorUtils.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/SelectorUtils.java
View File

@ -52,7 +52,7 @@
* <http://www.codehaus.org/>. * <http://www.codehaus.org/>.
*/ */
package org.codehaus.plexus.util; package org.apache.maven.it.util;
import java.io.File; import java.io.File;
import java.util.StringTokenizer; import java.util.StringTokenizer;

2
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/StringUtils.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/StringUtils.java
View File

@ -51,7 +51,7 @@
* information on the Apache Software Foundation, please see * information on the Apache Software Foundation, please see
* <http://www.codehaus.org/>. * <http://www.codehaus.org/>.
*/ */
package org.codehaus.plexus.util; package org.apache.maven.it.util;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;

2
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.util.cli; package org.apache.maven.it.util.cli;
/* /*
* The MIT License * The MIT License

6
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineUtils.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.util.cli; package org.apache.maven.it.util.cli;
/* /*
* The MIT License * The MIT License
@ -24,8 +24,8 @@ package org.codehaus.plexus.util.cli;
* SOFTWARE. * SOFTWARE.
*/ */
import org.codehaus.plexus.util.cli.Commandline; import org.apache.maven.it.util.cli.Commandline;
import org.codehaus.plexus.util.cli.CommandLineException; import org.apache.maven.it.util.cli.CommandLineException;
import java.io.InputStream; import java.io.InputStream;

2
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/Commandline.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/Commandline.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.util.cli; package org.apache.maven.it.util.cli;
/* /*
* The MIT License * The MIT License

2
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/DefaultConsumer.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.util.cli; package org.apache.maven.it.util.cli;
/* /*
* The MIT License * The MIT License

2
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/EnhancedStringTokenizer.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.util.cli; package org.apache.maven.it.util.cli;
/* /*
* The MIT License * The MIT License

2
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamConsumer.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.util.cli; package org.apache.maven.it.util.cli;
/* /*
* The MIT License * The MIT License

2
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamFeeder.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.util.cli; package org.apache.maven.it.util.cli;
/* /*
* The MIT License * The MIT License

4
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.util.cli; package org.apache.maven.it.util.cli;
/* /*
* The MIT License * The MIT License
@ -78,7 +78,7 @@ package org.codehaus.plexus.util.cli;
* ==================================================================== * ====================================================================
*/ */
import org.codehaus.plexus.util.cli.StreamConsumer; import org.apache.maven.it.util.cli.StreamConsumer;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;

4
maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java → maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/WriterStreamConsumer.java
View File

@ -1,6 +1,6 @@
package org.codehaus.plexus.util.cli; package org.apache.maven.it.util.cli;
import org.codehaus.plexus.util.cli.StreamConsumer; import org.apache.maven.it.util.cli.StreamConsumer;
import java.io.Writer; import java.io.Writer;
import java.io.PrintWriter; import java.io.PrintWriter;