Author: mcconnell
Date: Tue Jun 29 17:31:47 2004
New Revision: 22281
Removed:
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlinx
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlinx.bat
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlinx.sh
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/repository.bat
Modified:
avalon/trunk/runtime/merlin/cli/build.xml
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/README.TXT
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin.bat
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/nt/wrapper.conf
Log:
remove merlinx and update the nt service defintion to sync. with the new classpath
generation strategy
Modified: avalon/trunk/runtime/merlin/cli/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/cli/build.xml (original)
+++ avalon/trunk/runtime/merlin/cli/build.xml Tue Jun 29 17:31:47 2004
@@ -14,11 +14,11 @@
token="MERLIN_IMPLEMENTATION"/>
<x:filter key="avalon-activation-impl" feature="uri"
token="STANDARD_RUNTIME"/>
- <x:filter feature="classpath" platform="windows" prefix="%MERLIN_SYSTEM%"
+ <x:filter feature="classpath" platform="windows" prefix="%MERLIN_HOME%/system"
token="WINDOWS-CLI-CLASSPATH"/>
<x:filter feature="path" platform="windows"
token="WINDOWS-CLI-MAIN-PATH"/>
- <x:filter feature="classpath" platform="unix" prefix="$MERLIN_SYSTEM"
+ <x:filter feature="classpath" platform="unix" prefix="$MERLIN_HOME/system"
token="UNIX-CLI-CLASSPATH"/>
<x:filter feature="path" platform="unix"
token="UNIX-CLI-MAIN-PATH"/>
Modified: avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/README.TXT
==============================================================================
--- avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/README.TXT (original)
+++ avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/README.TXT Tue Jun 29
17:31:47 2004
@@ -2,14 +2,9 @@
For Windows
===========
merlin.bat -- classic merlin command line exeuction
-merlinx.bat -- launch merlin using the Maven repository for resolvution
- of internal Merlin jar files (handly if your developing
- with merlin)
For Unix/Linux
==============
merlin-server.sh -- equivalent to the merlin NT service
merlin -- same as merlin.bat
-merlinx -- same as merlinx.bat
merlin.sh -- (deprecated, use merlin) same as merlin.bat
-merlinx.sh -- (deprecated, use merlinx) same as merlinx.bat
Modified: avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin.bat
==============================================================================
--- avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin.bat (original)
+++ avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin.bat Tue Jun 29
17:31:47 2004
@@ -13,11 +13,10 @@
:SET_MERLIN
if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_SYSTEM=%MERLIN_HOME%\system
set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
-set [EMAIL PROTECTED]@;[EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@;[EMAIL PROTECTED]@
:RUN_MERLIN
-%JAVA% %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -classpath
%MERLIN_BOOTSTRAP_CLASSPATH% org.apache.avalon.merlin.cli.Main %MERLIN_CMD_LINE_ARGS%
+%JAVA% %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -classpath %MERLIN_CLASSPATH%
org.apache.avalon.merlin.cli.Main %MERLIN_CMD_LINE_ARGS%
goto EndOfScript
:EndOfScript
Modified: avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/nt/wrapper.conf
==============================================================================
--- avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/nt/wrapper.conf
(original)
+++ avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/nt/wrapper.conf Tue
Jun 29 17:31:47 2004
@@ -10,7 +10,8 @@
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=wrapper.jar
-wrapper.java.classpath.2=../../system/merlin/jars/@MERLIN_CLI_JAR@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
