You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/10/14 18:20:57 UTC
svn commit: r463971 - in
/maven/components/trunk/maven-core-it-verifier/src/main/java/org:
apache/maven/it/ apache/maven/it/util/ apache/maven/it/util/cli/
codehaus/plexus/util/
Author: jvanzyl
Date: Sat Oct 14 09:20:52 2006
New Revision: 463971
URL: http://svn.apache.org/viewvc?view=rev&rev=463971
Log:
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.
Added:
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/
- copied from r463328, maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/DirectoryScanner.java
- copied, changed from r463928, maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/DirectoryScanner.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/FileUtils.java
- copied, changed from r463928, maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/FileUtils.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/IOUtil.java
- copied, changed from r463928, maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/IOUtil.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/SelectorUtils.java
- copied, changed from r463928, maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/SelectorUtils.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/StringUtils.java
- copied, changed from r463928, maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/StringUtils.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/
- copied from r463928, maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/cli/
Removed:
maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/
Modified:
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineException.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineUtils.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/Commandline.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/DefaultConsumer.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/EnhancedStringTokenizer.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamConsumer.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamFeeder.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java
maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/WriterStreamConsumer.java
Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java?view=diff&rev=463971&r1=463970&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java Sat Oct 14 09:20:52 2006
@@ -9,8 +9,8 @@
import junit.framework.*;
-import org.codehaus.plexus.util.*;
-import org.codehaus.plexus.util.cli.*;
+import org.apache.maven.it.util.*;
+import org.apache.maven.it.util.cli.*;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
Copied: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/DirectoryScanner.java (from r463928, maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/DirectoryScanner.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/DirectoryScanner.java?view=diff&rev=463971&p1=maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/DirectoryScanner.java&r1=463928&p2=maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/DirectoryScanner.java&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/DirectoryScanner.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/DirectoryScanner.java Sat Oct 14 09:20:52 2006
@@ -52,7 +52,7 @@
* <http://www.codehaus.org/>.
*/
-package org.codehaus.plexus.util;
+package org.apache.maven.it.util;
import java.io.File;
import java.io.IOException;
Copied: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/FileUtils.java (from r463928, maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/FileUtils.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/FileUtils.java?view=diff&rev=463971&p1=maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/FileUtils.java&r1=463928&p2=maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/FileUtils.java&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/FileUtils.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/FileUtils.java Sat Oct 14 09:20:52 2006
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util;
+package org.apache.maven.it.util;
/* ====================================================================
* The Apache Software License, Version 1.1
@@ -55,7 +55,6 @@
*
*/
-import java.io.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -76,8 +75,6 @@
import java.util.List;
import java.util.Random;
import java.util.Vector;
-
-import org.apache.maven.it.*;
/**
* This class provides basic facilities for manipulating files and file paths.
Copied: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/IOUtil.java (from r463928, maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/IOUtil.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/IOUtil.java?view=diff&rev=463971&p1=maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/IOUtil.java&r1=463928&p2=maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/IOUtil.java&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/IOUtil.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/IOUtil.java Sat Oct 14 09:20:52 2006
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util;
+package org.apache.maven.it.util;
/* ====================================================================
* The Apache Software License, Version 1.1
Copied: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/SelectorUtils.java (from r463928, maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/SelectorUtils.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/SelectorUtils.java?view=diff&rev=463971&p1=maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/SelectorUtils.java&r1=463928&p2=maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/SelectorUtils.java&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/SelectorUtils.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/SelectorUtils.java Sat Oct 14 09:20:52 2006
@@ -52,7 +52,7 @@
* <http://www.codehaus.org/>.
*/
-package org.codehaus.plexus.util;
+package org.apache.maven.it.util;
import java.io.File;
import java.util.StringTokenizer;
Copied: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/StringUtils.java (from r463928, maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/StringUtils.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/StringUtils.java?view=diff&rev=463971&p1=maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/StringUtils.java&r1=463928&p2=maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/StringUtils.java&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/codehaus/plexus/util/StringUtils.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/StringUtils.java Sat Oct 14 09:20:52 2006
@@ -51,7 +51,7 @@
* information on the Apache Software Foundation, please see
* <http://www.codehaus.org/>.
*/
-package org.codehaus.plexus.util;
+package org.apache.maven.it.util;
import java.util.Iterator;
import java.util.Map;
Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineException.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineException.java?view=diff&rev=463971&r1=463928&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineException.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineException.java Sat Oct 14 09:20:52 2006
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util.cli;
+package org.apache.maven.it.util.cli;
/*
* The MIT License
Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineUtils.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineUtils.java?view=diff&rev=463971&r1=463928&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineUtils.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineUtils.java Sat Oct 14 09:20:52 2006
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util.cli;
+package org.apache.maven.it.util.cli;
/*
* The MIT License
@@ -24,8 +24,8 @@
* SOFTWARE.
*/
-import org.codehaus.plexus.util.cli.Commandline;
-import org.codehaus.plexus.util.cli.CommandLineException;
+import org.apache.maven.it.util.cli.Commandline;
+import org.apache.maven.it.util.cli.CommandLineException;
import java.io.InputStream;
Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/Commandline.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/Commandline.java?view=diff&rev=463971&r1=463928&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/Commandline.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/Commandline.java Sat Oct 14 09:20:52 2006
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util.cli;
+package org.apache.maven.it.util.cli;
/*
* The MIT License
Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/DefaultConsumer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/DefaultConsumer.java?view=diff&rev=463971&r1=463928&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/DefaultConsumer.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/DefaultConsumer.java Sat Oct 14 09:20:52 2006
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util.cli;
+package org.apache.maven.it.util.cli;
/*
* The MIT License
Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/EnhancedStringTokenizer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/EnhancedStringTokenizer.java?view=diff&rev=463971&r1=463928&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/EnhancedStringTokenizer.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/EnhancedStringTokenizer.java Sat Oct 14 09:20:52 2006
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util.cli;
+package org.apache.maven.it.util.cli;
/*
* The MIT License
Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamConsumer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamConsumer.java?view=diff&rev=463971&r1=463928&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamConsumer.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamConsumer.java Sat Oct 14 09:20:52 2006
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util.cli;
+package org.apache.maven.it.util.cli;
/*
* The MIT License
Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamFeeder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamFeeder.java?view=diff&rev=463971&r1=463928&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamFeeder.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamFeeder.java Sat Oct 14 09:20:52 2006
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util.cli;
+package org.apache.maven.it.util.cli;
/*
* The MIT License
Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java?view=diff&rev=463971&r1=463928&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java Sat Oct 14 09:20:52 2006
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util.cli;
+package org.apache.maven.it.util.cli;
/*
* The MIT License
@@ -78,7 +78,7 @@
* ====================================================================
*/
-import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.apache.maven.it.util.cli.StreamConsumer;
import java.io.BufferedReader;
import java.io.IOException;
Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/WriterStreamConsumer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/WriterStreamConsumer.java?view=diff&rev=463971&r1=463928&r2=463971
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/WriterStreamConsumer.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/util/cli/WriterStreamConsumer.java Sat Oct 14 09:20:52 2006
@@ -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.PrintWriter;