o Trying to keep only keep the main entry point into maven as the only classes in the top level package.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163238 13f79535-47bb-0310-9956-ffa450edef68

maven-core/src/bin/m2

@@ -1,7 +1,15 @@
 #!/bin/sh
 
-#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
-#   reserved.
+# -----------------------------------------------------------------------------
+# Copyright (c) 2001-2005 The Apache Software Foundation.
+# All rights reserved.
+# -----------------------------------------------------------------------------
+
+#@#
+CLASSWORLDS_JAR=${M2_HOME}/core/boot/classworlds-*.jar
+CLASSWORLDS_CONF=${M2_HOME}/bin/m2.conf
+CLASSWORLDS_LAUNCHER=org.codehaus.classworlds.Launcher
+#@#
 
 if [ -z "$MAVEN_OPTS" ] ; then
   MAVEN_OPTS="-Xmx256m"
@@ -73,8 +81,8 @@ fi
 
 $JAVACMD \
   $MAVEN_OPTS \
-  -classpath ${M2_HOME}/core/boot/classworlds-*.jar \
-  "-Dclassworlds.conf=${M2_HOME}/bin/classworlds.conf"  \
-  "-Dmaven.home=$M2_HOME"  \
-  org.codehaus.classworlds.Launcher $@
+  -classpath ${CLASSWORLDS_JAR} \
+  "-Dclassworlds.conf=${CLASSWORLDS_CONF}"  \
+  "-Dmaven.home=${M2_HOME}"  \
+  ${CLASSWORLDS_LAUNCHER} $@
 

maven-core/src/bin/m2.conf

@@ -1,4 +1,4 @@
-main is org.apache.maven.MavenCli from plexus.core.maven
+main is org.apache.maven.cli.MavenCli from plexus.core.maven
 
 set maven.home default ${user.home}/m2
 

maven-core/src/main/java/org/apache/maven/DefaultMaven.java

@@ -32,6 +32,7 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.reactor.ReactorException;
 
 import org.codehaus.plexus.ArtifactEnabledContainer;
 import org.codehaus.plexus.PlexusConstants;

maven-core/src/main/java/org/apache/maven/Maven.java

@@ -20,6 +20,7 @@ import org.apache.maven.lifecycle.goal.GoalNotFoundException;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.reactor.ReactorException;
 
 import java.io.File;
 import java.util.List;

maven-core/src/main/java/org/apache/maven/artifact/JarOverrideRequestTransformation.java

@@ -1,4 +1,4 @@
-package org.apache.maven;
+package org.apache.maven.artifact;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.

maven-core/src/main/java/org/apache/maven/artifact/SnapshotRequestTransformation.java

@@ -1,4 +1,4 @@
-package org.apache.maven;
+package org.apache.maven.artifact;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.

maven-core/src/main/java/org/apache/maven/cli/MavenCli.java

@@ -1,4 +1,4 @@
-package org.apache.maven;
+package org.apache.maven.cli;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -28,6 +28,8 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.Maven;
+import org.apache.maven.ExecutionResponse;
 
 import org.codehaus.classworlds.ClassWorld;
 import org.codehaus.plexus.embed.ArtifactEnabledEmbedder;

maven-core/src/main/java/org/apache/maven/cli/MavenConstants.java

@@ -1,4 +1,4 @@
-package org.apache.maven;
+package org.apache.maven.cli;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.

maven-core/src/main/java/org/apache/maven/exception/MavenExceptionHandler.java

@@ -1,4 +1,4 @@
-package org.apache.maven;
+package org.apache.maven.exception;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.

maven-core/src/main/java/org/apache/maven/exception/MavenHomeNotDefinedException.java

@@ -1,4 +1,4 @@
-package org.apache.maven;
+package org.apache.maven.exception;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.

maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java

@@ -1,4 +1,4 @@
-package org.apache.maven;
+package org.apache.maven.reactor;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.

maven-core/src/site/apt/install.apt

@@ -6,6 +6,9 @@
 
 Installing maven2
 
+ * 
+
+
  * Download m2 {{{http://www.apache.org/~jvanzyl/m2/m2.tgz}here}}.
  
  * Unpack in your home directory. In will expand in a directory called <<<m2>>>.

maven-core/src/test/java/org/apache/maven/MavenTestCase.java

@@ -59,6 +59,7 @@ public class MavenTestCase
         }
 
         testRepoUrl = testRepoLocation.toURL().toExternalForm();
+
         testRepoUrl = testRepoUrl.substring( 0, testRepoUrl.length() - 1 );
 
         pluginManager = (PluginManager) lookup( PluginManager.ROLE );