You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2012/08/29 22:08:28 UTC
svn commit: r1378696 - in /maven/shared/trunk:
maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/
maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/
maven-verifier/src/main/java/org/apache/maven/it/ maven-verifie...
Author: struberg
Date: Wed Aug 29 20:08:27 2012
New Revision: 1378696
URL: http://svn.apache.org/viewvc?rev=1378696&view=rev
Log:
MSHARED-236 move cli utils from verifier to shared-utils
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/
- copied from r1378656, maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java
- copied, changed from r1378679, maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java
Removed:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineException.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineUtils.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/Commandline.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/DefaultConsumer.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/EnhancedStringTokenizer.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamConsumer.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamFeeder.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/WriterStreamConsumer.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/shell/
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/EnhancedStringTokenizer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java?rev=1378696&r1=1378656&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java Wed Aug 29 20:08:27 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.it.util.cli;
+package org.apache.maven.shared.utils.cli;
/*
* The MIT License
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java?rev=1378696&r1=1378656&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java Wed Aug 29 20:08:27 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.it.util.cli;
+package org.apache.maven.shared.utils.cli;
/*
* The MIT License
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java?rev=1378696&r1=1378656&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java Wed Aug 29 20:08:27 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.it.util.cli;
+package org.apache.maven.shared.utils.cli;
/*
* The MIT License
@@ -78,9 +78,9 @@ package org.apache.maven.it.util.cli;
* ====================================================================
*/
-import org.apache.maven.it.util.cli.shell.CommandShell;
-import org.apache.maven.it.util.cli.shell.CmdShell;
-import org.apache.maven.it.util.cli.shell.Shell;
+import org.apache.maven.shared.utils.cli.shell.CommandShell;
+import org.apache.maven.shared.utils.cli.shell.CmdShell;
+import org.apache.maven.shared.utils.cli.shell.Shell;
import java.io.File;
import java.io.IOException;
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java?rev=1378696&r1=1378656&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java Wed Aug 29 20:08:27 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.it.util.cli;
+package org.apache.maven.shared.utils.cli;
/*
* The MIT License
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/EnhancedStringTokenizer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/EnhancedStringTokenizer.java?rev=1378696&r1=1378656&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/EnhancedStringTokenizer.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/EnhancedStringTokenizer.java Wed Aug 29 20:08:27 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.it.util.cli;
+package org.apache.maven.shared.utils.cli;
/*
* The MIT License
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java?rev=1378696&r1=1378656&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java Wed Aug 29 20:08:27 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.it.util.cli;
+package org.apache.maven.shared.utils.cli;
/*
* The MIT License
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java?rev=1378696&r1=1378656&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java Wed Aug 29 20:08:27 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.it.util.cli;
+package org.apache.maven.shared.utils.cli;
/*
* The MIT License
Copied: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java (from r1378679, maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java?p2=maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java&p1=maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java&r1=1378679&r2=1378696&rev=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java Wed Aug 29 20:08:27 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.it.util.cli;
+package org.apache.maven.shared.utils.cli;
/*
* The MIT License
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java?rev=1378696&r1=1378656&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java Wed Aug 29 20:08:27 2012
@@ -22,7 +22,7 @@
* SOFTWARE.
*/
-package org.apache.maven.it.util.cli;
+package org.apache.maven.shared.utils.cli;
import java.io.PrintWriter;
import java.io.Writer;
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java?rev=1378696&r1=1378656&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java Wed Aug 29 20:08:27 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.it.util.cli.shell;
+package org.apache.maven.shared.utils.cli.shell;
/**
* @author Jason van Zyl
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java?rev=1378696&r1=1378656&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java Wed Aug 29 20:08:27 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.it.util.cli.shell;
+package org.apache.maven.shared.utils.cli.shell;
import java.util.Arrays;
import java.util.List;
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java?rev=1378696&r1=1378656&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java Wed Aug 29 20:08:27 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.it.util.cli.shell;
+package org.apache.maven.shared.utils.cli.shell;
/*
* Copyright 2001-2006 The Apache Software Foundation.
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java?rev=1378696&r1=1378656&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java Wed Aug 29 20:08:27 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.it.util.cli.shell;
+package org.apache.maven.shared.utils.cli.shell;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.apache.maven.it.util.cli.she
* limitations under the License.
*/
-import org.apache.maven.it.util.cli.CommandLineException;
-import org.apache.maven.it.util.cli.Commandline;
+import org.apache.maven.shared.utils.cli.CommandLineException;
+import org.apache.maven.shared.utils.cli.Commandline;
import java.util.ArrayList;
import java.util.Arrays;
Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java?rev=1378696&r1=1378695&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java (original)
+++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java Wed Aug 29 20:08:27 2012
@@ -27,11 +27,11 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
-import org.apache.maven.it.util.cli.CommandLineException;
-import org.apache.maven.it.util.cli.CommandLineUtils;
-import org.apache.maven.it.util.cli.Commandline;
-import org.apache.maven.it.util.cli.StreamConsumer;
-import org.apache.maven.it.util.cli.WriterStreamConsumer;
+import org.apache.maven.shared.utils.cli.CommandLineException;
+import org.apache.maven.shared.utils.cli.CommandLineUtils;
+import org.apache.maven.shared.utils.cli.Commandline;
+import org.apache.maven.shared.utils.cli.StreamConsumer;
+import org.apache.maven.shared.utils.cli.WriterStreamConsumer;
/**
* @author Benjamin Bentmann
Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=1378696&r1=1378695&r2=1378696&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java (original)
+++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Wed Aug 29 20:08:27 2012
@@ -20,11 +20,11 @@ package org.apache.maven.it;
*/
import junit.framework.Assert;
-import org.apache.maven.it.util.cli.CommandLineException;
-import org.apache.maven.it.util.cli.CommandLineUtils;
-import org.apache.maven.it.util.cli.Commandline;
-import org.apache.maven.it.util.cli.StreamConsumer;
-import org.apache.maven.it.util.cli.WriterStreamConsumer;
+import org.apache.maven.shared.utils.cli.CommandLineException;
+import org.apache.maven.shared.utils.cli.CommandLineUtils;
+import org.apache.maven.shared.utils.cli.Commandline;
+import org.apache.maven.shared.utils.cli.StreamConsumer;
+import org.apache.maven.shared.utils.cli.WriterStreamConsumer;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.shared.utils.io.IOUtil;