jvanzyl 2004/04/09 17:15:37
Modified: maven-core/src/bin m2
Log:
o M2_HOME now instead of MAVEN_HOME
Revision Changes Path
1.2 +23 -23 maven-components/maven-core/src/bin/m2
Index: m2
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/bin/m2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- m2 10 Apr 2004 00:13:40 -0000 1.1
+++ m2 10 Apr 2004 00:15:37 -0000 1.2
@@ -21,14 +21,14 @@
Darwin*) darwin=true ;;
esac
-if [ -z "$MAVEN_HOME" ] ; then
+if [ -z "$M2_HOME" ] ; then
# try to find MAVEN
if [ -d /opt/maven ] ; then
- MAVEN_HOME=/opt/maven
+ M2_HOME=/opt/maven
fi
if [ -d ${HOME}/maven ] ; then
- MAVEN_HOME=${HOME}/maven
+ M2_HOME=${HOME}/maven
fi
## resolve links - $0 may be a link to maven's home
@@ -49,20 +49,20 @@
fi
done
- MAVEN_HOME=`dirname "$PRG"`/..
+ M2_HOME=`dirname "$PRG"`/..
# make it fully qualified
- MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
+ M2_HOME=`cd "$M2_HOME" && pwd`
cd $saveddir
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
- [ -n "$MAVEN_HOME" ] &&
- MAVEN_HOME=`cygpath --unix "$MAVEN_HOME"`
- [ -n "$MAVEN_HOME_LOCAL" ] &&
- MAVEN_HOME_LOCAL=`cygpath --unix "$MAVEN_HOME_LOCAL"`
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$M2_HOME_LOCAL" ] &&
+ M2_HOME_LOCAL=`cygpath --unix "$M2_HOME_LOCAL"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
@@ -95,14 +95,14 @@
echo " to the installation directory of java."
fi
-MAVEN_ENDORSED==${JAVA_HOME}/lib/endorsed:${MAVEN_HOME}/lib/endorsed
+MAVEN_ENDORSED==${JAVA_HOME}/lib/endorsed:${M2_HOME}/lib/endorsed
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
- [ -n "$MAVEN_HOME" ] &&
- MAVEN_HOME=`cygpath --path --windows "$MAVEN_HOME"`
- [ -n "$MAVEN_HOME_LOCAL" ] &&
- MAVEN_HOME_LOCAL=`cygpath --path --windows "$MAVEN_HOME_LOCAL"`
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$M2_HOME_LOCAL" ] &&
+ M2_HOME_LOCAL=`cygpath --path --windows "$M2_HOME_LOCAL"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
[ -n "$MAVEN_ENDORSED" ] &&
@@ -117,28 +117,28 @@
MAIN_CLASS=org.codehaus.classworlds.Launcher
-if [ -n "$MAVEN_HOME_LOCAL" ]; then
+if [ -n "$M2_HOME_LOCAL" ]; then
$JAVACMD \
$MAVEN_OPTS \
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
\
"-Djava.endorsed.dirs=${MAVEN_ENDORSED}" \
- -classpath "${MAVEN_HOME}/lib/classworlds-${CLASSWORLDS_VERSION}.jar" \
- "-Dclassworlds.conf=${MAVEN_HOME}/bin/classworlds.conf" \
+ -classpath "${M2_HOME}/lib/classworlds-${CLASSWORLDS_VERSION}.jar" \
+ "-Dclassworlds.conf=${M2_HOME}/bin/classworlds.conf" \
"-Dtools.jar=$TOOLS_JAR" \
- "-Dmaven.home=${MAVEN_HOME}" \
- "-Dmaven.home.local=${MAVEN_HOME_LOCAL}" \
+ "-Dmaven.home=${M2_HOME}" \
+ "-Dmaven.home.local=${M2_HOME_LOCAL}" \
$MAIN_CLASS $@
fi
-if [ ! -n "$MAVEN_HOME_LOCAL" ]; then
+if [ ! -n "$M2_HOME_LOCAL" ]; then
$JAVACMD \
$MAVEN_OPTS \
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
\
"-Djava.endorsed.dirs=${MAVEN_ENDORSED}" \
- -classpath "${MAVEN_HOME}/lib/classworlds-${CLASSWORLDS_VERSION}.jar" \
- "-Dclassworlds.conf=${MAVEN_HOME}/bin/classworlds.conf" \
+ -classpath "${M2_HOME}/lib/classworlds-${CLASSWORLDS_VERSION}.jar" \
+ "-Dclassworlds.conf=${M2_HOME}/bin/classworlds.conf" \
"-Dtools.jar=$TOOLS_JAR" \
- "-Dmaven.home=${MAVEN_HOME}" \
+ "-Dmaven.home=${M2_HOME}" \
$MAIN_CLASS $@
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
