dion 2003/09/14 22:28:05
Modified: src/bin maven.bat maven
. project.xml
Log:
Move to forehead 1.0 beta 5
Revision Changes Path
1.38 +160 -160 maven/src/bin/maven.bat
Index: maven.bat
===================================================================
RCS file: /home/cvs/maven/src/bin/maven.bat,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- maven.bat 5 Jun 2003 07:33:23 -0000 1.37
+++ maven.bat 15 Sep 2003 05:28:05 -0000 1.38
@@ -1,160 +1,160 @@
[EMAIL PROTECTED]
----------------------------------------------------------------------------
[EMAIL PROTECTED] Maven Start Up Batch script
[EMAIL PROTECTED]
[EMAIL PROTECTED] Required ENV vars:
[EMAIL PROTECTED] JAVA_HOME - location of a JDK home dir
[EMAIL PROTECTED] MAVEN_HOME - location of maven's installed home dir
[EMAIL PROTECTED]
[EMAIL PROTECTED] Optional ENV vars
[EMAIL PROTECTED] MAVEN_HOME_LOCAL - may override default dir Maven writes work files
[EMAIL PROTECTED] MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch
commands
[EMAIL PROTECTED] MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before
ending
[EMAIL PROTECTED] MAVEN_OPTS - parameters passed to the Java VM when running Maven
[EMAIL PROTECTED] e.g. to debug Maven itself, use
[EMAIL PROTECTED] set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
[EMAIL PROTECTED]
[EMAIL PROTECTED] Utility rquirements:
[EMAIL PROTECTED] Windows' find.exe
[EMAIL PROTECTED] Windows' cmd.exe (NT) OR command.com ( 98 or ME )
[EMAIL PROTECTED]
----------------------------------------------------------------------------
-
[EMAIL PROTECTED] Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
[EMAIL PROTECTED] off
[EMAIL PROTECTED] enable echoing my setting MAVEN_BATCH_ECHO to 'on'
[EMAIL PROTECTED] "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
-
[EMAIL PROTECTED] Execute a user defined script before this one
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-
[EMAIL PROTECTED] set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" @setlocal
-
[EMAIL PROTECTED] For Windows NT, use cmd.exe to execute the "CD" later
[EMAIL PROTECTED] For Win 98ME, use comand.com - if neither is found , default to use
[EMAIL PROTECTED] cmd.exe in the path and hope we'll hit a Win version of it
[EMAIL PROTECTED] FYI: Using command.com on Win NT causes "Parameter format not
correct" error
-set MAVEN_COMMAND_COM="cmd.exe"
-if exist "%SystemRoot%\system32\cmd.exe" set
MAVEN_COMMAND_COM="%SystemRoot%\system32\cmd.exe"
-if exist "%SystemRoot%\command.com" set MAVEN_COMMAND_COM="%SystemRoot%\command.com"
-
[EMAIL PROTECTED] Use explicit find.exe to prevent cygwin and others find.exe from
being
[EMAIL PROTECTED] used instead - we use this to test dir existance in a
cross-win-platform way
-set MAVEN_FIND_EXE="find.exe"
-if exist "%SystemRoot%\system32\find.exe" set
MAVEN_FIND_EXE="%SystemRoot%\system32\find.exe"
-if exist "%SystemRoot%\command\find.exe" set
MAVEN_FIND_EXE="%SystemRoot%\command\find.exe"
-
[EMAIL PROTECTED] ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo ERROR: JAVA_HOME not found in your environment.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation
-echo.
-goto end
-
-:OkJHome
-%MAVEN_COMMAND_COM% /C DIR "%JAVA_HOME%" 2>&1 | %MAVEN_FIND_EXE% /I /C
"%JAVA_HOME%" >nul
-if not errorlevel 1 goto chkMHome
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory.
-echo JAVA_HOME = %JAVA_HOME%
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation
-echo.
-goto end
-
-:chkMHome
-if not "%MAVEN_HOME%"=="" goto valMHome
-
-echo.
-echo ERROR: MAVEN_HOME not found in your environment.
-echo Please set the MAVEN_HOME variable in your environment to match the
-echo location of the Maven installation
-echo.
-goto end
-
-:valMHome
-%MAVEN_COMMAND_COM% /C DIR "%MAVEN_HOME%" 2>&1 | %MAVEN_FIND_EXE% /I /C
"%MAVEN_HOME%" >nul
-if not errorlevel 1 goto init
-
-echo.
-echo ERROR: MAVEN_HOME is set to an invalid directory.
-echo MAVEN_HOME = %MAVEN_HOME%
-echo Please set the MAVEN_HOME variable in your environment to match the
-echo location of the Maven installation
-echo.
-goto end
[EMAIL PROTECTED] ==== END VALIDATION ====
-
-:init
[EMAIL PROTECTED] Decide how to startup depending on the version of windows
-
[EMAIL PROTECTED] -- Win98ME
-if NOT "%OS%"=="Windows_NT" goto Win9xArg
-
[EMAIL PROTECTED] -- 4NT shell
-if "%eval[2+2]" == "4" goto 4NTArgs
-
[EMAIL PROTECTED] -- Regular WinNT shell
-set MAVEN_CMD_LINE_ARGS=%*
-goto endInit
-
[EMAIL PROTECTED] The 4NT Shell from jp software
-:4NTArgs
-set MAVEN_CMD_LINE_ARGS=%$
-goto endInit
-
-:Win9xArg
[EMAIL PROTECTED] Slurp the command line arguments. This loop allows for an
unlimited number
[EMAIL PROTECTED] of agruments (up to the command line limit, anyway).
-set MAVEN_CMD_LINE_ARGS=
-:Win9xApp
-if %1a==a goto endInit
-set MAVEN_CMD_LINE_ARGS=%MAVEN_CMD_LINE_ARGS% %1
-shift
-goto Win9xApp
-
[EMAIL PROTECTED] Reaching here means variables are defined and arguments have been
captured
-:endInit
-if "%MAVEN_OPTS%"=="" SET MAVEN_OPTS="-Xmx160m"
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-SET MAVEN_CLASSPATH="%MAVEN_HOME%\lib\forehead-1.0-beta-4.jar"
-SET MAVEN_MAIN_CLASS="com.werken.forehead.Forehead"
-SET
MAVEN_ENDORSED="-Djava.endorsed.dirs=%JAVA_HOME%\lib\endorsed;%MAVEN_HOME%\lib\endorsed"
-if not "%MAVEN_HOME_LOCAL%" == "" goto StartMHL
-
[EMAIL PROTECTED] Start MAVEN without MAVEN_HOME_LOCAL override
-%MAVEN_JAVA_EXE%
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
"-Dmaven.home=%MAVEN_HOME%" "-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf" %MAVEN_ENDORSED% %MAVEN_OPTS%
-classpath %MAVEN_CLASSPATH% %MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
[EMAIL PROTECTED] %MAVEN_JAVA_EXE%
-Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
"-Dmaven.home=%MAVEN_HOME%" "-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf" %MAVEN_ENDORSED% %MAVEN_OPTS%
-classpath %MAVEN_CLASSPATH% %MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
-goto :end
-
[EMAIL PROTECTED] Start MAVEN with MAVEN_HOME_LOCAL override
-:StartMHL
-%MAVEN_JAVA_EXE%
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
"-Dmaven.home=%MAVEN_HOME%" "-Dmaven.home.local=%MAVEN_HOME_LOCAL%"
"-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf" %MAVEN_ENDORSED% %MAVEN_OPTS%
-classpath %MAVEN_CLASSPATH% %MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
[EMAIL PROTECTED] %MAVEN_JAVA_EXE%
-Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
"-Dmaven.home=%MAVEN_HOME%" "-Dmaven.home.local=%MAVEN_HOME_LOCAL%"
"-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf" %MAVEN_ENDORSED% %MAVEN_OPTS%
-classpath %MAVEN_CLASSPATH% %MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
-
-:end
[EMAIL PROTECTED] set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" goto endNT
-
[EMAIL PROTECTED] For old DOS remove the set variables from ENV - we assume they
were not set
[EMAIL PROTECTED] before we started - at least we don't leave any baggage around
-set MAVEN_COMMAND_COM=
-set MAVEN_FIND_EXE=
-set MAVEN_JAVA_EXE=
-set MAVEN_CLASSPATH=
-set MAVEN_MAIN_CLASS=
-set MAVEN_CMD_LINE_ARGS=
-SET MAVEN_ENDORSED=
-goto postExec
-
-:endNT
[EMAIL PROTECTED]
-
-:postExec
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
[EMAIL PROTECTED] pause the batch file if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
[EMAIL PROTECTED]
----------------------------------------------------------------------------
[EMAIL PROTECTED] Maven Start Up Batch script
[EMAIL PROTECTED]
[EMAIL PROTECTED] Required ENV vars:
[EMAIL PROTECTED] JAVA_HOME - location of a JDK home dir
[EMAIL PROTECTED] MAVEN_HOME - location of maven's installed home dir
[EMAIL PROTECTED]
[EMAIL PROTECTED] Optional ENV vars
[EMAIL PROTECTED] MAVEN_HOME_LOCAL - may override default dir Maven writes work files
[EMAIL PROTECTED] MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch
commands
[EMAIL PROTECTED] MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before
ending
[EMAIL PROTECTED] MAVEN_OPTS - parameters passed to the Java VM when running Maven
[EMAIL PROTECTED] e.g. to debug Maven itself, use
[EMAIL PROTECTED] set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
[EMAIL PROTECTED]
[EMAIL PROTECTED] Utility rquirements:
[EMAIL PROTECTED] Windows' find.exe
[EMAIL PROTECTED] Windows' cmd.exe (NT) OR command.com ( 98 or ME )
[EMAIL PROTECTED]
----------------------------------------------------------------------------
+
[EMAIL PROTECTED] Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
[EMAIL PROTECTED] off
[EMAIL PROTECTED] enable echoing my setting MAVEN_BATCH_ECHO to 'on'
[EMAIL PROTECTED] "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
[EMAIL PROTECTED] Execute a user defined script before this one
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+
[EMAIL PROTECTED] set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" @setlocal
+
[EMAIL PROTECTED] For Windows NT, use cmd.exe to execute the "CD" later
[EMAIL PROTECTED] For Win 98ME, use comand.com - if neither is found , default to use
[EMAIL PROTECTED] cmd.exe in the path and hope we'll hit a Win version of it
[EMAIL PROTECTED] FYI: Using command.com on Win NT causes "Parameter format not
correct" error
+set MAVEN_COMMAND_COM="cmd.exe"
+if exist "%SystemRoot%\system32\cmd.exe" set
MAVEN_COMMAND_COM="%SystemRoot%\system32\cmd.exe"
+if exist "%SystemRoot%\command.com" set MAVEN_COMMAND_COM="%SystemRoot%\command.com"
+
[EMAIL PROTECTED] Use explicit find.exe to prevent cygwin and others find.exe from
being
[EMAIL PROTECTED] used instead - we use this to test dir existance in a
cross-win-platform way
+set MAVEN_FIND_EXE="find.exe"
+if exist "%SystemRoot%\system32\find.exe" set
MAVEN_FIND_EXE="%SystemRoot%\system32\find.exe"
+if exist "%SystemRoot%\command\find.exe" set
MAVEN_FIND_EXE="%SystemRoot%\command\find.exe"
+
[EMAIL PROTECTED] ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo ERROR: JAVA_HOME not found in your environment.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation
+echo.
+goto end
+
+:OkJHome
+%MAVEN_COMMAND_COM% /C DIR "%JAVA_HOME%" 2>&1 | %MAVEN_FIND_EXE% /I /C
"%JAVA_HOME%" >nul
+if not errorlevel 1 goto chkMHome
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory.
+echo JAVA_HOME = %JAVA_HOME%
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation
+echo.
+goto end
+
+:chkMHome
+if not "%MAVEN_HOME%"=="" goto valMHome
+
+echo.
+echo ERROR: MAVEN_HOME not found in your environment.
+echo Please set the MAVEN_HOME variable in your environment to match the
+echo location of the Maven installation
+echo.
+goto end
+
+:valMHome
+%MAVEN_COMMAND_COM% /C DIR "%MAVEN_HOME%" 2>&1 | %MAVEN_FIND_EXE% /I /C
"%MAVEN_HOME%" >nul
+if not errorlevel 1 goto init
+
+echo.
+echo ERROR: MAVEN_HOME is set to an invalid directory.
+echo MAVEN_HOME = %MAVEN_HOME%
+echo Please set the MAVEN_HOME variable in your environment to match the
+echo location of the Maven installation
+echo.
+goto end
[EMAIL PROTECTED] ==== END VALIDATION ====
+
+:init
[EMAIL PROTECTED] Decide how to startup depending on the version of windows
+
[EMAIL PROTECTED] -- Win98ME
+if NOT "%OS%"=="Windows_NT" goto Win9xArg
+
[EMAIL PROTECTED] -- 4NT shell
+if "%eval[2+2]" == "4" goto 4NTArgs
+
[EMAIL PROTECTED] -- Regular WinNT shell
+set MAVEN_CMD_LINE_ARGS=%*
+goto endInit
+
[EMAIL PROTECTED] The 4NT Shell from jp software
+:4NTArgs
+set MAVEN_CMD_LINE_ARGS=%$
+goto endInit
+
+:Win9xArg
[EMAIL PROTECTED] Slurp the command line arguments. This loop allows for an
unlimited number
[EMAIL PROTECTED] of agruments (up to the command line limit, anyway).
+set MAVEN_CMD_LINE_ARGS=
+:Win9xApp
+if %1a==a goto endInit
+set MAVEN_CMD_LINE_ARGS=%MAVEN_CMD_LINE_ARGS% %1
+shift
+goto Win9xApp
+
[EMAIL PROTECTED] Reaching here means variables are defined and arguments have been
captured
+:endInit
+if "%MAVEN_OPTS%"=="" SET MAVEN_OPTS="-Xmx160m"
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+SET MAVEN_CLASSPATH="%MAVEN_HOME%\lib\forehead-1.0-beta-5.jar"
+SET MAVEN_MAIN_CLASS="com.werken.forehead.Forehead"
+SET
MAVEN_ENDORSED="-Djava.endorsed.dirs=%JAVA_HOME%\lib\endorsed;%MAVEN_HOME%\lib\endorsed"
+if not "%MAVEN_HOME_LOCAL%" == "" goto StartMHL
+
[EMAIL PROTECTED] Start MAVEN without MAVEN_HOME_LOCAL override
+%MAVEN_JAVA_EXE%
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
"-Dmaven.home=%MAVEN_HOME%" "-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf" %MAVEN_ENDORSED% %MAVEN_OPTS%
-classpath %MAVEN_CLASSPATH% %MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
[EMAIL PROTECTED] %MAVEN_JAVA_EXE%
-Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
"-Dmaven.home=%MAVEN_HOME%" "-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf" %MAVEN_ENDORSED% %MAVEN_OPTS%
-classpath %MAVEN_CLASSPATH% %MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
+goto :end
+
[EMAIL PROTECTED] Start MAVEN with MAVEN_HOME_LOCAL override
+:StartMHL
+%MAVEN_JAVA_EXE%
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
"-Dmaven.home=%MAVEN_HOME%" "-Dmaven.home.local=%MAVEN_HOME_LOCAL%"
"-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf" %MAVEN_ENDORSED% %MAVEN_OPTS%
-classpath %MAVEN_CLASSPATH% %MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
[EMAIL PROTECTED] %MAVEN_JAVA_EXE%
-Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
"-Dmaven.home=%MAVEN_HOME%" "-Dmaven.home.local=%MAVEN_HOME_LOCAL%"
"-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf" %MAVEN_ENDORSED% %MAVEN_OPTS%
-classpath %MAVEN_CLASSPATH% %MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
+
+:end
[EMAIL PROTECTED] set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" goto endNT
+
[EMAIL PROTECTED] For old DOS remove the set variables from ENV - we assume they
were not set
[EMAIL PROTECTED] before we started - at least we don't leave any baggage around
+set MAVEN_COMMAND_COM=
+set MAVEN_FIND_EXE=
+set MAVEN_JAVA_EXE=
+set MAVEN_CLASSPATH=
+set MAVEN_MAIN_CLASS=
+set MAVEN_CMD_LINE_ARGS=
+SET MAVEN_ENDORSED=
+goto postExec
+
+:endNT
[EMAIL PROTECTED]
+
+:postExec
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
[EMAIL PROTECTED] pause the batch file if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
1.27 +1 -1 maven/src/bin/maven
Index: maven
===================================================================
RCS file: /home/cvs/maven/src/bin/maven,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- maven 4 May 2003 23:48:20 -0000 1.26
+++ maven 15 Sep 2003 05:28:05 -0000 1.27
@@ -3,7 +3,7 @@
# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
# reserved.
-FOREHEAD_VERSION=1.0-beta-4
+FOREHEAD_VERSION=1.0-beta-5
MAVEN_OPTS="$MAVEN_OPTS -Xmx256m"
1.305 +1 -1 maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/project.xml,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- project.xml 14 Sep 2003 15:00:08 -0000 1.304
+++ project.xml 15 Sep 2003 05:28:05 -0000 1.305
@@ -510,7 +510,7 @@
</dependency>
<dependency>
<id>forehead</id>
- <version>1.0-beta-4</version>
+ <version>1.0-beta-5</version>
</dependency>
<dependency>
<id>log4j</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
