Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 62860 invoked from network); 13 Feb 2006 10:14:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Feb 2006 10:14:16 -0000 Received: (qmail 603 invoked by uid 500); 13 Feb 2006 10:14:15 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 463 invoked by uid 500); 13 Feb 2006 10:14:14 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 451 invoked by uid 99); 13 Feb 2006 10:14:14 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Feb 2006 02:14:14 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 13 Feb 2006 02:14:13 -0800 Received: (qmail 62763 invoked by uid 65534); 13 Feb 2006 10:13:53 -0000 Message-ID: <20060213101353.62760.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r377333 - in /cocoon/branches/BRANCH_2_1_X: cocoon.bat cocoon.sh Date: Mon, 13 Feb 2006 10:13:52 -0000 To: cvs@cocoon.apache.org From: jbq@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jbq Date: Mon Feb 13 02:13:50 2006 New Revision: 377333 URL: http://svn.apache.org/viewcvs?rev=377333&view=rev Log: Add WEB-INF/classes to loader's classpath for cli and precompile Modified: cocoon/branches/BRANCH_2_1_X/cocoon.bat cocoon/branches/BRANCH_2_1_X/cocoon.sh Modified: cocoon/branches/BRANCH_2_1_X/cocoon.bat URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/cocoon.bat?rev=377333&r1=377332&r2=377333&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/cocoon.bat (original) +++ cocoon/branches/BRANCH_2_1_X/cocoon.bat Mon Feb 13 02:13:50 2006 @@ -136,7 +136,7 @@ :cliLoopEnd -"%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" -Djava.endorsed.dirs=lib\endorsed "-Dloader.jar.repositories=%COCOON_LIB%" -Dloader.class.path=lib\core\servlet_2_2.jar -Dloader.verbose=false -Dloader.main.class=org.apache.cocoon.Main Loader %param% +"%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" -Djava.endorsed.dirs=lib\endorsed "-Dloader.jar.repositories=%COCOON_LIB%" "-Dloader.class.path=lib\core\servlet_2_2.jar;%COCOON_HOME%\build\webapp\WEB-INF\classes" -Dloader.verbose=false -Dloader.main.class=org.apache.cocoon.Main Loader %param% goto end :: ----- Precompile ------------------------------------------------------------ @@ -152,7 +152,7 @@ :PrecompileLoopEnd -"%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" -Djava.endorsed.dirs=lib\endorsed "-Dloader.jar.repositories=%COCOON_LIB%" -Dloader.class.path=lib\core\servlet_2_2.jar -Dloader.verbose=false -Dloader.main.class=org.apache.cocoon.bean.XSPPrecompileWrapper Loader %param% +"%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" -Djava.endorsed.dirs=lib\endorsed "-Dloader.jar.repositories=%COCOON_LIB%" "-Dloader.class.path=lib\core\servlet_2_2.jar;%COCOON_HOME%\build\webapp\WEB-INF\classes" -Dloader.verbose=false -Dloader.main.class=org.apache.cocoon.bean.XSPPrecompileWrapper Loader %param% goto end :: ----- Servlet --------------------------------------------------------------- Modified: cocoon/branches/BRANCH_2_1_X/cocoon.sh URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/cocoon.sh?rev=377333&r1=377332&r2=377333&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/cocoon.sh (original) +++ cocoon/branches/BRANCH_2_1_X/cocoon.sh Mon Feb 13 02:13:50 2006 @@ -141,7 +141,7 @@ CLI="-Dloader.main.class=org.apache.cocoon.Main" CLI_LIBRARIES="-Dloader.jar.repositories=$COCOON_LIB" -CLI_CLASSPATH="-Dloader.class.path=lib/core/servlet_2_2.jar" +CLI_CLASSPATH="-Dloader.class.path=lib/core/servlet_2_2.jar:$COCOON_WEBAPP_HOME/WEB-INF/classes" CLI_VERBOSE="-Dloader.verbose=false" CLI_PROPERTIES="$CLI_LIBRARIES $CLI_CLASSPATH $CLI_VERBOSE"