svn commit: r479202 - in /maven/components/branches/maven.new/maven-cli/src: assemble/bin.xml bin/mvn main/java/org/apache/maven/cli/MavenCli.java test/java/org/apache/maven/cli/MavenCliTest.java

[jvanzyl]

Author: jvanzyl
Date: Sat Nov 25 13:32:58 2006
New Revision: 479202

URL: http://svn.apache.org/viewvc?view=rev&rev=479202
Log:
o applying another patch from andy

Modified:
    maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml
    maven/components/branches/maven.new/maven-cli/src/bin/mvn
    
maven/components/branches/maven.new/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
    
maven/components/branches/maven.new/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java

Modified: maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml?view=diff&rev=479202&r1=479201&r2=479202
==============================================================================
--- maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml 
(original)
+++ maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml Sat Nov 
25 13:32:58 2006
@@ -59,14 +59,14 @@
     <dependencySet>
       <outputDirectory>core/boot</outputDirectory>
       <includes>
-        <include>classworlds:classworlds</include>
+        <include>org.codehaus.plexus:plexus-classworlds</include>
       </includes>
     </dependencySet>
     <dependencySet>
       <outputDirectory>lib</outputDirectory>
       <excludes>
         <exclude>org.codehaus.plexus:plexus-container-default</exclude>
-        <exclude>classworlds:classworlds</exclude>
+        <exclude>org.codehaus.plexus:plexus-classworlds</exclude>
         <exclude>org.codehaus.plexus:plexus-utils</exclude>
         <!-- transitively picked up via default container - not needed -->
         <exclude>plexus:plexus-utils</exclude>

Modified: maven/components/branches/maven.new/maven-cli/src/bin/mvn
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-cli/src/bin/mvn?view=diff&rev=479202&r1=479201&r2=479202
==============================================================================
--- maven/components/branches/maven.new/maven-cli/src/bin/mvn (original)
+++ maven/components/branches/maven.new/maven-cli/src/bin/mvn Sat Nov 25 
13:32:58 2006
@@ -157,7 +157,7 @@
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
-  -classpath "${M2_HOME}"/core/boot/classworlds-*.jar \
+  -classpath "${M2_HOME}"/core/boot/plexus-classworlds-*.jar \
   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
   "-Dmaven.home=${M2_HOME}"  \
   ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS

Modified: 
maven/components/branches/maven.new/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java?view=diff&rev=479202&r1=479201&r2=479202
==============================================================================
--- 
maven/components/branches/maven.new/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
 (original)
+++ 
maven/components/branches/maven.new/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
 Sat Nov 25 13:32:58 2006
@@ -26,7 +26,7 @@
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.reactor.MavenExecutionException;
 import org.apache.maven.settings.Settings;
-import org.codehaus.classworlds.ClassWorld;
+import org.codehaus.plexus.classworlds.ClassWorld;
 
 import java.io.File;
 import java.io.IOException;

Modified: 
maven/components/branches/maven.new/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java?view=diff&rev=479202&r1=479201&r2=479202
==============================================================================
--- 
maven/components/branches/maven.new/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java
 (original)
+++ 
maven/components/branches/maven.new/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java
 Sat Nov 25 13:32:58 2006
@@ -19,7 +19,7 @@
 import java.io.OutputStream;
 import java.io.PrintStream;
 
-import org.codehaus.classworlds.ClassWorld;
+import org.codehaus.plexus.classworlds.ClassWorld;
 import org.codehaus.plexus.util.StringOutputStream;
 
 import junit.framework.TestCase;