cvs commit: cocoon-2.1 cocoon.bat
vgritsenko2003/07/30 20:19:10 Modified:.cocoon.bat Log: cleanup EXEC variable Revision ChangesPath 1.13 +2 -2 cocoon-2.1/cocoon.bat Index: cocoon.bat === RCS file: /home/cvs/cocoon-2.1/cocoon.bat,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cocoon.bat21 Jul 2003 05:08:57 - 1.12 +++ cocoon.bat31 Jul 2003 03:19:10 - 1.13 @@ -143,5 +143,5 @@ :end set CP= - +set EXEC=
Re: cvs commit: cocoon-2.1 cocoon.bat
Upayavira wrote: Joerg, I did some surfing, and came up with some basic code to work around the 10 parameter limit which I've just committed. It should work just as well on Win9x as on Win NT. Basically, it uses $1 and shift to make a string of the parameters, and passes that, which java then interprets as separate parameters. Looks really simple and good. I wonder what is possible with batch programming :) Oh, and good luck with your exams! Thanks. Regards, Upayavira Joerg
Re: cvs commit: cocoon-2.1 cocoon.bat
On Sun, 20 Jul 2003 09:52:51 +0200, "Joerg Heinicke" <[EMAIL PROTECTED]> said: > What about removing the shift for Win NT and passing also %1 for Win 9x > in the cocoon.bat (=> same behaviour for Win 9x and Win NT) and > therefore always ignore %1 / args[0] in the Java code? Joerg, I did some surfing, and came up with some basic code to work around the 10 parameter limit which I've just committed. It should work just as well on Win9x as on Win NT. Basically, it uses $1 and shift to make a string of the parameters, and passes that, which java then interprets as separate parameters. Oh, and good luck with your exams! Regards, Upayavira
cvs commit: cocoon-2.1 cocoon.bat
upayavira2003/07/20 22:08:58 Modified:.cocoon.bat Log: Should now fix the Windows 10 parameter limit Revision ChangesPath 1.12 +11 -6 cocoon-2.1/cocoon.bat Index: cocoon.bat === RCS file: /home/cvs/cocoon-2.1/cocoon.bat,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cocoon.bat19 Jul 2003 14:26:11 - 1.11 +++ cocoon.bat21 Jul 2003 05:08:57 - 1.12 @@ -103,12 +103,17 @@ :: - Cli --- :doCli -if not "%OS%" == "Windows_NT" goto noNT +set param= shift -%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %1 %2 %3 %4 %5 %6 %7 %8 %9 -goto end -:noNT -%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %2 %3 %4 %5 %6 %7 %8 %9 +:cliLoop +if "%1"=="" goto cliLoopEnd +if not "%1"=="" set param=%param% %1 +shift +goto cliLoop + +:cliLoopEnd + +%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %param% goto end :: - Servlet ---
Re: cvs commit: cocoon-2.1 cocoon.bat
Upayavira wrote: On Sun, 20 Jul 2003 02:58:32 +0200, "Joerg Heinicke" <[EMAIL PROTECTED]> said: Ah, there is a magic thing "shift"? I have looked for anything like that, but didn't find it. It's there in cocoon.bat already! But I've just found out that it does not affect $* :-( In the cocoon.bat - there I didn't look. I thought this handling were in the Java code. https://www.microsoft.com/technet/treeview/default.asp?url=/TechNet/prodtechnol/winxppro/proddocs/percent.asp Here's written %* does not include %0, I hope MS TechNet is more exact than the link I posted. But the non-working shift on %* explains the current behaviour too. That page has code showing how to handle more than 10 parameters, but I can't immediately think of how to get that to work when you just want to pass them on to another app in one go, rather than one by one. So I don't know what to do (other than make the CLI ignore 'cli' as its first argument) :-( What about removing the shift for Win NT and passing also %1 for Win 9x in the cocoon.bat (=> same behaviour for Win 9x and Win NT) and therefore always ignore %1 / args[0] in the Java code? Joerg
Re: cvs commit: cocoon-2.1 cocoon.bat
On Sun, 20 Jul 2003 02:58:32 +0200, "Joerg Heinicke" <[EMAIL PROTECTED]> said: > Ah, there is a magic thing "shift"? I have looked for anything like > that, but didn't find it. It's there in cocoon.bat already! But I've just found out that it does not affect $* :-( https://www.microsoft.com/technet/treeview/default.asp?url=/TechNet/prodtechnol/winxppro/proddocs/percent.asp That page has code showing how to handle more than 10 parameters, but I can't immediately think of how to get that to work when you just want to pass them on to another app in one go, rather than one by one. So I don't know what to do (other than make the CLI ignore 'cli' as its first argument) :-( > The problem while using $* is, that $0 is passed > (http://www.labmice.net/articles/batchcmds.htm#variable). So it works in > general ($0 is shifted), but you need it twice to shift $1 too. As you > see my change was from $* to $1 $2 ..., so "cli" is still passed as > argument, but shifted. > Can you revert my change, do the shifting a second time if it's "cli" > (compatibility to Win 9x) or in general if Win 9x can pass $0 too and at > the end point me to the shifting code? I don't have access to CVS, > Cocoon in the next days/weeks - have to pass exams. I'll try. My HDD died, so I'm using my mum's computer! Just downloaded from CVS, should now be able to do updates, we'll see... Regards, Upayavira
Re: cvs commit: cocoon-2.1 cocoon.bat
Ah, there is a magic thing "shift"? I have looked for anything like that, but didn't find it. The problem while using $* is, that $0 is passed (http://www.labmice.net/articles/batchcmds.htm#variable). So it works in general ($0 is shifted), but you need it twice to shift $1 too. As you see my change was from $* to $1 $2 ..., so "cli" is still passed as argument, but shifted. Can you revert my change, do the shifting a second time if it's "cli" (compatibility to Win 9x) or in general if Win 9x can pass $0 too and at the end point me to the shifting code? I don't have access to CVS, Cocoon in the next days/weeks - have to pass exams. Joerg Upayavira wrote: Joerg, Unfortunately, this isn't going to work, as the CLI regularly requires more than 9 arguments, and $* is the only way you can get a batch file to do this. 'shift' should remove the first argument from the list (i.e. the 'cli' bit), but I remember having problems with it. I know therefore therefore that the CLI with parameters doesn't work well on non-NT windows systems, because they don't support $*. So we'll need another way. How can we get 'shift' to work? Regards, Upayavira On 19 Jul 2003 14:26:12 -, [EMAIL PROTECTED] said: joerg 2003/07/19 07:26:12 Modified:.cocoon.bat Log: I don't know if it's correct, but at least now it's no longer tried to use "cli" as URI. Can someone confirm this? Revision ChangesPath 1.11 +2 -2 cocoon-2.1/cocoon.bat Index: cocoon.bat === RCS file: /home/cvs/cocoon-2.1/cocoon.bat,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cocoon.bat 18 Jul 2003 10:34:00 - 1.10 +++ cocoon.bat 19 Jul 2003 14:26:11 - 1.11 @@ -105,7 +105,7 @@ :doCli if not "%OS%" == "Windows_NT" goto noNT shift -%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %* +%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %1 %2 %3 %4 %5 %6 %7 %8 %9 goto end :noNT %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %2 %3 %4 %5 %6 %7 %8 %9
Re: cvs commit: cocoon-2.1 cocoon.bat
Joerg, Unfortunately, this isn't going to work, as the CLI regularly requires more than 9 arguments, and $* is the only way you can get a batch file to do this. 'shift' should remove the first argument from the list (i.e. the 'cli' bit), but I remember having problems with it. I know therefore therefore that the CLI with parameters doesn't work well on non-NT windows systems, because they don't support $*. So we'll need another way. How can we get 'shift' to work? Regards, Upayavira On 19 Jul 2003 14:26:12 -, [EMAIL PROTECTED] said: > joerg 2003/07/19 07:26:12 > > Modified:.cocoon.bat > Log: > I don't know if it's correct, but at least now it's no longer tried to > use "cli" as URI. Can someone confirm this? > > Revision ChangesPath > 1.11 +2 -2 cocoon-2.1/cocoon.bat > > Index: cocoon.bat > === > RCS file: /home/cvs/cocoon-2.1/cocoon.bat,v > retrieving revision 1.10 > retrieving revision 1.11 > diff -u -r1.10 -r1.11 > --- cocoon.bat 18 Jul 2003 10:34:00 - 1.10 > +++ cocoon.bat 19 Jul 2003 14:26:11 - 1.11 > @@ -105,7 +105,7 @@ >:doCli >if not "%OS%" == "Windows_NT" goto noNT >shift > -%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% > -Djava.endorsed.dirs=lib\endorsed > -Dloader.jar.repositories=%COCOON_LIB% > -Dloader.main.class=org.apache.cocoon.Main Loader %* > +%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% > -Djava.endorsed.dirs=lib\endorsed > -Dloader.jar.repositories=%COCOON_LIB% > -Dloader.main.class=org.apache.cocoon.Main Loader %1 %2 %3 %4 %5 %6 %7 > %8 %9 >goto end >:noNT >%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% >-Djava.endorsed.dirs=lib\endorsed >-Dloader.jar.repositories=%COCOON_LIB% >-Dloader.main.class=org.apache.cocoon.Main Loader %2 %3 %4 %5 %6 %7 %8 >%9 > > > >
cvs commit: cocoon-2.1 cocoon.bat
joerg 2003/07/19 07:26:12 Modified:.cocoon.bat Log: I don't know if it's correct, but at least now it's no longer tried to use "cli" as URI. Can someone confirm this? Revision ChangesPath 1.11 +2 -2 cocoon-2.1/cocoon.bat Index: cocoon.bat === RCS file: /home/cvs/cocoon-2.1/cocoon.bat,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cocoon.bat18 Jul 2003 10:34:00 - 1.10 +++ cocoon.bat19 Jul 2003 14:26:11 - 1.11 @@ -105,7 +105,7 @@ :doCli if not "%OS%" == "Windows_NT" goto noNT shift -%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %* +%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %1 %2 %3 %4 %5 %6 %7 %8 %9 goto end :noNT %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %2 %3 %4 %5 %6 %7 %8 %9
cvs commit: cocoon-2.1 cocoon.bat
cziegeler2003/07/18 03:34:00 Modified:.cocoon.bat Log: Making the configuration consistent between windows and unix Revision ChangesPath 1.10 +8 -8 cocoon-2.1/cocoon.bat Index: cocoon.bat === RCS file: /home/cvs/cocoon-2.1/cocoon.bat,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cocoon.bat18 Jul 2003 10:32:29 - 1.9 +++ cocoon.bat18 Jul 2003 10:34:00 - 1.10 @@ -16,7 +16,7 @@ :: JAVA_HOME :: Home of Java installation. :: -:: JAVA_OPT +:: JAVA_OPTIONS :: Extra options to pass to the JVM :: :: JAVA_DEBUG_PORT @@ -105,34 +105,34 @@ :doCli if not "%OS%" == "Windows_NT" goto noNT shift -%JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %* +%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %* goto end :noNT -%JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %2 %3 %4 %5 %6 %7 %8 %9 +%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %2 %3 %4 %5 %6 %7 %8 %9 goto end :: - Servlet --- :doServlet -%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dhome=%COCOON_HOME% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml +%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dhome=%COCOON_HOME% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml goto end :: - Servlet with Administration Web Interface - :doAdmin -%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dhome=%COCOON_HOME% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml %COCOON_HOME%\tools\jetty\conf\admin.xml +%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dhome=%COCOON_HOME% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml %COCOON_HOME%\tools\jetty\conf\admin.xml goto end :: - Servlet Debug - :doDebug -%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -Xdebug -Xrunjdwp:transport=dt_socket,address=%JAVA_DEBUG_PORT%,server=y,suspend=n -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dhome=%COCOON_HOME% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml +%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -Xdebug -Xrunjdwp:transport=dt_socket,address=%JAVA_DEBUG_PORT%,server=y,suspend=n -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dhome=%COCOON_HOME% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml goto end :: -
cvs commit: cocoon-2.1 cocoon.bat
cziegeler2003/07/18 03:32:30 Modified:.cocoon.bat Log: Fixing comment Revision ChangesPath 1.9 +2 -2 cocoon-2.1/cocoon.bat Index: cocoon.bat === RCS file: /home/cvs/cocoon-2.1/cocoon.bat,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cocoon.bat27 Jun 2003 23:18:31 - 1.8 +++ cocoon.bat18 Jul 2003 10:32:29 - 1.9 @@ -16,7 +16,7 @@ :: JAVA_HOME :: Home of Java installation. :: -:: JAVA_OPTIONS +:: JAVA_OPT :: Extra options to pass to the JVM :: :: JAVA_DEBUG_PORT
