cvs commit: maven-components/maven-core/src/bin m2

[jvanzyl]

jvanzyl     2004/04/12 12:14:02

  Modified:    maven-core/src/bin m2
  Log:
  
  
  Revision  Changes    Path
  1.3       +10 -28    maven-components/maven-core/src/bin/m2
  
  Index: m2
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/bin/m2,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- m2        10 Apr 2004 00:15:37 -0000      1.2
  +++ m2        12 Apr 2004 19:14:02 -0000      1.3
  @@ -23,12 +23,12 @@
   
   if [ -z "$M2_HOME" ] ; then
     # try to find MAVEN
  -  if [ -d /opt/maven ] ; then
  -    M2_HOME=/opt/maven
  +  if [ -d /opt/m2 ] ; then
  +    M2_HOME=/opt/m2
     fi
   
     if [ -d ${HOME}/maven ] ; then
  -    M2_HOME=${HOME}/maven
  +    M2_HOME=${HOME}/m2
     fi
   
     ## resolve links - $0 may be a link to maven's home
  @@ -117,28 +117,10 @@
   
   MAIN_CLASS=org.codehaus.classworlds.Launcher
   
  -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 "${M2_HOME}/lib/classworlds-${CLASSWORLDS_VERSION}.jar" \
  -    "-Dclassworlds.conf=${M2_HOME}/bin/classworlds.conf"  \
  -    "-Dtools.jar=$TOOLS_JAR" \
  -    "-Dmaven.home=${M2_HOME}" \
  -    "-Dmaven.home.local=${M2_HOME_LOCAL}" \
  -    $MAIN_CLASS $@
  -fi
  -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 "${M2_HOME}/lib/classworlds-${CLASSWORLDS_VERSION}.jar" \
  -    "-Dclassworlds.conf=${M2_HOME}/bin/classworlds.conf"  \
  -    "-Dtools.jar=$TOOLS_JAR" \
  -    "-Dmaven.home=${M2_HOME}" \
  -    $MAIN_CLASS $@
  -fi
  +$JAVACMD \
  +  $MAVEN_OPTS \
  +  -classpath "${M2_HOME}/lib/classworlds-${CLASSWORLDS_VERSION}.jar" \
  +  "-Dclassworlds.conf=${M2_HOME}/bin/classworlds.conf"  \
  +  "-Dtools.jar=$TOOLS_JAR" \
  +  "-Dmaven.home=${M2_HOME}"
  +  $MAIN_CLASS $@
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]