complete removal of maven.properties, make some changes for maven.home

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

maven-core/src/bin/classworlds.conf

@@ -1,6 +1,6 @@
 main is org.apache.maven.MavenCli from plexus.core.maven
 
-set maven.home using ${user.home}/maven.properties default ${user.home}/m2
+set maven.home default ${user.home}/m2
 
 [plexus.core]
 load ${maven.home}/core/plexus-0.17.jar

maven-core/src/bin/m2

@@ -53,9 +53,12 @@ if [ -z "$JAVA_HOME" ] ; then
   echo "  to the installation directory of java."
 fi
 
-if [ "$cygwin" = "true" ]
-then
-  M2_HOME=`cygpath -pu "$M2_HOME"`
+if $cygwin; then
+  [ -n "$M2_HOME" ] && M2_HOME=`cygpath --path --unix "$M2_HOME"`
+fi
+
+if [ -z "$M2_HOME" ]; then
+  M2_HOME=`dirname $0/..`
 fi
 
 CLASSWORLDS_CONF="${M2_HOME}/bin/classworlds.conf"
@@ -67,6 +70,7 @@ if $cygwin; then
   [ -n "$CP" ] && CP=`cygpath --path --windows "$CP"`
   [ -n "$CLASSWORLDS_CONF" ] && CLASSWORLDS_CONF=`cygpath --path --windows "$CLASSWORLDS_CONF"`
   [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$M2_HOME" ] && M2_HOME=`cygpath --path --windows "$M2_HOME"`
 fi
 
 MAIN_CLASS=org.codehaus.classworlds.Launcher
@@ -75,4 +79,6 @@ $JAVACMD \
   $MAVEN_OPTS \
   -classpath "$CP" \
   "-Dclassworlds.conf=$CLASSWORLDS_CONF"  \
+  "-Dmaven.home=$M2_HOME"  \
   $MAIN_CLASS $@
+