Author: jfrederic.clere(a)jboss.com
Date: 2010-05-25 10:29:29 -0400 (Tue, 25 May 2010)
New Revision: 2676
Modified:
trunk/build/unix/buildbin.TC7.sh
Log:
iAdd missing setenv.sh and arrange SSL parameters.
Modified: trunk/build/unix/buildbin.TC7.sh
===================================================================
--- trunk/build/unix/buildbin.TC7.sh 2010-05-25 12:40:23 UTC (rev 2675)
+++ trunk/build/unix/buildbin.TC7.sh 2010-05-25 14:29:29 UTC (rev 2676)
@@ -61,8 +61,14 @@
echo ""
echo "Running TCK tests"
cp $HOME/tcks/conf/* $native_sources/output/build/conf
-sed '/@SSL_CONNECTOR@/ r $HOME/tcks/conf/server.xml.apr' <
$HOME/tcks/conf/server.xml > $native_sources/output/build/conf/server.xml
(cd $HOME/tcks/servlet; bash install.sh $native_sources/output/build)
+sed "/@SSL_CONNECTOR@/r $HOME/tcks/conf/server.xml.apr"
$HOME/tcks/conf/server.xml | sed "/@SSL_CONNECTOR@/d" >
$native_sources/output/build/conf/server.xml
+
+cat > $native_sources/output/build/bin/setenv.sh << EOF
+JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
-Dorg.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR=false"
+export JAVA_OPTS
+EOF
+
(cd $native_sources/output/build; bin/startup.sh)
echo ""
echo "Waiting for Tomcat to start"