Author: bentmann
Date: Tue Dec 23 05:01:53 2008
New Revision: 728942
URL: http://svn.apache.org/viewvc?rev=728942&view=rev
Log:
[MNG-3867] Support MAVEN_OPTS in mvnDebug script
o Merged from r728940
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/apache-maven/ (props changed)
maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug
maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug.bat
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 23 05:01:53 2008
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,708790-728809,728834
-/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836
+/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
/maven/components/trunk:720001,721902,726845
Propchange: maven/components/branches/maven-2.1.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 23 05:01:53 2008
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven:679193-679867,680477-688882,708790-728809,728834
-/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,649903,657432,659677,679552-679867,693956-728820,728836
+/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,649903,657432,659677,679552-679867,693956-728820,728836,728940
/maven/components/branches/maven-2.1.0-M1-RC/apache-maven:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC/apache-maven:688883,689695,689976,689990
/maven/components/trunk/apache-maven:720001,721902,726845,727688
Modified: maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug?rev=728942&r1=728941&r2=728942&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug
(original)
+++ maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug Tue Dec
23 05:01:53 2008
@@ -33,7 +33,7 @@
# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
# ----------------------------------------------------------------------------
-INT_MAVEN_OPTS="$MAVEN_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
+MAVEN_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
echo Preparing to Execute Maven in Debug Mode
@@ -159,7 +159,8 @@
fi
exec "$JAVACMD" \
- $INT_MAVEN_OPTS \
+ $MAVEN_OPTS \
+ $MAVEN_DEBUG_OPTS \
-classpath "${M2_HOME}"/boot/classworlds-*.jar \
"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
"-Dmaven.home=${M2_HOME}" \
Modified:
maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug.bat
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug.bat?rev=728942&r1=728941&r2=728942&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug.bat
(original)
+++ maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug.bat Tue
Dec 23 05:01:53 2008
@@ -32,14 +32,14 @@
@REM set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@REM
----------------------------------------------------------------------------
-set INT_MAVEN_OPTS=%MAVEN_OPTS% -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-...@echo Preparing to Execute Maven in Debug Mode
-
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@echo off
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+set MAVEN_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+...@echo Preparing to Execute Maven in Debug Mode
+
@REM set %HOME% to equivalent of $HOME
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@@ -157,8 +157,7 @@
@REM Start MAVEN2
:runm2
-
-%MAVEN_JAVA_EXE% %INT_MAVEN_OPTS% -classpath %CLASSWORLDS_JAR%
"-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%"
org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %CLASSWORLDS_JAR%
"-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%"
org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end
