9:44 a.m.
Author: remy.maucherat(a)jboss.com
Date: 2008-05-14 10:44:21 -0400 (Wed, 14 May 2008)
New Revision: 623
Modified:
trunk/bin/catalina.bat
trunk/bin/catalina.sh
trunk/res/jboss-web.nsi
trunk/webapps/docs/changelog.xml
Log:
- Port two minor patches.
- Fix changelog (I was adding things to the CR2 changelog).
Modified: trunk/bin/catalina.bat
===================================================================
--- trunk/bin/catalina.bat 2008-05-14 12:07:31 UTC (rev 622)
+++ trunk/bin/catalina.bat 2008-05-14 14:44:21 UTC (rev 623)
@@ -134,7 +134,7 @@
set JPDA_SUSPEND=n
:gotJpdaSuspend
if not "%JPDA_OPTS%" == "" goto gotJpdaOpts
-set JPDA_OPTS=-Xdebug
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
+set
JPDA_OPTS=-agentlib:jdwp=transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
:gotJpdaOpts
shift
:noJpda
Modified: trunk/bin/catalina.sh
===================================================================
--- trunk/bin/catalina.sh 2008-05-14 12:07:31 UTC (rev 622)
+++ trunk/bin/catalina.sh 2008-05-14 14:44:21 UTC (rev 623)
@@ -210,7 +210,7 @@
JPDA_SUSPEND="n"
fi
if [ -z "$JPDA_OPTS" ]; then
- JPDA_OPTS="-Xdebug
-Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND"
+
JPDA_OPTS="-agentlib:jdwp=transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND"
fi
CATALINA_OPTS="$CATALINA_OPTS $JPDA_OPTS"
shift
Modified: trunk/res/jboss-web.nsi
===================================================================
--- trunk/res/jboss-web.nsi 2008-05-14 12:07:31 UTC (rev 622)
+++ trunk/res/jboss-web.nsi 2008-05-14 14:44:21 UTC (rev 623)
@@ -264,7 +264,7 @@
Section -post
nsExec::ExecToLog '"$INSTDIR\bin\jbossweb.exe" //US//JBossWeb --Classpath
"$INSTDIR\bin\bootstrap.jar" --StartClass org.apache.catalina.startup.Bootstrap
--StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
--StartMode jvm --StopMode jvm'
- nsExec::ExecToLog '"$INSTDIR\bin\jbossweb.exe" //US//JBossWeb
--JvmOptions
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"
--StdOutput auto --StdError auto'
+ nsExec::ExecToLog '"$INSTDIR\bin\jbossweb.exe" //US//JBossWeb
--JvmOptions
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"
--StdOutput auto --StdError auto'
WriteUninstaller "$INSTDIR\Uninstall.exe"
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-05-14 12:07:31 UTC (rev 622)
+++ trunk/webapps/docs/changelog.xml 2008-05-14 14:44:21 UTC (rev 623)
@@ -16,6 +16,40 @@
<body>
+<section name="JBoss Web 2.1.1.CR3 (remm)">
+ <subsection name="General">
+ <changelog>
+ <fix>
+ <bug>44988</bug>: Use new Java 5 syntax for debugger options. Patch
provided by Cedrik Lime. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>42934</bug>: Trigger contextInitialized() before
sessionDidActivate(). (markt)
+ </fix>
+ <add>
+ Initial ClusterListener implementation for mod_cluster support. (remm)
+ </add>
+ </changelog>
+ </subsection>
+ <subsection name="Coyote">
+ <changelog>
+ </changelog>
+ </subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>44986</bug>: Case insensitive comparison of charsets. (markt)
+ </fix>
+ <fix>
+ <bug>42943</bug>: Make sure the nested element is inside a
<jsp:text> element. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 2.1.1.CR2 (remm)">
<subsection name="General">
<changelog>
@@ -55,9 +89,6 @@
<fix>
<bug>44021</bug>: Add support to manger and deployer for wars and
dirs that use # to denote multi-level contexts. (markt)
</fix>
- <fix>
- <bug>42934</bug>: Trigger contextInitialized() before
sessionDidActivate(). (markt)
- </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -81,12 +112,6 @@
<fix>
<jboss-jira>JBCTS-776</jboss-jira>: NPE regression in EL type
handling. (remm)
</fix>
- <fix>
- <jboss-jira>JBAS-5518</jboss-jira>: Case insensitive comparison of
charsets. (remm)
- </fix>
- <fix>
- <bug>42943</bug>: Make sure the nested element is inside a
<jsp:text> element. (markt)
- </fix>
</changelog>
</subsection>
</section>