Author: jdcasey
Date: Tue Jun 9 20:18:27 2009
New Revision: 783124
URL: http://svn.apache.org/viewvc?rev=783124&view=rev
Log:
[MNG-4143] Still using compat layer to shield users from stacktrace on JDK <
1.5, but cleaning up the allocation of classes and the naming of
projects/classes to make this less intrusive and avoid problems with people
dependent on CLI classes.
Added:
maven/components/branches/maven-2.2.0-RC/maven-compat/
maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml
- copied, changed from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/pom.xml
maven/components/branches/maven-2.2.0-RC/maven-compat/src/
maven/components/branches/maven-2.2.0-RC/maven-compat/src/main/
maven/components/branches/maven-2.2.0-RC/maven-compat/src/main/java/
maven/components/branches/maven-2.2.0-RC/maven-compat/src/main/java/org/
maven/components/branches/maven-2.2.0-RC/maven-compat/src/main/java/org/apache/
maven/components/branches/maven-2.2.0-RC/maven-compat/src/main/java/org/apache/maven/
maven/components/branches/maven-2.2.0-RC/maven-compat/src/main/java/org/apache/maven/cli/
maven/components/branches/maven-2.2.0-RC/maven-compat/src/main/java/org/apache/maven/cli/compat/
maven/components/branches/maven-2.2.0-RC/maven-compat/src/main/java/org/apache/maven/cli/compat/CompatibleMain.java
- copied, changed from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/Main.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
- copied, changed from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
- copied, changed from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java
- copied, changed from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
- copied, changed from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
- copied, changed from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
- copied, changed from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java
- copied, changed from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java
- copied, changed from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
- copied, changed from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java
Removed:
maven/components/branches/maven-2.2.0-RC/maven-cli/pom.xml
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/Main.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java
Modified:
maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml
maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf
maven/components/branches/maven-2.2.0-RC/build.xml
maven/components/branches/maven-2.2.0-RC/pom.xml
Modified: maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml?rev=783124&r1=783123&r2=783124&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml Tue Jun 9
20:18:27 2009
@@ -146,7 +146,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-cli</artifactId>
+ <artifactId>maven-compat</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf?rev=783124&r1=783123&r2=783124&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf
(original)
+++ maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf Tue
Jun 9 20:18:27 2009
@@ -1,4 +1,4 @@
-main is org.apache.maven.cli.Main from plexus.core
+main is org.apache.maven.cli.compat.CompatibleMain from plexus.core
set maven.home default ${user.home}/m2
Modified: maven/components/branches/maven-2.2.0-RC/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/build.xml?rev=783124&r1=783123&r2=783124&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/build.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/build.xml Tue Jun 9 20:18:27 2009
@@ -184,7 +184,7 @@
</target>
<target name="maven-compile" depends="compile-boot" description="compiles
Maven using the bootstrap Maven, skipping automated tests">
- <java fork="true" classname="org.apache.maven.cli.Main" failonerror="true">
+ <java fork="true" classname="org.apache.maven.cli.compat.CompatibleMain"
failonerror="true">
<jvmarg value="-Xmx256M"/>
<!-- <jvmarg value="-Xdebug"/>
Copied: maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml (from
r783123, maven/components/branches/maven-2.2.0-RC/maven-cli/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml?p2=maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml&p1=maven/components/branches/maven-2.2.0-RC/maven-cli/pom.xml&r1=783123&r2=783124&rev=783124&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-cli/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml Tue Jun 9
20:18:27 2009
@@ -25,9 +25,9 @@
<version>2.2.0-RC3-SNAPSHOT</version>
</parent>
- <artifactId>maven-cli</artifactId>
+ <artifactId>maven-compat</artifactId>
- <name>Maven Command-Line Interface</name>
+ <name>Maven Compatibility Layer</name>
<dependencies>
<dependency>
Copied:
maven/components/branches/maven-2.2.0-RC/maven-compat/src/main/java/org/apache/maven/cli/compat/CompatibleMain.java
(from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/Main.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-compat/src/main/java/org/apache/maven/cli/compat/CompatibleMain.java?p2=maven/components/branches/maven-2.2.0-RC/maven-compat/src/main/java/org/apache/maven/cli/compat/CompatibleMain.java&p1=maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/Main.java&r1=783123&r2=783124&rev=783124&view=diff
==============================================================================
---
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/Main.java
(original)
+++
maven/components/branches/maven-2.2.0-RC/maven-compat/src/main/java/org/apache/maven/cli/compat/CompatibleMain.java
Tue Jun 9 20:18:27 2009
@@ -1,5 +1,6 @@
-package org.apache.maven.cli;
+package org.apache.maven.cli.compat;
+import org.apache.maven.cli.MavenCli;
import org.codehaus.classworlds.ClassWorld;
/**
@@ -7,7 +8,7 @@
*
* @since 2.2.0
*/
-public class Main
+public class CompatibleMain
{
public static void main( String[] args )
Copied:
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
(from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java?p2=maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java&p1=maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java&r1=783123&r2=783124&rev=783124&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
(from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java?p2=maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java&p1=maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java&r1=783123&r2=783124&rev=783124&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java
(from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java?p2=maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java&p1=maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java&r1=783123&r2=783124&rev=783124&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
(from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java?p2=maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java&p1=maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java&r1=783123&r2=783124&rev=783124&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
(from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?p2=maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java&p1=maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java&r1=783123&r2=783124&rev=783124&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
(from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java?p2=maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java&p1=maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java&r1=783123&r2=783124&rev=783124&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java
(from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java?p2=maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java&p1=maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java&r1=783123&r2=783124&rev=783124&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java
(from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java?p2=maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java&p1=maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java&r1=783123&r2=783124&rev=783124&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
(from r783123,
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java?p2=maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java&p1=maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java&r1=783123&r2=783124&rev=783124&view=diff
==============================================================================
(empty)
Modified: maven/components/branches/maven-2.2.0-RC/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/pom.xml?rev=783124&r1=783123&r2=783124&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/pom.xml Tue Jun 9 20:18:27 2009
@@ -280,7 +280,7 @@
<module>maven-artifact</module>
<module>maven-artifact-manager</module>
<module>maven-artifact-test</module>
- <module>maven-cli</module>
+ <module>maven-compat</module>
<module>maven-core</module>
<module>maven-error-diagnostics</module>
<module>maven-model</module>
@@ -372,7 +372,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-cli</artifactId>
+ <artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
